diff -urN highmem-ref/arch/i386/config.in highmem/arch/i386/config.in
--- highmem-ref/arch/i386/config.in	Tue Oct  9 04:43:33 2001
+++ highmem/arch/i386/config.in	Tue Oct  9 04:44:13 2001
@@ -406,6 +406,9 @@
    bool '  Spinlock debugging' CONFIG_DEBUG_SPINLOCK
    bool '  Verbose BUG() reporting (adds 70K)' CONFIG_DEBUG_BUGVERBOSE
    bool '  Debug allocation faliures' CONFIG_DEBUG_GFP
+   if [ "$CONFIG_HIGHMEM" = "y" ]; then
+      bool '  Debug HIGHMEM on lowmem machines' CONFIG_HIGHMEM_DEBUG
+   fi
 fi
 
 endmenu
diff -urN highmem-ref/arch/i386/kernel/setup.c highmem/arch/i386/kernel/setup.c
--- highmem-ref/arch/i386/kernel/setup.c	Tue Oct  9 00:10:12 2001
+++ highmem/arch/i386/kernel/setup.c	Tue Oct  9 04:43:46 2001
@@ -821,7 +821,19 @@
  */
 #define VMALLOC_RESERVE	(unsigned long)(128 << 20)
 #define MAXMEM		(unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE)
+#ifdef CONFIG_HIGHMEM_DEBUG
+#define MAXMEM_PFN				\
+({						\
+	int __max_pfn;				\
+	if (max_pfn > PFN_DOWN(MAXMEM))		\
+	     __max_pfn = PFN_DOWN(MAXMEM);	\
+	else					\
+	     __max_pfn = max_pfn / 5;		\
+	__max_pfn;				\
+})
+#else
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
+#endif
 #define MAX_NONPAE_PFN	(1 << 20)
 
 	/*