diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-10-21 13:36:30 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-12-14 11:35:00 +0100 |
| commit | f903d68ea42ed7d95f0d5a60db80c3d0489250e5 (patch) | |
| tree | 5d3c2641c7378de8dc8df627e9647da955697418 | |
| parent | 984dfde8a7189f3e5fa00799b7392b8328edfa58 (diff) | |
linux 2.6.23: dropped em-x270 copy of time.h.patch
| -rw-r--r-- | recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch | 19 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.23.bb | 3 |
2 files changed, 1 insertions, 21 deletions
diff --git a/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch b/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch deleted file mode 100644 index a2f6e1765e..0000000000 --- a/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - include/linux/time.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) -diff --git a/include/linux/time.h b/include/linux/time.h -index 2091a19..d32ef0a 100644 ---- a/include/linux/time.h -+++ b/include/linux/time.h -@@ -173,6 +173,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_2.6.23.bb b/recipes/linux/linux_2.6.23.bb index 69cdb57c27..65f400d6b6 100644 --- a/recipes/linux/linux_2.6.23.bb +++ b/recipes/linux/linux_2.6.23.bb @@ -31,8 +31,7 @@ SRC_URI_avr32 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \ " SRC_URI_append_em-x270 = "\ - file://em-x270.patch;patch=1 \ - file://01-prevent_loop_timespec_add_ns.patch;patch=1" + file://em-x270.patch;patch=1 " SRC_URI_append_cm-x270 = "\ file://0001-cm-x270-base2.patch;patch=1 \ |