lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch

   1 diff -Naur linux-2.6.10/arch/i386/Kconfig linux-2.6.10/arch/i386/Kconfig
   2 --- linux-2.6.10/arch/i386/Kconfig      2004-08-25 21:38:29.435578760 -0600
   3 +++ linux-2.6.10/arch/i386/Kconfig      2004-08-25 20:50:36.000000000 -0600
   4 @@ -721,6 +721,27 @@
   5         depends on HIGHMEM64G
   6         default y
   7
   8 +choice
   9 +       prompt "User address space size"
  10 +
  11 +config USER_3GB
  12 +        depends on X86
  13 +       depends on NOHIGHMEM
  14 +       bool "3GB User Address Space"
  15 +
  16 +config USER_2GB
  17 +        depends on X86
  18 +       depends on NOHIGHMEM
  19 +       bool "2GB User Address Space"
  20 +
  21 +config USER_1GB
  22 +        depends on X86
  23 +       depends on NOHIGHMEM
  24 +       bool "1GB User Address Space"
  25 +
  26 +endchoice
  27 +
  28 +
  29  # Common NUMA Features
  30  config NUMA
  31         bool "Numa Memory Allocation and Scheduler Support"
  32 diff -Naur linux-2.6.10/include/asm-generic/page_offset.h linux-2.6.10/include/asm-generic/page_offset.h
  33 --- linux-2.6.10/include/asm-generic/page_offset.h      1969-12-31 17:00:00.000000000 -0700
  34 +++ linux-2.6.10/include/asm-generic/page_offset.h      2004-08-25 20:51:03.000000000 -0600
  35 @@ -0,0 +1,24 @@
  36 +
  37 +#include <linux/config.h>
  38 +
  39 +#ifdef __ASSEMBLY__
  40 +
  41 +#if defined(CONFIG_USER_1GB)
  42 +#define PAGE_OFFSET_RAW 0x40000000
  43 +#elif defined(CONFIG_USER_2GB)
  44 +#define PAGE_OFFSET_RAW 0x80000000
  45 +#elif defined(CONFIG_USER_3GB)
  46 +#define PAGE_OFFSET_RAW 0xC0000000
  47 +#endif
  48 +
  49 +#else
  50 +
  51 +#if defined(CONFIG_USER_1GB)
  52 +#define PAGE_OFFSET_RAW 0x40000000UL
  53 +#elif defined(CONFIG_USER_2GB)
  54 +#define PAGE_OFFSET_RAW 0x80000000UL
  55 +#elif defined(CONFIG_USER_3GB)
  56 +#define PAGE_OFFSET_RAW 0xC0000000UL
  57 +#endif
  58 +
  59 +#endif
  60 diff -Naur linux-2.6.10/include/asm-generic/vmlinux.lds.h linux-2.6.10/include/asm-generic/vmlinux.lds.h
  61 --- linux-2.6.10/include/asm-generic/vmlinux.lds.h      2004-08-14 04:54:48.000000000 -0600
  62 +++ linux-2.6.10/include/asm-generic/vmlinux.lds.h      2004-08-25 20:49:32.000000000 -0600
  63 @@ -1,3 +1,6 @@
  64 +
  65 +#include <asm-generic/page_offset.h>
  66 +
  67  #ifndef LOAD_OFFSET
  68  #define LOAD_OFFSET 0
  69  #endif
  70 diff -Naur linux-2.6.10/include/asm-i386/page.h linux-2.6.10/include/asm-i386/page.h
  71 --- linux-2.6.10/include/asm-i386/page.h        2004-08-14 04:54:50.000000000 -0600
  72 +++ linux-2.6.10/include/asm-i386/page.h        2004-08-25 20:49:32.000000000 -0600
  73 @@ -119,9 +119,11 @@
  74  #endif /* __ASSEMBLY__ */
  75
  76  #ifdef __ASSEMBLY__
  77 -#define __PAGE_OFFSET          (0xC0000000)
  78 +#include <asm-generic/page_offset.h>
  79 +#define __PAGE_OFFSET          (PAGE_OFFSET_RAW)
  80  #else
  81 -#define __PAGE_OFFSET          (0xC0000000UL)
  82 +#include <asm-generic/page_offset.h>
  83 +#define __PAGE_OFFSET          (PAGE_OFFSET_RAW)
  84  #endif
  85
  86