-diff -u linux-2.6.37-pax/arch/x86/include/asm/futex.h linux-2.6.37-pax/arch/x86/include/asm/futex.h
---- linux-2.6.37-pax/arch/x86/include/asm/futex.h 2011-01-07 02:12:38.000000000 +0100
-+++ linux-2.6.37-pax/arch/x86/include/asm/futex.h 2011-01-25 18:00:49.000000000 +0100
-@@ -19,7 +19,7 @@
- "\tjmp\t2b\n" \
- "\t.previous\n" \
- _ASM_EXTABLE(1b, 3b) \
-- : "=r" (oldval), "=r" (ret), "+m" (*____m(uaddr))\
-+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 *)____m(uaddr))\
- : "i" (-EFAULT), "0" (oparg), "1" (0))
-
- #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
-@@ -36,7 +36,7 @@
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "=&a" (oldval), "=&r" (ret), \
-- "+m" (*(____m(uaddr))), "=&r" (tem) \
-+ "+m" (*(u32 *)____m(uaddr)), "=&r" (tem) \
- : "r" (oparg), "i" (-EFAULT), "1" (0))
-
- static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-@@ -130,7 +130,7 @@
- "\tjmp 2b\n"
- "\t.previous\n"
- _ASM_EXTABLE(1b, 3b)
-- : "=a" (oldval), "+m" (*____m(uaddr))
-+ : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
- : "i" (-EFAULT), "r" (newval), "0" (oldval)
- : "memory"
- );
-diff -u linux-2.6.37-pax/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37-pax/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.37-pax/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-22 16:31:42.000000000 +0100
-+++ linux-2.6.37-pax/arch/x86/kernel/cpu/mcheck/mce.c 2011-01-25 19:46:01.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <asm/ipi.h>
- #include <asm/mce.h>
- #include <asm/msr.h>
-+#include <asm/local.h>
-
- #include "mce-internal.h"
-
-diff -u linux-2.6.37-pax/arch/x86/kernel/head_32.S linux-2.6.37-pax/arch/x86/kernel/head_32.S
---- linux-2.6.37-pax/arch/x86/kernel/head_32.S 2011-01-07 02:12:38.000000000 +0100
-+++ linux-2.6.37-pax/arch/x86/kernel/head_32.S 2011-01-25 17:57:19.000000000 +0100
-@@ -699,6 +699,7 @@
- ENTRY(initial_pg_pmd)
- .fill 1024*KPMDS,4,0
- #else
-+.section .initial_page_table,"a",@progbits
- ENTRY(initial_page_table)
- .fill 1024,4,0
- #endif
-diff -u linux-2.6.37-pax/drivers/char/hvcs.c linux-2.6.37-pax/drivers/char/hvcs.c
---- linux-2.6.37-pax/drivers/char/hvcs.c 2011-01-22 16:31:42.000000000 +0100
-+++ linux-2.6.37-pax/drivers/char/hvcs.c 2011-01-25 19:46:35.000000000 +0100
-@@ -83,6 +83,7 @@
- #include <asm/hvcserver.h>
- #include <asm/uaccess.h>
- #include <asm/vio.h>
-+#include <asm/local.h>
-
- /*
- * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
-diff -u linux-2.6.37-pax/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37-pax/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.37-pax/drivers/char/pcmcia/ipwireless/tty.c 2011-01-22 16:31:42.000000000 +0100
-+++ linux-2.6.37-pax/drivers/char/pcmcia/ipwireless/tty.c 2011-01-25 19:47:06.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_flip.h>
- #include <linux/uaccess.h>
-+#include <asm/local.h>
-
- #include "tty.h"
- #include "network.h"
-diff -u linux-2.6.37-pax/drivers/char/sonypi.c linux-2.6.37-pax/drivers/char/sonypi.c
---- linux-2.6.37-pax/drivers/char/sonypi.c 2011-01-22 16:31:42.000000000 +0100
-+++ linux-2.6.37-pax/drivers/char/sonypi.c 2011-01-25 19:47:22.000000000 +0100
-@@ -55,6 +55,7 @@
- #include <asm/uaccess.h>
- #include <asm/io.h>
- #include <asm/system.h>
-+#include <asm/local.h>
-
- #include <linux/sonypi.h>
-
-diff -u linux-2.6.37-pax/drivers/isdn/gigaset/gigaset.h linux-2.6.37-pax/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.37-pax/drivers/isdn/gigaset/gigaset.h 2011-01-22 16:31:42.000000000 +0100
-+++ linux-2.6.37-pax/drivers/isdn/gigaset/gigaset.h 2011-01-25 19:47:36.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <linux/tty_driver.h>
- #include <linux/list.h>
- #include <asm/atomic.h>
-+#include <asm/local.h>
-
- #define GIG_VERSION {0, 5, 0, 0}
- #define GIG_COMPAT {0, 4, 0, 0}
-diff -u linux-2.6.37-pax/include/net/irda/ircomm_tty.h linux-2.6.37-pax/include/net/irda/ircomm_tty.h
---- linux-2.6.37-pax/include/net/irda/ircomm_tty.h 2011-01-22 16:31:44.000000000 +0100
-+++ linux-2.6.37-pax/include/net/irda/ircomm_tty.h 2011-01-25 19:48:10.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <linux/termios.h>
- #include <linux/timer.h>
- #include <linux/tty.h> /* struct tty_struct */
-+#include <asm/local.h>
-
- #include <net/irda/irias_object.h>
- #include <net/irda/ircomm_core.h>
-diff -u linux-2.6.37-pax/sound/drivers/portman2x4.c linux-2.6.37-pax/sound/drivers/portman2x4.c
---- linux-2.6.37-pax/sound/drivers/portman2x4.c 2011-01-22 16:31:44.000000000 +0100
-+++ linux-2.6.37-pax/sound/drivers/portman2x4.c 2011-01-25 19:49:14.000000000 +0100
-@@ -47,6 +47,7 @@
- #include <sound/initval.h>
- #include <sound/rawmidi.h>
- #include <sound/control.h>
-+#include <asm/local.h>
-
- #define CARD_NAME "Portman 2x4"
- #define DRIVER_NAME "portman"
-only in patch2:
-unchanged:
---- linux-2.6.37/sound/aoa/codecs/onyx.h 2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37-pax/sound/aoa/codecs/onyx.h 2011-01-25 19:48:28.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <linux/i2c.h>
- #include <asm/pmac_low_i2c.h>
- #include <asm/prom.h>
-+#include <asm/local.h>
-
- /* PCM3052 register definitions */
-