diff -urN highmem-debug-ref/arch/i386/config.in highmem-debug/arch/i386/config.in
--- highmem-debug-ref/arch/i386/config.in	Sat Mar 30 21:09:44 2002
+++ highmem-debug/arch/i386/config.in	Sat Mar 30 21:10:22 2002
@@ -435,6 +435,9 @@
    bool '  Memory mapped I/O debugging' CONFIG_DEBUG_IOVIRT
    bool '  Magic SysRq key' CONFIG_MAGIC_SYSRQ
    bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
+   if [ "$CONFIG_HIGHMEM" = "y" ]; then
+      bool '  Emulate HIGHMEM on lowmem machines' CONFIG_HIGHMEM_EMULATION
+   fi
 fi
 
 endmenu
diff -urN highmem-debug-ref/arch/i386/kernel/setup.c highmem-debug/arch/i386/kernel/setup.c
--- highmem-debug-ref/arch/i386/kernel/setup.c	Sat Mar 30 21:09:43 2002
+++ highmem-debug/arch/i386/kernel/setup.c	Sat Mar 30 21:09:54 2002
@@ -838,7 +838,20 @@
 /*
  * Reserved space for vmalloc and iomap - defined in asm/page.h
  */
+#ifdef CONFIG_HIGHMEM_EMULATION
+#define ORDER_DOWN(x)	((x >> (MAX_ORDER-1)) << (MAX_ORDER-1))
+#define MAXMEM_PFN					\
+({							\
+	int __max_pfn;					\
+	if (max_pfn > PFN_DOWN(MAXMEM))			\
+	     __max_pfn = PFN_DOWN(MAXMEM);		\
+	else						\
+	     __max_pfn = ORDER_DOWN(max_pfn / 5);	\
+	__max_pfn;					\
+})
+#else
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
+#endif
 #define MAX_NONPAE_PFN	(1 << 20)
 
 	/*