Skip to content
Snippets Groups Projects
Commit 04a7ad46 authored by alex's avatar alex
Browse files

- minor cleanups in that patch, quilt pop was claiming about old version

parent 4d6b0dbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
+ 12
− 12
View file @ 04a7ad46
diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig diff -Naur linux-2.6.10/arch/i386/Kconfig linux-2.6.10/arch/i386/Kconfig
--- ./arch/i386/Kconfig 2004-08-25 21:38:29.435578760 -0600 --- linux-2.6.10/arch/i386/Kconfig 2004-08-25 21:38:29.435578760 -0600
+++ ../linux-2.6.8.1-mem/./arch/i386/Kconfig 2004-08-25 20:50:36.000000000 -0600 +++ linux-2.6.10/arch/i386/Kconfig 2004-08-25 20:50:36.000000000 -0600
@@ -721,6 +721,27 @@ @@ -721,6 +721,27 @@
depends on HIGHMEM64G depends on HIGHMEM64G
default y default y
...@@ -29,9 +29,9 @@ diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig ...@@ -29,9 +29,9 @@ diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig
# Common NUMA Features # Common NUMA Features
config NUMA config NUMA
bool "Numa Memory Allocation and Scheduler Support" bool "Numa Memory Allocation and Scheduler Support"
diff -Naur ./include/asm-generic/page_offset.h ../linux-2.6.8.1-mem/./include/asm-generic/page_offset.h diff -Naur linux-2.6.10/include/asm-generic/page_offset.h linux-2.6.10/include/asm-generic/page_offset.h
--- ./include/asm-generic/page_offset.h 1969-12-31 17:00:00.000000000 -0700 --- linux-2.6.10/include/asm-generic/page_offset.h 1969-12-31 17:00:00.000000000 -0700
+++ ../linux-2.6.8.1-mem/./include/asm-generic/page_offset.h 2004-08-25 20:51:03.000000000 -0600 +++ linux-2.6.10/include/asm-generic/page_offset.h 2004-08-25 20:51:03.000000000 -0600
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+ +
+#include <linux/config.h> +#include <linux/config.h>
...@@ -57,9 +57,9 @@ diff -Naur ./include/asm-generic/page_offset.h ../linux-2.6.8.1-mem/./include/as ...@@ -57,9 +57,9 @@ diff -Naur ./include/asm-generic/page_offset.h ../linux-2.6.8.1-mem/./include/as
+#endif +#endif
+ +
+#endif +#endif
diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/asm-generic/vmlinux.lds.h diff -Naur linux-2.6.10/include/asm-generic/vmlinux.lds.h linux-2.6.10/include/asm-generic/vmlinux.lds.h
--- ./include/asm-generic/vmlinux.lds.h 2004-08-14 04:54:48.000000000 -0600 --- linux-2.6.10/include/asm-generic/vmlinux.lds.h 2004-08-14 04:54:48.000000000 -0600
+++ ../linux-2.6.8.1-mem/./include/asm-generic/vmlinux.lds.h 2004-08-25 20:49:32.000000000 -0600 +++ linux-2.6.10/include/asm-generic/vmlinux.lds.h 2004-08-25 20:49:32.000000000 -0600
@@ -1,3 +1,6 @@ @@ -1,3 +1,6 @@
+ +
+#include <asm-generic/page_offset.h> +#include <asm-generic/page_offset.h>
...@@ -67,9 +67,9 @@ diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/as ...@@ -67,9 +67,9 @@ diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/as
#ifndef LOAD_OFFSET #ifndef LOAD_OFFSET
#define LOAD_OFFSET 0 #define LOAD_OFFSET 0
#endif #endif
diff -Naur ./include/asm-i386/page.h ../linux-2.6.8.1-mem/./include/asm-i386/page.h diff -Naur linux-2.6.10/include/asm-i386/page.h linux-2.6.10/include/asm-i386/page.h
--- ./include/asm-i386/page.h 2004-08-14 04:54:50.000000000 -0600 --- linux-2.6.10/include/asm-i386/page.h 2004-08-14 04:54:50.000000000 -0600
+++ ../linux-2.6.8.1-mem/./include/asm-i386/page.h 2004-08-25 20:49:32.000000000 -0600 +++ linux-2.6.10/include/asm-i386/page.h 2004-08-25 20:49:32.000000000 -0600
@@ -119,9 +119,11 @@ @@ -119,9 +119,11 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy