diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-07-10 00:39:00 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-07-10 00:39:00 +0000 |
| commit | ad9f3f89ff3ceecfe9dbd2f6ac4a50851fdac5aa (patch) | |
| tree | 62077687a492c3c5dd6f8c8cbe3b7297fd914511 /sys-kernel | |
| parent | make sys-kernel/linux26-headers the default virtual/os-headers on all amd64 p... (diff) | |
| download | historical-ad9f3f89ff3ceecfe9dbd2f6ac4a50851fdac5aa.tar.gz historical-ad9f3f89ff3ceecfe9dbd2f6ac4a50851fdac5aa.tar.bz2 historical-ad9f3f89ff3ceecfe9dbd2f6ac4a50851fdac5aa.zip | |
Adding a slight tweak to <asm-x86_64/system.h> needed for iptables on AMD64 - bug #55928.
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux26-headers/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index 72500cf88f19..dc371a5f5204 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -25,4 +25,4 @@ MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-ba MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66 MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r1 66 -MD5 7985a1dfc2856b864241d6d462b4d7e4 files/linux26-headers-2.6.7-appCompat.patch 30215 +MD5 d6e1f23d0a090d6c0c0d44af0075359e files/linux26-headers-2.6.7-appCompat.patch 30277 diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch index 9d8492cc2adf..169fdda7fc87 100644 --- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch +++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch @@ -700,13 +700,15 @@ diff -ur linux-2.6.6/include/asm-x86_64/processor.h linux-2.6.6-gentoo/include/a } __attribute__((aligned(16))); #define INIT_THREAD {} -diff -ur linux-2.6.6/include/asm-x86_64/system.h linux-2.6.6-gentoo/include/asm-x86_64/system.h ---- linux-2.6.6/include/asm-x86_64/system.h 2004-06-02 19:25:27.000000000 +0100 -+++ linux-2.6.6-gentoo/include/asm-x86_64/system.h 2004-06-02 19:25:17.000000000 +0100 -@@ -5,6 +5,30 @@ +diff -ur linux-2.6.7/include/asm-x86_64/system.h linux-2.6.7-gentoo/include/asm-x86_64/system.h +--- linux-2.6.7/include/asm-x86_64/system.h 2004-06-02 19:25:27.000000000 +0100 ++++ linux-2.6.7-gentoo/include/asm-x86_64/system.h 2004-06-02 19:25:17.000000000 +0100 +@@ -4,6 +4,32 @@ + #include <linux/config.h> #include <linux/kernel.h> #include <asm/segment.h> - ++#include <linux/bitops.h> /* for LOCK_PREFIX... */ ++ +/* + * Alternative inline assembly with input. + * @@ -717,6 +719,7 @@ diff -ur linux-2.6.6/include/asm-x86_64/system.h linux-2.6.6-gentoo/include/asm- + * If you use variable sized constraints like "m" or "g" in the + * replacement maake sure to pad to the worst case length. + */ ++ +#define alternative_input(oldinstr, newinstr, feature, input) \ + asm volatile ("661:\n\t" oldinstr "\n662:\n" \ + ".section .altinstructions,\"a\"\n" \ @@ -730,11 +733,10 @@ diff -ur linux-2.6.6/include/asm-x86_64/system.h linux-2.6.6-gentoo/include/asm- + ".section .altinstr_replacement,\"ax\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */ \ + ".previous" :: "i" (feature), input) -+ + #ifdef __KERNEL__ - #ifdef CONFIG_SMP -@@ -114,30 +138,6 @@ +@@ -114,30 +140,6 @@ ".previous" :: "i" (feature) : "memory") /* |