From: alex <alex>
Date: Sun, 3 Jul 2005 20:23:57 +0000 (+0000)
Subject: - highmem-split-2.6.10-fc3.patch in order to make 3GB memory on mountain's
X-Git-Tag: v1_7_100~1132
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=8ddd7c44ca5118b0cd524119bb2f5221841f34a7

- highmem-split-2.6.10-fc3.patch in order to make 3GB memory on mountain's
  nodes available
---

diff --git a/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch b/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
new file mode 100644
index 0000000..f0498b0
--- /dev/null
+++ b/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
@@ -0,0 +1,86 @@
+diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig
+--- ./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
+@@ -721,6 +721,27 @@
+ 	depends on HIGHMEM64G
+ 	default y
+ 
++choice
++	prompt "User address space size"
++
++config USER_3GB
++        depends on X86
++	depends on NOHIGHMEM
++	bool "3GB User Address Space"
++
++config USER_2GB
++        depends on X86
++	depends on NOHIGHMEM
++	bool "2GB User Address Space"
++
++config USER_1GB
++        depends on X86
++	depends on NOHIGHMEM
++	bool "1GB User Address Space"
++
++endchoice
++
++
+ # Common NUMA Features
+ config NUMA
+ 	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
+--- ./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
+@@ -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
++#elif defined(CONFIG_USER_3GB)
++#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
++#elif defined(CONFIG_USER_3GB)
++#define PAGE_OFFSET_RAW 0xC0000000UL
++#endif
++
++#endif
+diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/asm-generic/vmlinux.lds.h
+--- ./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
+@@ -1,3 +1,6 @@
++
++#include <asm-generic/page_offset.h>
++
+ #ifndef LOAD_OFFSET
+ #define LOAD_OFFSET 0
+ #endif
+diff -Naur ./include/asm-i386/page.h ../linux-2.6.8.1-mem/./include/asm-i386/page.h
+--- ./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
+@@ -119,9 +119,11 @@
+ #endif /* __ASSEMBLY__ */
+ 
+ #ifdef __ASSEMBLY__
+-#define __PAGE_OFFSET		(0xC0000000)
++#include <asm-generic/page_offset.h>
++#define __PAGE_OFFSET		(PAGE_OFFSET_RAW)
+ #else
+-#define __PAGE_OFFSET		(0xC0000000UL)
++#include <asm-generic/page_offset.h>
++#define __PAGE_OFFSET		(PAGE_OFFSET_RAW)
+ #endif
+ 
+ 
diff --git a/lustre/kernel_patches/series/2.6-fc3.series b/lustre/kernel_patches/series/2.6-fc3.series
index 3819f0e..4ba55c9 100644
--- a/lustre/kernel_patches/series/2.6-fc3.series
+++ b/lustre/kernel_patches/series/2.6-fc3.series
@@ -28,3 +28,4 @@ linux-2.6.10-fc3-lkcd.patch
 vfs-intent_release_umount-vanilla-2.6.10-fc3.patch
 vfs-umount_lustre-vanilla-2.6.10-fc3.patch
 export-show_task-2.6-vanilla.patch
+highmem-split-2.6.10-fc3.patch