From 5402f73b0c1369d0a9af1ef380240beb306c338e Mon Sep 17 00:00:00 2001
From: tappro <tappro>
Date: Tue, 7 Nov 2006 07:31:06 +0000
Subject: [PATCH] add highmem-split patch from HEAD to series

---
 .../patches/highmem-split-2.6-rhel4.patch          | 83 ++++++++++++++++++++++
 lustre/kernel_patches/series/2.6-rhel4.series      |  4 +-
 2 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 lustre/kernel_patches/patches/highmem-split-2.6-rhel4.patch

diff --git a/lustre/kernel_patches/patches/highmem-split-2.6-rhel4.patch b/lustre/kernel_patches/patches/highmem-split-2.6-rhel4.patch
new file mode 100644
index 0000000..ec34fc3
--- /dev/null
+++ b/lustre/kernel_patches/patches/highmem-split-2.6-rhel4.patch
@@ -0,0 +1,83 @@
+diff -Naur linux-2.6.10/arch/i386/Kconfig linux-2.6.10/arch/i386/Kconfig
+--- linux-2.6.10/arch/i386/Kconfig	2004-08-25 21:38:29.435578760 -0600
++++ linux-2.6.10/arch/i386/Kconfig	2004-08-25 20:50:36.000000000 -0600
+@@ -789,6 +789,26 @@
+ 	depends on HIGHMEM64G
+ 	default y
+ 
++choice
++       depends on !X86_4G
++	depends on NOHIGHMEM
++	prompt "User address space size"
++
++config USER_3GB
++       depends on X86
++	bool "3GB User Address Space"
++
++config USER_2GB
++       depends on X86
++	bool "2GB User Address Space"
++
++config USER_1GB
++       depends on X86
++	bool "1GB User Address Space"
++
++endchoice
++
++
+ # Common NUMA Features
+ config NUMA
+ 	bool "Numa Memory Allocation and Scheduler Support"
+diff -Naur linux-2.6.10/include/asm-generic/page_offset.h linux-2.6.10/include/asm-generic/page_offset.h
+--- linux-2.6.10/include/asm-generic/page_offset.h	1969-12-31 17:00:00.000000000 -0700
++++ linux-2.6.10/include/asm-generic/page_offset.h	2004-08-25 20:51:03.000000000 -0600
+@@ -0,0 +1,24 @@
++
++#include <linux/config.h>
++
++#ifdef __ASSEMBLY__
++
++#if defined(CONFIG_USER_1GB)
++#define PAGE_OFFSET_RAW 0x40000000
++#elif defined(CONFIG_USER_2GB)
++#define PAGE_OFFSET_RAW 0x80000000
++#else
++#define PAGE_OFFSET_RAW 0xc0000000
++#endif
++
++#else
++
++#if defined(CONFIG_USER_1GB)
++#define PAGE_OFFSET_RAW 0x40000000UL
++#elif defined(CONFIG_USER_2GB)
++#define PAGE_OFFSET_RAW 0x80000000UL
++#else
++#define PAGE_OFFSET_RAW 0xc0000000UL
++#endif
++
++#endif
+diff -Naur linux-2.6.10/include/asm-generic/vmlinux.lds.h linux-2.6.10/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.10/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-25 20:49:32.000000000 -0600
+@@ -1,3 +1,6 @@
++
++#include <asm-generic/page_offset.h>
++
+ #ifndef LOAD_OFFSET
+ #define LOAD_OFFSET 0
+ #endif
+diff -Naur linux-2.6.10/include/asm-i386/page.h linux-2.6.10/include/asm-i386/page.h
+--- linux-2.6.10/include/asm-i386/page.h	2004-08-14 04:54:50.000000000 -0600
++++ linux-2.6.10/include/asm-i386/page.h	2004-08-25 20:49:32.000000000 -0600
+@@ -103,7 +103,8 @@
+ #define __PAGE_OFFSET		(0x02000000)
+ #define TASK_SIZE		((current->personality & 0x8000000) ? 0xc0000000 : 0xff000000)
+ #else
+-#define __PAGE_OFFSET		(0xc0000000)
++#include <asm-generic/page_offset.h>
++#define __PAGE_OFFSET		(PAGE_OFFSET_RAW)
+ #define TASK_SIZE		(0xc0000000)
+ #endif
+ 
+ 
+ 
diff --git a/lustre/kernel_patches/series/2.6-rhel4.series b/lustre/kernel_patches/series/2.6-rhel4.series
index 0ef45f0..93a0308 100644
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -19,7 +19,6 @@ qsnet-rhel4-2.6.patch
 linux-2.6-binutils-2.16.patch
 vm-tunables-rhel4.patch 
 2.6-rhel4-kgdb-ga.patch 
-tcp-zero-copy-2.6.9-rhel4.patch
 iallocsem_consistency.patch
 raid5-stats.patch
 raid5-configurable-cachesize.patch
@@ -29,6 +28,7 @@ raid5-merge-ios.patch
 raid5-serialize-ovelapping-reqs.patch
 jbd-stats-2.6.9.patch 
 bitops_ext2_find_next_le_bit-2.6.patch 
-proc-sleep-2.6.9.patch 
+highmem-split-2.6-rhel4.patch
+proc-sleep-2.6.9.patch
 pag-basic-2.6-rhel4.patch
 dynamic-locks-2.6.9.patch 
-- 
1.8.3.1