summaryrefslogtreecommitdiff
path: root/2.6.17
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2006-09-16 14:25:08 +0100
committerTim Yamin <plasmaroo@gentoo.org>2006-09-16 14:25:08 +0100
commit5dcf4af3f4a2057685941f7e025acd12e3f3fdee (patch)
treefa62a94070af8763b3af89f9117c290c33752594 /2.6.17
parentpatchset for latest 2.4 kernel (diff)
downloadlinux-headers-patches-5dcf4af3f4a2057685941f7e025acd12e3f3fdee.tar.gz
linux-headers-patches-5dcf4af3f4a2057685941f7e025acd12e3f3fdee.tar.bz2
linux-headers-patches-5dcf4af3f4a2057685941f7e025acd12e3f3fdee.zip
Fix #144082, #145512.
Diffstat (limited to '2.6.17')
-rw-r--r--2.6.17/2.6.17-fix-x86_64-compat.patch (renamed from 2.6.17/2.6.17-fix-x86_64-compat.h)3
-rw-r--r--2.6.17/2.6.17-i386-fls64-144082.patch15
2 files changed, 17 insertions, 1 deletions
diff --git a/2.6.17/2.6.17-fix-x86_64-compat.h b/2.6.17/2.6.17-fix-x86_64-compat.patch
index cb02d7b..cda9210 100644
--- a/2.6.17/2.6.17-fix-x86_64-compat.h
+++ b/2.6.17/2.6.17-fix-x86_64-compat.patch
@@ -8,9 +8,10 @@
#ifdef __USE_MISC
#undef st_atime
+
--- linux-2.6.17/include/asm-x86_64/compat.h 2006-03-20 05:53:29.000000000 +0000
+++ linux-2.6.17-gentoo/include/asm-x86_64/compat.h 2006-08-08 00:14:22.000000000 +0100
-@@ -5,68 +5,68 @@
+@@ -5,7 +5,7 @@
* Architecture specific compatibility types
*/
#include <linux/types.h>
diff --git a/2.6.17/2.6.17-i386-fls64-144082.patch b/2.6.17/2.6.17-i386-fls64-144082.patch
new file mode 100644
index 0000000..8651a35
--- /dev/null
+++ b/2.6.17/2.6.17-i386-fls64-144082.patch
@@ -0,0 +1,15 @@
+--- linux-2.6.17/include/asm-i386/bitops.h 2006-08-13 20:12:14.000000000 +0100
++++ linux-2.6.17/include/asm-i386/bitops.h 2006-09-16 12:58:51.000000000 +0100
+@@ -403,11 +403,10 @@
+ }
+
+ #include <asm-generic/bitops/hweight.h>
++#include <asm-generic/bitops/fls64.h>
+
+ #endif /* __KERNEL__ */
+
+-#include <asm-generic/bitops/fls64.h>
+-
+ #ifdef __KERNEL__
+
+ #include <asm-generic/bitops/ext2-non-atomic.h>