diff -ru linux-2.6.9-rc3/arch/i386/mm/init.c linux-2.6.9-rc3-za1/arch/i386/mm/init.c
--- linux-2.6.9-rc3/arch/i386/mm/init.c	2004-10-05 18:21:03.000000000 -0700
+++ linux-2.6.9-rc3-za1/arch/i386/mm/init.c	2004-10-05 18:24:08.000000000 -0700
@@ -671,9 +671,9 @@
 
 /*
  * This function cannot be __init, since exceptions don't work in that
- * section.  Put this after the callers, so that it cannot be inlined.
+ * section.  This function must not be inlined.
  */
-static int do_test_wp_bit(void)
+__attribute__((noinline)) static int do_test_wp_bit(void)
 {
 	char tmp_reg;
 	int flag;