diff options
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 15 | ||||
| -rw-r--r-- | recipes/linux/linux-rp_2.6.24.bb | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..9d7020d9f1 --- /dev/null +++ b/recipes/linux/linux-rp-2.6.24/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.24/include/linux/time.h +=================================================================== +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -172,6 +172,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/recipes/linux/linux-rp_2.6.24.bb b/recipes/linux/linux-rp_2.6.24.bb index 7b06916e1c..dd73738a3e 100644 --- a/recipes/linux/linux-rp_2.6.24.bb +++ b/recipes/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r22" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -23,6 +23,7 @@ DEFAULT_PREFERENCE_spitz = "1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ ${RPSRC}/export_atags-r2.patch;patch=1;status=pending \ ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending \ ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1;status=pending \ |