diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2010-06-23 13:51:15 +0800 |
---|---|---|
committer | Dexuan Cui <dexuan.cui@intel.com> | 2010-06-23 14:41:25 +0800 |
commit | a1d913a7fcb15dd75f457f5ba75f9ec3ed244918 (patch) | |
tree | e6686b205e4734122d709af84586166447e43613 /meta | |
parent | 3ceb99937d3cbfbd97f8a13c9e06118fe9003873 (diff) | |
download | poky-a1d913a7fcb15dd75f457f5ba75f9ec3ed244918.tar.gz |
linux-omap: fix build failure with gcc-4.3.3
Pull time.h patch from upstream Linux kernel
(commit 38332cb98772f5ea757e6486bed7ed0381cb5f98)
The patch fixes the following build failure:
LD .tmp_vmlinux1
kernel/built-in.o: In function `timespec_add_ns':
undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `do_gettimeofday':
undefined reference to `__aeabi_uldivmod'
undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `timespec_add_ns':
undefined reference to `__aeabi_uldivmod'
undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: more undefined references to `__aeabi_uldivmod'
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch | 29 | ||||
-rw-r--r-- | meta/packages/linux/linux-omap_2.6.24.7.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch b/meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch new file mode 100644 index 0000000000..58cbe7be23 --- /dev/null +++ b/meta/packages/linux/linux-omap-2.6.24.7/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | commit 38332cb98772f5ea757e6486bed7ed0381cb5f98 | ||
2 | Author: Segher Boessenkool <segher@kernel.crashing.org> | ||
3 | Date: Tue Mar 4 14:59:54 2008 -0800 | ||
4 | |||
5 | time: prevent the loop in timespec_add_ns() from being optimised away | ||
6 | |||
7 | Since some architectures don't support __udivdi3(). | ||
8 | |||
9 | Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> | ||
10 | Cc: john stultz <johnstul@us.ibm.com> | ||
11 | Cc: Ingo Molnar <mingo@elte.hu> | ||
12 | Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | ||
13 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | ||
14 | |||
15 | diff --git a/include/linux/time.h b/include/linux/time.h | ||
16 | index 2091a19..d32ef0a 100644 | ||
17 | --- a/include/linux/time.h | ||
18 | +++ b/include/linux/time.h | ||
19 | @@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) | ||
20 | { | ||
21 | ns += a->tv_nsec; | ||
22 | while(unlikely(ns >= NSEC_PER_SEC)) { | ||
23 | + /* The following asm() prevents the compiler from | ||
24 | + * optimising this loop into a modulo operation. */ | ||
25 | + asm("" : "+r"(ns)); | ||
26 | + | ||
27 | ns -= NSEC_PER_SEC; | ||
28 | a->tv_sec++; | ||
29 | } | ||
diff --git a/meta/packages/linux/linux-omap_2.6.24.7.bb b/meta/packages/linux/linux-omap_2.6.24.7.bb index 1cdad0db5e..1defa79c50 100644 --- a/meta/packages/linux/linux-omap_2.6.24.7.bb +++ b/meta/packages/linux/linux-omap_2.6.24.7.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require linux-omap.inc | 1 | require linux-omap.inc |
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r6" |
4 | 4 | ||
5 | COMPATIBLE_MACHINE = "omap-3430ldp|omap-3430sdp" | 5 | COMPATIBLE_MACHINE = "omap-3430ldp|omap-3430sdp" |
6 | DEFAULT_PREFERENCE = "1" | 6 | DEFAULT_PREFERENCE = "1" |
@@ -18,6 +18,7 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ | |||
18 | file://fixes.patch;patch=1 \ | 18 | file://fixes.patch;patch=1 \ |
19 | file://fixes2.patch;patch=1 \ | 19 | file://fixes2.patch;patch=1 \ |
20 | file://module_fix.patch;patch=1 \ | 20 | file://module_fix.patch;patch=1 \ |
21 | file://time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch;patch=1 \ | ||
21 | file://defconfig-${MACHINE}" | 22 | file://defconfig-${MACHINE}" |
22 | 23 | ||
23 | S = "${WORKDIR}/linux-2.6.24" | 24 | S = "${WORKDIR}/linux-2.6.24" |