kernel: Update to 2.6.37-1.

diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config
index 2d4809ff15568be70d4662e9d08b0e9cfee97c27..d4b5a68fa5d6f6a9614525cf7fed7f85a9c0f9fd 100644 (file)
--- a/pkgs/core/kernel/config
+++ b/pkgs/core/kernel/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36
-# Mon Dec 13 01:18:10 2010
+# Linux/i386 2.6.37 Kernel Configuration
+# Mon Jan 17 11:24:54 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -46,12 +46,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_EARLY_RES=y
 CONFIG_HAVE_INTEL_TXT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
@@ -60,6 +55,8 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
 
 #
 # General setup
@@ -89,11 +86,27 @@ CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_WATCH=y
 CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_SPARSE_IRQ=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -104,14 +117,14 @@ CONFIG_IKCONFIG=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
@@ -157,6 +170,7 @@ CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
@@ -171,6 +185,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 
 #
 # GCOV-based kernel profiling
@@ -189,7 +204,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
@@ -243,7 +258,6 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
-CONFIG_SPARSE_IRQ=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
@@ -254,7 +268,7 @@ CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_PARAVIRT_GUEST is not set
-# CONFIG_NO_BOOTMEM is not set
+CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -313,6 +327,7 @@ CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -342,6 +357,7 @@ CONFIG_NOHIGHMEM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_X86_PAE is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -352,6 +368,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
@@ -367,14 +384,13 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_RESERVE_LOW=64
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -400,12 +416,12 @@ CONFIG_ACPI=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=y
@@ -508,8 +524,9 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
+CONFIG_OLPC_XO1=m
 CONFIG_OLPC_OPENFIRMWARE=y
-CONFIG_K8_NB=y
+CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -537,6 +554,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_HAVE_AOUT=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_NET=y
 
 #
@@ -566,6 +584,7 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
@@ -766,6 +785,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 # CONFIG_IP6_NF_QUEUE is not set
 CONFIG_IP6_NF_IPTABLES=m
@@ -843,7 +863,6 @@ CONFIG_LLC=m
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_PHONET is not set
 # CONFIG_IEEE802154 is not set
@@ -900,6 +919,7 @@ CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
@@ -951,6 +971,7 @@ CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
 
 #
 # Device Drivers
@@ -1010,6 +1031,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_HD=y
+# CONFIG_BLK_DEV_RBD is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_IBM_ASM is not set
@@ -1022,13 +1044,18 @@ CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
 CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
+CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
 CONFIG_C2PORT=m
 # CONFIG_C2PORT_DURAMAR_2150 is not set
 
@@ -1042,6 +1069,11 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1089,6 +1121,7 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
@@ -1314,20 +1347,11 @@ CONFIG_FUSION_CTL=m
 #
 # IEEE 1394 (FireWire) support
 #
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
-# CONFIG_IEEE1394 is not set
 # CONFIG_FIREWIRE_NOSY is not set
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
@@ -1350,6 +1374,7 @@ CONFIG_TUN=m
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
+CONFIG_MII=m
 CONFIG_PHYLIB=y
 
 #
@@ -1363,6 +1388,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+CONFIG_BCM63XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -1373,7 +1399,6 @@ CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
@@ -1466,6 +1491,10 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
 CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
@@ -1496,6 +1525,7 @@ CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
+CONFIG_BNA=m
 CONFIG_SFC=m
 CONFIG_BE2NET=m
 # CONFIG_TR is not set
@@ -1528,10 +1558,14 @@ CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_AR9170_USB=m
 CONFIG_AR9170_LEDS=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -1570,6 +1604,10 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLAGN=m
 CONFIG_IWL4965=y
@@ -1617,8 +1655,8 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
 CONFIG_WL1251=m
+CONFIG_WL12XX=m
 CONFIG_WL1271=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -1654,6 +1692,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 # CONFIG_USB_IPHETH is not set
@@ -1714,6 +1753,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+CONFIG_PPTP=m
 CONFIG_PPPOATM=m
 CONFIG_PPPOL2TP=m
 CONFIG_SLIP=m
@@ -1863,6 +1903,7 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
@@ -1907,6 +1948,7 @@ CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
 # CONFIG_GAMEPORT is not set
 
 #
@@ -2002,6 +2044,7 @@ CONFIG_I2C_MUX=m
 #
 # Multiplexer I2C Chip support
 #
+CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
@@ -2041,6 +2084,7 @@ CONFIG_I2C_SCMI=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_SIMTEC=m
@@ -2076,8 +2120,10 @@ CONFIG_GPIO_MAX730X=m
 #
 # Memory mapped GPIO expanders:
 #
+CONFIG_GPIO_BASIC_MMIO=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
 
 #
 # I2C GPIO expanders:
@@ -2093,6 +2139,7 @@ CONFIG_GPIO_ADP5588=m
 #
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_LANGWELL=y
+CONFIG_GPIO_PCH=m
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_RDC321X=m
 
@@ -2136,9 +2183,11 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_OLPC=m
+CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2174,6 +2223,7 @@ CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IBMAEM=m
@@ -2194,6 +2244,7 @@ CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
@@ -2223,11 +2274,12 @@ CONFIG_SENSORS_W83781D=m
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 
@@ -2322,7 +2374,7 @@ CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_TPS6586X=m
+CONFIG_MFD_VX855=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_DUMMY=y
@@ -2333,14 +2385,15 @@ CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_TPS6586X=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -2367,10 +2420,12 @@ CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_ENE=m
+CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
@@ -2393,6 +2448,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -2406,6 +2462,10 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders
+#
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
@@ -2418,7 +2478,15 @@ CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
 CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
@@ -2428,21 +2496,37 @@ CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
 CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
 CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
 CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
+
+#
+# Video improvement chips
+#
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
+CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
@@ -2454,6 +2538,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -2472,7 +2557,10 @@ CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CX18_ALSA=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
 CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9M001=m
 CONFIG_SOC_CAMERA_MT9M111=m
 CONFIG_SOC_CAMERA_MT9T031=m
@@ -2481,6 +2569,7 @@ CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_V4L_USB_DRIVERS=y
@@ -2496,6 +2585,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_OV519=m
@@ -2524,6 +2614,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
 # CONFIG_VIDEO_PVRUSB2 is not set
 CONFIG_VIDEO_HDPVR=m
@@ -2535,6 +2626,9 @@ CONFIG_VIDEO_CX231XX_DVB=m
 # CONFIG_VIDEO_USBVISION is not set
 # CONFIG_USB_ET61X251 is not set
 # CONFIG_USB_SN9C102 is not set
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 CONFIG_USB_S2255=m
@@ -2603,6 +2697,7 @@ CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -2660,10 +2755,18 @@ CONFIG_DVB_NGENE=m
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# Multistandard (satellite) frontends
+#
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@@ -2687,6 +2790,10 @@ CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
 CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
 CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
@@ -2703,10 +2810,18 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+
+#
+# DVB-C (cable) frontends
+#
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_TDA10021=m
 CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
 CONFIG_DVB_NXT200X=m
 CONFIG_DVB_OR51211=m
 CONFIG_DVB_OR51132=m
@@ -2716,10 +2831,22 @@ CONFIG_DVB_LGDT3305=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_AU8522=m
 CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
 CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
 CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
@@ -2727,6 +2854,12 @@ CONFIG_DVB_ISL6423=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
 CONFIG_DAB=y
 CONFIG_USB_DABUSB=m
 
@@ -2748,8 +2881,9 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 # CONFIG_DRM is not set
+CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
@@ -2925,6 +3059,7 @@ CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_PCSP is not set
 CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_MTS64=m
@@ -2995,10 +3130,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
-CONFIG_SND_HDA_ELD=y
+CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -3054,8 +3186,10 @@ CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_PCM3008=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
@@ -3076,6 +3210,7 @@ CONFIG_SND_SOC_WM8741=m
 CONFIG_SND_SOC_WM8750=m
 CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8900=m
 CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
@@ -3083,9 +3218,11 @@ CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8955=m
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8971=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_WM8988=m
 CONFIG_SND_SOC_WM8990=m
 CONFIG_SND_SOC_WM8993=m
@@ -3125,6 +3262,8 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_EGALAX=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
@@ -3132,6 +3271,7 @@ CONFIG_HID_LOGITECH=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIWII_FF is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
@@ -3148,6 +3288,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
 CONFIG_HID_STANTUM=m
@@ -3237,6 +3378,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -3273,6 +3415,7 @@ CONFIG_USB_SEVSEG=m
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_ISIGHTFW is not set
+CONFIG_USB_YUREX=m
 # CONFIG_USB_ATM is not set
 # CONFIG_USB_GADGET is not set
 
@@ -3285,13 +3428,11 @@ CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
 CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
@@ -3302,6 +3443,8 @@ CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_REGULATOR=m
@@ -3395,7 +3538,6 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_INTEL_MID_DMAC=m
-CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
@@ -3432,7 +3574,7 @@ CONFIG_PANASONIC_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_ACPI=m
+CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -3440,6 +3582,7 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
@@ -3450,6 +3593,8 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO1_RFKILL=m
 
 #
 # Firmware Drivers
@@ -3504,14 +3649,16 @@ CONFIG_XFS_RT=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_NILFS2_FS is not set
+CONFIG_EXPORTFS=m
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_QUOTA is not set
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
@@ -3590,19 +3737,17 @@ CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
+# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -3612,6 +3757,7 @@ CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -3681,6 +3827,8 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+CONFIG_BKL=y
+# CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
@@ -3696,6 +3844,7 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_RING_BUFFER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING_SUPPORT=y
@@ -3705,6 +3854,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
@@ -3712,7 +3862,6 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_4KSTACKS=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -3832,6 +3981,7 @@ CONFIG_GRKERNSEC_FLOODBURST=4
 #
 # PaX
 #
+CONFIG_ARCH_TRACK_EXEC_LIMIT=y
 CONFIG_PAX=y
 
 #
@@ -3872,6 +4022,7 @@ CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_KEYS is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
@@ -3899,7 +4050,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
@@ -3907,7 +4057,6 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m

diff --git a/pkgs/core/kernel/kernel.nm b/pkgs/core/kernel/kernel.nm
index 929ca48ba7464b923a11ee5ef4b9ba50f7e4d8af..3bb7ad9b91e90bdc66e45e2173e0ded2f2c264c2 100644 (file)
--- a/pkgs/core/kernel/kernel.nm
+++ b/pkgs/core/kernel/kernel.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = linux
-PKG_VER        = 2.6.36
-PKG_REL        = 2
+PKG_VER        = 2.6.37
+PKG_REL        = 1
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
 PKG_GROUP      = System/Kernels

diff --git a/pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.36-201011062054.patch b/pkgs/core/kernel/patches/grsecurity-2.2.1-2.6.37-201101170305.patch
similarity index 77%
rename from pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.36-201011062054.patch
rename to pkgs/core/kernel/patches/grsecurity-2.2.1-2.6.37-201101170305.patch
index a74772917447a74a3ddaad07e8ca3201e239a2f2..69aee2ba60c415a6b9ba581d5aecde56ee2828aa 100644 (file)
--- a/pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.36-201011062054.patch
+++ b/pkgs/core/kernel/patches/grsecurity-2.2.1-2.6.37-201101170305.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.36/arch/alpha/include/asm/dma-mapping.h linux-2.6.36/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.36/arch/alpha/include/asm/dma-mapping.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/include/asm/dma-mapping.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/include/asm/dma-mapping.h linux-2.6.37/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/alpha/include/asm/dma-mapping.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/dma-mapping.h  2011-01-17 02:41:00.000000000 -0500
 @@ -3,9 +3,9 @@
  
  #include <linux/dma-attrs.h>
@@ -13,9 +13,9 @@ diff -urNp linux-2.6.36/arch/alpha/include/asm/dma-mapping.h linux-2.6.36/arch/a
  {
        return dma_ops;
  }
-diff -urNp linux-2.6.36/arch/alpha/include/asm/elf.h linux-2.6.36/arch/alpha/include/asm/elf.h
---- linux-2.6.36/arch/alpha/include/asm/elf.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/include/asm/elf.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/include/asm/elf.h linux-2.6.37/arch/alpha/include/asm/elf.h
+--- linux-2.6.37/arch/alpha/include/asm/elf.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/elf.h  2011-01-17 02:41:00.000000000 -0500
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +30,9 @@ diff -urNp linux-2.6.36/arch/alpha/include/asm/elf.h linux-2.6.36/arch/alpha/inc
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.36/arch/alpha/include/asm/pgtable.h linux-2.6.36/arch/alpha/include/asm/pgtable.h
---- linux-2.6.36/arch/alpha/include/asm/pgtable.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/include/asm/pgtable.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/include/asm/pgtable.h linux-2.6.37/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.37/arch/alpha/include/asm/pgtable.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/include/asm/pgtable.h      2011-01-17 02:41:00.000000000 -0500
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED   __pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY     __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -51,9 +51,9 @@ diff -urNp linux-2.6.36/arch/alpha/include/asm/pgtable.h linux-2.6.36/arch/alpha
  #define PAGE_KERNEL   __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.36/arch/alpha/kernel/module.c linux-2.6.36/arch/alpha/kernel/module.c
---- linux-2.6.36/arch/alpha/kernel/module.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/kernel/module.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/kernel/module.c linux-2.6.37/arch/alpha/kernel/module.c
+--- linux-2.6.37/arch/alpha/kernel/module.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/module.c    2011-01-17 02:41:00.000000000 -0500
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
        /* The small sections were sorted to the end of the segment.
@@ -63,9 +63,9 @@ diff -urNp linux-2.6.36/arch/alpha/kernel/module.c linux-2.6.36/arch/alpha/kerne
        got = sechdrs[me->arch.gotsecindex].sh_addr;
  
        for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.36/arch/alpha/kernel/osf_sys.c linux-2.6.36/arch/alpha/kernel/osf_sys.c
---- linux-2.6.36/arch/alpha/kernel/osf_sys.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/kernel/osf_sys.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/kernel/osf_sys.c linux-2.6.37/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.37/arch/alpha/kernel/osf_sys.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/osf_sys.c   2011-01-17 02:41:00.000000000 -0500
 @@ -1165,7 +1165,7 @@ arch_get_unmapped_area_1(unsigned long a
                /* At this point:  (!vma || addr < vma->vm_end). */
                if (limit - len < addr)
@@ -97,9 +97,9 @@ diff -urNp linux-2.6.36/arch/alpha/kernel/osf_sys.c linux-2.6.36/arch/alpha/kern
        if (addr != (unsigned long) -ENOMEM)
                return addr;
  
-diff -urNp linux-2.6.36/arch/alpha/kernel/pci_iommu.c linux-2.6.36/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.36/arch/alpha/kernel/pci_iommu.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/kernel/pci_iommu.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/kernel/pci_iommu.c linux-2.6.37/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/pci_iommu.c 2011-01-17 02:41:00.000000000 -0500
 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
        return 0;
  }
@@ -116,9 +116,9 @@ diff -urNp linux-2.6.36/arch/alpha/kernel/pci_iommu.c linux-2.6.36/arch/alpha/ke
 -struct dma_map_ops *dma_ops = &alpha_pci_ops;
 +const struct dma_map_ops *dma_ops = &alpha_pci_ops;
  EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.36/arch/alpha/kernel/pci-noop.c linux-2.6.36/arch/alpha/kernel/pci-noop.c
---- linux-2.6.36/arch/alpha/kernel/pci-noop.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/kernel/pci-noop.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/kernel/pci-noop.c linux-2.6.37/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.37/arch/alpha/kernel/pci-noop.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/kernel/pci-noop.c  2011-01-17 02:41:00.000000000 -0500
 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
        return 0;
  }
@@ -137,9 +137,9 @@ diff -urNp linux-2.6.36/arch/alpha/kernel/pci-noop.c linux-2.6.36/arch/alpha/ker
  EXPORT_SYMBOL(dma_ops);
  
  void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.36/arch/alpha/mm/fault.c linux-2.6.36/arch/alpha/mm/fault.c
---- linux-2.6.36/arch/alpha/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/alpha/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/alpha/mm/fault.c linux-2.6.37/arch/alpha/mm/fault.c
+--- linux-2.6.37/arch/alpha/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/alpha/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
        __reload_thread(pcb);
  }
@@ -296,9 +296,9 @@ diff -urNp linux-2.6.36/arch/alpha/mm/fault.c linux-2.6.36/arch/alpha/mm/fault.c
        } else if (!cause) {
                /* Allow reads even for write-only mappings */
                if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.36/arch/arm/include/asm/elf.h linux-2.6.36/arch/arm/include/asm/elf.h
---- linux-2.6.36/arch/arm/include/asm/elf.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/include/asm/elf.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/include/asm/elf.h linux-2.6.37/arch/arm/include/asm/elf.h
+--- linux-2.6.37/arch/arm/include/asm/elf.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/elf.h    2011-01-17 02:41:00.000000000 -0500
 @@ -113,7 +113,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -315,9 +315,20 @@ diff -urNp linux-2.6.36/arch/arm/include/asm/elf.h linux-2.6.36/arch/arm/include
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.36/arch/arm/include/asm/kmap_types.h linux-2.6.36/arch/arm/include/asm/kmap_types.h
---- linux-2.6.36/arch/arm/include/asm/kmap_types.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/include/asm/kmap_types.h     2010-11-06 18:58:15.000000000 -0400
+@@ -123,10 +130,6 @@ int dump_task_regs(struct task_struct *t
+ extern void elf_set_personality(const struct elf32_hdr *);
+ #define SET_PERSONALITY(ex)   elf_set_personality(&(ex))
+ 
+-struct mm_struct;
+-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
+-#define arch_randomize_brk arch_randomize_brk
+-
+ extern int vectors_user_mapping(void);
+ #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
+diff -urNp linux-2.6.37/arch/arm/include/asm/kmap_types.h linux-2.6.37/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.37/arch/arm/include/asm/kmap_types.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/kmap_types.h     2011-01-17 02:41:00.000000000 -0500
 @@ -21,6 +21,7 @@ enum km_type {
        KM_L1_CACHE,
        KM_L2_CACHE,
@@ -326,9 +337,9 @@ diff -urNp linux-2.6.36/arch/arm/include/asm/kmap_types.h linux-2.6.36/arch/arm/
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.36/arch/arm/include/asm/uaccess.h linux-2.6.36/arch/arm/include/asm/uaccess.h
---- linux-2.6.36/arch/arm/include/asm/uaccess.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/include/asm/uaccess.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/include/asm/uaccess.h linux-2.6.37/arch/arm/include/asm/uaccess.h
+--- linux-2.6.37/arch/arm/include/asm/uaccess.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/include/asm/uaccess.h        2011-01-17 02:41:00.000000000 -0500
 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -349,9 +360,9 @@ diff -urNp linux-2.6.36/arch/arm/include/asm/uaccess.h linux-2.6.36/arch/arm/inc
        if (access_ok(VERIFY_WRITE, to, n))
                n = __copy_to_user(to, from, n);
        return n;
-diff -urNp linux-2.6.36/arch/arm/kernel/kgdb.c linux-2.6.36/arch/arm/kernel/kgdb.c
---- linux-2.6.36/arch/arm/kernel/kgdb.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/kernel/kgdb.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/kernel/kgdb.c linux-2.6.37/arch/arm/kernel/kgdb.c
+--- linux-2.6.37/arch/arm/kernel/kgdb.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/kernel/kgdb.c        2011-01-17 02:41:00.000000000 -0500
 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
@@ -361,10 +372,34 @@ diff -urNp linux-2.6.36/arch/arm/kernel/kgdb.c linux-2.6.36/arch/arm/kernel/kgdb
  #ifndef __ARMEB__
        .gdb_bpt_instr          = {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.36/arch/arm/mach-at91/pm.c linux-2.6.36/arch/arm/mach-at91/pm.c
---- linux-2.6.36/arch/arm/mach-at91/pm.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-at91/pm.c       2010-11-06 18:58:15.000000000 -0400
-@@ -294,7 +294,7 @@ static void at91_pm_end(void)
+diff -urNp linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37/arch/arm/kernel/process.c
+--- linux-2.6.37/arch/arm/kernel/process.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/kernel/process.c     2011-01-17 02:41:00.000000000 -0500
+@@ -28,7 +28,6 @@
+ #include <linux/tick.h>
+ #include <linux/utsname.h>
+ #include <linux/uaccess.h>
+-#include <linux/random.h>
+ #include <linux/hw_breakpoint.h>
+ 
+ #include <asm/cacheflush.h>
+@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_stru
+       return 0;
+ }
+ 
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+-      unsigned long range_end = mm->brk + 0x02000000;
+-      return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+-}
+-
+ /*
+  * The vectors page is always readable from user space for the
+  * atomic helpers and the signal restart code.  Let's declare a mapping
+diff -urNp linux-2.6.37/arch/arm/mach-at91/pm.c linux-2.6.37/arch/arm/mach-at91/pm.c
+--- linux-2.6.37/arch/arm/mach-at91/pm.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-at91/pm.c       2011-01-17 02:41:00.000000000 -0500
+@@ -301,7 +301,7 @@ static void at91_pm_end(void)
  }
  
  
@@ -373,9 +408,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-at91/pm.c linux-2.6.36/arch/arm/mach-at91/
        .valid  = at91_pm_valid_state,
        .begin  = at91_pm_begin,
        .enter  = at91_pm_enter,
-diff -urNp linux-2.6.36/arch/arm/mach-davinci/pm.c linux-2.6.36/arch/arm/mach-davinci/pm.c
---- linux-2.6.36/arch/arm/mach-davinci/pm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-davinci/pm.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-davinci/pm.c linux-2.6.37/arch/arm/mach-davinci/pm.c
+--- linux-2.6.37/arch/arm/mach-davinci/pm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-davinci/pm.c    2011-01-17 02:41:00.000000000 -0500
 @@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
        return ret;
  }
@@ -385,9 +420,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-davinci/pm.c linux-2.6.36/arch/arm/mach-da
        .enter          = davinci_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.36/arch/arm/mach-imx/pm-imx27.c linux-2.6.36/arch/arm/mach-imx/pm-imx27.c
---- linux-2.6.36/arch/arm/mach-imx/pm-imx27.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-imx/pm-imx27.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-imx/pm-imx27.c linux-2.6.37/arch/arm/mach-imx/pm-imx27.c
+--- linux-2.6.37/arch/arm/mach-imx/pm-imx27.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-imx/pm-imx27.c  2011-01-17 02:41:00.000000000 -0500
 @@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_st
        return 0;
  }
@@ -397,9 +432,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-imx/pm-imx27.c linux-2.6.36/arch/arm/mach-
        .enter = mx27_suspend_enter,
        .valid = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.36/arch/arm/mach-lpc32xx/pm.c linux-2.6.36/arch/arm/mach-lpc32xx/pm.c
---- linux-2.6.36/arch/arm/mach-lpc32xx/pm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-lpc32xx/pm.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-lpc32xx/pm.c linux-2.6.37/arch/arm/mach-lpc32xx/pm.c
+--- linux-2.6.37/arch/arm/mach-lpc32xx/pm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-lpc32xx/pm.c    2011-01-17 02:41:00.000000000 -0500
 @@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_stat
        return 0;
  }
@@ -409,20 +444,20 @@ diff -urNp linux-2.6.36/arch/arm/mach-lpc32xx/pm.c linux-2.6.36/arch/arm/mach-lp
        .valid  = suspend_valid_only_mem,
        .enter  = lpc32xx_pm_enter,
  };
-diff -urNp linux-2.6.36/arch/arm/mach-msm/last_radio_log.c linux-2.6.36/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.36/arch/arm/mach-msm/last_radio_log.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-msm/last_radio_log.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-msm/last_radio_log.c linux-2.6.37/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.37/arch/arm/mach-msm/last_radio_log.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-msm/last_radio_log.c    2011-01-17 02:41:00.000000000 -0500
 @@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
        return count;
  }
  
 +/* cannot be const, see msm_init_last_radio_log */
  static struct file_operations last_radio_log_fops = {
-       .read = last_radio_log_read
- };
-diff -urNp linux-2.6.36/arch/arm/mach-omap1/pm.c linux-2.6.36/arch/arm/mach-omap1/pm.c
---- linux-2.6.36/arch/arm/mach-omap1/pm.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-omap1/pm.c      2010-11-06 18:58:15.000000000 -0400
+       .read = last_radio_log_read,
+       .llseek = default_llseek,
+diff -urNp linux-2.6.37/arch/arm/mach-omap1/pm.c linux-2.6.37/arch/arm/mach-omap1/pm.c
+--- linux-2.6.37/arch/arm/mach-omap1/pm.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap1/pm.c      2011-01-17 02:41:00.000000000 -0500
 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
  
  
@@ -432,22 +467,22 @@ diff -urNp linux-2.6.36/arch/arm/mach-omap1/pm.c linux-2.6.36/arch/arm/mach-omap
        .prepare        = omap_pm_prepare,
        .enter          = omap_pm_enter,
        .finish         = omap_pm_finish,
-diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm24xx.c linux-2.6.36/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.36/arch/arm/mach-omap2/pm24xx.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-omap2/pm24xx.c  2010-11-06 18:58:15.000000000 -0400
-@@ -324,7 +324,7 @@ static void omap2_pm_finish(void)
-       enable_hlt();
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm24xx.c linux-2.6.37/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm24xx.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm24xx.c  2011-01-17 02:41:00.000000000 -0500
+@@ -359,7 +359,7 @@ static void omap2_pm_end(void)
+       suspend_state = PM_SUSPEND_ON;
  }
  
 -static struct platform_suspend_ops omap_pm_ops = {
 +static const struct platform_suspend_ops omap_pm_ops = {
+       .begin          = omap2_pm_begin,
        .prepare        = omap2_pm_prepare,
        .enter          = omap2_pm_enter,
-       .finish         = omap2_pm_finish,
-diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm34xx.c linux-2.6.36/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.36/arch/arm/mach-omap2/pm34xx.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-omap2/pm34xx.c  2010-11-06 18:58:15.000000000 -0400
-@@ -672,7 +672,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm34xx.c linux-2.6.37/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm34xx.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm34xx.c  2011-01-17 02:41:00.000000000 -0500
+@@ -617,7 +617,7 @@ static void omap3_pm_end(void)
        return;
  }
  
@@ -456,9 +491,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm34xx.c linux-2.6.36/arch/arm/mach-
        .begin          = omap3_pm_begin,
        .end            = omap3_pm_end,
        .prepare        = omap3_pm_prepare,
-diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm44xx.c linux-2.6.36/arch/arm/mach-omap2/pm44xx.c
---- linux-2.6.36/arch/arm/mach-omap2/pm44xx.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-omap2/pm44xx.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-omap2/pm44xx.c linux-2.6.37/arch/arm/mach-omap2/pm44xx.c
+--- linux-2.6.37/arch/arm/mach-omap2/pm44xx.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-omap2/pm44xx.c  2011-01-17 02:41:00.000000000 -0500
 @@ -75,7 +75,7 @@ static void omap4_pm_end(void)
        return;
  }
@@ -468,9 +503,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-omap2/pm44xx.c linux-2.6.36/arch/arm/mach-
        .begin          = omap4_pm_begin,
        .end            = omap4_pm_end,
        .prepare        = omap4_pm_prepare,
-diff -urNp linux-2.6.36/arch/arm/mach-pnx4008/pm.c linux-2.6.36/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.36/arch/arm/mach-pnx4008/pm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-pnx4008/pm.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-pnx4008/pm.c linux-2.6.37/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.37/arch/arm/mach-pnx4008/pm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pnx4008/pm.c    2011-01-17 02:41:00.000000000 -0500
 @@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
               (state == PM_SUSPEND_MEM);
  }
@@ -480,9 +515,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-pnx4008/pm.c linux-2.6.36/arch/arm/mach-pn
        .enter = pnx4008_pm_enter,
        .valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.36/arch/arm/mach-pxa/pm.c linux-2.6.36/arch/arm/mach-pxa/pm.c
---- linux-2.6.36/arch/arm/mach-pxa/pm.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-pxa/pm.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-pxa/pm.c linux-2.6.37/arch/arm/mach-pxa/pm.c
+--- linux-2.6.37/arch/arm/mach-pxa/pm.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pxa/pm.c        2011-01-17 02:41:00.000000000 -0500
 @@ -96,7 +96,7 @@ void pxa_pm_finish(void)
                pxa_cpu_pm_fns->finish();
  }
@@ -492,9 +527,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-pxa/pm.c linux-2.6.36/arch/arm/mach-pxa/pm
        .valid          = pxa_pm_valid,
        .enter          = pxa_pm_enter,
        .prepare        = pxa_pm_prepare,
-diff -urNp linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-pxa/sharpsl_pm.c        2011-01-17 02:41:00.000000000 -0500
 @@ -868,7 +868,7 @@ static void sharpsl_apm_get_power_status
  }
  
@@ -504,9 +539,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.36/arch/arm/mac
        .prepare        = pxa_pm_prepare,
        .finish         = pxa_pm_finish,
        .enter          = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.36/arch/arm/mach-sa1100/pm.c linux-2.6.36/arch/arm/mach-sa1100/pm.c
---- linux-2.6.36/arch/arm/mach-sa1100/pm.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mach-sa1100/pm.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mach-sa1100/pm.c linux-2.6.37/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.37/arch/arm/mach-sa1100/pm.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mach-sa1100/pm.c     2011-01-17 02:41:00.000000000 -0500
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
        return virt_to_phys(sp);
  }
@@ -516,9 +551,9 @@ diff -urNp linux-2.6.36/arch/arm/mach-sa1100/pm.c linux-2.6.36/arch/arm/mach-sa1
        .enter          = sa11x0_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.36/arch/arm/mm/fault.c linux-2.6.36/arch/arm/mm/fault.c
---- linux-2.6.36/arch/arm/mm/fault.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mm/fault.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mm/fault.c linux-2.6.37/arch/arm/mm/fault.c
+--- linux-2.6.37/arch/arm/mm/fault.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mm/fault.c   2011-01-17 02:41:00.000000000 -0500
 @@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
        }
  #endif
@@ -567,9 +602,9 @@ diff -urNp linux-2.6.36/arch/arm/mm/fault.c linux-2.6.36/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.36/arch/arm/mm/mmap.c linux-2.6.36/arch/arm/mm/mmap.c
---- linux-2.6.36/arch/arm/mm/mmap.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/mm/mmap.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/mm/mmap.c linux-2.6.37/arch/arm/mm/mmap.c
+--- linux-2.6.37/arch/arm/mm/mmap.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/mm/mmap.c    2011-01-17 02:41:00.000000000 -0500
 @@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
        if (len > TASK_SIZE)
                return -ENOMEM;
@@ -619,9 +654,9 @@ diff -urNp linux-2.6.36/arch/arm/mm/mmap.c linux-2.6.36/arch/arm/mm/mmap.c
                        /*
                         * Remember the place where we stopped the search:
                         */
-diff -urNp linux-2.6.36/arch/arm/plat-samsung/pm.c linux-2.6.36/arch/arm/plat-samsung/pm.c
---- linux-2.6.36/arch/arm/plat-samsung/pm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/arm/plat-samsung/pm.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/arm/plat-samsung/pm.c linux-2.6.37/arch/arm/plat-samsung/pm.c
+--- linux-2.6.37/arch/arm/plat-samsung/pm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/arm/plat-samsung/pm.c    2011-01-17 02:41:00.000000000 -0500
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
        s3c_pm_check_cleanup();
  }
@@ -631,9 +666,9 @@ diff -urNp linux-2.6.36/arch/arm/plat-samsung/pm.c linux-2.6.36/arch/arm/plat-sa
        .enter          = s3c_pm_enter,
        .prepare        = s3c_pm_prepare,
        .finish         = s3c_pm_finish,
-diff -urNp linux-2.6.36/arch/avr32/include/asm/elf.h linux-2.6.36/arch/avr32/include/asm/elf.h
---- linux-2.6.36/arch/avr32/include/asm/elf.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/avr32/include/asm/elf.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/avr32/include/asm/elf.h linux-2.6.37/arch/avr32/include/asm/elf.h
+--- linux-2.6.37/arch/avr32/include/asm/elf.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/avr32/include/asm/elf.h  2011-01-17 02:41:00.000000000 -0500
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -650,9 +685,9 @@ diff -urNp linux-2.6.36/arch/avr32/include/asm/elf.h linux-2.6.36/arch/avr32/inc
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.36/arch/avr32/include/asm/kmap_types.h linux-2.6.36/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.36/arch/avr32/include/asm/kmap_types.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/avr32/include/asm/kmap_types.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/avr32/include/asm/kmap_types.h linux-2.6.37/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.37/arch/avr32/include/asm/kmap_types.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/avr32/include/asm/kmap_types.h   2011-01-17 02:41:00.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)        KM_IRQ0,
  D(11) KM_IRQ1,
  D(12) KM_SOFTIRQ0,
@@ -663,9 +698,9 @@ diff -urNp linux-2.6.36/arch/avr32/include/asm/kmap_types.h linux-2.6.36/arch/av
  };
  
  #undef D
-diff -urNp linux-2.6.36/arch/avr32/mach-at32ap/pm.c linux-2.6.36/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.36/arch/avr32/mach-at32ap/pm.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/avr32/mach-at32ap/pm.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/avr32/mach-at32ap/pm.c linux-2.6.37/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.37/arch/avr32/mach-at32ap/pm.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/avr32/mach-at32ap/pm.c   2011-01-17 02:41:00.000000000 -0500
 @@ -176,7 +176,7 @@ out:
        return 0;
  }
@@ -675,9 +710,9 @@ diff -urNp linux-2.6.36/arch/avr32/mach-at32ap/pm.c linux-2.6.36/arch/avr32/mach
        .valid  = avr32_pm_valid_state,
        .enter  = avr32_pm_enter,
  };
-diff -urNp linux-2.6.36/arch/avr32/mm/fault.c linux-2.6.36/arch/avr32/mm/fault.c
---- linux-2.6.36/arch/avr32/mm/fault.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/avr32/mm/fault.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/avr32/mm/fault.c linux-2.6.37/arch/avr32/mm/fault.c
+--- linux-2.6.37/arch/avr32/mm/fault.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/avr32/mm/fault.c 2011-01-17 02:41:00.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -719,9 +754,9 @@ diff -urNp linux-2.6.36/arch/avr32/mm/fault.c linux-2.6.36/arch/avr32/mm/fault.c
                if (exception_trace && printk_ratelimit())
                        printk("%s%s[%d]: segfault at %08lx pc %08lx "
                               "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.36/arch/blackfin/kernel/kgdb.c linux-2.6.36/arch/blackfin/kernel/kgdb.c
---- linux-2.6.36/arch/blackfin/kernel/kgdb.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/blackfin/kernel/kgdb.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/blackfin/kernel/kgdb.c linux-2.6.37/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.37/arch/blackfin/kernel/kgdb.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/blackfin/kernel/kgdb.c   2011-01-17 02:41:00.000000000 -0500
 @@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
        return -1;              /* this means that we do not want to exit from the handler */
  }
@@ -731,9 +766,9 @@ diff -urNp linux-2.6.36/arch/blackfin/kernel/kgdb.c linux-2.6.36/arch/blackfin/k
        .gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
        .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.36/arch/blackfin/mach-common/pm.c linux-2.6.36/arch/blackfin/mach-common/pm.c
---- linux-2.6.36/arch/blackfin/mach-common/pm.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/blackfin/mach-common/pm.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/blackfin/mach-common/pm.c linux-2.6.37/arch/blackfin/mach-common/pm.c
+--- linux-2.6.37/arch/blackfin/mach-common/pm.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/blackfin/mach-common/pm.c        2011-01-17 02:41:00.000000000 -0500
 @@ -233,7 +233,7 @@ static int bfin_pm_enter(suspend_state_t
        return 0;
  }
@@ -743,9 +778,9 @@ diff -urNp linux-2.6.36/arch/blackfin/mach-common/pm.c linux-2.6.36/arch/blackfi
        .enter = bfin_pm_enter,
        .valid  = bfin_pm_valid,
  };
-diff -urNp linux-2.6.36/arch/blackfin/mm/maccess.c linux-2.6.36/arch/blackfin/mm/maccess.c
---- linux-2.6.36/arch/blackfin/mm/maccess.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/blackfin/mm/maccess.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/blackfin/mm/maccess.c linux-2.6.37/arch/blackfin/mm/maccess.c
+--- linux-2.6.37/arch/blackfin/mm/maccess.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/blackfin/mm/maccess.c    2011-01-17 02:41:00.000000000 -0500
 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
        return bfin_mem_access_type(addr, size);
  }
@@ -764,9 +799,9 @@ diff -urNp linux-2.6.36/arch/blackfin/mm/maccess.c linux-2.6.36/arch/blackfin/mm
  {
        unsigned long ldst = (unsigned long)dst;
        int mem_type;
-diff -urNp linux-2.6.36/arch/frv/include/asm/kmap_types.h linux-2.6.36/arch/frv/include/asm/kmap_types.h
---- linux-2.6.36/arch/frv/include/asm/kmap_types.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/frv/include/asm/kmap_types.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/frv/include/asm/kmap_types.h linux-2.6.37/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.37/arch/frv/include/asm/kmap_types.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/frv/include/asm/kmap_types.h     2011-01-17 02:41:00.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -775,9 +810,9 @@ diff -urNp linux-2.6.36/arch/frv/include/asm/kmap_types.h linux-2.6.36/arch/frv/
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.36/arch/frv/mm/elf-fdpic.c linux-2.6.36/arch/frv/mm/elf-fdpic.c
---- linux-2.6.36/arch/frv/mm/elf-fdpic.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/frv/mm/elf-fdpic.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/frv/mm/elf-fdpic.c linux-2.6.37/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.37/arch/frv/mm/elf-fdpic.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/frv/mm/elf-fdpic.c       2011-01-17 02:41:00.000000000 -0500
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
        if (addr) {
                addr = PAGE_ALIGN(addr);
@@ -806,9 +841,9 @@ diff -urNp linux-2.6.36/arch/frv/mm/elf-fdpic.c linux-2.6.36/arch/frv/mm/elf-fdp
                                goto success;
                        addr = vma->vm_end;
                }
-diff -urNp linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/hp/common/hwsw_iommu.c      2011-01-17 02:41:00.000000000 -0500
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -827,9 +862,9 @@ diff -urNp linux-2.6.36/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.36/arch/ia64/
  {
        if (use_swiotlb(dev))
                return &swiotlb_dma_ops;
-diff -urNp linux-2.6.36/arch/ia64/hp/common/sba_iommu.c linux-2.6.36/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.36/arch/ia64/hp/common/sba_iommu.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/hp/common/sba_iommu.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/hp/common/sba_iommu.c linux-2.6.37/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.37/arch/ia64/hp/common/sba_iommu.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/hp/common/sba_iommu.c       2011-01-17 02:41:00.000000000 -0500
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
        },
  };
@@ -848,9 +883,9 @@ diff -urNp linux-2.6.36/arch/ia64/hp/common/sba_iommu.c linux-2.6.36/arch/ia64/h
        .alloc_coherent         = sba_alloc_coherent,
        .free_coherent          = sba_free_coherent,
        .map_page               = sba_map_page,
-diff -urNp linux-2.6.36/arch/ia64/include/asm/dma-mapping.h linux-2.6.36/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.36/arch/ia64/include/asm/dma-mapping.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/include/asm/dma-mapping.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/include/asm/dma-mapping.h linux-2.6.37/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/ia64/include/asm/dma-mapping.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/include/asm/dma-mapping.h   2011-01-17 02:41:00.000000000 -0500
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -894,9 +929,9 @@ diff -urNp linux-2.6.36/arch/ia64/include/asm/dma-mapping.h linux-2.6.36/arch/ia
        return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.36/arch/ia64/include/asm/elf.h linux-2.6.36/arch/ia64/include/asm/elf.h
---- linux-2.6.36/arch/ia64/include/asm/elf.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/include/asm/elf.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/include/asm/elf.h linux-2.6.37/arch/ia64/include/asm/elf.h
+--- linux-2.6.37/arch/ia64/include/asm/elf.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/include/asm/elf.h   2011-01-17 02:41:00.000000000 -0500
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -911,9 +946,9 @@ diff -urNp linux-2.6.36/arch/ia64/include/asm/elf.h linux-2.6.36/arch/ia64/inclu
  #define PT_IA_64_UNWIND               0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.36/arch/ia64/include/asm/machvec.h linux-2.6.36/arch/ia64/include/asm/machvec.h
---- linux-2.6.36/arch/ia64/include/asm/machvec.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/include/asm/machvec.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/include/asm/machvec.h linux-2.6.37/arch/ia64/include/asm/machvec.h
+--- linux-2.6.37/arch/ia64/include/asm/machvec.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/include/asm/machvec.h       2011-01-17 02:41:00.000000000 -0500
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -932,9 +967,9 @@ diff -urNp linux-2.6.36/arch/ia64/include/asm/machvec.h linux-2.6.36/arch/ia64/i
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.36/arch/ia64/include/asm/pgtable.h linux-2.6.36/arch/ia64/include/asm/pgtable.h
---- linux-2.6.36/arch/ia64/include/asm/pgtable.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/include/asm/pgtable.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/include/asm/pgtable.h linux-2.6.37/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.37/arch/ia64/include/asm/pgtable.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/include/asm/pgtable.h       2011-01-17 02:41:00.000000000 -0500
 @@ -12,7 +12,7 @@
   *    David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -962,9 +997,9 @@ diff -urNp linux-2.6.36/arch/ia64/include/asm/pgtable.h linux-2.6.36/arch/ia64/i
  #define PAGE_GATE     __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL   __pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.36/arch/ia64/include/asm/uaccess.h linux-2.6.36/arch/ia64/include/asm/uaccess.h
---- linux-2.6.36/arch/ia64/include/asm/uaccess.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/include/asm/uaccess.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/include/asm/uaccess.h linux-2.6.37/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.37/arch/ia64/include/asm/uaccess.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/include/asm/uaccess.h       2011-01-17 02:41:00.000000000 -0500
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
        const void *__cu_from = (from);                                                 \
        long __cu_len = (n);                                                            \
@@ -983,9 +1018,9 @@ diff -urNp linux-2.6.36/arch/ia64/include/asm/uaccess.h linux-2.6.36/arch/ia64/i
                __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);   \
        __cu_len;                                                                       \
  })
-diff -urNp linux-2.6.36/arch/ia64/kernel/dma-mapping.c linux-2.6.36/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.36/arch/ia64/kernel/dma-mapping.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/dma-mapping.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/dma-mapping.c linux-2.6.37/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.37/arch/ia64/kernel/dma-mapping.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/dma-mapping.c        2011-01-17 02:41:00.000000000 -0500
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -1004,9 +1039,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/dma-mapping.c linux-2.6.36/arch/ia64/ke
  {
        return dma_ops;
  }
-diff -urNp linux-2.6.36/arch/ia64/kernel/module.c linux-2.6.36/arch/ia64/kernel/module.c
---- linux-2.6.36/arch/ia64/kernel/module.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/module.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/module.c linux-2.6.37/arch/ia64/kernel/module.c
+--- linux-2.6.37/arch/ia64/kernel/module.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/module.c     2011-01-17 02:41:00.000000000 -0500
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1095,9 +1130,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/module.c linux-2.6.36/arch/ia64/kernel/
                mod->arch.gp = gp;
                DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
        }
-diff -urNp linux-2.6.36/arch/ia64/kernel/pci-dma.c linux-2.6.36/arch/ia64/kernel/pci-dma.c
---- linux-2.6.36/arch/ia64/kernel/pci-dma.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/pci-dma.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/pci-dma.c linux-2.6.37/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.37/arch/ia64/kernel/pci-dma.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/pci-dma.c    2011-01-17 02:41:00.000000000 -0500
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
        .dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -1107,9 +1142,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/pci-dma.c linux-2.6.36/arch/ia64/kernel
  
  static int __init pci_iommu_init(void)
  {
-diff -urNp linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/pci-swiotlb.c        2011-01-17 02:41:00.000000000 -0500
 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
        return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
@@ -1119,9 +1154,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/pci-swiotlb.c linux-2.6.36/arch/ia64/ke
        .alloc_coherent = ia64_swiotlb_alloc_coherent,
        .free_coherent = swiotlb_free_coherent,
        .map_page = swiotlb_map_page,
-diff -urNp linux-2.6.36/arch/ia64/kernel/sys_ia64.c linux-2.6.36/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.36/arch/ia64/kernel/sys_ia64.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/sys_ia64.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/sys_ia64.c linux-2.6.37/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.37/arch/ia64/kernel/sys_ia64.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/sys_ia64.c   2011-01-17 02:41:00.000000000 -0500
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
        if (REGION_NUMBER(addr) == RGN_HPAGE)
                addr = 0;
@@ -1154,9 +1189,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/sys_ia64.c linux-2.6.36/arch/ia64/kerne
                        /* Remember the address where we stopped this search:  */
                        mm->free_area_cache = addr + len;
                        return addr;
-diff -urNp linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/kernel/vmlinux.lds.S        2011-01-17 02:41:00.000000000 -0500
 @@ -199,7 +199,7 @@ SECTIONS {
        /* Per-cpu data: */
        . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1166,9 +1201,9 @@ diff -urNp linux-2.6.36/arch/ia64/kernel/vmlinux.lds.S linux-2.6.36/arch/ia64/ke
        /*
         * ensure percpu data fits
         * into percpu page size
-diff -urNp linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36/arch/ia64/mm/fault.c
---- linux-2.6.36/arch/ia64/mm/fault.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/mm/fault.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37/arch/ia64/mm/fault.c
+--- linux-2.6.37/arch/ia64/mm/fault.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/mm/fault.c  2011-01-17 02:41:00.000000000 -0500
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
        return pte_present(pte);
  }
@@ -1218,9 +1253,9 @@ diff -urNp linux-2.6.36/arch/ia64/mm/fault.c linux-2.6.36/arch/ia64/mm/fault.c
        /*
         * If for any reason at all we couldn't handle the fault, make
         * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-2.6.36/arch/ia64/mm/hugetlbpage.c linux-2.6.36/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.36/arch/ia64/mm/hugetlbpage.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/mm/hugetlbpage.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/mm/hugetlbpage.c linux-2.6.37/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.37/arch/ia64/mm/hugetlbpage.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/mm/hugetlbpage.c    2011-01-17 02:41:00.000000000 -0500
 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
                /* At this point:  (!vmm || addr < vmm->vm_end). */
                if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1230,9 +1265,9 @@ diff -urNp linux-2.6.36/arch/ia64/mm/hugetlbpage.c linux-2.6.36/arch/ia64/mm/hug
                        return addr;
                addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
        }
-diff -urNp linux-2.6.36/arch/ia64/mm/init.c linux-2.6.36/arch/ia64/mm/init.c
---- linux-2.6.36/arch/ia64/mm/init.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/mm/init.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/mm/init.c linux-2.6.37/arch/ia64/mm/init.c
+--- linux-2.6.37/arch/ia64/mm/init.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/mm/init.c   2011-01-17 02:41:00.000000000 -0500
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
                vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1253,9 +1288,9 @@ diff -urNp linux-2.6.36/arch/ia64/mm/init.c linux-2.6.36/arch/ia64/mm/init.c
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
                down_write(&current->mm->mmap_sem);
                if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.36/arch/ia64/sn/pci/pci_dma.c linux-2.6.36/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.36/arch/ia64/sn/pci/pci_dma.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/ia64/sn/pci/pci_dma.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/ia64/sn/pci/pci_dma.c linux-2.6.37/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.37/arch/ia64/sn/pci/pci_dma.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/ia64/sn/pci/pci_dma.c    2011-01-17 02:41:00.000000000 -0500
 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
        return ret;
  }
@@ -1265,9 +1300,9 @@ diff -urNp linux-2.6.36/arch/ia64/sn/pci/pci_dma.c linux-2.6.36/arch/ia64/sn/pci
        .alloc_coherent         = sn_dma_alloc_coherent,
        .free_coherent          = sn_dma_free_coherent,
        .map_page               = sn_dma_map_page,
-diff -urNp linux-2.6.36/arch/m32r/lib/usercopy.c linux-2.6.36/arch/m32r/lib/usercopy.c
---- linux-2.6.36/arch/m32r/lib/usercopy.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/m32r/lib/usercopy.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/m32r/lib/usercopy.c linux-2.6.37/arch/m32r/lib/usercopy.c
+--- linux-2.6.37/arch/m32r/lib/usercopy.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/m32r/lib/usercopy.c      2011-01-17 02:41:00.000000000 -0500
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1288,9 +1323,9 @@ diff -urNp linux-2.6.36/arch/m32r/lib/usercopy.c linux-2.6.36/arch/m32r/lib/user
        prefetchw(to);
        if (access_ok(VERIFY_READ, from, n))
                __copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.36/arch/microblaze/include/asm/device.h linux-2.6.36/arch/microblaze/include/asm/device.h
---- linux-2.6.36/arch/microblaze/include/asm/device.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/include/asm/device.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/microblaze/include/asm/device.h linux-2.6.37/arch/microblaze/include/asm/device.h
+--- linux-2.6.37/arch/microblaze/include/asm/device.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/include/asm/device.h  2011-01-17 02:41:00.000000000 -0500
 @@ -13,7 +13,7 @@ struct device_node;
  
  struct dev_archdata {
@@ -1300,9 +1335,9 @@ diff -urNp linux-2.6.36/arch/microblaze/include/asm/device.h linux-2.6.36/arch/m
        void                    *dma_data;
  };
  
-diff -urNp linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/include/asm/dma-mapping.h     2011-01-17 02:41:00.000000000 -0500
 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
        return 0xfffffffful;
  }
@@ -1374,9 +1409,9 @@ diff -urNp linux-2.6.36/arch/microblaze/include/asm/dma-mapping.h linux-2.6.36/a
  
        BUG_ON(!ops);
        debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.36/arch/microblaze/include/asm/pci.h linux-2.6.36/arch/microblaze/include/asm/pci.h
---- linux-2.6.36/arch/microblaze/include/asm/pci.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/include/asm/pci.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/microblaze/include/asm/pci.h linux-2.6.37/arch/microblaze/include/asm/pci.h
+--- linux-2.6.37/arch/microblaze/include/asm/pci.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/include/asm/pci.h     2011-01-17 02:41:00.000000000 -0500
 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
  }
  
@@ -1388,9 +1423,9 @@ diff -urNp linux-2.6.36/arch/microblaze/include/asm/pci.h linux-2.6.36/arch/micr
  #else /* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()     NULL
-diff -urNp linux-2.6.36/arch/microblaze/kernel/dma.c linux-2.6.36/arch/microblaze/kernel/dma.c
---- linux-2.6.36/arch/microblaze/kernel/dma.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/kernel/dma.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/microblaze/kernel/dma.c linux-2.6.37/arch/microblaze/kernel/dma.c
+--- linux-2.6.37/arch/microblaze/kernel/dma.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/kernel/dma.c  2011-01-17 02:41:00.000000000 -0500
 @@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
        __dma_sync_page(dma_address, 0 , size, direction);
  }
@@ -1400,20 +1435,25 @@ diff -urNp linux-2.6.36/arch/microblaze/kernel/dma.c linux-2.6.36/arch/microblaz
        .alloc_coherent = dma_direct_alloc_coherent,
        .free_coherent  = dma_direct_free_coherent,
        .map_sg         = dma_direct_map_sg,
-diff -urNp linux-2.6.36/arch/microblaze/kernel/kgdb.c linux-2.6.36/arch/microblaze/kernel/kgdb.c
---- linux-2.6.36/arch/microblaze/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
-@@ -142,6 +142,6 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.37/arch/microblaze/kernel/kgdb.c linux-2.6.37/arch/microblaze/kernel/kgdb.c
+--- linux-2.6.37/arch/microblaze/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
+@@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
  /*
   * Global data
   */
 -struct kgdb_arch arch_kgdb_ops = {
 +const struct kgdb_arch arch_kgdb_ops = {
+ #ifdef __MICROBLAZEEL__
+       .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
+ #else
++>>>>>>> master
        .gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
+ #endif
  };
-diff -urNp linux-2.6.36/arch/microblaze/pci/pci-common.c linux-2.6.36/arch/microblaze/pci/pci-common.c
---- linux-2.6.36/arch/microblaze/pci/pci-common.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/microblaze/pci/pci-common.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/microblaze/pci/pci-common.c linux-2.6.37/arch/microblaze/pci/pci-common.c
+--- linux-2.6.37/arch/microblaze/pci/pci-common.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/microblaze/pci/pci-common.c      2011-01-17 02:41:00.000000000 -0500
 @@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
  /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
  unsigned int pci_flags;
@@ -1432,9 +1472,9 @@ diff -urNp linux-2.6.36/arch/microblaze/pci/pci-common.c linux-2.6.36/arch/micro
  {
        return pci_dma_ops;
  }
-diff -urNp linux-2.6.36/arch/mips/alchemy/devboards/pm.c linux-2.6.36/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.36/arch/mips/alchemy/devboards/pm.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/alchemy/devboards/pm.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/alchemy/devboards/pm.c linux-2.6.37/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.37/arch/mips/alchemy/devboards/pm.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/alchemy/devboards/pm.c      2011-01-17 02:41:00.000000000 -0500
 @@ -110,7 +110,7 @@ static void db1x_pm_end(void)
  
  }
@@ -1444,10 +1484,92 @@ diff -urNp linux-2.6.36/arch/mips/alchemy/devboards/pm.c linux-2.6.36/arch/mips/
        .valid          = suspend_valid_only_mem,
        .begin          = db1x_pm_begin,
        .enter          = db1x_pm_enter,
-diff -urNp linux-2.6.36/arch/mips/include/asm/elf.h linux-2.6.36/arch/mips/include/asm/elf.h
---- linux-2.6.36/arch/mips/include/asm/elf.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/include/asm/elf.h   2010-11-06 18:58:15.000000000 -0400
-@@ -368,6 +368,13 @@ extern const char *__elf_platform;
+diff -urNp linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c
+--- linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/cavium-octeon/dma-octeon.c  2011-01-17 02:41:00.000000000 -0500
+@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p
+ }
+ 
+ struct octeon_dma_map_ops {
+-      struct dma_map_ops dma_map_ops;
++      const struct dma_map_ops dma_map_ops;
+       dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
+       phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
+ };
+@@ -324,7 +324,7 @@ static struct octeon_dma_map_ops _octeon
+       },
+ };
+ 
+-struct dma_map_ops *octeon_pci_dma_map_ops;
++const struct dma_map_ops *octeon_pci_dma_map_ops;
+ 
+ void __init octeon_pci_dma_init(void)
+ {
+diff -urNp linux-2.6.37/arch/mips/include/asm/device.h linux-2.6.37/arch/mips/include/asm/device.h
+--- linux-2.6.37/arch/mips/include/asm/device.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/device.h        2011-01-17 02:41:00.000000000 -0500
+@@ -10,7 +10,7 @@ struct dma_map_ops;
+ 
+ struct dev_archdata {
+       /* DMA operations on that device */
+-      struct dma_map_ops *dma_ops;
++      const struct dma_map_ops *dma_ops;
+ };
+ 
+ struct pdev_archdata {
+diff -urNp linux-2.6.37/arch/mips/include/asm/dma-mapping.h linux-2.6.37/arch/mips/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/mips/include/asm/dma-mapping.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/dma-mapping.h   2011-01-17 02:41:00.000000000 -0500
+@@ -7,9 +7,9 @@
+ 
+ #include <dma-coherence.h>
+ 
+-extern struct dma_map_ops *mips_dma_map_ops;
++extern const struct dma_map_ops *mips_dma_map_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+       if (dev && dev->archdata.dma_ops)
+               return dev->archdata.dma_ops;
+@@ -31,13 +31,13 @@ static inline void dma_mark_clean(void *
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+       return ops->dma_supported(dev, mask);
+ }
+ 
+ static inline int dma_mapping_error(struct device *dev, u64 mask)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+       return ops->mapping_error(dev, mask);
+ }
+ 
+@@ -59,7 +59,7 @@ static inline void *dma_alloc_coherent(s
+                                      dma_addr_t *dma_handle, gfp_t gfp)
+ {
+       void *ret;
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+       ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
+ 
+@@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(s
+ static inline void dma_free_coherent(struct device *dev, size_t size,
+                                    void *vaddr, dma_addr_t dma_handle)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+       ops->free_coherent(dev, size, vaddr, dma_handle);
+ 
+diff -urNp linux-2.6.37/arch/mips/include/asm/elf.h linux-2.6.37/arch/mips/include/asm/elf.h
+--- linux-2.6.37/arch/mips/include/asm/elf.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/elf.h   2011-01-17 02:41:00.000000000 -0500
+@@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
  
@@ -1461,9 +1583,28 @@ diff -urNp linux-2.6.36/arch/mips/include/asm/elf.h linux-2.6.36/arch/mips/inclu
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
  struct linux_binprm;
  extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-diff -urNp linux-2.6.36/arch/mips/include/asm/page.h linux-2.6.36/arch/mips/include/asm/page.h
---- linux-2.6.36/arch/mips/include/asm/page.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/include/asm/page.h  2010-11-06 18:58:15.000000000 -0400
+                                      int uses_interp);
+ 
+-struct mm_struct;
+-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
+-#define arch_randomize_brk arch_randomize_brk
+-
+ #endif /* _ASM_ELF_H */
+diff -urNp linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+--- linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h      2011-01-17 02:41:00.000000000 -0500
+@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de
+ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
+ 
+ struct dma_map_ops;
+-extern struct dma_map_ops *octeon_pci_dma_map_ops;
++extern const struct dma_map_ops *octeon_pci_dma_map_ops;
+ extern char *octeon_swiotlb;
+ 
+ #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
+diff -urNp linux-2.6.37/arch/mips/include/asm/page.h linux-2.6.37/arch/mips/include/asm/page.h
+--- linux-2.6.37/arch/mips/include/asm/page.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/page.h  2011-01-17 02:41:00.000000000 -0500
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1473,10 +1614,18 @@ diff -urNp linux-2.6.36/arch/mips/include/asm/page.h linux-2.6.36/arch/mips/incl
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)       ((x).pte)
-diff -urNp linux-2.6.36/arch/mips/include/asm/system.h linux-2.6.36/arch/mips/include/asm/system.h
---- linux-2.6.36/arch/mips/include/asm/system.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/include/asm/system.h        2010-11-06 18:58:15.000000000 -0400
-@@ -234,6 +234,6 @@ extern void per_cpu_trap_init(void);
+diff -urNp linux-2.6.37/arch/mips/include/asm/system.h linux-2.6.37/arch/mips/include/asm/system.h
+--- linux-2.6.37/arch/mips/include/asm/system.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/include/asm/system.h        2011-01-17 02:41:00.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <asm/dsp.h>
+ #include <asm/watch.h>
+ #include <asm/war.h>
++#include <asm/asm.h>
+ 
+ 
+ /*
+@@ -230,6 +231,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
  
@@ -1484,9 +1633,9 @@ diff -urNp linux-2.6.36/arch/mips/include/asm/system.h linux-2.6.36/arch/mips/in
 +#define arch_align_stack(x) ((x) & ALMASK)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.36/arch/mips/jz4740/pm.c linux-2.6.36/arch/mips/jz4740/pm.c
---- linux-2.6.36/arch/mips/jz4740/pm.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/jz4740/pm.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/jz4740/pm.c linux-2.6.37/arch/mips/jz4740/pm.c
+--- linux-2.6.37/arch/mips/jz4740/pm.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/jz4740/pm.c 2011-01-17 02:41:00.000000000 -0500
 @@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state
        return 0;
  }
@@ -1496,9 +1645,9 @@ diff -urNp linux-2.6.36/arch/mips/jz4740/pm.c linux-2.6.36/arch/mips/jz4740/pm.c
        .valid          = suspend_valid_only_mem,
        .enter          = jz4740_pm_enter,
  };
-diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/kernel/binfmt_elfn32.c      2011-01-17 02:41:00.000000000 -0500
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1513,9 +1662,9 @@ diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfn32.c linux-2.6.36/arch/mips/
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/kernel/binfmt_elfo32.c      2011-01-17 02:41:00.000000000 -0500
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1530,9 +1679,9 @@ diff -urNp linux-2.6.36/arch/mips/kernel/binfmt_elfo32.c linux-2.6.36/arch/mips/
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.36/arch/mips/kernel/kgdb.c linux-2.6.36/arch/mips/kernel/kgdb.c
---- linux-2.6.36/arch/mips/kernel/kgdb.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/kernel/kgdb.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/kernel/kgdb.c linux-2.6.37/arch/mips/kernel/kgdb.c
+--- linux-2.6.37/arch/mips/kernel/kgdb.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/kernel/kgdb.c       2011-01-17 02:41:00.000000000 -0500
 @@ -351,6 +351,7 @@ int kgdb_arch_handle_exception(int vecto
        return -1;
  }
@@ -1541,10 +1690,10 @@ diff -urNp linux-2.6.36/arch/mips/kernel/kgdb.c linux-2.6.36/arch/mips/kernel/kg
  struct kgdb_arch arch_kgdb_ops;
  
  /*
-diff -urNp linux-2.6.36/arch/mips/kernel/process.c linux-2.6.36/arch/mips/kernel/process.c
---- linux-2.6.36/arch/mips/kernel/process.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/kernel/process.c    2010-11-06 18:58:15.000000000 -0400
-@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_stru
+diff -urNp linux-2.6.37/arch/mips/kernel/process.c linux-2.6.37/arch/mips/kernel/process.c
+--- linux-2.6.37/arch/mips/kernel/process.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/kernel/process.c    2011-01-17 02:41:00.000000000 -0500
+@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
        return pc;
  }
@@ -1560,9 +1709,9 @@ diff -urNp linux-2.6.36/arch/mips/kernel/process.c linux-2.6.36/arch/mips/kernel
 -
 -      return sp & ALMASK;
 -}
-diff -urNp linux-2.6.36/arch/mips/kernel/syscall.c linux-2.6.36/arch/mips/kernel/syscall.c
---- linux-2.6.36/arch/mips/kernel/syscall.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/kernel/syscall.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/mips/kernel/syscall.c linux-2.6.37/arch/mips/kernel/syscall.c
+--- linux-2.6.37/arch/mips/kernel/syscall.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/kernel/syscall.c    2011-01-17 02:41:00.000000000 -0500
 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
        do_color_align = 0;
        if (filp || (flags & MAP_SHARED))
@@ -1593,9 +1742,29 @@ diff -urNp linux-2.6.36/arch/mips/kernel/syscall.c linux-2.6.36/arch/mips/kernel
                        return addr;
                addr = vmm->vm_end;
                if (do_color_align)
-diff -urNp linux-2.6.36/arch/mips/loongson/common/pm.c linux-2.6.36/arch/mips/loongson/common/pm.c
---- linux-2.6.36/arch/mips/loongson/common/pm.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/loongson/common/pm.c        2010-11-06 18:58:15.000000000 -0400
+@@ -168,19 +172,6 @@ static inline unsigned long brk_rnd(void
+       return rnd;
+ }
+ 
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+-      unsigned long base = mm->brk;
+-      unsigned long ret;
+-
+-      ret = PAGE_ALIGN(base + brk_rnd());
+-
+-      if (ret < mm->brk)
+-              return mm->brk;
+-
+-      return ret;
+-}
+-
+ SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
+       unsigned long, prot, unsigned long, flags, unsigned long,
+       fd, off_t, offset)
+diff -urNp linux-2.6.37/arch/mips/loongson/common/pm.c linux-2.6.37/arch/mips/loongson/common/pm.c
+--- linux-2.6.37/arch/mips/loongson/common/pm.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/loongson/common/pm.c        2011-01-17 02:41:00.000000000 -0500
 @@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
        }
  }
@@ -1605,10 +1774,31 @@ diff -urNp linux-2.6.36/arch/mips/loongson/common/pm.c linux-2.6.36/arch/mips/lo
        .valid  = loongson_pm_valid_state,
        .enter  = loongson_pm_enter,
  };
-diff -urNp linux-2.6.36/arch/mips/mm/fault.c linux-2.6.36/arch/mips/mm/fault.c
---- linux-2.6.36/arch/mips/mm/fault.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/mips/mm/fault.c  2010-11-06 18:58:15.000000000 -0400
-@@ -27,6 +27,23 @@
+diff -urNp linux-2.6.37/arch/mips/mm/dma-default.c linux-2.6.37/arch/mips/mm/dma-default.c
+--- linux-2.6.37/arch/mips/mm/dma-default.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/mm/dma-default.c    2011-01-17 02:41:00.000000000 -0500
+@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, 
+ 
+ EXPORT_SYMBOL(dma_cache_sync);
+ 
+-static struct dma_map_ops mips_default_dma_map_ops = {
++static const struct dma_map_ops mips_default_dma_map_ops = {
+       .alloc_coherent = mips_dma_alloc_coherent,
+       .free_coherent = mips_dma_free_coherent,
+       .map_page = mips_dma_map_page,
+@@ -315,7 +315,7 @@ static struct dma_map_ops mips_default_d
+       .dma_supported = mips_dma_supported
+ };
+ 
+-struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
++const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
+ EXPORT_SYMBOL(mips_dma_map_ops);
+ 
+ #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+diff -urNp linux-2.6.37/arch/mips/mm/fault.c linux-2.6.37/arch/mips/mm/fault.c
+--- linux-2.6.37/arch/mips/mm/fault.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/mips/mm/fault.c  2011-01-17 02:41:00.000000000 -0500
+@@ -28,6 +28,23 @@
  #include <asm/highmem.h>              /* For VMALLOC_END */
  #include <linux/kdebug.h>
  
@@ -1632,9 +1822,9 @@ diff -urNp linux-2.6.36/arch/mips/mm/fault.c linux-2.6.36/arch/mips/mm/fault.c
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.36/arch/parisc/include/asm/elf.h linux-2.6.36/arch/parisc/include/asm/elf.h
---- linux-2.6.36/arch/parisc/include/asm/elf.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/include/asm/elf.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/include/asm/elf.h linux-2.6.37/arch/parisc/include/asm/elf.h
+--- linux-2.6.37/arch/parisc/include/asm/elf.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/include/asm/elf.h 2011-01-17 02:41:00.000000000 -0500
 @@ -342,6 +342,13 @@ struct pt_regs;   /* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1649,9 +1839,9 @@ diff -urNp linux-2.6.36/arch/parisc/include/asm/elf.h linux-2.6.36/arch/parisc/i
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.36/arch/parisc/include/asm/pgtable.h linux-2.6.36/arch/parisc/include/asm/pgtable.h
---- linux-2.6.36/arch/parisc/include/asm/pgtable.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/include/asm/pgtable.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/include/asm/pgtable.h linux-2.6.37/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.37/arch/parisc/include/asm/pgtable.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/include/asm/pgtable.h     2011-01-17 02:41:00.000000000 -0500
 @@ -207,6 +207,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1670,9 +1860,9 @@ diff -urNp linux-2.6.36/arch/parisc/include/asm/pgtable.h linux-2.6.36/arch/pari
  #define PAGE_KERNEL   __pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO        __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC       __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.36/arch/parisc/kernel/module.c linux-2.6.36/arch/parisc/kernel/module.c
---- linux-2.6.36/arch/parisc/kernel/module.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/kernel/module.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/kernel/module.c linux-2.6.37/arch/parisc/kernel/module.c
+--- linux-2.6.37/arch/parisc/kernel/module.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/kernel/module.c   2011-01-17 02:41:00.000000000 -0500
 @@ -96,16 +96,38 @@
  
  /* three functions to determine where in the module core
@@ -1773,9 +1963,9 @@ diff -urNp linux-2.6.36/arch/parisc/kernel/module.c linux-2.6.36/arch/parisc/ker
  
        DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
               me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.36/arch/parisc/kernel/sys_parisc.c linux-2.6.36/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.36/arch/parisc/kernel/sys_parisc.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/kernel/sys_parisc.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/kernel/sys_parisc.c linux-2.6.37/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.37/arch/parisc/kernel/sys_parisc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/kernel/sys_parisc.c       2011-01-17 02:41:00.000000000 -0500
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
                /* At this point:  (!vma || addr < vma->vm_end). */
                if (TASK_SIZE - len < addr)
@@ -1803,9 +1993,9 @@ diff -urNp linux-2.6.36/arch/parisc/kernel/sys_parisc.c linux-2.6.36/arch/parisc
  
        if (filp) {
                addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36/arch/parisc/kernel/traps.c
---- linux-2.6.36/arch/parisc/kernel/traps.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/kernel/traps.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37/arch/parisc/kernel/traps.c
+--- linux-2.6.37/arch/parisc/kernel/traps.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/kernel/traps.c    2011-01-17 02:41:00.000000000 -0500
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
                        down_read(&current->mm->mmap_sem);
@@ -1817,9 +2007,9 @@ diff -urNp linux-2.6.36/arch/parisc/kernel/traps.c linux-2.6.36/arch/parisc/kern
                                fault_address = regs->iaoq[0];
                                fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36/arch/parisc/mm/fault.c
---- linux-2.6.36/arch/parisc/mm/fault.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/parisc/mm/fault.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37/arch/parisc/mm/fault.c
+--- linux-2.6.37/arch/parisc/mm/fault.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/parisc/mm/fault.c        2011-01-17 02:41:00.000000000 -0500
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1989,9 +2179,9 @@ diff -urNp linux-2.6.36/arch/parisc/mm/fault.c linux-2.6.36/arch/parisc/mm/fault
  
        /*
         * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/device.h linux-2.6.36/arch/powerpc/include/asm/device.h
---- linux-2.6.36/arch/powerpc/include/asm/device.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/device.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/device.h linux-2.6.37/arch/powerpc/include/asm/device.h
+--- linux-2.6.37/arch/powerpc/include/asm/device.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/device.h     2011-01-17 02:41:00.000000000 -0500
 @@ -11,7 +11,7 @@ struct device_node;
  
  struct dev_archdata {
@@ -2001,16 +2191,17 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/device.h linux-2.6.36/arch/powe
  
        /*
         * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/dma-mapping.h        2011-01-17 02:41:00.000000000 -0500
 @@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
  /*
   * Available generic sets of operations
   */
 +/* cannot be const */
  #ifdef CONFIG_PPC64
- extern struct dma_map_ops dma_iommu_ops;
+-extern struct dma_map_ops dma_iommu_ops;
++extern const struct dma_map_ops dma_iommu_ops;
  #endif
 -extern struct dma_map_ops dma_direct_ops;
 +extern const struct dma_map_ops dma_direct_ops;
@@ -2038,16 +2229,7 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch
  
        if (unlikely(dma_ops == NULL))
                return 0;
-@@ -129,7 +130,7 @@ static inline int dma_supported(struct d
- 
- static inline int dma_set_mask(struct device *dev, u64 dma_mask)
- {
--      struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+      const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
-       if (unlikely(dma_ops == NULL))
-               return -EIO;
-@@ -144,7 +145,7 @@ static inline int dma_set_mask(struct de
+@@ -132,7 +133,7 @@ extern int dma_set_mask(struct device *d
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag)
  {
@@ -2056,7 +2238,7 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch
        void *cpu_addr;
  
        BUG_ON(!dma_ops);
-@@ -159,7 +160,7 @@ static inline void *dma_alloc_coherent(s
+@@ -147,7 +148,7 @@ static inline void *dma_alloc_coherent(s
  static inline void dma_free_coherent(struct device *dev, size_t size,
                                     void *cpu_addr, dma_addr_t dma_handle)
  {
@@ -2065,7 +2247,7 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch
  
        BUG_ON(!dma_ops);
  
-@@ -170,7 +171,7 @@ static inline void dma_free_coherent(str
+@@ -158,7 +159,7 @@ static inline void dma_free_coherent(str
  
  static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
@@ -2074,9 +2256,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/dma-mapping.h linux-2.6.36/arch
  
        if (dma_ops->mapping_error)
                return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/elf.h linux-2.6.36/arch/powerpc/include/asm/elf.h
---- linux-2.6.36/arch/powerpc/include/asm/elf.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/elf.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/elf.h linux-2.6.37/arch/powerpc/include/asm/elf.h
+--- linux-2.6.37/arch/powerpc/include/asm/elf.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/elf.h        2011-01-17 02:41:00.000000000 -0500
 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -2089,8 +2271,8 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/elf.h linux-2.6.36/arch/powerpc
 +#define PAX_ELF_ET_DYN_BASE   (0x10000000UL)
 +
 +#ifdef __powerpc64__
-+#define PAX_DELTA_MMAP_LEN    (test_thread_flag(TIF_32BIT) ? 16 : 28)
-+#define PAX_DELTA_STACK_LEN   (test_thread_flag(TIF_32BIT) ? 16 : 28)
++#define PAX_DELTA_MMAP_LEN    (is_32bit_task() ? 16 : 28)
++#define PAX_DELTA_STACK_LEN   (is_32bit_task() ? 16 : 28)
 +#else
 +#define PAX_DELTA_MMAP_LEN    15
 +#define PAX_DELTA_STACK_LEN   15
@@ -2109,9 +2291,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/elf.h linux-2.6.36/arch/powerpc
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/iommu.h linux-2.6.36/arch/powerpc/include/asm/iommu.h
---- linux-2.6.36/arch/powerpc/include/asm/iommu.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/iommu.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/iommu.h linux-2.6.37/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.37/arch/powerpc/include/asm/iommu.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/iommu.h      2011-01-17 02:41:00.000000000 -0500
 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
@@ -2122,9 +2304,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/iommu.h linux-2.6.36/arch/power
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/kmap_types.h linux-2.6.36/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.36/arch/powerpc/include/asm/kmap_types.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/kmap_types.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/kmap_types.h linux-2.6.37/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.37/arch/powerpc/include/asm/kmap_types.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/kmap_types.h 2011-01-17 02:41:00.000000000 -0500
 @@ -27,6 +27,7 @@ enum km_type {
        KM_PPC_SYNC_PAGE,
        KM_PPC_SYNC_ICACHE,
@@ -2133,9 +2315,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/kmap_types.h linux-2.6.36/arch/
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/page_64.h linux-2.6.36/arch/powerpc/include/asm/page_64.h
---- linux-2.6.36/arch/powerpc/include/asm/page_64.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/page_64.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/page_64.h linux-2.6.37/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.37/arch/powerpc/include/asm/page_64.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/page_64.h    2011-01-17 02:41:00.000000000 -0500
 @@ -172,15 +172,18 @@ do {                                             \
   * stack by default, so in the absense of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -2151,15 +2333,15 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/page_64.h linux-2.6.36/arch/pow
  
 +#ifndef CONFIG_PAX_PAGEEXEC
  #define VM_STACK_DEFAULT_FLAGS \
-       (test_thread_flag(TIF_32BIT) ? \
+       (is_32bit_task() ? \
         VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
 +#endif
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/page.h linux-2.6.36/arch/powerpc/include/asm/page.h
---- linux-2.6.36/arch/powerpc/include/asm/page.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/page.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/page.h linux-2.6.37/arch/powerpc/include/asm/page.h
+--- linux-2.6.37/arch/powerpc/include/asm/page.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/page.h       2011-01-17 02:41:00.000000000 -0500
 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -2182,9 +2364,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/page.h linux-2.6.36/arch/powerp
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/pci.h linux-2.6.36/arch/powerpc/include/asm/pci.h
---- linux-2.6.36/arch/powerpc/include/asm/pci.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/pci.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/pci.h linux-2.6.37/arch/powerpc/include/asm/pci.h
+--- linux-2.6.37/arch/powerpc/include/asm/pci.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/pci.h        2011-01-17 02:41:00.000000000 -0500
 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
  }
  
@@ -2196,9 +2378,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/pci.h linux-2.6.36/arch/powerpc
  #else /* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()     NULL
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/pte-hash32.h 2011-01-17 02:41:00.000000000 -0500
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE    0x004   /* when !present: nonlinear file mapping */
  #define _PAGE_USER    0x004   /* usermode access allowed */
@@ -2207,9 +2389,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/pte-hash32.h linux-2.6.36/arch/
  #define _PAGE_COHERENT        0x010   /* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE        0x020   /* I: cache inhibit */
  #define _PAGE_WRITETHRU       0x040   /* W: cache write-through */
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/reg.h linux-2.6.36/arch/powerpc/include/asm/reg.h
---- linux-2.6.36/arch/powerpc/include/asm/reg.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/reg.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/reg.h linux-2.6.37/arch/powerpc/include/asm/reg.h
+--- linux-2.6.37/arch/powerpc/include/asm/reg.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/reg.h        2011-01-17 02:41:00.000000000 -0500
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR     0x136   /* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR    0x012   /* Data Storage Interrupt Status Register */
@@ -2218,9 +2400,9 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/reg.h linux-2.6.36/arch/powerpc
  #define   DSISR_PROTFAULT     0x08000000      /* protection fault */
  #define   DSISR_ISSTORE               0x02000000      /* access was a store */
  #define   DSISR_DABRMATCH     0x00400000      /* hit data breakpoint */
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/swiotlb.h linux-2.6.36/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.36/arch/powerpc/include/asm/swiotlb.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/swiotlb.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/swiotlb.h linux-2.6.37/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.37/arch/powerpc/include/asm/swiotlb.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/swiotlb.h    2011-01-17 02:41:00.000000000 -0500
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -2230,9 +2412,21 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/swiotlb.h linux-2.6.36/arch/pow
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.36/arch/powerpc/include/asm/uaccess.h linux-2.6.36/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.36/arch/powerpc/include/asm/uaccess.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/include/asm/uaccess.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/system.h linux-2.6.37/arch/powerpc/include/asm/system.h
+--- linux-2.6.37/arch/powerpc/include/asm/system.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/system.h     2011-01-17 02:41:00.000000000 -0500
+@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
+ #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+ #endif
+ 
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
+ 
+ /* Used in very early kernel initialization. */
+ extern unsigned long reloc_offset(void);
+diff -urNp linux-2.6.37/arch/powerpc/include/asm/uaccess.h linux-2.6.37/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.37/arch/powerpc/include/asm/uaccess.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/include/asm/uaccess.h    2011-01-17 02:41:00.000000000 -0500
 @@ -13,6 +13,8 @@
  #define VERIFY_READ   0
  #define VERIFY_WRITE  1
@@ -2410,10 +2604,10 @@ diff -urNp linux-2.6.36/arch/powerpc/include/asm/uaccess.h linux-2.6.36/arch/pow
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.36/arch/powerpc/kernel/dma.c linux-2.6.36/arch/powerpc/kernel/dma.c
---- linux-2.6.36/arch/powerpc/kernel/dma.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/dma.c     2010-11-06 18:58:15.000000000 -0400
-@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
+diff -urNp linux-2.6.37/arch/powerpc/kernel/dma.c linux-2.6.37/arch/powerpc/kernel/dma.c
+--- linux-2.6.37/arch/powerpc/kernel/dma.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/dma.c     2011-01-17 02:41:00.000000000 -0500
+@@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
  }
  #endif
  
@@ -2422,9 +2616,18 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/dma.c linux-2.6.36/arch/powerpc/kern
        .alloc_coherent = dma_direct_alloc_coherent,
        .free_coherent  = dma_direct_free_coherent,
        .map_sg         = dma_direct_map_sg,
-diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-iommu.c linux-2.6.36/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.36/arch/powerpc/kernel/dma-iommu.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/dma-iommu.c       2010-11-06 18:58:15.000000000 -0400
+@@ -157,7 +157,7 @@ EXPORT_SYMBOL(dma_direct_ops);
+ 
+ int dma_set_mask(struct device *dev, u64 dma_mask)
+ {
+-      struct dma_map_ops *dma_ops = get_dma_ops(dev);
++      const struct dma_map_ops *dma_ops = get_dma_ops(dev);
+ 
+       if (ppc_md.dma_set_mask)
+               return ppc_md.dma_set_mask(dev, dma_mask);
+diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-iommu.c linux-2.6.37/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.37/arch/powerpc/kernel/dma-iommu.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/dma-iommu.c       2011-01-17 02:41:00.000000000 -0500
 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
  }
  
@@ -2434,7 +2637,7 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-iommu.c linux-2.6.36/arch/powerp
  {
        struct iommu_table *tbl = get_iommu_table_base(dev);
  
-@@ -89,6 +89,7 @@ static int dma_iommu_dma_supported(struc
+@@ -90,6 +90,7 @@ static int dma_iommu_dma_supported(struc
                return 1;
  }
  
@@ -2442,9 +2645,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-iommu.c linux-2.6.36/arch/powerp
  struct dma_map_ops dma_iommu_ops = {
        .alloc_coherent = dma_iommu_alloc_coherent,
        .free_coherent  = dma_iommu_free_coherent,
-diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/dma-swiotlb.c     2011-01-17 02:41:00.000000000 -0500
 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
@@ -2454,9 +2657,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.36/arch/powe
        .alloc_coherent = dma_direct_alloc_coherent,
        .free_coherent = dma_direct_free_coherent,
        .map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/exceptions-64e.S  2011-01-17 02:41:00.000000000 -0500
 @@ -495,6 +495,7 @@ storage_fault_common:
        std     r14,_DAR(r1)
        std     r15,_DSISR(r1)
@@ -2475,10 +2678,10 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64e.S linux-2.6.36/arch/p
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
        bl      .bad_page_fault
-diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S  2010-11-06 18:58:15.000000000 -0400
-@@ -841,10 +841,10 @@ handle_page_fault:
+diff -urNp linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/exceptions-64s.S  2011-01-17 02:41:00.000000000 -0500
+@@ -847,10 +847,10 @@ handle_page_fault:
  11:   ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
@@ -2490,9 +2693,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/exceptions-64s.S linux-2.6.36/arch/p
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
-diff -urNp linux-2.6.36/arch/powerpc/kernel/ibmebus.c linux-2.6.36/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.36/arch/powerpc/kernel/ibmebus.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/ibmebus.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/ibmebus.c linux-2.6.37/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.37/arch/powerpc/kernel/ibmebus.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/ibmebus.c 2011-01-17 02:41:00.000000000 -0500
 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct 
        return 1;
  }
@@ -2502,10 +2705,10 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/ibmebus.c linux-2.6.36/arch/powerpc/
        .alloc_coherent = ibmebus_alloc_coherent,
        .free_coherent  = ibmebus_free_coherent,
        .map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.36/arch/powerpc/kernel/kgdb.c linux-2.6.36/arch/powerpc/kernel/kgdb.c
---- linux-2.6.36/arch/powerpc/kernel/kgdb.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/kgdb.c    2010-11-06 18:58:15.000000000 -0400
-@@ -360,7 +360,7 @@ int kgdb_arch_handle_exception(int vecto
+diff -urNp linux-2.6.37/arch/powerpc/kernel/kgdb.c linux-2.6.37/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.37/arch/powerpc/kernel/kgdb.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/kgdb.c    2011-01-17 02:41:00.000000000 -0500
+@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
  /*
   * Global data
   */
@@ -2514,9 +2717,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/kgdb.c linux-2.6.36/arch/powerpc/ker
        .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.36/arch/powerpc/kernel/module_32.c linux-2.6.36/arch/powerpc/kernel/module_32.c
---- linux-2.6.36/arch/powerpc/kernel/module_32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/module_32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/module_32.c linux-2.6.37/arch/powerpc/kernel/module_32.c
+--- linux-2.6.37/arch/powerpc/kernel/module_32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/module_32.c       2011-01-17 02:41:00.000000000 -0500
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
                        me->arch.core_plt_section = i;
        }
@@ -2546,9 +2749,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/module_32.c linux-2.6.36/arch/powerp
  
        /* Find this entry, or if that fails, the next avail. entry */
        while (entry->jump[0]) {
-diff -urNp linux-2.6.36/arch/powerpc/kernel/module.c linux-2.6.36/arch/powerpc/kernel/module.c
---- linux-2.6.36/arch/powerpc/kernel/module.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/module.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/module.c linux-2.6.37/arch/powerpc/kernel/module.c
+--- linux-2.6.37/arch/powerpc/kernel/module.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/module.c  2011-01-17 02:41:00.000000000 -0500
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2588,9 +2791,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/module.c linux-2.6.36/arch/powerpc/k
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
                                    const Elf_Shdr *sechdrs,
                                    const char *name)
-diff -urNp linux-2.6.36/arch/powerpc/kernel/pci-common.c linux-2.6.36/arch/powerpc/kernel/pci-common.c
---- linux-2.6.36/arch/powerpc/kernel/pci-common.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/pci-common.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/pci-common.c linux-2.6.37/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.37/arch/powerpc/kernel/pci-common.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/pci-common.c      2011-01-17 02:41:00.000000000 -0500
 @@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
@@ -2609,13 +2812,54 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/pci-common.c linux-2.6.36/arch/power
  {
        return pci_dma_ops;
  }
-diff -urNp linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36/arch/powerpc/kernel/process.c
---- linux-2.6.36/arch/powerpc/kernel/process.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/process.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1251,54 +1251,6 @@ unsigned long arch_align_stack(unsigned 
-       return sp & ~0xf;
+diff -urNp linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37/arch/powerpc/kernel/process.c
+--- linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-17 02:41:00.000000000 -0500
+@@ -653,8 +653,8 @@ void show_regs(struct pt_regs * regs)
+        * Lookup NIP late so we have the best change of getting the
+        * above info out without failing
+        */
+-      printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
+-      printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
++      printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
++      printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
+ #endif
+       show_stack(current, (unsigned long *) regs->gpr[1]);
+       if (!user_mode(regs))
+@@ -1144,10 +1144,10 @@ void show_stack(struct task_struct *tsk,
+               newsp = stack[0];
+               ip = stack[STACK_FRAME_LR_SAVE];
+               if (!firstframe || ip != lr) {
+-                      printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
++                      printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+                       if ((ip == rth || ip == mrth) && curr_frame >= 0) {
+-                              printk(" (%pS)",
++                              printk(" (%pA)",
+                                      (void *)current->ret_stack[curr_frame].ret);
+                               curr_frame--;
+                       }
+@@ -1167,7 +1167,7 @@ void show_stack(struct task_struct *tsk,
+                       struct pt_regs *regs = (struct pt_regs *)
+                               (sp + STACK_FRAME_OVERHEAD);
+                       lr = regs->link;
+-                      printk("--- Exception: %lx at %pS\n    LR = %pS\n",
++                      printk("--- Exception: %lx at %pA\n    LR = %pA\n",
+                              regs->trap, (void *)regs->nip, (void *)lr);
+                       firstframe = 1;
+               }
+@@ -1242,58 +1242,3 @@ void thread_info_cache_init(void)
  }
  
+ #endif /* THREAD_SHIFT < PAGE_SHIFT */
+-
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+-      if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+-              sp -= get_random_int() & ~PAGE_MASK;
+-      return sp & ~0xf;
+-}
+-
 -static inline unsigned long brk_rnd(void)
 -{
 -        unsigned long rnd = 0;
@@ -2663,13 +2907,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/process.c linux-2.6.36/arch/powerpc/
 -
 -      return ret;
 -}
--
- #ifdef CONFIG_SMP
- int arch_sd_sibling_asym_packing(void)
- {
-diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_32.c linux-2.6.36/arch/powerpc/kernel/signal_32.c
---- linux-2.6.36/arch/powerpc/kernel/signal_32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/signal_32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_32.c linux-2.6.37/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.37/arch/powerpc/kernel/signal_32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/signal_32.c       2011-01-17 02:41:00.000000000 -0500
 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
        /* Save user registers on the stack */
        frame = &rt_sf->uc.uc_mcontext;
@@ -2679,9 +2919,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_32.c linux-2.6.36/arch/powerp
                if (save_user_regs(regs, frame, 0, 1))
                        goto badframe;
                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_64.c linux-2.6.36/arch/powerpc/kernel/signal_64.c
---- linux-2.6.36/arch/powerpc/kernel/signal_64.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/signal_64.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/signal_64.c linux-2.6.37/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.37/arch/powerpc/kernel/signal_64.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/signal_64.c       2011-01-17 02:41:00.000000000 -0500
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
        current->thread.fpscr.val = 0;
  
@@ -2691,9 +2931,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/signal_64.c linux-2.6.36/arch/powerp
                regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
        } else {
                err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36/arch/powerpc/kernel/vdso.c
---- linux-2.6.36/arch/powerpc/kernel/vdso.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/vdso.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/kernel/vdso.c linux-2.6.37/arch/powerpc/kernel/vdso.c
+--- linux-2.6.37/arch/powerpc/kernel/vdso.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/vdso.c    2011-01-17 02:41:00.000000000 -0500
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2720,10 +2960,10 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/vdso.c linux-2.6.36/arch/powerpc/ker
        if (IS_ERR_VALUE(vdso_base)) {
                rc = vdso_base;
                goto fail_mmapsem;
-diff -urNp linux-2.6.36/arch/powerpc/kernel/vio.c linux-2.6.36/arch/powerpc/kernel/vio.c
---- linux-2.6.36/arch/powerpc/kernel/vio.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/kernel/vio.c     2010-11-06 18:58:15.000000000 -0400
-@@ -602,11 +602,12 @@ static void vio_dma_iommu_unmap_sg(struc
+diff -urNp linux-2.6.37/arch/powerpc/kernel/vio.c linux-2.6.37/arch/powerpc/kernel/vio.c
+--- linux-2.6.37/arch/powerpc/kernel/vio.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/kernel/vio.c     2011-01-17 02:41:00.000000000 -0500
+@@ -600,11 +600,12 @@ static void vio_dma_iommu_unmap_sg(struc
        vio_cmo_dealloc(viodev, alloc_size);
  }
  
@@ -2737,7 +2977,7 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/vio.c linux-2.6.36/arch/powerpc/kern
        .map_page       = vio_dma_iommu_map_page,
        .unmap_page     = vio_dma_iommu_unmap_page,
  
-@@ -860,7 +861,6 @@ static void vio_cmo_bus_remove(struct vi
+@@ -858,7 +859,6 @@ static void vio_cmo_bus_remove(struct vi
  
  static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
  {
@@ -2745,9 +2985,9 @@ diff -urNp linux-2.6.36/arch/powerpc/kernel/vio.c linux-2.6.36/arch/powerpc/kern
        viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
  }
  
-diff -urNp linux-2.6.36/arch/powerpc/lib/usercopy_64.c linux-2.6.36/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.36/arch/powerpc/lib/usercopy_64.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/lib/usercopy_64.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/lib/usercopy_64.c linux-2.6.37/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.37/arch/powerpc/lib/usercopy_64.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/lib/usercopy_64.c        2011-01-17 02:41:00.000000000 -0500
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2779,13 +3019,13 @@ diff -urNp linux-2.6.36/arch/powerpc/lib/usercopy_64.c linux-2.6.36/arch/powerpc
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fault.c
---- linux-2.6.36/arch/powerpc/mm/fault.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/mm/fault.c       2010-11-06 18:58:15.000000000 -0400
-@@ -30,6 +30,10 @@
- #include <linux/kprobes.h>
+diff -urNp linux-2.6.37/arch/powerpc/mm/fault.c linux-2.6.37/arch/powerpc/mm/fault.c
+--- linux-2.6.37/arch/powerpc/mm/fault.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/mm/fault.c       2011-01-17 02:41:00.000000000 -0500
+@@ -31,6 +31,10 @@
  #include <linux/kdebug.h>
  #include <linux/perf_event.h>
+ #include <linux/magic.h>
 +#include <linux/slab.h>
 +#include <linux/pagemap.h>
 +#include <linux/compiler.h>
@@ -2793,7 +3033,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
  
  #include <asm/firmware.h>
  #include <asm/page.h>
-@@ -41,6 +45,7 @@
+@@ -42,6 +46,7 @@
  #include <asm/tlbflush.h>
  #include <asm/siginfo.h>
  #include <mm/mmu_decl.h>
@@ -2801,7 +3041,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
  
  #ifdef CONFIG_KPROBES
  static inline int notify_page_fault(struct pt_regs *regs)
-@@ -64,6 +69,33 @@ static inline int notify_page_fault(stru
+@@ -65,6 +70,33 @@ static inline int notify_page_fault(stru
  }
  #endif
  
@@ -2835,7 +3075,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
  /*
   * Check whether the instruction at regs->nip is a store using
   * an update addressing form which will update r1.
-@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_re
+@@ -135,7 +167,7 @@ int __kprobes do_page_fault(struct pt_re
         * indicate errors in DSISR but can validly be set in SRR1.
         */
        if (trap == 0x400)
@@ -2844,7 +3084,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
        else
                is_write = error_code & DSISR_ISSTORE;
  #else
-@@ -257,7 +289,7 @@ good_area:
+@@ -258,7 +290,7 @@ good_area:
           * "undefined".  Of those that can be set, this is the only
           * one which seems bad.
           */
@@ -2853,7 +3093,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
                  /* Guarded storage error. */
                goto bad_area;
  #endif /* CONFIG_8xx */
-@@ -272,7 +304,7 @@ good_area:
+@@ -273,7 +305,7 @@ good_area:
                 * processors use the same I/D cache coherency mechanism
                 * as embedded.
                 */
@@ -2862,7 +3102,7 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
                        goto bad_area;
  #endif /* CONFIG_PPC_STD_MMU */
  
-@@ -341,6 +373,23 @@ bad_area:
+@@ -342,6 +374,23 @@ bad_area:
  bad_area_nosemaphore:
        /* User mode accesses cause a SIGSEGV */
        if (user_mode(regs)) {
@@ -2886,9 +3126,9 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/fault.c linux-2.6.36/arch/powerpc/mm/fau
                _exception(SIGSEGV, regs, code, address);
                return 0;
        }
-diff -urNp linux-2.6.36/arch/powerpc/mm/mmap_64.c linux-2.6.36/arch/powerpc/mm/mmap_64.c
---- linux-2.6.36/arch/powerpc/mm/mmap_64.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/mm/mmap_64.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/mm/mmap_64.c linux-2.6.37/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.37/arch/powerpc/mm/mmap_64.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/mm/mmap_64.c     2011-01-17 02:41:00.000000000 -0500
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2912,9 +3152,9 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/mmap_64.c linux-2.6.36/arch/powerpc/mm/m
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.36/arch/powerpc/mm/slice.c linux-2.6.36/arch/powerpc/mm/slice.c
---- linux-2.6.36/arch/powerpc/mm/slice.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/mm/slice.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/mm/slice.c linux-2.6.37/arch/powerpc/mm/slice.c
+--- linux-2.6.37/arch/powerpc/mm/slice.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/mm/slice.c       2011-01-17 02:41:00.000000000 -0500
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
        if ((mm->task_size - len) < addr)
                return 0;
@@ -2954,9 +3194,9 @@ diff -urNp linux-2.6.36/arch/powerpc/mm/slice.c linux-2.6.36/arch/powerpc/mm/sli
        /* If hint, make sure it matches our alignment restrictions */
        if (!fixed && addr) {
                addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/52xx/lite5200_pm.c     2011-01-17 02:41:00.000000000 -0500
 @@ -232,7 +232,7 @@ static void lite5200_pm_end(void)
        lite5200_pm_target_state = PM_SUSPEND_ON;
  }
@@ -2966,9 +3206,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.36/a
        .valid          = lite5200_pm_valid,
        .begin          = lite5200_pm_begin,
        .prepare        = lite5200_pm_prepare,
-diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2011-01-17 02:41:00.000000000 -0500
 @@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void)
        iounmap(mbar);
  }
@@ -2978,9 +3218,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.36/ar
        .valid          = mpc52xx_pm_valid,
        .prepare        = mpc52xx_pm_prepare,
        .enter          = mpc52xx_pm_enter,
-diff -urNp linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/83xx/suspend.c 2011-01-17 02:41:00.000000000 -0500
 @@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
        return ret;
  }
@@ -2990,9 +3230,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/83xx/suspend.c linux-2.6.36/arch/
        .valid = mpc83xx_suspend_valid,
        .begin = mpc83xx_suspend_begin,
        .enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.36/arch/powerpc/platforms/cell/iommu.c linux-2.6.36/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.36/arch/powerpc/platforms/cell/iommu.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/cell/iommu.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/cell/iommu.c linux-2.6.37/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.37/arch/powerpc/platforms/cell/iommu.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/cell/iommu.c   2011-01-17 02:41:00.000000000 -0500
 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -3002,9 +3242,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/cell/iommu.c linux-2.6.36/arch/po
        .alloc_coherent = dma_fixed_alloc_coherent,
        .free_coherent  = dma_fixed_free_coherent,
        .map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/ps3/system-bus.c       2011-01-17 02:41:00.000000000 -0500
 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
        return mask >= DMA_BIT_MASK(32);
  }
@@ -3023,9 +3263,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.36/arc
        .alloc_coherent = ps3_alloc_coherent,
        .free_coherent = ps3_free_coherent,
        .map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c
---- linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c
+--- linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/platforms/pseries/suspend.c      2011-01-17 02:41:00.000000000 -0500
 @@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysde
        .name = "power",
  };
@@ -3035,9 +3275,9 @@ diff -urNp linux-2.6.36/arch/powerpc/platforms/pseries/suspend.c linux-2.6.36/ar
        .valid          = suspend_valid_only_mem,
        .begin          = pseries_suspend_begin,
        .prepare_late   = pseries_prepare_late,
-diff -urNp linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c
---- linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c
+--- linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/powerpc/sysdev/fsl_pmc.c 2011-01-17 02:41:00.000000000 -0500
 @@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
        return 1;
  }
@@ -3047,9 +3287,9 @@ diff -urNp linux-2.6.36/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.36/arch/powerpc/
        .valid = pmc_suspend_valid,
        .enter = pmc_suspend_enter,
  };
-diff -urNp linux-2.6.36/arch/s390/include/asm/elf.h linux-2.6.36/arch/s390/include/asm/elf.h
---- linux-2.6.36/arch/s390/include/asm/elf.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/include/asm/elf.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/include/asm/elf.h linux-2.6.37/arch/s390/include/asm/elf.h
+--- linux-2.6.37/arch/s390/include/asm/elf.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/include/asm/elf.h   2011-01-17 02:41:00.000000000 -0500
 @@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
     that it will "exec", and that there is sufficient room for the brk.  */
  #define ELF_ET_DYN_BASE               (STACK_TOP / 3 * 2)
@@ -3064,9 +3304,9 @@ diff -urNp linux-2.6.36/arch/s390/include/asm/elf.h linux-2.6.36/arch/s390/inclu
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
  
-diff -urNp linux-2.6.36/arch/s390/include/asm/uaccess.h linux-2.6.36/arch/s390/include/asm/uaccess.h
---- linux-2.6.36/arch/s390/include/asm/uaccess.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/include/asm/uaccess.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/include/asm/uaccess.h linux-2.6.37/arch/s390/include/asm/uaccess.h
+--- linux-2.6.37/arch/s390/include/asm/uaccess.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/include/asm/uaccess.h       2011-01-17 02:41:00.000000000 -0500
 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -3099,10 +3339,10 @@ diff -urNp linux-2.6.36/arch/s390/include/asm/uaccess.h linux-2.6.36/arch/s390/i
        if (unlikely(sz != -1 && sz < n)) {
                copy_from_user_overflow();
                return n;
-diff -urNp linux-2.6.36/arch/s390/Kconfig linux-2.6.36/arch/s390/Kconfig
---- linux-2.6.36/arch/s390/Kconfig     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/Kconfig     2010-11-06 18:58:15.000000000 -0400
-@@ -227,13 +227,12 @@ config AUDIT_ARCH
+diff -urNp linux-2.6.37/arch/s390/Kconfig linux-2.6.37/arch/s390/Kconfig
+--- linux-2.6.37/arch/s390/Kconfig     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/Kconfig     2011-01-17 02:41:00.000000000 -0500
+@@ -242,13 +242,12 @@ config AUDIT_ARCH
  
  config S390_EXEC_PROTECT
        bool "Data execute protection"
@@ -3112,17 +3352,17 @@ diff -urNp linux-2.6.36/arch/s390/Kconfig linux-2.6.36/arch/s390/Kconfig
 -        space programs and it also selects the addressing mode option above.
 -        The kernel parameter noexec=on will enable this feature and also
 -        switch the addressing modes, default is disabled. Enabling this (via
--        kernel parameter) on machines earlier than IBM System z9-109 EC/BC
--        will reduce system performance.
+-        kernel parameter) on machines earlier than IBM System z9 this will
+-        reduce system performance.
 +        space programs.
-+        Enabling this on machines earlier than IBM System z9-109 EC/BC will
-+        reduce system performance.
++        Enabling this (via kernel parameter) on machines earlier than IBM
++        System z9 will reduce system performance.
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.36/arch/s390/kernel/module.c linux-2.6.36/arch/s390/kernel/module.c
---- linux-2.6.36/arch/s390/kernel/module.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/kernel/module.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/kernel/module.c linux-2.6.37/arch/s390/kernel/module.c
+--- linux-2.6.37/arch/s390/kernel/module.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/kernel/module.c     2011-01-17 02:41:00.000000000 -0500
 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
        /* Increase core size by size of got & plt and set start
@@ -3194,9 +3434,9 @@ diff -urNp linux-2.6.36/arch/s390/kernel/module.c linux-2.6.36/arch/s390/kernel/
                        rela->r_addend - loc;
                if (r_type == R_390_GOTPC)
                        *(unsigned int *) loc = val;
-diff -urNp linux-2.6.36/arch/s390/kernel/setup.c linux-2.6.36/arch/s390/kernel/setup.c
---- linux-2.6.36/arch/s390/kernel/setup.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/kernel/setup.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/kernel/setup.c linux-2.6.37/arch/s390/kernel/setup.c
+--- linux-2.6.37/arch/s390/kernel/setup.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/kernel/setup.c      2011-01-17 02:41:00.000000000 -0500
 @@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -3245,9 +3485,9 @@ diff -urNp linux-2.6.36/arch/s390/kernel/setup.c linux-2.6.36/arch/s390/kernel/s
  static void setup_addressing_mode(void)
  {
        if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.36/arch/s390/mm/maccess.c linux-2.6.36/arch/s390/mm/maccess.c
---- linux-2.6.36/arch/s390/mm/maccess.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/mm/maccess.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/mm/maccess.c linux-2.6.37/arch/s390/mm/maccess.c
+--- linux-2.6.37/arch/s390/mm/maccess.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/mm/maccess.c        2011-01-17 02:41:00.000000000 -0500
 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void 
        return rc ? rc : count;
  }
@@ -3257,9 +3497,9 @@ diff -urNp linux-2.6.36/arch/s390/mm/maccess.c linux-2.6.36/arch/s390/mm/maccess
  {
        long copied = 0;
  
-diff -urNp linux-2.6.36/arch/s390/mm/mmap.c linux-2.6.36/arch/s390/mm/mmap.c
---- linux-2.6.36/arch/s390/mm/mmap.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/s390/mm/mmap.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/s390/mm/mmap.c linux-2.6.37/arch/s390/mm/mmap.c
+--- linux-2.6.37/arch/s390/mm/mmap.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/s390/mm/mmap.c   2011-01-17 02:41:00.000000000 -0500
 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -3306,9 +3546,33 @@ diff -urNp linux-2.6.36/arch/s390/mm/mmap.c linux-2.6.36/arch/s390/mm/mmap.c
                mm->get_unmapped_area = s390_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/score/include/asm/system.h linux-2.6.37/arch/score/include/asm/system.h
+--- linux-2.6.37/arch/score/include/asm/system.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/score/include/asm/system.h       2011-01-17 02:41:00.000000000 -0500
+@@ -17,7 +17,7 @@ do {                                                         \
+ #define finish_arch_switch(prev)      do {} while (0)
+ 
+ typedef void (*vi_handler_t)(void);
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) (x)
+ 
+ #define mb()          barrier()
+ #define rmb()         barrier()
+diff -urNp linux-2.6.37/arch/score/kernel/process.c linux-2.6.37/arch/score/kernel/process.c
+--- linux-2.6.37/arch/score/kernel/process.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/score/kernel/process.c   2011-01-17 02:41:00.000000000 -0500
+@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
+ 
+       return task_pt_regs(task)->cp0_epc;
+ }
+-
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+-      return sp;
+-}
+diff -urNp linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/boards/mach-hp6xx/pm.c        2011-01-17 02:41:00.000000000 -0500
 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
        return 0;
  }
@@ -3318,9 +3582,9 @@ diff -urNp linux-2.6.36/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.36/arch/sh/boar
        .enter          = hp6x0_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.36/arch/sh/include/asm/dma-mapping.h linux-2.6.36/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.36/arch/sh/include/asm/dma-mapping.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/include/asm/dma-mapping.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/include/asm/dma-mapping.h linux-2.6.37/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/sh/include/asm/dma-mapping.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/include/asm/dma-mapping.h     2011-01-17 02:41:00.000000000 -0500
 @@ -1,10 +1,10 @@
  #ifndef __ASM_SH_DMA_MAPPING_H
  #define __ASM_SH_DMA_MAPPING_H
@@ -3379,9 +3643,9 @@ diff -urNp linux-2.6.36/arch/sh/include/asm/dma-mapping.h linux-2.6.36/arch/sh/i
  
        if (dma_release_from_coherent(dev, get_order(size), vaddr))
                return;
-diff -urNp linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/kernel/cpu/shmobile/pm.c      2011-01-17 02:41:00.000000000 -0500
 @@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
        return 0;
  }
@@ -3391,9 +3655,9 @@ diff -urNp linux-2.6.36/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.36/arch/sh/ke
        .enter          = sh_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.36/arch/sh/kernel/dma-nommu.c linux-2.6.36/arch/sh/kernel/dma-nommu.c
---- linux-2.6.36/arch/sh/kernel/dma-nommu.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/kernel/dma-nommu.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/kernel/dma-nommu.c linux-2.6.37/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.37/arch/sh/kernel/dma-nommu.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/kernel/dma-nommu.c    2011-01-17 02:41:00.000000000 -0500
 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device 
  }
  #endif
@@ -3403,9 +3667,9 @@ diff -urNp linux-2.6.36/arch/sh/kernel/dma-nommu.c linux-2.6.36/arch/sh/kernel/d
        .alloc_coherent         = dma_generic_alloc_coherent,
        .free_coherent          = dma_generic_free_coherent,
        .map_page               = nommu_map_page,
-diff -urNp linux-2.6.36/arch/sh/kernel/kgdb.c linux-2.6.36/arch/sh/kernel/kgdb.c
---- linux-2.6.36/arch/sh/kernel/kgdb.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/kernel/kgdb.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/kernel/kgdb.c linux-2.6.37/arch/sh/kernel/kgdb.c
+--- linux-2.6.37/arch/sh/kernel/kgdb.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/kernel/kgdb.c 2011-01-17 02:41:00.000000000 -0500
 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
        unregister_die_notifier(&kgdb_notifier);
  }
@@ -3415,9 +3679,9 @@ diff -urNp linux-2.6.36/arch/sh/kernel/kgdb.c linux-2.6.36/arch/sh/kernel/kgdb.c
        /* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
        .gdb_bpt_instr          = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.36/arch/sh/mm/consistent.c linux-2.6.36/arch/sh/mm/consistent.c
---- linux-2.6.36/arch/sh/mm/consistent.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/mm/consistent.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/mm/consistent.c linux-2.6.37/arch/sh/mm/consistent.c
+--- linux-2.6.37/arch/sh/mm/consistent.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/mm/consistent.c       2011-01-17 02:41:00.000000000 -0500
 @@ -22,7 +22,7 @@
  
  #define PREALLOC_DMA_DEBUG_ENTRIES    4096
@@ -3427,9 +3691,9 @@ diff -urNp linux-2.6.36/arch/sh/mm/consistent.c linux-2.6.36/arch/sh/mm/consiste
  EXPORT_SYMBOL(dma_ops);
  
  static int __init dma_init(void)
-diff -urNp linux-2.6.36/arch/sh/mm/mmap.c linux-2.6.36/arch/sh/mm/mmap.c
---- linux-2.6.36/arch/sh/mm/mmap.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sh/mm/mmap.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sh/mm/mmap.c linux-2.6.37/arch/sh/mm/mmap.c
+--- linux-2.6.37/arch/sh/mm/mmap.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sh/mm/mmap.c     2011-01-17 02:41:00.000000000 -0500
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
                        addr = PAGE_ALIGN(addr);
  
@@ -3477,9 +3741,9 @@ diff -urNp linux-2.6.36/arch/sh/mm/mmap.c linux-2.6.36/arch/sh/mm/mmap.c
                        /* remember the address as a hint for next time */
                        return (mm->free_area_cache = addr);
                }
-diff -urNp linux-2.6.36/arch/sparc/include/asm/atomic_64.h linux-2.6.36/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.36/arch/sparc/include/asm/atomic_64.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/atomic_64.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/atomic_64.h linux-2.6.37/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.37/arch/sparc/include/asm/atomic_64.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/atomic_64.h    2011-01-17 02:41:00.000000000 -0500
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)      { (i) }
  
@@ -3639,9 +3903,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/atomic_64.h linux-2.6.36/arch/spa
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.36/arch/sparc/include/asm/dma-mapping.h linux-2.6.36/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.36/arch/sparc/include/asm/dma-mapping.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/dma-mapping.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/dma-mapping.h linux-2.6.37/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/sparc/include/asm/dma-mapping.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/dma-mapping.h  2011-01-17 02:41:00.000000000 -0500
 @@ -12,10 +12,10 @@ extern int dma_supported(struct device *
  #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
@@ -3673,9 +3937,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/dma-mapping.h linux-2.6.36/arch/s
  
        debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
        ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_32.h linux-2.6.36/arch/sparc/include/asm/elf_32.h
---- linux-2.6.36/arch/sparc/include/asm/elf_32.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/elf_32.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_32.h linux-2.6.37/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.37/arch/sparc/include/asm/elf_32.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/elf_32.h       2011-01-17 02:41:00.000000000 -0500
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3690,9 +3954,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_32.h linux-2.6.36/arch/sparc/
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_64.h linux-2.6.36/arch/sparc/include/asm/elf_64.h
---- linux-2.6.36/arch/sparc/include/asm/elf_64.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/elf_64.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/elf_64.h linux-2.6.37/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.37/arch/sparc/include/asm/elf_64.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/elf_64.h       2011-01-17 02:41:00.000000000 -0500
 @@ -162,6 +162,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE               0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE        0x0000000070000000UL
@@ -3706,9 +3970,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/elf_64.h linux-2.6.36/arch/sparc/
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtable_32.h linux-2.6.36/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.36/arch/sparc/include/asm/pgtable_32.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/pgtable_32.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtable_32.h linux-2.6.37/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.37/arch/sparc/include/asm/pgtable_32.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/pgtable_32.h   2011-01-17 02:41:00.000000000 -0500
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3740,9 +4004,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtable_32.h linux-2.6.36/arch/sp
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/pgtsrmmu.h     2011-01-17 02:41:00.000000000 -0500
 @@ -115,6 +115,13 @@
                                    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3757,9 +4021,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.36/arch/spar
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
                                    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.36/arch/sparc/include/asm/spinlock_64.h linux-2.6.36/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.36/arch/sparc/include/asm/spinlock_64.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/spinlock_64.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/spinlock_64.h linux-2.6.37/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.37/arch/sparc/include/asm/spinlock_64.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/spinlock_64.h  2011-01-17 02:41:00.000000000 -0500
 @@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
        __asm__ __volatile__ (
  "1:   ldsw            [%2], %0\n"
@@ -3811,9 +4075,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/spinlock_64.h linux-2.6.36/arch/s
  "     cas     [%2], %0, %1\n"
  "     cmp     %0, %1\n"
  "     bne,pn  %%xcc, 1b\n"
-diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_32.h linux-2.6.36/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.36/arch/sparc/include/asm/uaccess_32.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/uaccess_32.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_32.h linux-2.6.37/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.37/arch/sparc/include/asm/uaccess_32.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/uaccess_32.h   2011-01-17 02:41:00.000000000 -0500
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3865,9 +4129,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_32.h linux-2.6.36/arch/sp
        return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_64.h linux-2.6.36/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.36/arch/sparc/include/asm/uaccess_64.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/uaccess_64.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess_64.h linux-2.6.37/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.37/arch/sparc/include/asm/uaccess_64.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/uaccess_64.h   2011-01-17 02:41:00.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3910,9 +4174,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess_64.h linux-2.6.36/arch/sp
        if (unlikely(ret))
                ret = copy_to_user_fixup(to, from, size);
        return ret;
-diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess.h linux-2.6.36/arch/sparc/include/asm/uaccess.h
---- linux-2.6.36/arch/sparc/include/asm/uaccess.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/include/asm/uaccess.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/include/asm/uaccess.h linux-2.6.37/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.37/arch/sparc/include/asm/uaccess.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/include/asm/uaccess.h      2011-01-17 02:41:00.000000000 -0500
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3927,9 +4191,9 @@ diff -urNp linux-2.6.36/arch/sparc/include/asm/uaccess.h linux-2.6.36/arch/sparc
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-2.6.36/arch/sparc/kernel/iommu.c linux-2.6.36/arch/sparc/kernel/iommu.c
---- linux-2.6.36/arch/sparc/kernel/iommu.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/iommu.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/iommu.c linux-2.6.37/arch/sparc/kernel/iommu.c
+--- linux-2.6.37/arch/sparc/kernel/iommu.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/iommu.c     2011-01-17 02:41:00.000000000 -0500
 @@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struc
        spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -3948,9 +4212,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/iommu.c linux-2.6.36/arch/sparc/kernel
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.36/arch/sparc/kernel/ioport.c linux-2.6.36/arch/sparc/kernel/ioport.c
---- linux-2.6.36/arch/sparc/kernel/ioport.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/ioport.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/ioport.c linux-2.6.37/arch/sparc/kernel/ioport.c
+--- linux-2.6.37/arch/sparc/kernel/ioport.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/ioport.c    2011-01-17 02:41:00.000000000 -0500
 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
        BUG();
  }
@@ -3978,9 +4242,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/ioport.c linux-2.6.36/arch/sparc/kerne
        .alloc_coherent         = pci32_alloc_coherent,
        .free_coherent          = pci32_free_coherent,
        .map_page               = pci32_map_page,
-diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_32.c linux-2.6.36/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.36/arch/sparc/kernel/kgdb_32.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/kgdb_32.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_32.c linux-2.6.37/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.37/arch/sparc/kernel/kgdb_32.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/kgdb_32.c   2011-01-17 02:41:00.000000000 -0500
 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
        regs->npc = regs->pc + 4;
  }
@@ -3990,9 +4254,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_32.c linux-2.6.36/arch/sparc/kern
        /* Breakpoint instruction: ta 0x7d */
        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_64.c linux-2.6.36/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.36/arch/sparc/kernel/kgdb_64.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/kgdb_64.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/kgdb_64.c linux-2.6.37/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.37/arch/sparc/kernel/kgdb_64.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/kgdb_64.c   2011-01-17 02:41:00.000000000 -0500
 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
        regs->tnpc = regs->tpc + 4;
  }
@@ -4002,9 +4266,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/kgdb_64.c linux-2.6.36/arch/sparc/kern
        /* Breakpoint instruction: ta 0x72 */
        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.36/arch/sparc/kernel/Makefile linux-2.6.36/arch/sparc/kernel/Makefile
---- linux-2.6.36/arch/sparc/kernel/Makefile    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/Makefile    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/Makefile linux-2.6.37/arch/sparc/kernel/Makefile
+--- linux-2.6.37/arch/sparc/kernel/Makefile    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/Makefile    2011-01-17 02:41:00.000000000 -0500
 @@ -3,7 +3,7 @@
  #
  
@@ -4014,9 +4278,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/Makefile linux-2.6.36/arch/sparc/kerne
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.36/arch/sparc/kernel/pci_sun4v.c linux-2.6.36/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.36/arch/sparc/kernel/pci_sun4v.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/pci_sun4v.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/pci_sun4v.c linux-2.6.37/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.37/arch/sparc/kernel/pci_sun4v.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/pci_sun4v.c 2011-01-17 02:41:00.000000000 -0500
 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
        spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -4026,10 +4290,86 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/pci_sun4v.c linux-2.6.36/arch/sparc/ke
        .alloc_coherent                 = dma_4v_alloc_coherent,
        .free_coherent                  = dma_4v_free_coherent,
        .map_page                       = dma_4v_map_page,
-diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
+diff -urNp linux-2.6.37/arch/sparc/kernel/process_32.c linux-2.6.37/arch/sparc/kernel/process_32.c
+--- linux-2.6.37/arch/sparc/kernel/process_32.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/process_32.c        2011-01-17 02:41:00.000000000 -0500
+@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
+                      rw->ins[4], rw->ins[5],
+                      rw->ins[6],
+                      rw->ins[7]);
+-              printk("%pS\n", (void *) rw->ins[7]);
++              printk("%pA\n", (void *) rw->ins[7]);
+               rw = (struct reg_window32 *) rw->ins[6];
+       }
+       spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
+@@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r)
+ 
+         printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx    %s\n",
+              r->psr, r->pc, r->npc, r->y, print_tainted());
+-      printk("PC: <%pS>\n", (void *) r->pc);
++      printk("PC: <%pA>\n", (void *) r->pc);
+       printk("%%G: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
+              r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
+              r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
+       printk("%%O: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
+              r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
+              r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
+-      printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
++      printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
+ 
+       printk("%%L: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
+              rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
+@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk,
+               rw = (struct reg_window32 *) fp;
+               pc = rw->ins[7];
+               printk("[%08lx : ", pc);
+-              printk("%pS ] ", (void *) pc);
++              printk("%pA ] ", (void *) pc);
+               fp = rw->ins[6];
+       } while (++count < 16);
+       printk("\n");
+diff -urNp linux-2.6.37/arch/sparc/kernel/process_64.c linux-2.6.37/arch/sparc/kernel/process_64.c
+--- linux-2.6.37/arch/sparc/kernel/process_64.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/process_64.c        2011-01-17 02:41:00.000000000 -0500
+@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
+       printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
+              rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
+       if (regs->tstate & TSTATE_PRIV)
+-              printk("I7: <%pS>\n", (void *) rwk->ins[7]);
++              printk("I7: <%pA>\n", (void *) rwk->ins[7]);
+ }
+ 
+ void show_regs(struct pt_regs *regs)
+ {
+       printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x    %s\n", regs->tstate,
+              regs->tpc, regs->tnpc, regs->y, print_tainted());
+-      printk("TPC: <%pS>\n", (void *) regs->tpc);
++      printk("TPC: <%pA>\n", (void *) regs->tpc);
+       printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
+              regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
+              regs->u_regs[3]);
+@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
+       printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
+              regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
+              regs->u_regs[15]);
+-      printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
++      printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
+       show_regwindow(regs);
+       show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
+ }
+@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void
+                      ((tp && tp->task) ? tp->task->pid : -1));
+ 
+               if (gp->tstate & TSTATE_PRIV) {
+-                      printk("             TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
++                      printk("             TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
+                              (void *) gp->tpc,
+                              (void *) gp->o7,
+                              (void *) gp->i7,
+diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/sys_sparc_32.c      2011-01-17 02:41:00.000000000 -0500
+@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
        if (ARCH_SUN4C && len > 0x20000000)
                return -ENOMEM;
        if (!addr)
@@ -4038,7 +4378,7 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c linux-2.6.36/arch/sparc
  
        if (flags & MAP_SHARED)
                addr = COLOUR_ALIGN(addr);
-@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
+@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(str
                }
                if (TASK_SIZE - PAGE_SIZE - len < addr)
                        return -ENOMEM;
@@ -4047,9 +4387,9 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_32.c linux-2.6.36/arch/sparc
                        return addr;
                addr = vmm->vm_end;
                if (flags & MAP_SHARED)
-diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/sys_sparc_64.c      2011-01-17 02:41:00.000000000 -0500
 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
                /* We do not accept a shared mapping if it would violate
                 * cache aliasing constraints.
@@ -4170,9 +4510,30 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/sys_sparc_64.c linux-2.6.36/arch/sparc
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.36/arch/sparc/kernel/traps_64.c linux-2.6.36/arch/sparc/kernel/traps_64.c
---- linux-2.6.36/arch/sparc/kernel/traps_64.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/kernel/traps_64.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/kernel/traps_32.c linux-2.6.37/arch/sparc/kernel/traps_32.c
+--- linux-2.6.37/arch/sparc/kernel/traps_32.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/traps_32.c  2011-01-17 02:41:00.000000000 -0500
+@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
+                     count++ < 30                              &&
+                       (((unsigned long) rw) >= PAGE_OFFSET)   &&
+                     !(((unsigned long) rw) & 0x7)) {
+-                      printk("Caller[%08lx]: %pS\n", rw->ins[7],
++                      printk("Caller[%08lx]: %pA\n", rw->ins[7],
+                              (void *) rw->ins[7]);
+                       rw = (struct reg_window32 *)rw->ins[6];
+               }
+diff -urNp linux-2.6.37/arch/sparc/kernel/traps_64.c linux-2.6.37/arch/sparc/kernel/traps_64.c
+--- linux-2.6.37/arch/sparc/kernel/traps_64.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/traps_64.c  2011-01-17 02:41:00.000000000 -0500
+@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
+                      i + 1,
+                      p->trapstack[i].tstate, p->trapstack[i].tpc,
+                      p->trapstack[i].tnpc, p->trapstack[i].tt);
+-              printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
++              printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
+       }
+ }
+ 
 @@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long
  
        lvl -= 0x100;
@@ -4204,9 +4565,97 @@ diff -urNp linux-2.6.36/arch/sparc/kernel/traps_64.c linux-2.6.36/arch/sparc/ker
        dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
  
        sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.36/arch/sparc/lib/atomic_64.S linux-2.6.36/arch/sparc/lib/atomic_64.S
---- linux-2.6.36/arch/sparc/lib/atomic_64.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/lib/atomic_64.S    2010-11-06 18:58:15.000000000 -0400
+@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt
+              regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
+       printk("%s" "ERROR(%d): ",
+              (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
+-      printk("TPC<%pS>\n", (void *) regs->tpc);
++      printk("TPC<%pA>\n", (void *) regs->tpc);
+       printk("%s" "ERROR(%d): M_SYND(%lx),  E_SYND(%lx)%s%s\n",
+              (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
+              (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
+@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type,
+                      smp_processor_id(),
+                      (type & 0x1) ? 'I' : 'D',
+                      regs->tpc);
+-              printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
++              printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
+               panic("Irrecoverable Cheetah+ parity error.");
+       }
+ 
+@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type,
+              smp_processor_id(),
+              (type & 0x1) ? 'I' : 'D',
+              regs->tpc);
+-      printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
++      printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
+ }
+ 
+ struct sun4v_error_entry {
+@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_r
+ 
+       printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
+              regs->tpc, tl);
+-      printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
++      printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
+       printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
+-      printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
++      printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
+              (void *) regs->u_regs[UREG_I7]);
+       printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
+              "pte[%lx] error[%lx]\n",
+@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_r
+ 
+       printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
+              regs->tpc, tl);
+-      printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
++      printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
+       printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
+-      printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
++      printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
+              (void *) regs->u_regs[UREG_I7]);
+       printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
+              "pte[%lx] error[%lx]\n",
+@@ -2196,13 +2207,13 @@ void show_stack(struct task_struct *tsk,
+                       fp = (unsigned long)sf->fp + STACK_BIAS;
+               }
+ 
+-              printk(" [%016lx] %pS\n", pc, (void *) pc);
++              printk(" [%016lx] %pA\n", pc, (void *) pc);
+ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+               if ((pc + 8UL) == (unsigned long) &return_to_handler) {
+                       int index = tsk->curr_ret_stack;
+                       if (tsk->ret_stack && index >= graph) {
+                               pc = tsk->ret_stack[index - graph].ret;
+-                              printk(" [%016lx] %pS\n", pc, (void *) pc);
++                              printk(" [%016lx] %pA\n", pc, (void *) pc);
+                               graph++;
+                       }
+               }
+@@ -2255,7 +2266,7 @@ void die_if_kernel(char *str, struct pt_
+               while (rw &&
+                      count++ < 30 &&
+                      kstack_valid(tp, (unsigned long) rw)) {
+-                      printk("Caller[%016lx]: %pS\n", rw->ins[7],
++                      printk("Caller[%016lx]: %pA\n", rw->ins[7],
+                              (void *) rw->ins[7]);
+ 
+                       rw = kernel_stack_up(rw);
+diff -urNp linux-2.6.37/arch/sparc/kernel/unaligned_64.c linux-2.6.37/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.37/arch/sparc/kernel/unaligned_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/kernel/unaligned_64.c      2011-01-17 02:41:00.000000000 -0500
+@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
+       static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
+ 
+       if (__ratelimit(&ratelimit)) {
+-              printk("Kernel unaligned access at TPC[%lx] %pS\n",
++              printk("Kernel unaligned access at TPC[%lx] %pA\n",
+                      regs->tpc, (void *) regs->tpc);
+       }
+ }
+diff -urNp linux-2.6.37/arch/sparc/lib/atomic_64.S linux-2.6.37/arch/sparc/lib/atomic_64.S
+--- linux-2.6.37/arch/sparc/lib/atomic_64.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/lib/atomic_64.S    2011-01-17 02:41:00.000000000 -0500
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
        BACKOFF_SETUP(%o2)
@@ -4441,9 +4890,9 @@ diff -urNp linux-2.6.36/arch/sparc/lib/atomic_64.S linux-2.6.36/arch/sparc/lib/a
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-2.6.36/arch/sparc/lib/ksyms.c linux-2.6.36/arch/sparc/lib/ksyms.c
---- linux-2.6.36/arch/sparc/lib/ksyms.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/lib/ksyms.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/lib/ksyms.c linux-2.6.37/arch/sparc/lib/ksyms.c
+--- linux-2.6.37/arch/sparc/lib/ksyms.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/lib/ksyms.c        2011-01-17 02:41:00.000000000 -0500
 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4462,9 +4911,9 @@ diff -urNp linux-2.6.36/arch/sparc/lib/ksyms.c linux-2.6.36/arch/sparc/lib/ksyms
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.36/arch/sparc/Makefile linux-2.6.36/arch/sparc/Makefile
---- linux-2.6.36/arch/sparc/Makefile   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/Makefile   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/Makefile linux-2.6.37/arch/sparc/Makefile
+--- linux-2.6.37/arch/sparc/Makefile   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/Makefile   2011-01-17 02:41:00.000000000 -0500
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)   += arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4474,9 +4923,9 @@ diff -urNp linux-2.6.36/arch/sparc/Makefile linux-2.6.36/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.36/arch/sparc/mm/fault_32.c linux-2.6.36/arch/sparc/mm/fault_32.c
---- linux-2.6.36/arch/sparc/mm/fault_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/fault_32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/mm/fault_32.c linux-2.6.37/arch/sparc/mm/fault_32.c
+--- linux-2.6.37/arch/sparc/mm/fault_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/fault_32.c      2011-01-17 02:41:00.000000000 -0500
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4781,9 +5230,9 @@ diff -urNp linux-2.6.36/arch/sparc/mm/fault_32.c linux-2.6.36/arch/sparc/mm/faul
                /* Allow reads even for write-only mappings */
                if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
                        goto bad_area;
-diff -urNp linux-2.6.36/arch/sparc/mm/fault_64.c linux-2.6.36/arch/sparc/mm/fault_64.c
---- linux-2.6.36/arch/sparc/mm/fault_64.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/fault_64.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/mm/fault_64.c linux-2.6.37/arch/sparc/mm/fault_64.c
+--- linux-2.6.37/arch/sparc/mm/fault_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/fault_64.c      2011-01-17 02:41:00.000000000 -0500
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4794,6 +5243,15 @@ diff -urNp linux-2.6.36/arch/sparc/mm/fault_64.c linux-2.6.36/arch/sparc/mm/faul
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
+@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(stru
+       printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
+              regs->tpc);
+       printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
+-      printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
++      printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
+       printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
+       dump_stack();
+       unhandled_fault(regs->tpc, current, regs);
 @@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32b
        show_regs(regs);
  }
@@ -5282,9 +5740,9 @@ diff -urNp linux-2.6.36/arch/sparc/mm/fault_64.c linux-2.6.36/arch/sparc/mm/faul
        /* Pure DTLB misses do not tell us whether the fault causing
         * load/store/atomic was a write or not, it only says that there
         * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.36/arch/sparc/mm/hugetlbpage.c linux-2.6.36/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.36/arch/sparc/mm/hugetlbpage.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/hugetlbpage.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/mm/hugetlbpage.c linux-2.6.37/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.37/arch/sparc/mm/hugetlbpage.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/hugetlbpage.c   2011-01-17 02:41:00.000000000 -0500
 @@ -68,7 +68,7 @@ full_search:
                        }
                        return -ENOMEM;
@@ -5322,9 +5780,9 @@ diff -urNp linux-2.6.36/arch/sparc/mm/hugetlbpage.c linux-2.6.36/arch/sparc/mm/h
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.36/arch/sparc/mm/init_32.c linux-2.6.36/arch/sparc/mm/init_32.c
---- linux-2.6.36/arch/sparc/mm/init_32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/init_32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/mm/init_32.c linux-2.6.37/arch/sparc/mm/init_32.c
+--- linux-2.6.37/arch/sparc/mm/init_32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/init_32.c       2011-01-17 02:41:00.000000000 -0500
 @@ -318,6 +318,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5359,9 +5817,9 @@ diff -urNp linux-2.6.36/arch/sparc/mm/init_32.c linux-2.6.36/arch/sparc/mm/init_
        protection_map[12] = PAGE_READONLY;
        protection_map[13] = PAGE_READONLY;
        protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.36/arch/sparc/mm/Makefile linux-2.6.36/arch/sparc/mm/Makefile
---- linux-2.6.36/arch/sparc/mm/Makefile        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/Makefile        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/sparc/mm/Makefile linux-2.6.37/arch/sparc/mm/Makefile
+--- linux-2.6.37/arch/sparc/mm/Makefile        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/Makefile        2011-01-17 02:41:00.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  
@@ -5371,10 +5829,10 @@ diff -urNp linux-2.6.36/arch/sparc/mm/Makefile linux-2.6.36/arch/sparc/mm/Makefi
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.36/arch/sparc/mm/srmmu.c linux-2.6.36/arch/sparc/mm/srmmu.c
---- linux-2.6.36/arch/sparc/mm/srmmu.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/sparc/mm/srmmu.c 2010-11-06 18:58:15.000000000 -0400
-@@ -2198,6 +2198,13 @@ void __init ld_mmu_srmmu(void)
+diff -urNp linux-2.6.37/arch/sparc/mm/srmmu.c linux-2.6.37/arch/sparc/mm/srmmu.c
+--- linux-2.6.37/arch/sparc/mm/srmmu.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/sparc/mm/srmmu.c 2011-01-17 02:41:00.000000000 -0500
+@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
        PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
        BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
        BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
@@ -5388,9 +5846,9 @@ diff -urNp linux-2.6.36/arch/sparc/mm/srmmu.c linux-2.6.36/arch/sparc/mm/srmmu.c
        BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
        page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.36/arch/um/include/asm/kmap_types.h linux-2.6.36/arch/um/include/asm/kmap_types.h
---- linux-2.6.36/arch/um/include/asm/kmap_types.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/um/include/asm/kmap_types.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/um/include/asm/kmap_types.h linux-2.6.37/arch/um/include/asm/kmap_types.h
+--- linux-2.6.37/arch/um/include/asm/kmap_types.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/um/include/asm/kmap_types.h      2011-01-17 02:41:00.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -5399,9 +5857,9 @@ diff -urNp linux-2.6.36/arch/um/include/asm/kmap_types.h linux-2.6.36/arch/um/in
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.36/arch/um/include/asm/page.h linux-2.6.36/arch/um/include/asm/page.h
---- linux-2.6.36/arch/um/include/asm/page.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/um/include/asm/page.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/um/include/asm/page.h linux-2.6.37/arch/um/include/asm/page.h
+--- linux-2.6.37/arch/um/include/asm/page.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/um/include/asm/page.h    2011-01-17 02:41:00.000000000 -0500
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE     (_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK     (~(PAGE_SIZE-1))
@@ -5412,9 +5870,35 @@ diff -urNp linux-2.6.36/arch/um/include/asm/page.h linux-2.6.36/arch/um/include/
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.36/arch/um/sys-i386/syscalls.c linux-2.6.36/arch/um/sys-i386/syscalls.c
---- linux-2.6.36/arch/um/sys-i386/syscalls.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/um/sys-i386/syscalls.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/um/kernel/process.c linux-2.6.37/arch/um/kernel/process.c
+--- linux-2.6.37/arch/um/kernel/process.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/um/kernel/process.c      2011-01-17 02:41:00.000000000 -0500
+@@ -404,22 +404,6 @@ int singlestepping(void * t)
+       return 2;
+ }
+ 
+-/*
+- * Only x86 and x86_64 have an arch_align_stack().
+- * All other arches have "#define arch_align_stack(x) (x)"
+- * in their asm/system.h
+- * As this is included in UML from asm-um/system-generic.h,
+- * we can use it to behave as the subarch does.
+- */
+-#ifndef arch_align_stack
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+-      if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+-              sp -= get_random_int() % 8192;
+-      return sp & ~0xf;
+-}
+-#endif
+-
+ unsigned long get_wchan(struct task_struct *p)
+ {
+       unsigned long stack_page, sp, ip;
+diff -urNp linux-2.6.37/arch/um/sys-i386/syscalls.c linux-2.6.37/arch/um/sys-i386/syscalls.c
+--- linux-2.6.37/arch/um/sys-i386/syscalls.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/um/sys-i386/syscalls.c   2011-01-17 02:41:00.000000000 -0500
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5437,9 +5921,9 @@ diff -urNp linux-2.6.36/arch/um/sys-i386/syscalls.c linux-2.6.36/arch/um/sys-i38
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-2.6.36/arch/x86/boot/bitops.h linux-2.6.36/arch/x86/boot/bitops.h
---- linux-2.6.36/arch/x86/boot/bitops.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/bitops.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/bitops.h linux-2.6.37/arch/x86/boot/bitops.h
+--- linux-2.6.37/arch/x86/boot/bitops.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/bitops.h        2011-01-17 02:41:00.000000000 -0500
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
        u8 v;
        const u32 *p = (const u32 *)addr;
@@ -5458,9 +5942,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/bitops.h linux-2.6.36/arch/x86/boot/bitops
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.36/arch/x86/boot/boot.h linux-2.6.36/arch/x86/boot/boot.h
---- linux-2.6.36/arch/x86/boot/boot.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/boot.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/boot.h linux-2.6.37/arch/x86/boot/boot.h
+--- linux-2.6.37/arch/x86/boot/boot.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/boot.h  2011-01-17 02:41:00.000000000 -0500
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5479,9 +5963,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/boot.h linux-2.6.36/arch/x86/boot/boot.h
            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
        return diff;
  }
-diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_32.S linux-2.6.36/arch/x86/boot/compressed/head_32.S
---- linux-2.6.36/arch/x86/boot/compressed/head_32.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/compressed/head_32.S    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_32.S linux-2.6.37/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.37/arch/x86/boot/compressed/head_32.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/compressed/head_32.S    2011-01-17 02:41:00.000000000 -0500
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5510,9 +5994,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_32.S linux-2.6.36/arch/x86
        addl    %ebx, -__PAGE_OFFSET(%ebx, %ecx)
        jmp     1b
  2:
-diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_64.S linux-2.6.36/arch/x86/boot/compressed/head_64.S
---- linux-2.6.36/arch/x86/boot/compressed/head_64.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/compressed/head_64.S    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/compressed/head_64.S linux-2.6.37/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.37/arch/x86/boot/compressed/head_64.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/compressed/head_64.S    2011-01-17 02:41:00.000000000 -0500
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5531,10 +6015,10 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/head_64.S linux-2.6.36/arch/x86
  #endif
  
        /* Target address to relocate to for decompression */
-diff -urNp linux-2.6.36/arch/x86/boot/compressed/misc.c linux-2.6.36/arch/x86/boot/compressed/misc.c
---- linux-2.6.36/arch/x86/boot/compressed/misc.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/compressed/misc.c       2010-11-06 18:58:15.000000000 -0400
-@@ -289,7 +289,7 @@ static void parse_elf(void *output)
+diff -urNp linux-2.6.37/arch/x86/boot/compressed/misc.c linux-2.6.37/arch/x86/boot/compressed/misc.c
+--- linux-2.6.37/arch/x86/boot/compressed/misc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/compressed/misc.c       2011-01-17 02:41:00.000000000 -0500
+@@ -306,7 +306,7 @@ static void parse_elf(void *output)
                case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
                        dest = output;
@@ -5543,7 +6027,7 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/misc.c linux-2.6.36/arch/x86/bo
  #else
                        dest = (void *)(phdr->p_paddr);
  #endif
-@@ -342,7 +342,7 @@ asmlinkage void decompress_kernel(void *
+@@ -359,7 +359,7 @@ asmlinkage void decompress_kernel(void *
                error("Destination address too large");
  #endif
  #ifndef CONFIG_RELOCATABLE
@@ -5552,9 +6036,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/misc.c linux-2.6.36/arch/x86/bo
                error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/compressed/mkpiggy.c    2011-01-17 02:41:00.000000000 -0500
 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
  
        offs = (olen > ilen) ? olen - ilen : 0;
@@ -5564,9 +6048,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/mkpiggy.c linux-2.6.36/arch/x86
        offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
  
        printf(".section \".rodata..compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.36/arch/x86/boot/compressed/relocs.c linux-2.6.36/arch/x86/boot/compressed/relocs.c
---- linux-2.6.36/arch/x86/boot/compressed/relocs.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/compressed/relocs.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/compressed/relocs.c linux-2.6.37/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.37/arch/x86/boot/compressed/relocs.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/compressed/relocs.c     2011-01-17 02:41:00.000000000 -0500
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5759,9 +6243,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/compressed/relocs.c linux-2.6.36/arch/x86/
        read_shdrs(fp);
        read_strtabs(fp);
        read_symtabs(fp);
-diff -urNp linux-2.6.36/arch/x86/boot/cpucheck.c linux-2.6.36/arch/x86/boot/cpucheck.c
---- linux-2.6.36/arch/x86/boot/cpucheck.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/cpucheck.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/cpucheck.c linux-2.6.37/arch/x86/boot/cpucheck.c
+--- linux-2.6.37/arch/x86/boot/cpucheck.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/cpucheck.c      2011-01-17 02:41:00.000000000 -0500
 @@ -74,7 +74,7 @@ static int has_fpu(void)
        u16 fcw = -1, fsw = -1;
        u32 cr0;
@@ -5857,9 +6341,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/cpucheck.c linux-2.6.36/arch/x86/boot/cpuc
  
                err = check_flags();
        }
-diff -urNp linux-2.6.36/arch/x86/boot/header.S linux-2.6.36/arch/x86/boot/header.S
---- linux-2.6.36/arch/x86/boot/header.S        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/header.S        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/header.S linux-2.6.37/arch/x86/boot/header.S
+--- linux-2.6.37/arch/x86/boot/header.S        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/header.S        2011-01-17 02:41:00.000000000 -0500
 @@ -224,7 +224,7 @@ setup_data:                .quad 0                 # 64-bit physical
                                                # single linked list of
                                                # struct setup_data
@@ -5869,9 +6353,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/header.S linux-2.6.36/arch/x86/boot/header
  
  #define ZO_INIT_SIZE  (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE  (VO__end - VO__text)
-diff -urNp linux-2.6.36/arch/x86/boot/memory.c linux-2.6.36/arch/x86/boot/memory.c
---- linux-2.6.36/arch/x86/boot/memory.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/memory.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/memory.c linux-2.6.37/arch/x86/boot/memory.c
+--- linux-2.6.37/arch/x86/boot/memory.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/memory.c        2011-01-17 02:41:00.000000000 -0500
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5881,9 +6365,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/memory.c linux-2.6.36/arch/x86/boot/memory
        struct biosregs ireg, oreg;
        struct e820entry *desc = boot_params.e820_map;
        static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.36/arch/x86/boot/video.c linux-2.6.36/arch/x86/boot/video.c
---- linux-2.6.36/arch/x86/boot/video.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/video.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/video.c linux-2.6.37/arch/x86/boot/video.c
+--- linux-2.6.37/arch/x86/boot/video.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/video.c 2011-01-17 02:41:00.000000000 -0500
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -5893,9 +6377,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/video.c linux-2.6.36/arch/x86/boot/video.c
        int key;
        unsigned int v;
  
-diff -urNp linux-2.6.36/arch/x86/boot/video-vesa.c linux-2.6.36/arch/x86/boot/video-vesa.c
---- linux-2.6.36/arch/x86/boot/video-vesa.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/boot/video-vesa.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/boot/video-vesa.c linux-2.6.37/arch/x86/boot/video-vesa.c
+--- linux-2.6.37/arch/x86/boot/video-vesa.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/boot/video-vesa.c    2011-01-17 02:41:00.000000000 -0500
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
        boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5904,9 +6388,9 @@ diff -urNp linux-2.6.36/arch/x86/boot/video-vesa.c linux-2.6.36/arch/x86/boot/vi
  }
  
  /*
-diff -urNp linux-2.6.36/arch/x86/ia32/ia32_aout.c linux-2.6.36/arch/x86/ia32/ia32_aout.c
---- linux-2.6.36/arch/x86/ia32/ia32_aout.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/ia32/ia32_aout.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/ia32/ia32_aout.c linux-2.6.37/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.37/arch/x86/ia32/ia32_aout.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/ia32/ia32_aout.c     2011-01-17 02:41:00.000000000 -0500
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
        unsigned long dump_start, dump_size;
        struct user32 dump;
@@ -5916,9 +6400,9 @@ diff -urNp linux-2.6.36/arch/x86/ia32/ia32_aout.c linux-2.6.36/arch/x86/ia32/ia3
        fs = get_fs();
        set_fs(KERNEL_DS);
        has_dumped = 1;
-diff -urNp linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36/arch/x86/ia32/ia32entry.S
---- linux-2.6.36/arch/x86/ia32/ia32entry.S     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/ia32/ia32entry.S     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/ia32/ia32entry.S linux-2.6.37/arch/x86/ia32/ia32entry.S
+--- linux-2.6.37/arch/x86/ia32/ia32entry.S     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/ia32/ia32entry.S     2011-01-17 02:41:00.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>  
  #include <asm/segment.h>
@@ -6013,9 +6497,9 @@ diff -urNp linux-2.6.36/arch/x86/ia32/ia32entry.S linux-2.6.36/arch/x86/ia32/ia3
        /*
         * No need to follow this irqs on/off section: the syscall
         * disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.36/arch/x86/ia32/ia32_signal.c linux-2.6.36/arch/x86/ia32/ia32_signal.c
---- linux-2.6.36/arch/x86/ia32/ia32_signal.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/ia32/ia32_signal.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/ia32/ia32_signal.c linux-2.6.37/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.37/arch/x86/ia32/ia32_signal.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/ia32/ia32_signal.c   2011-01-17 02:41:00.000000000 -0500
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
        sp -= frame_size;
        /* Align the stack pointer according to the i386 ABI,
@@ -6025,6 +6509,15 @@ diff -urNp linux-2.6.36/arch/x86/ia32/ia32_signal.c linux-2.6.36/arch/x86/ia32/i
        return (void __user *) sp;
  }
  
+@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s
+                * These are actually not used anymore, but left because some
+                * gdb versions depend on them as a marker.
+                */
+-              put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
++              put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode);
+       } put_user_catch(err);
+ 
+       if (err)
 @@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 
                0xb8,
                __NR_ia32_rt_sigreturn,
@@ -6034,7 +6527,7 @@ diff -urNp linux-2.6.36/arch/x86/ia32/ia32_signal.c linux-2.6.36/arch/x86/ia32/i
        };
  
        frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -533,9 +533,11 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct 
  
                if (ka->sa.sa_flags & SA_RESTORER)
                        restorer = ka->sa.sa_restorer;
@@ -6048,10 +6541,18 @@ diff -urNp linux-2.6.36/arch/x86/ia32/ia32_signal.c linux-2.6.36/arch/x86/ia32/i
                put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
  
                /*
-diff -urNp linux-2.6.36/arch/x86/include/asm/alternative.h linux-2.6.36/arch/x86/include/asm/alternative.h
---- linux-2.6.36/arch/x86/include/asm/alternative.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/alternative.h    2010-11-06 18:58:15.000000000 -0400
-@@ -92,7 +92,7 @@ static inline int alternatives_text_rese
+                * Not actually used anymore, but left because some gdb
+                * versions need it.
+                */
+-              put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
++              put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode);
+       } put_user_catch(err);
+ 
+       if (err)
+diff -urNp linux-2.6.37/arch/x86/include/asm/alternative.h linux-2.6.37/arch/x86/include/asm/alternative.h
+--- linux-2.6.37/arch/x86/include/asm/alternative.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/alternative.h    2011-01-17 02:41:00.000000000 -0500
+@@ -93,7 +93,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"                          \
        "        .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */   \
        ".previous\n"                                                   \
@@ -6060,9 +6561,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/alternative.h linux-2.6.36/arch/x86
        "663:\n\t" newinstr "\n664:\n"          /* replacement     */   \
        ".previous"
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/apm.h linux-2.6.36/arch/x86/include/asm/apm.h
---- linux-2.6.36/arch/x86/include/asm/apm.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/apm.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/apm.h linux-2.6.37/arch/x86/include/asm/apm.h
+--- linux-2.6.37/arch/x86/include/asm/apm.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/apm.h    2011-01-17 02:41:00.000000000 -0500
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
        __asm__ __volatile__(APM_DO_ZERO_SEGS
                "pushl %%edi\n\t"
@@ -6081,25 +6582,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/apm.h linux-2.6.36/arch/x86/include
                "setc %%bl\n\t"
                "popl %%ebp\n\t"
                "popl %%edi\n\t"
-diff -urNp linux-2.6.36/arch/x86/include/asm/asm.h linux-2.6.36/arch/x86/include/asm/asm.h
---- linux-2.6.36/arch/x86/include/asm/asm.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/asm.h    2010-11-06 18:58:15.000000000 -0400
-@@ -37,6 +37,12 @@
- #define _ASM_SI               __ASM_REG(si)
- #define _ASM_DI               __ASM_REG(di)
- 
-+#ifdef CONFIG_X86_32
-+#define _ASM_INTO     "into"
-+#else
-+#define _ASM_INTO     "int $4"
-+#endif
-+
- /* Exception table entry */
- #ifdef __ASSEMBLY__
- # define _ASM_EXTABLE(from,to)            \
-diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_32.h linux-2.6.36/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.36/arch/x86/include/asm/atomic64_32.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/atomic64_32.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_32.h linux-2.6.37/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.37/arch/x86/include/asm/atomic64_32.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/atomic64_32.h    2011-01-17 02:41:00.000000000 -0500
 @@ -12,6 +12,14 @@ typedef struct {
        u64 __aligned(8) counter;
  } atomic64_t;
@@ -6115,13 +6600,18 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_32.h linux-2.6.36/arch/x86
  #define ATOMIC64_INIT(val)    { (val) }
  
  #ifdef CONFIG_X86_CMPXCHG64
-diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_64.h linux-2.6.36/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.36/arch/x86/include/asm/atomic64_64.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/atomic64_64.h    2010-11-06 18:58:15.000000000 -0400
-@@ -22,6 +22,18 @@ static inline long atomic64_read(const a
- }
- 
- /**
+diff -urNp linux-2.6.37/arch/x86/include/asm/atomic64_64.h linux-2.6.37/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.37/arch/x86/include/asm/atomic64_64.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/atomic64_64.h    2011-01-17 02:41:00.000000000 -0500
+@@ -18,7 +18,19 @@
+  */
+ static inline long atomic64_read(const atomic64_t *v)
+ {
+-      return (*(volatile long *)&(v)->counter);
++      return (*(volatile const long *)&(v)->counter);
++}
++
++/**
 + * atomic64_read_unchecked - read atomic64 variable
 + * @v: pointer of type atomic64_unchecked_t
 + *
@@ -6130,13 +6620,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_64.h linux-2.6.36/arch/x86
 + */
 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
 +{
-+      return v->counter;
-+}
-+
-+/**
-  * atomic64_set - set atomic64 variable
-  * @v: pointer to type atomic64_t
-  * @i: required value
++      return (*(volatile const long *)&(v)->counter);
+ }
+ 
+ /**
 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64
  }
  
@@ -6425,13 +6912,18 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic64_64.h linux-2.6.36/arch/x86
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/include/asm/atomic.h
---- linux-2.6.36/arch/x86/include/asm/atomic.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/atomic.h 2010-11-06 18:58:15.000000000 -0400
-@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
- }
- 
- /**
+diff -urNp linux-2.6.37/arch/x86/include/asm/atomic.h linux-2.6.37/arch/x86/include/asm/atomic.h
+--- linux-2.6.37/arch/x86/include/asm/atomic.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/atomic.h 2011-01-17 02:41:00.000000000 -0500
+@@ -22,7 +22,18 @@
+  */
+ static inline int atomic_read(const atomic_t *v)
+ {
+-      return (*(volatile int *)&(v)->counter);
++      return (*(volatile const int *)&(v)->counter);
++}
++
++/**
 + * atomic_read_unchecked - read atomic variable
 + * @v: pointer of type atomic_unchecked_t
 + *
@@ -6439,13 +6931,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 + */
 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
 +{
-+      return v->counter;
-+}
-+
-+/**
-  * atomic_set - set atomic variable
-  * @v: pointer of type atomic_t
-  * @i: required value
++      return (*(volatile const int *)&(v)->counter);
+ }
+ 
+ /**
 @@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *
  }
  
@@ -6475,7 +6964,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "subl %1,%0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6506,7 +6995,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "addl %1,%0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6537,7 +7026,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "addl %2,%0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6555,7 +7044,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "decl %0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6584,7 +7073,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "incl %0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6613,7 +7102,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "incl %0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6631,7 +7120,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "decl %0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6649,7 +7138,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   LOCK_PREFIX "subl %2,%0\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6666,7 +7155,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
 +                   "movl %0, %1\n"
-+                   _ASM_INTO "\n0:\n"
++                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6733,7 +7222,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
 +#ifdef CONFIG_PAX_REFCOUNT
 +                           "jno 0f\n"
 +                           "subl %2,%0\n"
-+                           _ASM_INTO "\n0:\n"
++                           "int $4\n0:\n"
 +                           _ASM_EXTABLE(0b, 0b)
 +#endif
 +
@@ -6750,9 +7239,21 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/atomic.h linux-2.6.36/arch/x86/incl
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-diff -urNp linux-2.6.36/arch/x86/include/asm/boot.h linux-2.6.36/arch/x86/include/asm/boot.h
---- linux-2.6.36/arch/x86/include/asm/boot.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/boot.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/bitops.h linux-2.6.37/arch/x86/include/asm/bitops.h
+--- linux-2.6.37/arch/x86/include/asm/bitops.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/bitops.h 2011-01-17 02:41:00.000000000 -0500
+@@ -38,7 +38,7 @@
+  * a mask operation on a byte.
+  */
+ #define IS_IMMEDIATE(nr)              (__builtin_constant_p(nr))
+-#define CONST_MASK_ADDR(nr, addr)     BITOP_ADDR((void *)(addr) + ((nr)>>3))
++#define CONST_MASK_ADDR(nr, addr)     BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
+ #define CONST_MASK(nr)                        (1 << ((nr) & 7))
+ 
+ /**
+diff -urNp linux-2.6.37/arch/x86/include/asm/boot.h linux-2.6.37/arch/x86/include/asm/boot.h
+--- linux-2.6.37/arch/x86/include/asm/boot.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/boot.h   2011-01-17 02:41:00.000000000 -0500
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6770,9 +7271,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/boot.h linux-2.6.36/arch/x86/includ
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2  PMD_SHIFT
-diff -urNp linux-2.6.36/arch/x86/include/asm/cacheflush.h linux-2.6.36/arch/x86/include/asm/cacheflush.h
---- linux-2.6.36/arch/x86/include/asm/cacheflush.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/cacheflush.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/cacheflush.h linux-2.6.37/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.37/arch/x86/include/asm/cacheflush.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/cacheflush.h     2011-01-17 02:41:00.000000000 -0500
 @@ -66,7 +66,7 @@ static inline unsigned long get_page_mem
        unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -6782,9 +7283,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/cacheflush.h linux-2.6.36/arch/x86/
        else if (pg_flags == _PGMT_WC)
                return _PAGE_CACHE_WC;
        else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.36/arch/x86/include/asm/cache.h linux-2.6.36/arch/x86/include/asm/cache.h
---- linux-2.6.36/arch/x86/include/asm/cache.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/cache.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/cache.h linux-2.6.37/arch/x86/include/asm/cache.h
+--- linux-2.6.37/arch/x86/include/asm/cache.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/cache.h  2011-01-17 02:41:00.000000000 -0500
 @@ -8,6 +8,7 @@
  #define L1_CACHE_BYTES        (1 << L1_CACHE_SHIFT)
  
@@ -6793,9 +7294,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/cache.h linux-2.6.36/arch/x86/inclu
  
  #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
  #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.36/arch/x86/include/asm/checksum_32.h linux-2.6.36/arch/x86/include/asm/checksum_32.h
---- linux-2.6.36/arch/x86/include/asm/checksum_32.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/checksum_32.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/checksum_32.h linux-2.6.37/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.37/arch/x86/include/asm/checksum_32.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/checksum_32.h    2011-01-17 02:41:00.000000000 -0500
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
                                            int len, __wsum sum,
                                            int *src_err_ptr, int *dst_err_ptr);
@@ -6829,10 +7330,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/checksum_32.h linux-2.6.36/arch/x86
                                                 len, sum, NULL, err_ptr);
  
        if (len)
-diff -urNp linux-2.6.36/arch/x86/include/asm/cpufeature.h linux-2.6.36/arch/x86/include/asm/cpufeature.h
---- linux-2.6.36/arch/x86/include/asm/cpufeature.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/cpufeature.h     2010-11-06 18:58:15.000000000 -0400
-@@ -338,7 +338,7 @@ static __always_inline __pure bool __sta
+diff -urNp linux-2.6.37/arch/x86/include/asm/cpufeature.h linux-2.6.37/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.37/arch/x86/include/asm/cpufeature.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/cpufeature.h     2011-01-17 02:41:00.000000000 -0500
+@@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
                             ".section .discard,\"aw\",@progbits\n"
                             " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
                             ".previous\n"
@@ -6841,9 +7342,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/cpufeature.h linux-2.6.36/arch/x86/
                             "3: movb $1,%0\n"
                             "4:\n"
                             ".previous\n"
-diff -urNp linux-2.6.36/arch/x86/include/asm/desc.h linux-2.6.36/arch/x86/include/asm/desc.h
---- linux-2.6.36/arch/x86/include/asm/desc.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/desc.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/desc.h linux-2.6.37/arch/x86/include/asm/desc.h
+--- linux-2.6.37/arch/x86/include/asm/desc.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/desc.h   2011-01-17 02:41:00.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7013,9 +7514,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/desc.h linux-2.6.36/arch/x86/includ
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/device.h linux-2.6.36/arch/x86/include/asm/device.h
---- linux-2.6.36/arch/x86/include/asm/device.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/device.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/device.h linux-2.6.37/arch/x86/include/asm/device.h
+--- linux-2.6.37/arch/x86/include/asm/device.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/device.h 2011-01-17 02:41:00.000000000 -0500
 @@ -6,7 +6,7 @@ struct dev_archdata {
        void    *acpi_handle;
  #endif
@@ -7025,9 +7526,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/device.h linux-2.6.36/arch/x86/incl
  #endif
  #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
        void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.36/arch/x86/include/asm/dma-mapping.h linux-2.6.36/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.36/arch/x86/include/asm/dma-mapping.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/dma-mapping.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/dma-mapping.h linux-2.6.37/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.37/arch/x86/include/asm/dma-mapping.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/dma-mapping.h    2011-01-17 02:41:00.000000000 -0500
 @@ -26,9 +26,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
@@ -7067,9 +7568,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/dma-mapping.h linux-2.6.36/arch/x86
  
        WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/e820.h linux-2.6.36/arch/x86/include/asm/e820.h
---- linux-2.6.36/arch/x86/include/asm/e820.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/e820.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/e820.h linux-2.6.37/arch/x86/include/asm/e820.h
+--- linux-2.6.37/arch/x86/include/asm/e820.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/e820.h   2011-01-17 02:41:00.000000000 -0500
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS     0xa0000
  #define ISA_END_ADDRESS               0x100000
@@ -7078,10 +7579,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/e820.h linux-2.6.36/arch/x86/includ
 +#define BIOS_BEGIN            0x000c0000
  #define BIOS_END              0x00100000
  
- #ifdef __KERNEL__
-diff -urNp linux-2.6.36/arch/x86/include/asm/elf.h linux-2.6.36/arch/x86/include/asm/elf.h
---- linux-2.6.36/arch/x86/include/asm/elf.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/elf.h    2010-11-06 18:58:15.000000000 -0400
+ #define BIOS_ROM_BASE         0xffe00000
+diff -urNp linux-2.6.37/arch/x86/include/asm/elf.h linux-2.6.37/arch/x86/include/asm/elf.h
+--- linux-2.6.37/arch/x86/include/asm/elf.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/elf.h    2011-01-17 02:41:00.000000000 -0500
 @@ -237,7 +237,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -7135,48 +7636,13 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/elf.h linux-2.6.36/arch/x86/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/include/asm/futex.h
---- linux-2.6.36/arch/x86/include/asm/futex.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/futex.h  2010-11-06 18:58:15.000000000 -0400
-@@ -11,17 +11,54 @@
- #include <asm/processor.h>
+diff -urNp linux-2.6.37/arch/x86/include/asm/futex.h linux-2.6.37/arch/x86/include/asm/futex.h
+--- linux-2.6.37/arch/x86/include/asm/futex.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/futex.h  2011-01-17 02:41:00.000000000 -0500
+@@ -12,16 +12,18 @@
  #include <asm/system.h>
  
-+#ifdef CONFIG_X86_32
  #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
-+      asm volatile(                                           \
-+                   "movw\t%w6, %%ds\n"                        \
-+                   "1:\t" insn "\n"                           \
-+                   "2:\tpushl\t%%ss\n"                        \
-+                   "\tpopl\t%%ds\n"                           \
-+                   "\t.section .fixup,\"ax\"\n"               \
-+                   "3:\tmov\t%3, %1\n"                        \
-+                   "\tjmp\t2b\n"                              \
-+                   "\t.previous\n"                            \
-+                   _ASM_EXTABLE(1b, 3b)                       \
-+                   : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+                   : "i" (-EFAULT), "0" (oparg), "1" (0), "r" (__USER_DS))
-+
-+#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg)   \
-+      asm volatile("movw\t%w7, %%es\n"                        \
-+                   "1:\tmovl\t%%es:%2, %0\n"                  \
-+                   "\tmovl\t%0, %3\n"                         \
-+                   "\t" insn "\n"                             \
-+                   "2:\t" LOCK_PREFIX "cmpxchgl %3, %%es:%2\n"\
-+                   "\tjnz\t1b\n"                              \
-+                   "3:\tpushl\t%%ss\n"                        \
-+                   "\tpopl\t%%es\n"                           \
-+                   "\t.section .fixup,\"ax\"\n"               \
-+                   "4:\tmov\t%5, %1\n"                        \
-+                   "\tjmp\t3b\n"                              \
-+                   "\t.previous\n"                            \
-+                   _ASM_EXTABLE(1b, 4b)                       \
-+                   _ASM_EXTABLE(2b, 4b)                       \
-+                   : "=&a" (oldval), "=&r" (ret),             \
-+                     "+m" (*uaddr), "=&r" (tem)               \
-+                   : "r" (oparg), "i" (-EFAULT), "1" (0), "r" (__USER_DS))
-+#else
-+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
 +      typecheck(u32 *, uaddr);                                \
        asm volatile("1:\t" insn "\n"                           \
                     "2:\t.section .fixup,\"ax\"\n"             \
@@ -7185,8 +7651,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/inclu
                     "\t.previous\n"                            \
                     _ASM_EXTABLE(1b, 3b)                       \
 -                   : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+                   : "=r" (oldval), "=r" (ret),               \
-+                     "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))\
++                   : "=r" (oldval), "=r" (ret), "+m" (*____m(uaddr))\
                     : "i" (-EFAULT), "0" (oparg), "1" (0))
  
  #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg)   \
@@ -7194,43 +7659,33 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/inclu
        asm volatile("1:\tmovl  %2, %0\n"                       \
                     "\tmovl\t%0, %3\n"                         \
                     "\t" insn "\n"                             \
-@@ -34,10 +71,12 @@
+@@ -34,10 +36,10 @@
                     _ASM_EXTABLE(1b, 4b)                       \
                     _ASM_EXTABLE(2b, 4b)                       \
                     : "=&a" (oldval), "=&r" (ret),             \
 -                     "+m" (*uaddr), "=&r" (tem)               \
-+                     "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4)),\
-+                     "=&r" (tem)                              \
++                     "+m" (*(____m(uaddr))), "=&r" (tem)      \
                     : "r" (oparg), "i" (-EFAULT), "1" (0))
-+#endif
  
 -static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
 +static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
  {
        int op = (encoded_op >> 28) & 7;
        int cmp = (encoded_op >> 24) & 15;
-@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser
+@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser
  
        switch (op) {
        case FUTEX_OP_SET:
-+#ifdef CONFIG_X86_32
-+              __futex_atomic_op1("xchgl %0, %%ds:%2", ret, oldval, uaddr, oparg);
-+#else
-               __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
-+#endif
+-              __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
++              __futex_atomic_op1("xchgl %0, "__copyuser_seg"%2", ret, oldval, uaddr, oparg);
                break;
        case FUTEX_OP_ADD:
-+#ifdef CONFIG_X86_32
-+              __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %%ds:%2", ret, oldval,
-+                                 uaddr, oparg);
-+#else
-               __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
+-              __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
++              __futex_atomic_op1(LOCK_PREFIX "xaddl %0, "__copyuser_seg"%2", ret, oldval,
                                   uaddr, oparg);
-+#endif
                break;
        case FUTEX_OP_OR:
-               __futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
-@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser
+@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser
        return ret;
  }
  
@@ -7239,7 +7694,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/inclu
                                                int newval)
  {
  
-@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_i
+@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i
                return -ENOSYS;
  #endif
  
@@ -7248,36 +7703,21 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/futex.h linux-2.6.36/arch/x86/inclu
                return -EFAULT;
  
 -      asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
--                   "2:\t.section .fixup, \"ax\"\n"
-+      asm volatile(
-+#ifdef CONFIG_X86_32
-+                   "\tmovw %w5, %%ds\n"
-+                   "1:\t" LOCK_PREFIX "cmpxchgl %3, %%ds:%1\n"
-+                   "2:\tpushl   %%ss\n"
-+                   "\tpopl    %%ds\n"
-+#else
-+                   "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-+                   "2:\n"
-+#endif
-+                   "\t.section .fixup, \"ax\"\n"
++      asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, "__copyuser_seg"%1\n"
+                    "2:\t.section .fixup, \"ax\"\n"
                     "3:\tmov     %2, %0\n"
                     "\tjmp     2b\n"
                     "\t.previous\n"
                     _ASM_EXTABLE(1b, 3b)
-+#ifdef CONFIG_X86_32
-                    : "=a" (oldval), "+m" (*uaddr)
-+                   : "i" (-EFAULT), "r" (newval), "0" (oldval), "r" (__USER_DS)
-+#else
-+                   : "=a" (oldval), "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))
+-                   : "=a" (oldval), "+m" (*uaddr)
++                   : "=a" (oldval), "+m" (*____m(uaddr))
                     : "i" (-EFAULT), "r" (newval), "0" (oldval)
-+#endif
                     : "memory"
        );
- 
-diff -urNp linux-2.6.36/arch/x86/include/asm/i387.h linux-2.6.36/arch/x86/include/asm/i387.h
---- linux-2.6.36/arch/x86/include/asm/i387.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/i387.h   2010-11-06 18:58:15.000000000 -0400
-@@ -90,6 +90,11 @@ static inline int fxrstor_checking(struc
+diff -urNp linux-2.6.37/arch/x86/include/asm/i387.h linux-2.6.37/arch/x86/include/asm/i387.h
+--- linux-2.6.37/arch/x86/include/asm/i387.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/i387.h   2011-01-17 02:41:00.000000000 -0500
+@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
        int err;
  
@@ -7286,10 +7726,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/i387.h linux-2.6.36/arch/x86/includ
 +              fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
 +#endif
 +
+       /* See comment in fxsave() below. */
        asm volatile("1:  rex64/fxrstor (%[fx])\n\t"
                     "2:\n"
-                    ".section .fixup,\"ax\"\n"
-@@ -140,6 +145,11 @@ static inline int fxsave_user(struct i38
+@@ -109,6 +114,11 @@ static inline int fxsave_user(struct i38
  {
        int err;
  
@@ -7301,8 +7741,8 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/i387.h linux-2.6.36/arch/x86/includ
        /*
         * Clear the bytes not touched by the fxsave and reserved
         * for the SW usage.
-@@ -242,13 +252,8 @@ static inline int fxrstor_checking(struc
- }
+@@ -189,13 +199,8 @@ static inline void fpu_fxsave(struct fpu
+ #endif        /* CONFIG_X86_64 */
  
  /* We need a safe address that is cheap to find and that is already
 -   in L1 during context switch. The best choices are unfortunately
@@ -7317,10 +7757,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/i387.h linux-2.6.36/arch/x86/includ
  
  /*
   * These must be called with preempt disabled
-diff -urNp linux-2.6.36/arch/x86/include/asm/io.h linux-2.6.36/arch/x86/include/asm/io.h
---- linux-2.6.36/arch/x86/include/asm/io.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/io.h     2010-11-06 18:58:15.000000000 -0400
-@@ -213,6 +213,17 @@ extern void iounmap(volatile void __iome
+diff -urNp linux-2.6.37/arch/x86/include/asm/io.h linux-2.6.37/arch/x86/include/asm/io.h
+--- linux-2.6.37/arch/x86/include/asm/io.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/io.h     2011-01-17 02:41:00.000000000 -0500
+@@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
  
@@ -7338,9 +7778,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/io.h linux-2.6.36/arch/x86/include/
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-2.6.36/arch/x86/include/asm/iommu.h linux-2.6.36/arch/x86/include/asm/iommu.h
---- linux-2.6.36/arch/x86/include/asm/iommu.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/iommu.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/iommu.h linux-2.6.37/arch/x86/include/asm/iommu.h
+--- linux-2.6.37/arch/x86/include/asm/iommu.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/iommu.h  2011-01-17 02:41:00.000000000 -0500
 @@ -1,7 +1,7 @@
  #ifndef _ASM_X86_IOMMU_H
  #define _ASM_X86_IOMMU_H
@@ -7350,10 +7790,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/iommu.h linux-2.6.36/arch/x86/inclu
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.36/arch/x86/include/asm/irqflags.h linux-2.6.36/arch/x86/include/asm/irqflags.h
---- linux-2.6.36/arch/x86/include/asm/irqflags.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/irqflags.h       2010-11-06 18:58:15.000000000 -0400
-@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
+diff -urNp linux-2.6.37/arch/x86/include/asm/irqflags.h linux-2.6.37/arch/x86/include/asm/irqflags.h
+--- linux-2.6.37/arch/x86/include/asm/irqflags.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/irqflags.h       2011-01-17 02:41:00.000000000 -0500
+@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
        sti;                                    \
        sysexit
  
@@ -7365,10 +7805,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/irqflags.h linux-2.6.36/arch/x86/in
  #else
  #define INTERRUPT_RETURN              iret
  #define ENABLE_INTERRUPTS_SYSEXIT     sti; sysexit
-diff -urNp linux-2.6.36/arch/x86/include/asm/kvm_host.h linux-2.6.36/arch/x86/include/asm/kvm_host.h
---- linux-2.6.36/arch/x86/include/asm/kvm_host.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/kvm_host.h       2010-11-06 18:58:15.000000000 -0400
-@@ -525,7 +525,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.37/arch/x86/include/asm/kvm_host.h linux-2.6.37/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.37/arch/x86/include/asm/kvm_host.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/kvm_host.h       2011-01-17 02:41:00.000000000 -0500
+@@ -585,7 +585,7 @@ struct kvm_x86_ops {
        const struct trace_print_flags *exit_reasons_str;
  };
  
@@ -7377,10 +7817,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/kvm_host.h linux-2.6.36/arch/x86/in
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/include/asm/local.h
---- linux-2.6.36/arch/x86/include/asm/local.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/local.h  2010-11-06 18:58:15.000000000 -0400
-@@ -18,26 +18,90 @@ typedef struct {
+diff -urNp linux-2.6.37/arch/x86/include/asm/local.h linux-2.6.37/arch/x86/include/asm/local.h
+--- linux-2.6.37/arch/x86/include/asm/local.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/local.h  2011-01-17 02:41:00.000000000 -0500
+@@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
  {
@@ -7388,18 +7828,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_INC "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_DEC "%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (l->a.counter));
@@ -7411,18 +7843,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_DEC "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_INC "%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (l->a.counter));
@@ -7434,18 +7858,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_ADD "%1,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_SUB "%1,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (l->a.counter)
@@ -7458,24 +7874,16 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_SUB "%1,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_ADD "%1,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (l->a.counter)
                     : "ir" (i));
  }
-@@ -55,7 +119,24 @@ static inline int local_sub_and_test(lon
+@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon
  {
        unsigned char c;
  
@@ -7483,25 +7891,17 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_SUB "%2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_ADD "%2,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                   "sete %1\n"
                     : "+m" (l->a.counter), "=qm" (c)
                     : "ir" (i) : "memory");
        return c;
-@@ -73,7 +154,24 @@ static inline int local_dec_and_test(loc
+@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc
  {
        unsigned char c;
  
@@ -7509,25 +7909,17 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_DEC "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_INC "%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                   "sete %1\n"
                     : "+m" (l->a.counter), "=qm" (c)
                     : : "memory");
        return c != 0;
-@@ -91,7 +189,24 @@ static inline int local_inc_and_test(loc
+@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc
  {
        unsigned char c;
  
@@ -7535,25 +7927,17 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_INC "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_DEC "%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                   "sete %1\n"
                     : "+m" (l->a.counter), "=qm" (c)
                     : : "memory");
        return c != 0;
-@@ -110,7 +225,24 @@ static inline int local_add_negative(lon
+@@ -110,7 +169,16 @@ static inline int local_add_negative(lon
  {
        unsigned char c;
  
@@ -7561,25 +7945,17 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_ADD "%2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_SUB "%2,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                   "sets %1\n"
                     : "+m" (l->a.counter), "=qm" (c)
                     : "ir" (i) : "memory");
        return c;
-@@ -133,7 +265,23 @@ static inline long local_add_return(long
+@@ -133,7 +201,15 @@ static inline long local_add_return(long
  #endif
        /* Modern 486+ processor */
        __i = i;
@@ -7587,26 +7963,18 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/local.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(_ASM_XADD "%0, %1\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   _ASM_MOV "%0,%1\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+r" (i), "+m" (l->a.counter)
                     : : "memory");
        return i + __i;
-diff -urNp linux-2.6.36/arch/x86/include/asm/mc146818rtc.h linux-2.6.36/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.36/arch/x86/include/asm/mc146818rtc.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/mc146818rtc.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/mc146818rtc.h linux-2.6.37/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.37/arch/x86/include/asm/mc146818rtc.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/mc146818rtc.h    2011-01-17 02:41:00.000000000 -0500
 @@ -81,8 +81,8 @@ static inline unsigned char current_lock
  #else
  #define lock_cmos_prefix(reg) do {} while (0)
@@ -7618,9 +7986,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/mc146818rtc.h linux-2.6.36/arch/x86
  #define do_i_have_lock_cmos() 0
  #define current_lock_cmos_reg() 0
  #endif
-diff -urNp linux-2.6.36/arch/x86/include/asm/microcode.h linux-2.6.36/arch/x86/include/asm/microcode.h
---- linux-2.6.36/arch/x86/include/asm/microcode.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/microcode.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/microcode.h linux-2.6.37/arch/x86/include/asm/microcode.h
+--- linux-2.6.37/arch/x86/include/asm/microcode.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/microcode.h      2011-01-17 02:41:00.000000000 -0500
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -7661,9 +8029,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/microcode.h linux-2.6.36/arch/x86/i
  {
        return NULL;
  }
-diff -urNp linux-2.6.36/arch/x86/include/asm/mman.h linux-2.6.36/arch/x86/include/asm/mman.h
---- linux-2.6.36/arch/x86/include/asm/mman.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/mman.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/mman.h linux-2.6.37/arch/x86/include/asm/mman.h
+--- linux-2.6.37/arch/x86/include/asm/mman.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/mman.h   2011-01-17 02:41:00.000000000 -0500
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7679,9 +8047,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/mman.h linux-2.6.36/arch/x86/includ
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/mmu_context.h linux-2.6.36/arch/x86/include/asm/mmu_context.h
---- linux-2.6.36/arch/x86/include/asm/mmu_context.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/mmu_context.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/mmu_context.h linux-2.6.37/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.37/arch/x86/include/asm/mmu_context.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/mmu_context.h    2011-01-17 02:41:00.000000000 -0500
 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7806,9 +8174,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/mmu_context.h linux-2.6.36/arch/x86
  }
  
  #define activate_mm(prev, next)                       \
-diff -urNp linux-2.6.36/arch/x86/include/asm/mmu.h linux-2.6.36/arch/x86/include/asm/mmu.h
---- linux-2.6.36/arch/x86/include/asm/mmu.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/mmu.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/mmu.h linux-2.6.37/arch/x86/include/asm/mmu.h
+--- linux-2.6.37/arch/x86/include/asm/mmu.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/mmu.h    2011-01-17 02:41:00.000000000 -0500
 @@ -9,10 +9,23 @@
   * we put the segment information here.
   */
@@ -7835,10 +8203,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/mmu.h linux-2.6.36/arch/x86/include
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.36/arch/x86/include/asm/module.h linux-2.6.36/arch/x86/include/asm/module.h
---- linux-2.6.36/arch/x86/include/asm/module.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/module.h 2010-11-06 18:58:50.000000000 -0400
-@@ -59,13 +59,31 @@
+diff -urNp linux-2.6.37/arch/x86/include/asm/module.h linux-2.6.37/arch/x86/include/asm/module.h
+--- linux-2.6.37/arch/x86/include/asm/module.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/module.h 2011-01-17 02:41:00.000000000 -0500
+@@ -59,8 +59,26 @@
  #error unknown processor family
  #endif
  
@@ -7849,12 +8217,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/module.h linux-2.6.36/arch/x86/incl
 +#endif
 +
  #ifdef CONFIG_X86_32
- # ifdef CONFIG_4KSTACKS
- #  define MODULE_STACKSIZE "4KSTACKS "
- # else
- #  define MODULE_STACKSIZE ""
- # endif
--# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
+-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
 +# ifdef CONFIG_PAX_KERNEXEC
 +#  define MODULE_PAX_KERNEXEC "KERNEXEC "
 +# else
@@ -7865,30 +8228,28 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/module.h linux-2.6.36/arch/x86/incl
 +# else
 +#  define MODULE_GRSEC ""
 +# endif
-+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
++# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
 +#else
 +# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF
  #endif
  
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/page_32_types.h linux-2.6.36/arch/x86/include/asm/page_32_types.h
---- linux-2.6.36/arch/x86/include/asm/page_32_types.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/page_32_types.h  2010-11-06 18:58:15.000000000 -0400
-@@ -15,6 +15,10 @@
-  */
- #define __PAGE_OFFSET         _AC(CONFIG_PAGE_OFFSET, UL)
- 
-+#ifdef CONFIG_PAX_PAGEEXEC
-+#define CONFIG_ARCH_TRACK_EXEC_LIMIT 1
-+#endif
-+
- #ifdef CONFIG_4KSTACKS
- #define THREAD_ORDER  0
- #else
-diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt.h linux-2.6.36/arch/x86/include/asm/paravirt.h
---- linux-2.6.36/arch/x86/include/asm/paravirt.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/paravirt.h       2010-11-06 18:58:15.000000000 -0400
-@@ -720,6 +720,21 @@ static inline void __set_fixmap(unsigned
+diff -urNp linux-2.6.37/arch/x86/include/asm/page_64_types.h linux-2.6.37/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.37/arch/x86/include/asm/page_64_types.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/page_64_types.h  2011-01-17 02:41:00.000000000 -0500
+@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
+ 
+ /* duplicated to the one in bootmem.h */
+ extern unsigned long max_pfn;
+-extern unsigned long phys_base;
++extern const unsigned long phys_base;
+ 
+ extern unsigned long __phys_addr(unsigned long);
+ #define __phys_reloc_hide(x)  (x)
+diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt.h linux-2.6.37/arch/x86/include/asm/paravirt.h
+--- linux-2.6.37/arch/x86/include/asm/paravirt.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/paravirt.h       2011-01-17 02:41:00.000000000 -0500
+@@ -715,6 +715,21 @@ static inline void __set_fixmap(unsigned
        pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
@@ -7910,7 +8271,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt.h linux-2.6.36/arch/x86/in
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
  static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -936,7 +951,7 @@ extern void default_banner(void);
+@@ -931,7 +946,7 @@ extern void default_banner(void);
  
  #define PARA_PATCH(struct, off)        ((PARAVIRT_PATCH_##struct + (off)) / 4)
  #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
@@ -7919,7 +8280,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt.h linux-2.6.36/arch/x86/in
  #endif
  
  #define INTERRUPT_RETURN                                              \
-@@ -1013,6 +1028,21 @@ extern void default_banner(void);
+@@ -1008,6 +1023,21 @@ extern void default_banner(void);
        PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit),    \
                  CLBR_NONE,                                            \
                  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
@@ -7941,10 +8302,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt.h linux-2.6.36/arch/x86/in
  #endif        /* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt_types.h linux-2.6.36/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.36/arch/x86/include/asm/paravirt_types.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/paravirt_types.h 2010-11-06 18:58:15.000000000 -0400
-@@ -312,6 +312,12 @@ struct pv_mmu_ops {
+diff -urNp linux-2.6.37/arch/x86/include/asm/paravirt_types.h linux-2.6.37/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.37/arch/x86/include/asm/paravirt_types.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/paravirt_types.h 2011-01-17 02:41:00.000000000 -0500
+@@ -311,6 +311,12 @@ struct pv_mmu_ops {
           an mfn.  We can tell which is which from the index. */
        void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
                           phys_addr_t phys, pgprot_t flags);
@@ -7957,10 +8318,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/paravirt_types.h linux-2.6.36/arch/
  };
  
  struct arch_spinlock;
-diff -urNp linux-2.6.36/arch/x86/include/asm/pci_x86.h linux-2.6.36/arch/x86/include/asm/pci_x86.h
---- linux-2.6.36/arch/x86/include/asm/pci_x86.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pci_x86.h        2010-11-06 18:58:15.000000000 -0400
-@@ -92,16 +92,16 @@ extern int (*pcibios_enable_irq)(struct 
+diff -urNp linux-2.6.37/arch/x86/include/asm/pci_x86.h linux-2.6.37/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.37/arch/x86/include/asm/pci_x86.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pci_x86.h        2011-01-17 02:41:01.000000000 -0500
+@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct 
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
  struct pci_raw_ops {
@@ -7982,9 +8343,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pci_x86.h linux-2.6.36/arch/x86/inc
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgalloc.h linux-2.6.36/arch/x86/include/asm/pgalloc.h
---- linux-2.6.36/arch/x86/include/asm/pgalloc.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgalloc.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgalloc.h linux-2.6.37/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.37/arch/x86/include/asm/pgalloc.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgalloc.h        2011-01-17 02:41:01.000000000 -0500
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
                                       pmd_t *pmd, pte_t *pte)
  {
@@ -7999,9 +8360,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgalloc.h linux-2.6.36/arch/x86/inc
        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-2level.h linux-2.6.36/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.36/arch/x86/include/asm/pgtable-2level.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable-2level.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-2level.h linux-2.6.37/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable-2level.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable-2level.h 2011-01-17 02:41:01.000000000 -0500
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8012,15 +8373,15 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-2level.h linux-2.6.36/arch/
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32.h linux-2.6.36/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.36/arch/x86/include/asm/pgtable_32.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable_32.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32.h linux-2.6.37/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable_32.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable_32.h     2011-01-17 02:41:01.000000000 -0500
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
  
 -extern pgd_t swapper_pg_dir[1024];
--extern pgd_t trampoline_pg_dir[1024];
+-extern pgd_t initial_page_table[1024];
 -
  static inline void pgtable_cache_init(void) { }
  static inline void check_pgt_cache(void) { }
@@ -8030,15 +8391,15 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32.h linux-2.6.36/arch/x86/
  #endif
  
 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-+extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
++extern pgd_t initial_page_table[PTRS_PER_PGD];
 +#ifdef CONFIG_X86_PAE
 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
 +#endif
 +
  #if defined(CONFIG_HIGHPTE)
- #define __KM_PTE                      \
-       (in_nmi() ? KM_NMI_PTE :        \
-@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
+ #define pte_offset_map(dir, address)                                  \
+       ((pte_t *)kmap_atomic(pmd_page(*(dir))) +               \
+@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, u
  /* Clear a kernel PTE and flush it from the TLB */
  #define kpte_clear_flush(ptep, vaddr)         \
  do {                                          \
@@ -8048,7 +8409,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32.h linux-2.6.36/arch/x86/
        __flush_tlb_one((vaddr));               \
  } while (0)
  
-@@ -84,6 +89,9 @@ do {                                         \
+@@ -74,6 +79,9 @@ do {                                         \
  
  #endif /* !__ASSEMBLY__ */
  
@@ -8058,9 +8419,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32.h linux-2.6.36/arch/x86/
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable_32_types.h       2011-01-17 02:41:01.000000000 -0500
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8090,9 +8451,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_32_types.h linux-2.6.36/arc
  #define MODULES_VADDR VMALLOC_START
  #define MODULES_END   VMALLOC_END
  #define MODULES_LEN   (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-3level.h linux-2.6.36/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.36/arch/x86/include/asm/pgtable-3level.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable-3level.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable-3level.h linux-2.6.37/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable-3level.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable-3level.h 2011-01-17 02:41:01.000000000 -0500
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8110,9 +8471,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable-3level.h linux-2.6.36/arch/
  }
  
  /*
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64.h linux-2.6.36/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.36/arch/x86/include/asm/pgtable_64.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable_64.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64.h linux-2.6.37/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable_64.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable_64.h     2011-01-17 02:41:01.000000000 -0500
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8149,9 +8510,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64.h linux-2.6.36/arch/x86/
  }
  
  static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable_64_types.h       2011-01-17 02:41:01.000000000 -0500
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8163,10 +8524,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_64_types.h linux-2.6.36/arc
 +#define ktva_ktla(addr)               (addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/include/asm/pgtable.h
---- linux-2.6.36/arch/x86/include/asm/pgtable.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable.h        2010-11-06 18:58:15.000000000 -0400
-@@ -76,12 +76,51 @@ extern struct list_head pgd_list;
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable.h linux-2.6.37/arch/x86/include/asm/pgtable.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable.h        2011-01-17 02:41:01.000000000 -0500
+@@ -78,12 +78,51 @@ extern struct mm_struct *pgd_page_get_mm
  
  #define arch_end_context_switch(prev) do {} while(0)
  
@@ -8218,7 +8579,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  static inline int pte_dirty(pte_t pte)
  {
        return pte_flags(pte) & _PAGE_DIRTY;
-@@ -169,9 +208,29 @@ static inline pte_t pte_wrprotect(pte_t 
+@@ -171,9 +210,29 @@ static inline pte_t pte_wrprotect(pte_t 
        return pte_clear_flags(pte, _PAGE_RW);
  }
  
@@ -8249,7 +8610,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -304,6 +363,15 @@ pte_t *populate_extra_pte(unsigned long 
+@@ -306,6 +365,15 @@ pte_t *populate_extra_pte(unsigned long 
  #endif
  
  #ifndef __ASSEMBLY__
@@ -8265,7 +8626,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  #include <linux/mm_types.h>
  
  static inline int pte_none(pte_t pte)
-@@ -474,7 +542,7 @@ static inline pud_t *pud_offset(pgd_t *p
+@@ -476,7 +544,7 @@ static inline pud_t *pud_offset(pgd_t *p
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -8274,7 +8635,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -497,7 +565,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -499,7 +567,12 @@ static inline int pgd_none(pgd_t pgd)
   * pgd_offset() returns a (pgd_t *)
   * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
   */
@@ -8288,7 +8649,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  /*
   * a shortcut which implies the use of the kernel's pgd, instead
   * of a process's
-@@ -508,6 +581,20 @@ static inline int pgd_none(pgd_t pgd)
+@@ -510,6 +583,20 @@ static inline int pgd_none(pgd_t pgd)
  #define KERNEL_PGD_BOUNDARY   pgd_index(PAGE_OFFSET)
  #define KERNEL_PGD_PTRS               (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
  
@@ -8309,7 +8670,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  #ifndef __ASSEMBLY__
  
  extern int direct_gbpages;
-@@ -613,11 +700,23 @@ static inline void ptep_set_wrprotect(st
+@@ -617,11 +704,23 @@ static inline void ptep_set_wrprotect(st
   * dst and src can be on the same page, but the range must not overlap,
   * and must not cross a page boundary.
   */
@@ -8335,9 +8696,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable.h linux-2.6.36/arch/x86/inc
  
  #include <asm-generic/pgtable.h>
  #endif        /* __ASSEMBLY__ */
-diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_types.h linux-2.6.36/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.36/arch/x86/include/asm/pgtable_types.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/pgtable_types.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/pgtable_types.h linux-2.6.37/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.37/arch/x86/include/asm/pgtable_types.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/pgtable_types.h  2011-01-17 02:41:01.000000000 -0500
 @@ -16,12 +16,11 @@
  #define _PAGE_BIT_PSE         7       /* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT         7       /* on 4KB pages */
@@ -8449,10 +8810,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/pgtable_types.h linux-2.6.36/arch/x
  
  #define pgprot_writecombine   pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/include/asm/processor.h
---- linux-2.6.36/arch/x86/include/asm/processor.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/processor.h      2010-11-06 18:58:15.000000000 -0400
-@@ -269,7 +269,7 @@ struct tss_struct {
+diff -urNp linux-2.6.37/arch/x86/include/asm/processor.h linux-2.6.37/arch/x86/include/asm/processor.h
+--- linux-2.6.37/arch/x86/include/asm/processor.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/processor.h      2011-01-17 02:41:01.000000000 -0500
+@@ -271,7 +271,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
  
@@ -8461,7 +8822,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -885,8 +885,15 @@ static inline void spin_lock_prefetch(co
+@@ -864,8 +864,15 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE             PAGE_OFFSET
  #define TASK_SIZE_MAX         TASK_SIZE
@@ -8478,7 +8839,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
  
  #define INIT_THREAD  {                                                          \
        .sp0                    = sizeof(init_stack) + (long)&init_stack, \
-@@ -903,7 +910,7 @@ static inline void spin_lock_prefetch(co
+@@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {                                                     \
        .x86_tss = {                                                      \
@@ -8487,7 +8848,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
                .ss0            = __KERNEL_DS,                            \
                .ss1            = __KERNEL_CS,                            \
                .io_bitmap_base = INVALID_IO_BITMAP_OFFSET,               \
-@@ -914,11 +921,7 @@ static inline void spin_lock_prefetch(co
+@@ -893,11 +900,7 @@ static inline void spin_lock_prefetch(co
  extern unsigned long thread_saved_pc(struct task_struct *tsk);
  
  #define THREAD_SIZE_LONGS      (THREAD_SIZE/sizeof(unsigned long))
@@ -8500,7 +8861,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -933,7 +936,7 @@ extern unsigned long thread_saved_pc(str
+@@ -912,7 +915,7 @@ extern unsigned long thread_saved_pc(str
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -8509,7 +8870,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
         __regs__ - 1;                                                   \
  })
  
-@@ -943,13 +946,13 @@ extern unsigned long thread_saved_pc(str
+@@ -922,13 +925,13 @@ extern unsigned long thread_saved_pc(str
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -8525,7 +8886,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
  
  #define TASK_SIZE             (test_thread_flag(TIF_IA32) ? \
                                        IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -986,6 +989,10 @@ extern void start_thread(struct pt_regs 
+@@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE    (PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -8536,9 +8897,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/processor.h linux-2.6.36/arch/x86/i
  #define KSTK_EIP(task)                (task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.36/arch/x86/include/asm/ptrace.h linux-2.6.36/arch/x86/include/asm/ptrace.h
---- linux-2.6.36/arch/x86/include/asm/ptrace.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/ptrace.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/ptrace.h linux-2.6.37/arch/x86/include/asm/ptrace.h
+--- linux-2.6.37/arch/x86/include/asm/ptrace.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/ptrace.h 2011-01-17 02:41:01.000000000 -0500
 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
  }
  
@@ -8575,9 +8936,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/ptrace.h linux-2.6.36/arch/x86/incl
  #endif
  }
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/reboot.h linux-2.6.36/arch/x86/include/asm/reboot.h
---- linux-2.6.36/arch/x86/include/asm/reboot.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/reboot.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/reboot.h linux-2.6.37/arch/x86/include/asm/reboot.h
+--- linux-2.6.37/arch/x86/include/asm/reboot.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/reboot.h 2011-01-17 02:41:01.000000000 -0500
 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
  
  void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8587,194 +8948,100 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/reboot.h linux-2.6.36/arch/x86/incl
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.36/arch/x86/include/asm/rwsem.h linux-2.6.36/arch/x86/include/asm/rwsem.h
---- linux-2.6.36/arch/x86/include/asm/rwsem.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/rwsem.h  2010-11-06 18:58:15.000000000 -0400
-@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
+diff -urNp linux-2.6.37/arch/x86/include/asm/rwsem.h linux-2.6.37/arch/x86/include/asm/rwsem.h
+--- linux-2.6.37/arch/x86/include/asm/rwsem.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/rwsem.h  2011-01-17 02:41:01.000000000 -0500
+@@ -118,6 +118,14 @@ static inline void __down_read(struct rw
  {
        asm volatile("# beginning down_read\n\t"
                     LOCK_PREFIX _ASM_INC "(%1)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   LOCK_PREFIX _ASM_DEC "(%1)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     /* adds 0x00000001 */
--                   "  jns        1f\n"
-+                   "  jns        2f\n"
+                    "  jns        1f\n"
                     "  call call_rwsem_down_read_failed\n"
--                   "1:\n\t"
-+                   "2:\n\t"
-                    "# ending down_read\n\t"
-                    : "+m" (sem->count)
-                    : "a" (sem)
-@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
-       rwsem_count_t result, tmp;
-       asm volatile("# beginning __down_read_trylock\n\t"
-                    "  mov          %0,%1\n\t"
--                   "1:\n\t"
-+                   "2:\n\t"
+@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st
+                    "1:\n\t"
                     "  mov          %1,%2\n\t"
                     "  add          %3,%2\n\t"
--                   "  jle          2f\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   "sub %3,%2\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-+                   "  jle          3f\n\t"
+                    "  jle          2f\n\t"
                     LOCK_PREFIX "  cmpxchg  %2,%0\n\t"
--                   "  jnz          1b\n\t"
--                   "2:\n\t"
-+                   "  jnz          2b\n\t"
-+                   "3:\n\t"
-                    "# ending __down_read_trylock\n\t"
-                    : "+m" (sem->count), "=&a" (result), "=&r" (tmp)
-                    : "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -158,12 +190,28 @@ static inline void __down_write_nested(s
+                    "  jnz          1b\n\t"
+@@ -158,6 +174,14 @@ static inline void __down_write_nested(s
        rwsem_count_t tmp;
        asm volatile("# beginning down_write\n\t"
                     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   "mov %1,(%2)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     /* adds 0xffff0001, returns the old value */
                     "  test      %1,%1\n\t"
                     /* was the count 0 before? */
--                   "  jz        1f\n"
-+                   "  jz        2f\n"
-                    "  call call_rwsem_down_write_failed\n"
--                   "1:\n"
-+                   "2:\n"
-                    "# ending down_write"
-                    : "+m" (sem->count), "=d" (tmp)
-                    : "a" (sem), "1" (RWSEM_ACTIVE_WRITE_BIAS)
-@@ -196,10 +244,26 @@ static inline void __up_read(struct rw_s
+@@ -196,6 +220,14 @@ static inline void __up_read(struct rw_s
        rwsem_count_t tmp;
        asm volatile("# beginning __up_read\n\t"
                     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   "mov %1,(%2)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     /* subtracts 1, returns the old value */
--                   "  jns        1f\n\t"
-+                   "  jns        2f\n\t"
+                    "  jns        1f\n\t"
                     "  call call_rwsem_wake\n" /* expects old value in %edx */
--                   "1:\n"
-+                   "2:\n"
-                    "# ending __up_read\n"
-                    : "+m" (sem->count), "=d" (tmp)
-                    : "a" (sem), "1" (-RWSEM_ACTIVE_READ_BIAS)
-@@ -214,10 +278,26 @@ static inline void __up_write(struct rw_
+@@ -214,6 +246,14 @@ static inline void __up_write(struct rw_
        rwsem_count_t tmp;
        asm volatile("# beginning __up_write\n\t"
                     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   "mov %1,(%2)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     /* subtracts 0xffff0001, returns the old value */
--                   "  jns        1f\n\t"
-+                   "  jns        2f\n\t"
+                    "  jns        1f\n\t"
                     "  call call_rwsem_wake\n" /* expects old value in %edx */
--                   "1:\n\t"
-+                   "2:\n\t"
-                    "# ending __up_write\n"
-                    : "+m" (sem->count), "=d" (tmp)
-                    : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -231,13 +311,29 @@ static inline void __downgrade_write(str
+@@ -231,6 +271,14 @@ static inline void __downgrade_write(str
  {
        asm volatile("# beginning __downgrade_write\n\t"
                     LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     /*
                      * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
                      *     0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
-                     */
--                   "  jns       1f\n\t"
-+                   "  jns       2f\n\t"
-                    "  call call_rwsem_downgrade_wake\n"
--                   "1:\n\t"
-+                   "2:\n\t"
-                    "# ending __downgrade_write\n"
-                    : "+m" (sem->count)
-                    : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
-@@ -250,7 +346,23 @@ static inline void __downgrade_write(str
+@@ -250,7 +298,15 @@ static inline void __downgrade_write(str
  static inline void rwsem_atomic_add(rwsem_count_t delta,
                                    struct rw_semaphore *sem)
  {
@@ -8782,24 +9049,16 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/rwsem.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   LOCK_PREFIX _ASM_SUB "%1,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (sem->count)
                     : "er" (delta));
  }
-@@ -263,7 +375,23 @@ static inline rwsem_count_t rwsem_atomic
+@@ -263,7 +319,15 @@ static inline rwsem_count_t rwsem_atomic
  {
        rwsem_count_t tmp = delta;
  
@@ -8807,26 +9066,18 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/rwsem.h linux-2.6.36/arch/x86/inclu
 +      asm volatile(LOCK_PREFIX "xadd %0,%1\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   "mov %0,%1\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+r" (tmp), "+m" (sem->count)
                     : : "memory");
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/segment.h linux-2.6.36/arch/x86/include/asm/segment.h
---- linux-2.6.36/arch/x86/include/asm/segment.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/segment.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/segment.h linux-2.6.37/arch/x86/include/asm/segment.h
+--- linux-2.6.37/arch/x86/include/asm/segment.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/segment.h        2011-01-17 02:41:01.000000000 -0500
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu                      [ offset to per-cpu data area ]
@@ -8840,30 +9091,21 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/segment.h linux-2.6.36/arch/x86/inc
  #define GDT_ENTRY_TLS_MIN     6
 @@ -77,6 +77,8 @@
  
- #define GDT_ENTRY_KERNEL_CS           (GDT_ENTRY_KERNEL_BASE + 0)
+ #define GDT_ENTRY_KERNEL_CS           (GDT_ENTRY_KERNEL_BASE+0)
  
 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS  (4)
 +
- #define GDT_ENTRY_KERNEL_DS           (GDT_ENTRY_KERNEL_BASE + 1)
- 
- #define GDT_ENTRY_TSS                 (GDT_ENTRY_KERNEL_BASE + 4)
-@@ -88,7 +90,7 @@
- #define GDT_ENTRY_ESPFIX_SS           (GDT_ENTRY_KERNEL_BASE + 14)
- #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
+ #define GDT_ENTRY_KERNEL_DS           (GDT_ENTRY_KERNEL_BASE+1)
  
--#define GDT_ENTRY_PERCPU                      (GDT_ENTRY_KERNEL_BASE + 15)
-+#define GDT_ENTRY_PERCPU              (GDT_ENTRY_KERNEL_BASE + 15)
- #ifdef CONFIG_SMP
- #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
- #else
+ #define GDT_ENTRY_TSS                 (GDT_ENTRY_KERNEL_BASE+4)
 @@ -102,6 +104,12 @@
  #define __KERNEL_STACK_CANARY         0
  #endif
  
-+#define GDT_ENTRY_PCIBIOS_CS          (GDT_ENTRY_KERNEL_BASE + 17)
++#define GDT_ENTRY_PCIBIOS_CS          (GDT_ENTRY_KERNEL_BASE+17)
 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
 +
-+#define GDT_ENTRY_PCIBIOS_DS          (GDT_ENTRY_KERNEL_BASE + 18)
++#define GDT_ENTRY_PCIBIOS_DS          (GDT_ENTRY_KERNEL_BASE+18)
 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
 +
  #define GDT_ENTRY_DOUBLEFAULT_TSS     31
@@ -8890,14 +9132,14 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/segment.h linux-2.6.36/arch/x86/inc
 @@ -183,6 +193,7 @@
  #endif
  
- #define __KERNEL_CS   (GDT_ENTRY_KERNEL_CS * 8)
-+#define __KERNEXEC_KERNEL_CS  (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8)
- #define __KERNEL_DS   (GDT_ENTRY_KERNEL_DS * 8)
- #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
- #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.36/arch/x86/include/asm/smp.h linux-2.6.36/arch/x86/include/asm/smp.h
---- linux-2.6.36/arch/x86/include/asm/smp.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/smp.h    2010-11-06 18:58:15.000000000 -0400
+ #define __KERNEL_CS   (GDT_ENTRY_KERNEL_CS*8)
++#define __KERNEXEC_KERNEL_CS  (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
+ #define __KERNEL_DS   (GDT_ENTRY_KERNEL_DS*8)
+ #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS*8+3)
+ #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS*8+3)
+diff -urNp linux-2.6.37/arch/x86/include/asm/smp.h linux-2.6.37/arch/x86/include/asm/smp.h
+--- linux-2.6.37/arch/x86/include/asm/smp.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/smp.h    2011-01-17 02:41:01.000000000 -0500
 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -8907,65 +9149,40 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/smp.h linux-2.6.36/arch/x86/include
  
  static inline struct cpumask *cpu_sibling_mask(int cpu)
  {
-diff -urNp linux-2.6.36/arch/x86/include/asm/spinlock.h linux-2.6.36/arch/x86/include/asm/spinlock.h
---- linux-2.6.36/arch/x86/include/asm/spinlock.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/spinlock.h       2010-11-06 18:58:15.000000000 -0400
-@@ -249,18 +249,50 @@ static inline int arch_write_can_lock(ar
+diff -urNp linux-2.6.37/arch/x86/include/asm/spinlock.h linux-2.6.37/arch/x86/include/asm/spinlock.h
+--- linux-2.6.37/arch/x86/include/asm/spinlock.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/spinlock.h       2011-01-17 02:41:01.000000000 -0500
+@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
        asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
--                   "jns 1f\n"
--                   "call __read_lock_failed\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-                    "1:\n"
 +                   LOCK_PREFIX " addl $1,(%0)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-+                   "jns 2f\n"
-+                   "call __read_lock_failed\n\t"
-+                   "2:\n"
-                    ::LOCK_PTR_REG (rw) : "memory");
- }
- 
+                    "jns 1f\n"
+                    "call __read_lock_failed\n\t"
+                    "1:\n"
+@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_r
  static inline void arch_write_lock(arch_rwlock_t *rw)
  {
        asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
--                   "jz 1f\n"
--                   "call __write_lock_failed\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-                    "1:\n"
 +                   LOCK_PREFIX " addl %1,(%0)\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-+                   "jz 2f\n"
-+                   "call __write_lock_failed\n\t"
-+                   "2:\n"
-                    ::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory");
- }
- 
-@@ -286,12 +318,45 @@ static inline int arch_write_trylock(arc
+                    "jz 1f\n"
+                    "call __write_lock_failed\n\t"
+                    "1:\n"
+@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arc
  
  static inline void arch_read_unlock(arch_rwlock_t *rw)
  {
@@ -8973,18 +9190,10 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/spinlock.h linux-2.6.36/arch/x86/in
 +      asm volatile(LOCK_PREFIX "incl %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
 +                   LOCK_PREFIX "decl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   "int $4\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                   :"+m" (rw->lock) : : "memory");
@@ -8996,26 +9205,30 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/spinlock.h linux-2.6.36/arch/x86/in
 +      asm volatile(LOCK_PREFIX "addl %1, %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
-+#ifdef CONFIG_X86_32
-+                   "into\n0:\n"
-+#else
 +                   "jno 0f\n"
++                   LOCK_PREFIX "subl %1, %0\n"
 +                   "int $4\n0:\n"
-+#endif
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
-+                   LOCK_PREFIX "subl %1,%0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
++                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
                     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/system.h linux-2.6.36/arch/x86/include/asm/system.h
---- linux-2.6.36/arch/x86/include/asm/system.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/system.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/stackprotector.h linux-2.6.37/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.37/arch/x86/include/asm/stackprotector.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/stackprotector.h 2011-01-17 02:41:01.000000000 -0500
+@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
+ 
+ static inline void load_stack_canary_segment(void)
+ {
+-#ifdef CONFIG_X86_32
++#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
+       asm volatile ("mov %0, %%gs" : : "r" (0));
+ #endif
+ }
+diff -urNp linux-2.6.37/arch/x86/include/asm/system.h linux-2.6.37/arch/x86/include/asm/system.h
+--- linux-2.6.37/arch/x86/include/asm/system.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/system.h 2011-01-17 02:41:01.000000000 -0500
 @@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
  {
        unsigned long __limit;
@@ -9034,9 +9247,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/system.h linux-2.6.36/arch/x86/incl
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_32.h linux-2.6.36/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.36/arch/x86/include/asm/uaccess_32.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/uaccess_32.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_32.h linux-2.6.37/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.37/arch/x86/include/asm/uaccess_32.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/uaccess_32.h     2011-01-17 02:41:01.000000000 -0500
 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9193,9 +9406,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_32.h linux-2.6.36/arch/x86/
        return n;
  }
  
-diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.36/arch/x86/include/asm/uaccess_64.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/uaccess_64.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess_64.h linux-2.6.37/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.37/arch/x86/include/asm/uaccess_64.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/uaccess_64.h     2011-01-17 02:41:01.000000000 -0500
 @@ -11,6 +11,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9246,7 +9459,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
        return n;
  }
  
-@@ -65,17 +68,35 @@ int copy_to_user(void __user *dst, const
+@@ -65,110 +68,174 @@ int copy_to_user(void __user *dst, const
  {
        might_fault();
  
@@ -9266,10 +9479,16 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
  
        might_fault();
 -      if (!__builtin_constant_p(size))
+-              return copy_user_generic(dst, (__force void *)src, size);
 +
 +      if ((int)size < 0)
 +              return size;
 +
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_READ, src, size))
++              return size;
++#endif
++
 +      if (unlikely(sz != -1 && sz < size)) {
 +#ifdef CONFIG_DEBUG_VM
 +              WARN(1, "Buffer overflow detected!\n");
@@ -9281,18 +9500,52 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +              check_object_size(dst, size, false);
 +              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +                      src += PAX_USER_SHADOW_BASE;
-               return copy_user_generic(dst, (__force void *)src, size);
++              return copy_user_generic(dst, (__force const void *)src, size);
 +      }
        switch (size) {
-       case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
+-      case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
++      case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
                              ret, "b", "b", "=q", 1);
-@@ -108,18 +129,36 @@ int __copy_from_user(void *dst, const vo
+               return ret;
+-      case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
++      case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
+                             ret, "w", "w", "=r", 2);
+               return ret;
+-      case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
++      case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
+                             ret, "l", "k", "=r", 4);
+               return ret;
+-      case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
++      case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
+                             ret, "q", "", "=r", 8);
+               return ret;
+       case 10:
+-              __get_user_asm(*(u64 *)dst, (u64 __user *)src,
++              __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
+                              ret, "q", "", "=r", 10);
+               if (unlikely(ret))
+                       return ret;
+               __get_user_asm(*(u16 *)(8 + (char *)dst),
+-                             (u16 __user *)(8 + (char __user *)src),
++                             (const u16 __user *)(8 + (const char __user *)src),
+                              ret, "w", "w", "=r", 2);
+               return ret;
+       case 16:
+-              __get_user_asm(*(u64 *)dst, (u64 __user *)src,
++              __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
+                              ret, "q", "", "=r", 16);
+               if (unlikely(ret))
+                       return ret;
+               __get_user_asm(*(u64 *)(8 + (char *)dst),
+-                             (u64 __user *)(8 + (char __user *)src),
++                             (const u64 __user *)(8 + (const char __user *)src),
                               ret, "q", "", "=r", 8);
                return ret;
        default:
+-              return copy_user_generic(dst, (__force void *)src, size);
 +              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +                      src += PAX_USER_SHADOW_BASE;
-               return copy_user_generic(dst, (__force void *)src, size);
++              return copy_user_generic(dst, (__force const void *)src, size);
        }
  }
  
@@ -9310,6 +9563,11 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +      if ((int)size < 0)
 +              return size;
 +
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_WRITE, dst, size))
++              return size;
++#endif
++
 +      if (unlikely(sz != -1 && sz < size)) {
 +#ifdef CONFIG_DEBUG_VM
 +              WARN(1, "Buffer overflow detected!\n");
@@ -9324,9 +9582,42 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
                return copy_user_generic((__force void *)dst, src, size);
 +      }
        switch (size) {
-       case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
+-      case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
++      case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
                              ret, "b", "b", "iq", 1);
-@@ -152,19 +191,30 @@ int __copy_to_user(void __user *dst, con
+               return ret;
+-      case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
++      case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
+                             ret, "w", "w", "ir", 2);
+               return ret;
+-      case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
++      case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
+                             ret, "l", "k", "ir", 4);
+               return ret;
+-      case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
++      case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
+                             ret, "q", "", "er", 8);
+               return ret;
+       case 10:
+-              __put_user_asm(*(u64 *)src, (u64 __user *)dst,
++              __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
+                              ret, "q", "", "er", 10);
+               if (unlikely(ret))
+                       return ret;
+               asm("":::"memory");
+-              __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
++              __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
+                              ret, "w", "w", "ir", 2);
+               return ret;
+       case 16:
+-              __put_user_asm(*(u64 *)src, (u64 __user *)dst,
++              __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
+                              ret, "q", "", "er", 16);
+               if (unlikely(ret))
+                       return ret;
+               asm("":::"memory");
+-              __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
++              __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
                               ret, "q", "", "er", 8);
                return ret;
        default:
@@ -9349,18 +9640,58 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +      if ((int)size < 0)
 +              return size;
 +
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_READ, src, size))
++              return size;
++      if (!__access_ok(VERIFY_WRITE, dst, size))
++              return size;
++#endif
++
 +      if (!__builtin_constant_p(size)) {
 +              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +                      src += PAX_USER_SHADOW_BASE;
 +              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +                      dst += PAX_USER_SHADOW_BASE;
                return copy_user_generic((__force void *)dst,
-                                        (__force void *)src, size);
+-                                       (__force void *)src, size);
++                                       (__force const void *)src, size);
 +      }
        switch (size) {
        case 1: {
                u8 tmp;
-@@ -204,6 +254,10 @@ int __copy_in_user(void __user *dst, con
+-              __get_user_asm(tmp, (u8 __user *)src,
++              __get_user_asm(tmp, (const u8 __user *)src,
+                              ret, "b", "b", "=q", 1);
+               if (likely(!ret))
+                       __put_user_asm(tmp, (u8 __user *)dst,
+@@ -177,7 +244,7 @@ int __copy_in_user(void __user *dst, con
+       }
+       case 2: {
+               u16 tmp;
+-              __get_user_asm(tmp, (u16 __user *)src,
++              __get_user_asm(tmp, (const u16 __user *)src,
+                              ret, "w", "w", "=r", 2);
+               if (likely(!ret))
+                       __put_user_asm(tmp, (u16 __user *)dst,
+@@ -187,7 +254,7 @@ int __copy_in_user(void __user *dst, con
+ 
+       case 4: {
+               u32 tmp;
+-              __get_user_asm(tmp, (u32 __user *)src,
++              __get_user_asm(tmp, (const u32 __user *)src,
+                              ret, "l", "k", "=r", 4);
+               if (likely(!ret))
+                       __put_user_asm(tmp, (u32 __user *)dst,
+@@ -196,7 +263,7 @@ int __copy_in_user(void __user *dst, con
+       }
+       case 8: {
+               u64 tmp;
+-              __get_user_asm(tmp, (u64 __user *)src,
++              __get_user_asm(tmp, (const u64 __user *)src,
+                              ret, "q", "", "=r", 8);
+               if (likely(!ret))
+                       __put_user_asm(tmp, (u64 __user *)dst,
+@@ -204,8 +271,12 @@ int __copy_in_user(void __user *dst, con
                return ret;
        }
        default:
@@ -9369,12 +9700,23 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +                      dst += PAX_USER_SHADOW_BASE;
                return copy_user_generic((__force void *)dst,
-                                        (__force void *)src, size);
+-                                       (__force void *)src, size);
++                                       (__force const void *)src, size);
        }
-@@ -222,33 +276,45 @@ __must_check unsigned long __clear_user(
+ }
+ 
+@@ -222,33 +293,68 @@ __must_check unsigned long __clear_user(
  static __must_check __always_inline int
  __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
  {
++      if ((int)size < 0)
++              return size;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_READ, src, size))
++              return size;
++#endif
++
 +      if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +              src += PAX_USER_SHADOW_BASE;
        return copy_user_generic(dst, (__force const void *)src, size);
@@ -9387,6 +9729,11 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +      if ((int)size < 0)
 +              return size;
 +
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_WRITE, dst, size))
++              return size;
++#endif
++
 +      if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +              dst += PAX_USER_SHADOW_BASE;
        return copy_user_generic((__force void *)dst, src, size);
@@ -9404,6 +9751,11 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
 +
 +      if ((int)size < 0)
 +              return size;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_READ, src, size))
++              return size;
++#endif
 +
        return __copy_user_nocache(dst, src, size, 1);
  }
@@ -9415,6 +9767,11 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
  {
 +      if ((int)size < 0)
 +              return size;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      if (!__access_ok(VERIFY_READ, src, size))
++              return size;
++#endif
 +
        return __copy_user_nocache(dst, src, size, 0);
  }
@@ -9424,9 +9781,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess_64.h linux-2.6.36/arch/x86/
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/include/asm/uaccess.h
---- linux-2.6.36/arch/x86/include/asm/uaccess.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/uaccess.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/uaccess.h linux-2.6.37/arch/x86/include/asm/uaccess.h
+--- linux-2.6.37/arch/x86/include/asm/uaccess.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/uaccess.h        2011-01-17 02:41:01.000000000 -0500
 @@ -8,12 +8,15 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
@@ -9447,8 +9804,8 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/inc
  
  #define get_ds()      (KERNEL_DS)
  #define get_fs()      (current_thread_info()->addr_limit)
-+#ifdef CONFIG_X86_32
-+void __set_fs(mm_segment_t x, int cpu);
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++void __set_fs(mm_segment_t x);
 +void set_fs(mm_segment_t x);
 +#else
  #define set_fs(x)     (current_thread_info()->addr_limit = (x))
@@ -9491,92 +9848,69 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/inc
  
  /*
   * The exception table consists of pairs of addresses: the first is the
-@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
+@@ -183,12 +217,20 @@ extern int __get_user_bad(void);
        asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
                     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
  
 -
-+#ifdef CONFIG_X86_32
-+#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
-+#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg "%%gs:"
++#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
++#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
 +#else
-+#define _ASM_LOAD_USER_DS(ds)
-+#define _ASM_LOAD_KERNEL_DS
++#define __copyuser_seg
++#define __COPYUSER_SET_ES
++#define __COPYUSER_RESTORE_ES
 +#endif
  
  #ifdef CONFIG_X86_32
  #define __put_user_asm_u64(x, addr, err, errret)                      \
 -      asm volatile("1:        movl %%eax,0(%2)\n"                     \
 -                   "2:        movl %%edx,4(%2)\n"                     \
-+      asm volatile(_ASM_LOAD_USER_DS(5)                               \
-+                   "1:        movl %%eax,%%ds:0(%2)\n"                \
-+                   "2:        movl %%edx,%%ds:4(%2)\n"                \
++      asm volatile("1:        movl %%eax," __copyuser_seg"0(%2)\n"    \
++                   "2:        movl %%edx," __copyuser_seg"4(%2)\n"    \
                     "3:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     ".section .fixup,\"ax\"\n"                         \
                     "4:        movl %3,%0\n"                           \
-                    "  jmp 3b\n"                                       \
-@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
-                    _ASM_EXTABLE(1b, 4b)                               \
-                    _ASM_EXTABLE(2b, 4b)                               \
-                    : "=r" (err)                                       \
--                   : "A" (x), "r" (addr), "i" (errret), "0" (err))
-+                   : "A" (x), "r" (addr), "i" (errret), "0" (err),    \
-+                     "r"(__USER_DS))
+@@ -200,8 +242,8 @@ extern int __get_user_bad(void);
+                    : "A" (x), "r" (addr), "i" (errret), "0" (err))
  
  #define __put_user_asm_ex_u64(x, addr)                                        \
 -      asm volatile("1:        movl %%eax,0(%1)\n"                     \
 -                   "2:        movl %%edx,4(%1)\n"                     \
-+      asm volatile(_ASM_LOAD_USER_DS(2)                               \
-+                   "1:        movl %%eax,%%ds:0(%1)\n"                \
-+                   "2:        movl %%edx,%%ds:4(%1)\n"                \
++      asm volatile("1:        movl %%eax," __copyuser_seg"0(%1)\n"    \
++                   "2:        movl %%edx," __copyuser_seg"4(%1)\n"    \
                     "3:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     _ASM_EXTABLE(1b, 2b - 1b)                          \
                     _ASM_EXTABLE(2b, 3b - 2b)                          \
--                   : : "A" (x), "r" (addr))
-+                   : : "A" (x), "r" (addr), "r"(__USER_DS))
- 
- #define __put_user_x8(x, ptr, __ret_pu)                               \
-       asm volatile("call __put_user_8" : "=a" (__ret_pu)      \
-@@ -374,16 +419,18 @@ do {                                                                     \
+@@ -374,7 +416,7 @@ do {                                                                       \
  } while (0)
  
  #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)     \
 -      asm volatile("1:        mov"itype" %2,%"rtype"1\n"              \
-+      asm volatile(_ASM_LOAD_USER_DS(5)                               \
-+                   "1:        mov"itype" %%ds:%2,%"rtype"1\n"         \
++      asm volatile("1:        mov"itype" "__copyuser_seg"%2,%"rtype"1\n"\
                     "2:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     ".section .fixup,\"ax\"\n"                         \
                     "3:        mov %3,%0\n"                            \
-                    "  xor"itype" %"rtype"1,%"rtype"1\n"               \
+@@ -382,7 +424,7 @@ do {                                                                       \
                     "  jmp 2b\n"                                       \
                     ".previous\n"                                      \
                     _ASM_EXTABLE(1b, 3b)                               \
 -                   : "=r" (err), ltype(x)                             \
--                   : "m" (__m(addr)), "i" (errret), "0" (err))
 +                   : "=r" (err), ltype (x)                            \
-+                   : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
+                    : "m" (__m(addr)), "i" (errret), "0" (err))
  
  #define __get_user_size_ex(x, ptr, size)                              \
- do {                                                                  \
-@@ -407,10 +454,12 @@ do {                                                                     \
+@@ -407,7 +449,7 @@ do {                                                                       \
  } while (0)
  
  #define __get_user_asm_ex(x, addr, itype, rtype, ltype)                       \
 -      asm volatile("1:        mov"itype" %1,%"rtype"0\n"              \
-+      asm volatile(_ASM_LOAD_USER_DS(2)                               \
-+                   "1:        mov"itype" %%ds:%1,%"rtype"0\n"         \
++      asm volatile("1:        mov"itype" "__copyuser_seg"%1,%"rtype"0\n"\
                     "2:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     _ASM_EXTABLE(1b, 2b - 1b)                          \
--                   : ltype(x) : "m" (__m(addr)))
-+                   : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
- 
- #define __put_user_nocheck(x, ptr, size)                      \
- ({                                                            \
-@@ -424,13 +473,24 @@ do {                                                                     \
+                    : ltype(x) : "m" (__m(addr)))
+@@ -424,13 +466,24 @@ do {                                                                     \
        int __gu_err;                                                   \
        unsigned long __gu_val;                                         \
        __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);    \
@@ -9603,38 +9937,55 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/inc
  
  /*
   * Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +498,26 @@ struct __large_struct { unsigned long bu
+@@ -438,7 +491,7 @@ struct __large_struct { unsigned long bu
   * aliasing issues.
   */
  #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)     \
 -      asm volatile("1:        mov"itype" %"rtype"1,%2\n"              \
-+      asm volatile(_ASM_LOAD_USER_DS(5)                               \
-+                   "1:        mov"itype" %"rtype"1,%%ds:%2\n"         \
++      asm volatile("1:        mov"itype" %"rtype"1," __copyuser_seg"%2\n"\
                     "2:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     ".section .fixup,\"ax\"\n"                         \
                     "3:        mov %3,%0\n"                            \
-                    "  jmp 2b\n"                                       \
+@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu
                     ".previous\n"                                      \
                     _ASM_EXTABLE(1b, 3b)                               \
                     : "=r"(err)                                        \
 -                   : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+                   : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
-+                     "r"(__USER_DS))
++                   : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
  
  #define __put_user_asm_ex(x, addr, itype, rtype, ltype)                       \
 -      asm volatile("1:        mov"itype" %"rtype"0,%1\n"              \
-+      asm volatile(_ASM_LOAD_USER_DS(2)                               \
-+                   "1:        mov"itype" %"rtype"0,%%ds:%1\n"         \
++      asm volatile("1:        mov"itype" %"rtype"0," __copyuser_seg"%1\n"\
                     "2:\n"                                             \
-+                   _ASM_LOAD_KERNEL_DS                                \
                     _ASM_EXTABLE(1b, 2b - 1b)                          \
--                   : : ltype(x), "m" (__m(addr)))
-+                   : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
+                    : : ltype(x), "m" (__m(addr)))
+@@ -488,8 +541,12 @@ struct __large_struct { unsigned long bu
+  * On error, the variable @x is set to zero.
+  */
  
- /*
-  * uaccess_try and catch
-@@ -530,7 +595,7 @@ struct __large_struct { unsigned long bu
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __get_user(x, ptr)    get_user((x), (ptr))
++#else
+ #define __get_user(x, ptr)                                            \
+       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
++#endif
+ 
+ /**
+  * __put_user: - Write a simple value into user space, with less checking.
+@@ -511,8 +568,12 @@ struct __large_struct { unsigned long bu
+  * Returns zero on success, or -EFAULT on error.
+  */
+ 
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __put_user(x, ptr)    put_user((x), (ptr))
++#else
+ #define __put_user(x, ptr)                                            \
+       __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
++#endif
+ 
+ #define __get_user_unaligned __get_user
+ #define __put_user_unaligned __put_user
+@@ -530,7 +591,7 @@ struct __large_struct { unsigned long bu
  #define get_user_ex(x, ptr)   do {                                    \
        unsigned long __gue_val;                                        \
        __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));       \
@@ -9643,7 +9994,7 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/inc
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +632,7 @@ extern struct movsl_mask {
+@@ -567,6 +628,7 @@ extern struct movsl_mask {
  
  #define ARCH_HAS_NOCACHE_UACCESS 1
  
@@ -9651,9 +10002,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/uaccess.h linux-2.6.36/arch/x86/inc
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.36/arch/x86/include/asm/vgtod.h linux-2.6.36/arch/x86/include/asm/vgtod.h
---- linux-2.6.36/arch/x86/include/asm/vgtod.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/vgtod.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/vgtod.h linux-2.6.37/arch/x86/include/asm/vgtod.h
+--- linux-2.6.37/arch/x86/include/asm/vgtod.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/vgtod.h  2011-01-17 02:41:01.000000000 -0500
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
        int             sysctl_enabled;
        struct timezone sys_tz;
@@ -9662,20 +10013,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/vgtod.h linux-2.6.36/arch/x86/inclu
                cycle_t (*vread)(void);
                cycle_t cycle_last;
                cycle_t mask;
-diff -urNp linux-2.6.36/arch/x86/include/asm/vmi.h linux-2.6.36/arch/x86/include/asm/vmi.h
---- linux-2.6.36/arch/x86/include/asm/vmi.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/vmi.h    2010-11-06 18:58:15.000000000 -0400
-@@ -191,6 +191,7 @@ struct vrom_header {
-       u8      reserved[96];   /* Reserved for headers */
-       char    vmi_init[8];    /* VMI_Init jump point */
-       char    get_reloc[8];   /* VMI_GetRelocationInfo jump point */
-+      char    rom_data[8048]; /* rest of the option ROM */
- } __attribute__((packed));
- 
- struct pnp_header {
-diff -urNp linux-2.6.36/arch/x86/include/asm/vsyscall.h linux-2.6.36/arch/x86/include/asm/vsyscall.h
---- linux-2.6.36/arch/x86/include/asm/vsyscall.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/vsyscall.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/vsyscall.h linux-2.6.37/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.37/arch/x86/include/asm/vsyscall.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/vsyscall.h       2011-01-17 02:41:01.000000000 -0500
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -9706,9 +10046,9 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/vsyscall.h linux-2.6.36/arch/x86/in
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.36/arch/x86/include/asm/xsave.h linux-2.6.36/arch/x86/include/asm/xsave.h
---- linux-2.6.36/arch/x86/include/asm/xsave.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/include/asm/xsave.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/include/asm/xsave.h linux-2.6.37/arch/x86/include/asm/xsave.h
+--- linux-2.6.37/arch/x86/include/asm/xsave.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/include/asm/xsave.h  2011-01-17 02:41:01.000000000 -0500
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
        int err;
@@ -9733,10 +10073,19 @@ diff -urNp linux-2.6.36/arch/x86/include/asm/xsave.h linux-2.6.36/arch/x86/inclu
        __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
                             "2:\n"
                             ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
---- linux-2.6.36/arch/x86/Kconfig      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/Kconfig      2010-11-06 18:58:50.000000000 -0400
-@@ -1036,7 +1036,7 @@ choice
+diff -urNp linux-2.6.37/arch/x86/Kconfig linux-2.6.37/arch/x86/Kconfig
+--- linux-2.6.37/arch/x86/Kconfig      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/Kconfig      2011-01-17 02:41:01.000000000 -0500
+@@ -225,7 +225,7 @@ config X86_TRAMPOLINE
+ 
+ config X86_32_LAZY_GS
+       def_bool y
+-      depends on X86_32 && !CC_STACKPROTECTOR
++      depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
+ 
+ config ARCH_HWEIGHT_CFLAGS
+       string
+@@ -992,7 +992,7 @@ choice
  
  config NOHIGHMEM
        bool "off"
@@ -9745,7 +10094,7 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        ---help---
          Linux can use up to 64 Gigabytes of physical memory on x86 systems.
          However, the address space of 32-bit x86 processors is only 4
-@@ -1073,7 +1073,7 @@ config NOHIGHMEM
+@@ -1029,7 +1029,7 @@ config NOHIGHMEM
  
  config HIGHMEM4G
        bool "4GB"
@@ -9754,7 +10103,7 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        ---help---
          Select this if you have a 32-bit processor and between 1 and 4
          gigabytes of physical RAM.
-@@ -1127,7 +1127,7 @@ config PAGE_OFFSET
+@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
        hex
        default 0xB0000000 if VMSPLIT_3G_OPT
        default 0x80000000 if VMSPLIT_2G
@@ -9763,7 +10112,7 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        default 0x40000000 if VMSPLIT_1G
        default 0xC0000000
        depends on X86_32
-@@ -1459,7 +1459,7 @@ config ARCH_USES_PG_UNCACHED
+@@ -1427,7 +1427,7 @@ config ARCH_USES_PG_UNCACHED
  
  config EFI
        bool "EFI runtime service support"
@@ -9772,7 +10121,15 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        ---help---
          This enables the kernel to use EFI runtime services that are
          available (such as the EFI variable services).
-@@ -1546,6 +1546,7 @@ config KEXEC_JUMP
+@@ -1457,6 +1457,7 @@ config SECCOMP
+ 
+ config CC_STACKPROTECTOR
+       bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
++      depends on X86_64 || !PAX_MEMORY_UDEREF
+       ---help---
+         This option turns on the -fstack-protector GCC feature. This
+         feature puts, at the beginning of functions, a canary value on
+@@ -1514,6 +1515,7 @@ config KEXEC_JUMP
  config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000"
@@ -9780,7 +10137,7 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        ---help---
          This gives the physical address where the kernel is loaded.
  
-@@ -1609,6 +1610,7 @@ config X86_NEED_RELOCS
+@@ -1577,6 +1579,7 @@ config X86_NEED_RELOCS
  config PHYSICAL_ALIGN
        hex "Alignment value to which kernel should be aligned" if X86_32
        default "0x1000000"
@@ -9788,7 +10145,7 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        range 0x2000 0x1000000
        ---help---
          This value puts the alignment restrictions on physical address
-@@ -1640,9 +1642,10 @@ config HOTPLUG_CPU
+@@ -1608,9 +1611,10 @@ config HOTPLUG_CPU
          Say N if you want to disable CPU hotplug.
  
  config COMPAT_VDSO
@@ -9800,9 +10157,9 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig linux-2.6.36/arch/x86/Kconfig
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-2.6.36/arch/x86/Kconfig.cpu linux-2.6.36/arch/x86/Kconfig.cpu
---- linux-2.6.36/arch/x86/Kconfig.cpu  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/Kconfig.cpu  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/Kconfig.cpu linux-2.6.37/arch/x86/Kconfig.cpu
+--- linux-2.6.37/arch/x86/Kconfig.cpu  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/Kconfig.cpu  2011-01-17 02:41:01.000000000 -0500
 @@ -336,7 +336,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -9830,10 +10187,10 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig.cpu linux-2.6.36/arch/x86/Kconfig.cpu
  
  config X86_MINIMUM_CPU_FAMILY
        int
-diff -urNp linux-2.6.36/arch/x86/Kconfig.debug linux-2.6.36/arch/x86/Kconfig.debug
---- linux-2.6.36/arch/x86/Kconfig.debug        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/Kconfig.debug        2010-11-06 18:58:15.000000000 -0400
-@@ -97,7 +97,7 @@ config X86_PTDUMP
+diff -urNp linux-2.6.37/arch/x86/Kconfig.debug linux-2.6.37/arch/x86/Kconfig.debug
+--- linux-2.6.37/arch/x86/Kconfig.debug        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/Kconfig.debug        2011-01-17 02:41:01.000000000 -0500
+@@ -101,7 +101,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
        bool "Write protect kernel read-only data structures"
        default y
@@ -9842,10 +10199,10 @@ diff -urNp linux-2.6.36/arch/x86/Kconfig.debug linux-2.6.36/arch/x86/Kconfig.deb
        ---help---
          Mark the kernel read-only data as write-protected in the pagetables,
          in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.36/arch/x86/kernel/acpi/boot.c linux-2.6.36/arch/x86/kernel/acpi/boot.c
---- linux-2.6.36/arch/x86/kernel/acpi/boot.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/acpi/boot.c   2010-11-06 18:58:15.000000000 -0400
-@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a
+diff -urNp linux-2.6.37/arch/x86/kernel/acpi/boot.c linux-2.6.37/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.37/arch/x86/kernel/acpi/boot.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/acpi/boot.c   2011-01-17 02:41:01.000000000 -0500
+@@ -1498,7 +1498,7 @@ static struct dmi_system_id __initdata a
                     DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
                     },
         },
@@ -9854,15 +10211,18 @@ diff -urNp linux-2.6.36/arch/x86/kernel/acpi/boot.c linux-2.6.36/arch/x86/kernel
  };
  
  /*
-diff -urNp linux-2.6.36/arch/x86/kernel/acpi/sleep.c linux-2.6.36/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.36/arch/x86/kernel/acpi/sleep.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/acpi/sleep.c  2010-11-06 18:58:15.000000000 -0400
-@@ -11,11 +11,12 @@
+diff -urNp linux-2.6.37/arch/x86/kernel/acpi/sleep.c linux-2.6.37/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.37/arch/x86/kernel/acpi/sleep.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/acpi/sleep.c  2011-01-17 02:41:01.000000000 -0500
+@@ -12,6 +12,7 @@
  #include <linux/cpumask.h>
  #include <asm/segment.h>
  #include <asm/desc.h>
 +#include <asm/e820.h>
  
+ #ifdef CONFIG_X86_32
+ #include <asm/pgtable.h>
+@@ -20,7 +21,7 @@
  #include "realmode/wakeup.h"
  #include "sleep.h"
  
@@ -9871,7 +10231,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/acpi/sleep.c linux-2.6.36/arch/x86/kerne
  unsigned long acpi_realmode_flags;
  
  /* address in low memory of the wakeup routine. */
-@@ -96,8 +97,12 @@ int acpi_save_state_mem(void)
+@@ -101,8 +102,12 @@ int acpi_save_state_mem(void)
        header->trampoline_segment = setup_trampoline() >> 4;
  #ifdef CONFIG_SMP
        stack_start.sp = temp_stack + sizeof(temp_stack);
@@ -9884,9 +10244,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/acpi/sleep.c linux-2.6.36/arch/x86/kerne
        initial_gs = per_cpu_offset(smp_processor_id());
  #endif
        initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/acpi/wakeup_32.S      2011-01-17 02:41:01.000000000 -0500
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
        # and restore the stack ... but you need gdt for this to work
        movl    saved_context_esp, %esp
@@ -9903,9 +10263,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.36/arch/x86/k
  
  bogus_magic:
        jmp     bogus_magic
-diff -urNp linux-2.6.36/arch/x86/kernel/alternative.c linux-2.6.36/arch/x86/kernel/alternative.c
---- linux-2.6.36/arch/x86/kernel/alternative.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/alternative.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/alternative.c linux-2.6.37/arch/x86/kernel/alternative.c
+--- linux-2.6.37/arch/x86/kernel/alternative.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/alternative.c 2011-01-17 02:41:01.000000000 -0500
 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const 
                if (!*poff || ptr < text || ptr >= text_end)
                        continue;
@@ -9946,8 +10306,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/alternative.c linux-2.6.36/arch/x86/kern
   * instructions. And on the local CPU you need to be protected again NMI or MCE
   * handlers seeing an inconsistent instruction while you patch.
   */
--static void *__init_or_module text_poke_early(void *addr, const void *opcode,
-+static void *__kprobes text_poke_early(void *addr, const void *opcode,
+-void *__init_or_module text_poke_early(void *addr, const void *opcode,
++void *__kprobes text_poke_early(void *addr, const void *opcode,
                                              size_t len)
  {
        unsigned long flags;
@@ -9962,7 +10322,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/alternative.c linux-2.6.36/arch/x86/kern
        local_irq_restore(flags);
        /* Could also do a CLFLUSH here to speed up CPU recovery; but
           that causes hangs on some VIA CPUs. */
-@@ -550,36 +554,22 @@ static void *__init_or_module text_poke_
+@@ -550,36 +554,22 @@ void *__init_or_module text_poke_early(v
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -10003,13 +10363,25 @@ diff -urNp linux-2.6.36/arch/x86/kernel/alternative.c linux-2.6.36/arch/x86/kern
        for (i = 0; i < len; i++)
 -              BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
 -      local_irq_restore(flags);
-+              BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
++              BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
        return addr;
  }
  
-diff -urNp linux-2.6.36/arch/x86/kernel/amd_iommu.c linux-2.6.36/arch/x86/kernel/amd_iommu.c
---- linux-2.6.36/arch/x86/kernel/amd_iommu.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/amd_iommu.c   2010-11-06 18:58:15.000000000 -0400
+@@ -645,9 +635,9 @@ void *__kprobes text_poke_smp(void *addr
+ #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
+ 
+ #ifdef CONFIG_X86_64
+-unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 };
++unsigned char ideal_nop5[5] __read_only = { 0x66, 0x66, 0x66, 0x66, 0x90 };
+ #else
+-unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
++unsigned char ideal_nop5[5] __read_only = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
+ #endif
+ 
+ void __init arch_init_ideal_nop5(void)
+diff -urNp linux-2.6.37/arch/x86/kernel/amd_iommu.c linux-2.6.37/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.37/arch/x86/kernel/amd_iommu.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/amd_iommu.c   2011-01-17 02:41:01.000000000 -0500
 @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
        }
  }
@@ -10019,19 +10391,19 @@ diff -urNp linux-2.6.36/arch/x86/kernel/amd_iommu.c linux-2.6.36/arch/x86/kernel
        .alloc_coherent = alloc_coherent,
        .free_coherent = free_coherent,
        .map_page = map_page,
-diff -urNp linux-2.6.36/arch/x86/kernel/apic/io_apic.c linux-2.6.36/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.36/arch/x86/kernel/apic/io_apic.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/apic/io_apic.c        2010-11-06 18:58:15.000000000 -0400
-@@ -696,7 +696,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+diff -urNp linux-2.6.37/arch/x86/kernel/apic/io_apic.c linux-2.6.37/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.37/arch/x86/kernel/apic/io_apic.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/apic/io_apic.c        2011-01-17 02:41:01.000000000 -0500
+@@ -597,7 +597,7 @@ struct IO_APIC_route_entry **alloc_ioapi
        ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
-                               GFP_ATOMIC);
+                               GFP_KERNEL);
        if (!ioapic_entries)
 -              return 0;
 +              return NULL;
  
        for (apic = 0; apic < nr_ioapics; apic++) {
                ioapic_entries[apic] =
-@@ -713,7 +713,7 @@ nomem:
+@@ -614,7 +614,7 @@ nomem:
                kfree(ioapic_entries[apic]);
        kfree(ioapic_entries);
  
@@ -10040,7 +10412,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apic/io_apic.c linux-2.6.36/arch/x86/ker
  }
  
  /*
-@@ -1123,7 +1123,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
+@@ -1024,7 +1024,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
  
@@ -10049,7 +10421,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apic/io_apic.c linux-2.6.36/arch/x86/ker
  {
        /* Used to the online set of cpus does not change
         * during assign_irq_vector.
-@@ -1131,7 +1131,7 @@ void lock_vector_lock(void)
+@@ -1032,7 +1032,7 @@ void lock_vector_lock(void)
        raw_spin_lock(&vector_lock);
  }
  
@@ -10058,9 +10430,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apic/io_apic.c linux-2.6.36/arch/x86/ker
  {
        raw_spin_unlock(&vector_lock);
  }
-diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/apm_32.c
---- linux-2.6.36/arch/x86/kernel/apm_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/apm_32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/apm_32.c linux-2.6.37/arch/x86/kernel/apm_32.c
+--- linux-2.6.37/arch/x86/kernel/apm_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/apm_32.c      2011-01-17 02:41:01.000000000 -0500
 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -10125,7 +10497,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/ap
                0xb8, 0x00, 0x10,       /* movw  $0x1000,ax  */
                0x8e, 0xd0,             /* movw  ax,ss       */
                0xbc, 0x00, 0xf0,       /* movw  $0xf000,sp  */
-@@ -1931,7 +1945,10 @@ static const struct file_operations apm_
+@@ -1932,7 +1946,10 @@ static const struct file_operations apm_
  static struct miscdevice apm_device = {
        APM_MINOR_DEV,
        "apm_bios",
@@ -10137,7 +10509,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/ap
  };
  
  
-@@ -2252,7 +2269,7 @@ static struct dmi_system_id __initdata a
+@@ -2253,7 +2270,7 @@ static struct dmi_system_id __initdata a
                {       DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
        },
  
@@ -10146,7 +10518,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/ap
  };
  
  /*
-@@ -2355,12 +2372,15 @@ static int __init apm_init(void)
+@@ -2356,12 +2373,15 @@ static int __init apm_init(void)
         * code to that CPU.
         */
        gdt = get_cpu_gdt_table(0);
@@ -10162,10 +10534,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/apm_32.c linux-2.6.36/arch/x86/kernel/ap
  
        proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_32.c linux-2.6.36/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.36/arch/x86/kernel/asm-offsets_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/asm-offsets_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -115,6 +115,11 @@ void foo(void)
+diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_32.c linux-2.6.37/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.37/arch/x86/kernel/asm-offsets_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/asm-offsets_32.c      2011-01-17 02:41:01.000000000 -0500
+@@ -113,6 +113,11 @@ void foo(void)
        OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
        OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
        OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
@@ -10177,9 +10549,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_32.c linux-2.6.36/arch/x86/k
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_64.c linux-2.6.36/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.36/arch/x86/kernel/asm-offsets_64.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/asm-offsets_64.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/asm-offsets_64.c linux-2.6.37/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.37/arch/x86/kernel/asm-offsets_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/asm-offsets_64.c      2011-01-17 02:41:01.000000000 -0500
 @@ -63,6 +63,18 @@ int main(void)
        OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
        OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10207,9 +10579,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/asm-offsets_64.c linux-2.6.36/arch/x86/k
        DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
        BLANK();
        DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kernel/cpu/common.c
---- linux-2.6.36/arch/x86/kernel/cpu/common.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/common.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/common.c linux-2.6.37/arch/x86/kernel/cpu/common.c
+--- linux-2.6.37/arch/x86/kernel/cpu/common.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/common.c  2011-01-17 02:41:01.000000000 -0500
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10280,7 +10652,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kerne
        gdt_descr.size = GDT_SIZE - 1;
        load_gdt(&gdt_descr);
        /* Reload the per-cpu base */
-@@ -820,6 +766,10 @@ static void __cpuinit identify_cpu(struc
+@@ -825,6 +771,10 @@ static void __cpuinit identify_cpu(struc
        /* Filter out anything that depends on CPUID levels we don't have */
        filter_cpuid_features(c, true);
  
@@ -10291,7 +10663,16 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kerne
        /* If the model name is still unset, do table lookup. */
        if (!c->x86_model_id[0]) {
                const char *p;
-@@ -1135,7 +1085,7 @@ void __cpuinit cpu_init(void)
+@@ -1085,7 +1035,7 @@ struct pt_regs * __cpuinit idle_regs(str
+ {
+       memset(regs, 0, sizeof(struct pt_regs));
+       regs->fs = __KERNEL_PERCPU;
+-      regs->gs = __KERNEL_STACK_CANARY;
++      savesegment(gs, regs->gs);
+ 
+       return regs;
+ }
+@@ -1140,7 +1090,7 @@ void __cpuinit cpu_init(void)
        int i;
  
        cpu = stack_smp_processor_id();
@@ -10300,7 +10681,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kerne
        oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
-@@ -1161,7 +1111,7 @@ void __cpuinit cpu_init(void)
+@@ -1166,7 +1116,7 @@ void __cpuinit cpu_init(void)
        switch_to_new_gdt(cpu);
        loadsegment(fs, 0);
  
@@ -10309,7 +10690,15 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kerne
  
        memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
        syscall_init();
-@@ -1224,7 +1174,7 @@ void __cpuinit cpu_init(void)
+@@ -1175,7 +1125,6 @@ void __cpuinit cpu_init(void)
+       wrmsrl(MSR_KERNEL_GS_BASE, 0);
+       barrier();
+ 
+-      x86_configure_nx();
+       if (cpu != 0)
+               enable_x2apic();
+ 
+@@ -1229,7 +1178,7 @@ void __cpuinit cpu_init(void)
  {
        int cpu = smp_processor_id();
        struct task_struct *curr = current;
@@ -10318,9 +10707,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/common.c linux-2.6.36/arch/x86/kerne
        struct thread_struct *thread = &curr->thread;
  
        if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2011-01-17 02:41:01.000000000 -0500
 @@ -481,7 +481,7 @@ static const struct dmi_system_id sw_any
                        DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
                },
@@ -10330,9 +10719,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.36/
  };
  
  static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2011-01-17 02:41:01.000000000 -0500
 @@ -226,7 +226,7 @@ static struct cpu_model models[] =
        { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
        { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10342,9 +10731,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2
  };
  #undef _BANIAS
  #undef BANIAS
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/intel.c linux-2.6.36/arch/x86/kernel/cpu/intel.c
---- linux-2.6.36/arch/x86/kernel/cpu/intel.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/intel.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/intel.c linux-2.6.37/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.37/arch/x86/kernel/cpu/intel.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/intel.c   2011-01-17 02:41:01.000000000 -0500
 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
         * Update the IDT descriptor and reload the IDT so that
         * it uses the read-only mapped virtual address.
@@ -10354,9 +10743,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/intel.c linux-2.6.36/arch/x86/kernel
        load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/Makefile linux-2.6.36/arch/x86/kernel/cpu/Makefile
---- linux-2.6.36/arch/x86/kernel/cpu/Makefile  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/Makefile  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/Makefile linux-2.6.37/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.37/arch/x86/kernel/cpu/Makefile  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/Makefile  2011-01-17 02:41:01.000000000 -0500
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -10368,9 +10757,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/Makefile linux-2.6.36/arch/x86/kerne
  obj-y                 := intel_cacheinfo.o scattered.o topology.o
  obj-y                 += proc.o capflags.o powerflags.o common.o
  obj-y                 += vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/mcheck/mce.c      2011-01-17 02:41:01.000000000 -0500
 @@ -219,7 +219,7 @@ static void print_mce(struct mce *m)
                        !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
                                m->cs, m->ip);
@@ -10415,7 +10804,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.36/arch/x86/k
        open_exclu = 0;
  
        spin_unlock(&mce_state_lock);
-@@ -1672,6 +1672,7 @@ static struct miscdevice mce_log_device 
+@@ -1673,6 +1673,7 @@ static struct miscdevice mce_log_device 
        MISC_MCELOG_MINOR,
        "mcelog",
        &mce_chrdev_ops,
@@ -10423,9 +10812,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.36/arch/x86/k
  };
  
  /*
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/generic.c    2011-01-17 02:41:01.000000000 -0500
 @@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
        { MSR_MTRRfix64K_00000, 1 }, /* one   64k MTRR  */
        { MSR_MTRRfix16K_80000, 2 }, /* two   16k MTRRs */
@@ -10435,9 +10824,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.36/arch/x86
  };
  
  static unsigned long smp_changes_mask;
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/main.c       2011-01-17 02:41:01.000000000 -0500
 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -10447,9 +10836,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.36/arch/x86/ke
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/mtrr/mtrr.h       2011-01-17 02:41:01.000000000 -0500
 @@ -12,19 +12,19 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
@@ -10478,9 +10867,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.36/arch/x86/ke
  };
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/perfctr-watchdog.c        2011-01-17 02:41:01.000000000 -0500
 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
  
  /* Interface defining a CPU specific perfctr watchdog */
@@ -10514,21 +10903,21 @@ diff -urNp linux-2.6.36/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.36/arch
  static struct wd_ops intel_arch_wd_ops __read_mostly = {
        .reserve        = single_msr_reserve,
        .unreserve      = single_msr_unreserve,
-diff -urNp linux-2.6.36/arch/x86/kernel/cpu/perf_event.c linux-2.6.36/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.36/arch/x86/kernel/cpu/perf_event.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/cpu/perf_event.c      2010-11-06 18:58:15.000000000 -0400
-@@ -1732,7 +1732,7 @@ perf_callchain_user(struct pt_regs *regs
+diff -urNp linux-2.6.37/arch/x86/kernel/cpu/perf_event.c linux-2.6.37/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.37/arch/x86/kernel/cpu/perf_event.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/cpu/perf_event.c      2011-01-17 02:41:01.000000000 -0500
+@@ -1757,7 +1757,7 @@ perf_callchain_user(struct perf_callchai
                        break;
  
-               callchain_store(entry, frame.return_address);
+               perf_callchain_store(entry, frame.return_address);
 -              fp = frame.next_frame;
 +              fp = (__force const void __user *)frame.next_frame;
        }
  }
  
-diff -urNp linux-2.6.36/arch/x86/kernel/crash.c linux-2.6.36/arch/x86/kernel/crash.c
---- linux-2.6.36/arch/x86/kernel/crash.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/crash.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/crash.c linux-2.6.37/arch/x86/kernel/crash.c
+--- linux-2.6.37/arch/x86/kernel/crash.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/crash.c       2011-01-17 02:41:01.000000000 -0500
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
        regs = args->regs;
  
@@ -10538,9 +10927,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/crash.c linux-2.6.36/arch/x86/kernel/cra
                crash_fixup_ss_esp(&fixed_regs, regs);
                regs = &fixed_regs;
        }
-diff -urNp linux-2.6.36/arch/x86/kernel/doublefault_32.c linux-2.6.36/arch/x86/kernel/doublefault_32.c
---- linux-2.6.36/arch/x86/kernel/doublefault_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/doublefault_32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/doublefault_32.c linux-2.6.37/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.37/arch/x86/kernel/doublefault_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/doublefault_32.c      2011-01-17 02:41:01.000000000 -0500
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10572,9 +10961,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/doublefault_32.c linux-2.6.36/arch/x86/k
                .fs             = __KERNEL_PERCPU,
  
                .__cr3          = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack_32.c linux-2.6.36/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.36/arch/x86/kernel/dumpstack_32.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/dumpstack_32.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack_32.c linux-2.6.37/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.37/arch/x86/kernel/dumpstack_32.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/dumpstack_32.c        2011-01-17 02:41:01.000000000 -0500
 @@ -105,11 +105,12 @@ void show_registers(struct pt_regs *regs
         * When in-kernel, we also print out the stack and code at the
         * time of the fault..
@@ -10619,10 +11008,29 @@ diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack_32.c linux-2.6.36/arch/x86/ker
        if (ip < PAGE_OFFSET)
                return 0;
        if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel/dumpstack.c
---- linux-2.6.36/arch/x86/kernel/dumpstack.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/dumpstack.c   2010-11-06 18:58:15.000000000 -0400
-@@ -206,7 +206,7 @@ void dump_stack(void)
+diff -urNp linux-2.6.37/arch/x86/kernel/dumpstack.c linux-2.6.37/arch/x86/kernel/dumpstack.c
+--- linux-2.6.37/arch/x86/kernel/dumpstack.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/dumpstack.c   2011-01-17 02:41:01.000000000 -0500
+@@ -2,6 +2,9 @@
+  *  Copyright (C) 1991, 1992  Linus Torvalds
+  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
+  */
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++#define __INCLUDED_BY_HIDESYM 1
++#endif
+ #include <linux/kallsyms.h>
+ #include <linux/kprobes.h>
+ #include <linux/uaccess.h>
+@@ -27,7 +30,7 @@ static int die_counter;
+ 
+ void printk_address(unsigned long address, int reliable)
+ {
+-      printk(" [<%p>] %s%pS\n", (void *) address,
++      printk(" [<%p>] %s%pA\n", (void *) address,
+                       reliable ? "" : "? ", (void *) address);
+ }
+ 
+@@ -206,7 +209,7 @@ void dump_stack(void)
  #endif
  
        printk("Pid: %d, comm: %.20s %s %s %.*s\n",
@@ -10631,7 +11039,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
-@@ -262,7 +262,7 @@ void __kprobes oops_end(unsigned long fl
+@@ -262,7 +265,7 @@ void __kprobes oops_end(unsigned long fl
                panic("Fatal exception in interrupt");
        if (panic_on_oops)
                panic("Fatal exception");
@@ -10640,7 +11048,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel
  }
  
  int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -289,7 +289,7 @@ int __kprobes __die(const char *str, str
+@@ -289,7 +292,7 @@ int __kprobes __die(const char *str, str
  
        show_registers(regs);
  #ifdef CONFIG_X86_32
@@ -10649,7 +11057,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel
                sp = regs->sp;
                ss = regs->ss & 0xffff;
        } else {
-@@ -317,7 +317,7 @@ void die(const char *str, struct pt_regs
+@@ -317,7 +320,7 @@ void die(const char *str, struct pt_regs
        unsigned long flags = oops_begin();
        int sig = SIGSEGV;
  
@@ -10658,194 +11066,24 @@ diff -urNp linux-2.6.36/arch/x86/kernel/dumpstack.c linux-2.6.36/arch/x86/kernel
                report_bug(regs->ip, regs);
  
        if (__die(str, regs, err))
-diff -urNp linux-2.6.36/arch/x86/kernel/efi_32.c linux-2.6.36/arch/x86/kernel/efi_32.c
---- linux-2.6.36/arch/x86/kernel/efi_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/efi_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -38,70 +38,38 @@
-  */
- 
- static unsigned long efi_rt_eflags;
--static pgd_t efi_bak_pg_dir_pointer[2];
-+static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS];
- 
--void efi_call_phys_prelog(void)
-+void __init efi_call_phys_prelog(void)
- {
--      unsigned long cr4;
--      unsigned long temp;
-       struct desc_ptr gdt_descr;
- 
-       local_irq_save(efi_rt_eflags);
- 
--      /*
--       * If I don't have PAE, I should just duplicate two entries in page
--       * directory. If I have PAE, I just need to duplicate one entry in
--       * page directory.
--       */
--      cr4 = read_cr4_safe();
- 
--      if (cr4 & X86_CR4_PAE) {
--              efi_bak_pg_dir_pointer[0].pgd =
--                  swapper_pg_dir[pgd_index(0)].pgd;
--              swapper_pg_dir[0].pgd =
--                  swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
--      } else {
--              efi_bak_pg_dir_pointer[0].pgd =
--                  swapper_pg_dir[pgd_index(0)].pgd;
--              efi_bak_pg_dir_pointer[1].pgd =
--                  swapper_pg_dir[pgd_index(0x400000)].pgd;
--              swapper_pg_dir[pgd_index(0)].pgd =
--                  swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
--              temp = PAGE_OFFSET + 0x400000;
--              swapper_pg_dir[pgd_index(0x400000)].pgd =
--                  swapper_pg_dir[pgd_index(temp)].pgd;
--      }
-+      clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS);
-+      clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-+                      min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
- 
-       /*
-        * After the lock is released, the original page table is restored.
-        */
-       __flush_tlb_all();
- 
--      gdt_descr.address = __pa(get_cpu_gdt_table(0));
-+      gdt_descr.address = (struct desc_struct *)__pa(get_cpu_gdt_table(0));
-       gdt_descr.size = GDT_SIZE - 1;
-       load_gdt(&gdt_descr);
- }
- 
--void efi_call_phys_epilog(void)
-+void __init efi_call_phys_epilog(void)
- {
--      unsigned long cr4;
-       struct desc_ptr gdt_descr;
- 
--      gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
-+      gdt_descr.address = get_cpu_gdt_table(0);
-       gdt_descr.size = GDT_SIZE - 1;
-       load_gdt(&gdt_descr);
- 
--      cr4 = read_cr4_safe();
--
--      if (cr4 & X86_CR4_PAE) {
--              swapper_pg_dir[pgd_index(0)].pgd =
--                  efi_bak_pg_dir_pointer[0].pgd;
--      } else {
--              swapper_pg_dir[pgd_index(0)].pgd =
--                  efi_bak_pg_dir_pointer[0].pgd;
--              swapper_pg_dir[pgd_index(0x400000)].pgd =
--                  efi_bak_pg_dir_pointer[1].pgd;
--      }
-+      clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS);
- 
-       /*
-        * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.36/arch/x86/kernel/efi_stub_32.S linux-2.6.36/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.36/arch/x86/kernel/efi_stub_32.S 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/efi_stub_32.S 2010-11-06 18:58:15.000000000 -0400
-@@ -6,6 +6,7 @@
-  */
- 
- #include <linux/linkage.h>
-+#include <linux/init.h>
- #include <asm/page_types.h>
- 
- /*
-@@ -20,7 +21,7 @@
-  * service functions will comply with gcc calling convention, too.
-  */
- 
--.text
-+__INIT
- ENTRY(efi_call_phys)
-       /*
-        * 0. The function can only be called in Linux kernel. So CS has been
-@@ -36,9 +37,7 @@ ENTRY(efi_call_phys)
-        * The mapping of lower virtual memory has been created in prelog and
-        * epilog.
-        */
--      movl    $1f, %edx
--      subl    $__PAGE_OFFSET, %edx
--      jmp     *%edx
-+      jmp     1f-__PAGE_OFFSET
- 1:
- 
-       /*
-@@ -47,14 +46,8 @@ ENTRY(efi_call_phys)
-        * parameter 2, ..., param n. To make things easy, we save the return
-        * address of efi_call_phys in a global variable.
-        */
--      popl    %edx
--      movl    %edx, saved_return_addr
--      /* get the function pointer into ECX*/
--      popl    %ecx
--      movl    %ecx, efi_rt_function_ptr
--      movl    $2f, %edx
--      subl    $__PAGE_OFFSET, %edx
--      pushl   %edx
-+      popl    (saved_return_addr)
-+      popl    (efi_rt_function_ptr)
- 
-       /*
-        * 3. Clear PG bit in %CR0.
-@@ -73,9 +66,8 @@ ENTRY(efi_call_phys)
-       /*
-        * 5. Call the physical function.
-        */
--      jmp     *%ecx
-+      call    *(efi_rt_function_ptr-__PAGE_OFFSET)
- 
--2:
-       /*
-        * 6. After EFI runtime service returns, control will return to
-        * following instruction. We'd better readjust stack pointer first.
-@@ -88,35 +80,28 @@ ENTRY(efi_call_phys)
-       movl    %cr0, %edx
-       orl     $0x80000000, %edx
-       movl    %edx, %cr0
--      jmp     1f
--1:
+diff -urNp linux-2.6.37/arch/x86/kernel/entry_32.S linux-2.6.37/arch/x86/kernel/entry_32.S
+--- linux-2.6.37/arch/x86/kernel/entry_32.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/entry_32.S    2011-01-17 02:41:01.000000000 -0500
+@@ -183,13 +183,81 @@
+       /*CFI_REL_OFFSET gs, PT_GS*/
+ .endm
+ .macro SET_KERNEL_GS reg
 +
-       /*
-        * 8. Now restore the virtual mode from flat mode by
-        * adding EIP with PAGE_OFFSET.
-        */
--      movl    $1f, %edx
--      jmp     *%edx
-+      jmp     1f+__PAGE_OFFSET
- 1:
- 
-       /*
-        * 9. Balance the stack. And because EAX contain the return value,
-        * we'd better not clobber it.
-        */
--      leal    efi_rt_function_ptr, %edx
--      movl    (%edx), %ecx
--      pushl   %ecx
-+      pushl   (efi_rt_function_ptr)
- 
-       /*
--       * 10. Push the saved return address onto the stack and return.
-+       * 10. Return to the saved return address.
-        */
--      leal    saved_return_addr, %edx
--      movl    (%edx), %ecx
--      pushl   %ecx
--      ret
-+      jmpl    *(saved_return_addr)
- ENDPROC(efi_call_phys)
- .previous
- 
--.data
-+__INITDATA
- saved_return_addr:
-       .long 0
- efi_rt_function_ptr:
-diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/entry_32.S
---- linux-2.6.36/arch/x86/kernel/entry_32.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/entry_32.S    2010-11-06 18:58:15.000000000 -0400
-@@ -192,7 +192,67 @@
++#ifdef CONFIG_CC_STACKPROTECTOR
+       movl $(__KERNEL_STACK_CANARY), \reg
++#elif defined(CONFIG_PAX_MEMORY_UDEREF)
++      movl $(__USER_DS), \reg
++#else
++      xorl \reg, \reg
++#endif
++
+       movl \reg, %gs
+ .endm
  
  #endif        /* CONFIG_X86_32_LAZY_GS */
  
@@ -10853,7 +11091,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 +.macro PAX_EXIT_KERNEL
 +#ifdef CONFIG_PAX_KERNEXEC
 +#ifdef CONFIG_PARAVIRT
-+      push %eax; push %ecx;
++      push %eax; push %ecx
 +#endif
 +      mov %cs, %esi
 +      cmp $__KERNEXEC_KERNEL_CS, %esi
@@ -10883,7 +11121,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 +.macro PAX_ENTER_KERNEL
 +#ifdef CONFIG_PAX_KERNEXEC
 +#ifdef CONFIG_PARAVIRT
-+      push %eax; push %ecx;
++      push %eax; push %ecx
 +      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
 +      mov %eax, %esi
 +#else
@@ -10913,17 +11151,17 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 +.macro __SAVE_ALL _DS
        cld
        PUSH_GS
-       pushl %fs
-@@ -225,7 +285,7 @@
-       pushl %ebx
-       CFI_ADJUST_CFA_OFFSET 4
+       pushl_cfi %fs
+@@ -212,7 +280,7 @@
+       CFI_REL_OFFSET ecx, 0
+       pushl_cfi %ebx
        CFI_REL_OFFSET ebx, 0
 -      movl $(__USER_DS), %edx
 +      movl $\_DS, %edx
        movl %edx, %ds
        movl %edx, %es
        movl $(__KERNEL_PERCPU), %edx
-@@ -233,6 +293,15 @@
+@@ -220,6 +288,15 @@
        SET_KERNEL_GS %edx
  .endm
  
@@ -10937,9 +11175,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 +.endm
 +
  .macro RESTORE_INT_REGS
-       popl %ebx
-       CFI_ADJUST_CFA_OFFSET -4
-@@ -357,7 +426,15 @@ check_userspace:
+       popl_cfi %ebx
+       CFI_RESTORE ebx
+@@ -330,7 +407,15 @@ check_userspace:
        movb PT_CS(%esp), %al
        andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
        cmpl $USER_RPL, %eax
@@ -10955,20 +11193,20 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  
  ENTRY(resume_userspace)
        LOCKDEP_SYS_EXIT
-@@ -423,10 +500,9 @@ sysenter_past_esp:
+@@ -392,10 +477,9 @@ sysenter_past_esp:
        /*CFI_REL_OFFSET cs, 0*/
        /*
         * Push current_thread_info()->sysenter_return to the stack.
 -       * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
 -       * pushed above; +8 corresponds to copy_thread's esp0 setting.
         */
--      pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
+-      pushl_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp)
 +      GET_THREAD_INFO(%ebp)
-+      pushl TI_sysenter_return(%ebp)
-       CFI_ADJUST_CFA_OFFSET 4
++      pushl_cfi TI_sysenter_return(%ebp)
        CFI_REL_OFFSET eip, 0
  
-@@ -439,9 +515,19 @@ sysenter_past_esp:
+       pushl_cfi %eax
+@@ -406,9 +490,19 @@ sysenter_past_esp:
   * Load the potential sixth argument from user stack.
   * Careful about security.
   */
@@ -10988,7 +11226,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
        .align 4
-@@ -464,12 +550,23 @@ sysenter_do_call:
+@@ -431,12 +525,23 @@ sysenter_do_call:
        testl $_TIF_ALLWORK_MASK, %ecx
        jne sysexit_audit
  sysenter_exit:
@@ -11012,7 +11250,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        PTGS_TO_GS
        ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -513,11 +610,17 @@ sysexit_audit:
+@@ -479,11 +584,17 @@ sysexit_audit:
  
        CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -11032,7 +11270,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  .popsection
        PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -551,6 +654,10 @@ syscall_exit:
+@@ -516,6 +627,10 @@ syscall_exit:
        testl $_TIF_ALLWORK_MASK, %ecx  # current->work
        jne syscall_exit_work
  
@@ -11043,7 +11281,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  restore_all:
        TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -611,14 +718,21 @@ ldt_ss:
+@@ -575,14 +690,21 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -11065,10 +11303,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 -      mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
 +      mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
 +      mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
-       pushl $__ESPFIX_SS
-       CFI_ADJUST_CFA_OFFSET 4
-       push %eax                       /* new kernel esp */
-@@ -655,25 +769,19 @@ work_resched:
+       pushl_cfi $__ESPFIX_SS
+       pushl_cfi %eax                  /* new kernel esp */
+       /* Disable interrupts, but do not irqtrace this section: we
+@@ -617,23 +739,17 @@ work_resched:
  
  work_notifysig:                               # deal with pending signals and
                                        # notify-resume requests
@@ -11085,11 +11323,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  
 -      ALIGN
 -work_notifysig_v86:
-       pushl %ecx                      # save ti_flags for do_notify_resume
-       CFI_ADJUST_CFA_OFFSET 4
+       pushl_cfi %ecx                  # save ti_flags for do_notify_resume
        call save_v86_state             # %eax contains pt_regs pointer
-       popl %ecx
-       CFI_ADJUST_CFA_OFFSET -4
+       popl_cfi %ecx
        movl %eax, %esp
 -#else
 -      movl %esp, %eax
@@ -11097,7 +11333,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  #endif
        xorl %edx, %edx
        call do_notify_resume
-@@ -708,6 +816,10 @@ END(syscall_exit_work)
+@@ -668,6 +784,10 @@ END(syscall_exit_work)
  
        RING0_INT_FRAME                 # can't unwind into user space anyway
  syscall_fault:
@@ -11108,7 +11344,44 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        GET_THREAD_INFO(%ebp)
        movl $-EFAULT,PT_EAX(%esp)
        jmp resume_userspace
-@@ -791,8 +903,15 @@ ptregs_clone:
+@@ -750,6 +870,36 @@ ptregs_clone:
+       CFI_ENDPROC
+ ENDPROC(ptregs_clone)
+ 
++      ALIGN;
++ENTRY(kernel_execve)
++      CFI_STARTPROC
++      pushl_cfi %ebp
++      sub $PT_OLDSS+4,%esp
++      pushl_cfi %edi
++      pushl_cfi %ecx
++      pushl_cfi %eax
++      lea 3*4(%esp),%edi
++      mov $PT_OLDSS/4+1,%ecx
++      xorl %eax,%eax
++      rep stosl
++      popl_cfi %eax
++      popl_cfi %ecx
++      popl_cfi %edi
++      movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
++      pushl_cfi %esp
++      call sys_execve
++      add $4,%esp
++      CFI_ADJUST_CFA_OFFSET -4
++      GET_THREAD_INFO(%ebp)
++      test %eax,%eax
++      jz syscall_exit
++      add $PT_OLDSS+4,%esp
++      CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
++      popl_cfi %ebp
++      ret
++      CFI_ENDPROC
++ENDPROC(kernel_execve)
++
+ .macro FIXUP_ESPFIX_STACK
+ /*
+  * Switch back for ESPFIX stack to the normal zerobased stack
+@@ -759,8 +909,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
        /* fixup the stack */
@@ -11125,8 +11398,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
 +      mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
        shl $16, %eax
        addl %esp, %eax                 /* the adjusted stack pointer */
-       pushl $__KERNEL_DS
-@@ -1275,7 +1394,6 @@ return_to_handler:
+       pushl_cfi $__KERNEL_DS
+@@ -1211,7 +1368,6 @@ return_to_handler:
        jmp *%ecx
  #endif
  
@@ -11134,7 +11407,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1332,9 +1450,12 @@ error_code:
+@@ -1257,9 +1413,12 @@ error_code:
        movl $-1, PT_ORIG_EAX(%esp)     # no syscall to restart
        REG_TO_PTGS %ecx
        SET_KERNEL_GS %ecx
@@ -11148,7 +11421,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        TRACE_IRQS_OFF
        movl %esp,%eax                  # pt_regs pointer
        call *%edi
-@@ -1428,6 +1549,9 @@ nmi_stack_correct:
+@@ -1344,6 +1503,9 @@ nmi_stack_correct:
        xorl %edx,%edx          # zero error code
        movl %esp,%eax          # pt_regs pointer
        call do_nmi
@@ -11158,7 +11431,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        jmp restore_all_notrace
        CFI_ENDPROC
  
-@@ -1468,6 +1592,9 @@ nmi_espfix_stack:
+@@ -1380,6 +1542,9 @@ nmi_espfix_stack:
        FIXUP_ESPFIX_STACK              # %eax == %esp
        xorl %edx,%edx                  # zero error code
        call do_nmi
@@ -11168,9 +11441,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_32.S linux-2.6.36/arch/x86/kernel/
        RESTORE_REGS
        lss 12+4(%esp), %esp            # back to espfix stack
        CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/entry_64.S
---- linux-2.6.36/arch/x86/kernel/entry_64.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/entry_64.S    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/entry_64.S linux-2.6.37/arch/x86/kernel/entry_64.S
+--- linux-2.6.37/arch/x86/kernel/entry_64.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/entry_64.S    2011-01-17 02:41:01.000000000 -0500
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -11369,7 +11642,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -317,7 +501,7 @@ ENTRY(save_args)
+@@ -312,7 +496,7 @@ ENTRY(save_args)
        leaq -ARGOFFSET+16(%rsp),%rdi   /* arg1 for handler */
        movq_cfi rbp, 8         /* push %rbp */
        leaq 8(%rsp), %rbp              /* mov %rsp, %ebp */
@@ -11378,7 +11651,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        je 1f
        SWAPGS
        /*
-@@ -409,7 +593,7 @@ ENTRY(ret_from_fork)
+@@ -403,7 +587,7 @@ ENTRY(ret_from_fork)
  
        RESTORE_REST
  
@@ -11387,7 +11660,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        je   int_ret_from_sys_call
  
        testl $_TIF_IA32, TI_flags(%rcx)        # 32-bit compat task needs IRET
-@@ -468,6 +652,11 @@ ENTRY(system_call_after_swapgs)
+@@ -462,6 +646,11 @@ ENTRY(system_call_after_swapgs)
  
        movq    %rsp,PER_CPU_VAR(old_rsp)
        movq    PER_CPU_VAR(kernel_stack),%rsp
@@ -11399,7 +11672,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        /*
         * No need to follow this irqs off/on section - it's straight
         * and short:
-@@ -502,6 +691,11 @@ sysret_check:
+@@ -496,6 +685,11 @@ sysret_check:
        andl %edi,%edx
        jnz  sysret_careful
        CFI_REMEMBER_STATE
@@ -11411,7 +11684,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        /*
         * sysretq will re-enable interrupts:
         */
-@@ -613,7 +807,7 @@ tracesys:
+@@ -605,7 +799,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
        DISABLE_INTERRUPTS(CLBR_NONE)
        TRACE_IRQS_OFF
@@ -11420,8 +11693,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        je retint_restore_args
        movl $_TIF_ALLWORK_MASK,%edi
        /* edi: mask to check */
-@@ -800,6 +994,16 @@ END(interrupt)
-       CFI_ADJUST_CFA_OFFSET 10*8
+@@ -786,6 +980,16 @@ END(interrupt)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+8
        call save_args
        PARTIAL_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11437,7 +11710,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        call \func
        .endm
  
-@@ -826,7 +1030,7 @@ ret_from_intr:
+@@ -813,7 +1017,7 @@ ret_from_intr:
        CFI_ADJUST_CFA_OFFSET   -8
  exit_intr:
        GET_THREAD_INFO(%rcx)
@@ -11446,7 +11719,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        je retint_kernel
  
        /* Interrupt came from user space */
-@@ -848,12 +1052,18 @@ retint_swapgs:          /* return to user-space 
+@@ -835,12 +1039,18 @@ retint_swapgs:          /* return to user-space 
         * The iretq could re-enable interrupts:
         */
        DISABLE_INTERRUPTS(CLBR_ANY)
@@ -11465,8 +11738,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        /*
         * The iretq could re-enable interrupts:
         */
-@@ -1040,6 +1250,16 @@ ENTRY(\sym)
-       CFI_ADJUST_CFA_OFFSET 15*8
+@@ -1012,6 +1222,16 @@ ENTRY(\sym)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11482,8 +11755,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1057,6 +1277,16 @@ ENTRY(\sym)
-       subq $15*8, %rsp
+@@ -1029,6 +1249,16 @@ ENTRY(\sym)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11499,7 +11772,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1065,7 +1295,7 @@ ENTRY(\sym)
+@@ -1037,7 +1267,7 @@ ENTRY(\sym)
  END(\sym)
  .endm
  
@@ -11508,8 +11781,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
        INTR_FRAME
-@@ -1075,8 +1305,24 @@ ENTRY(\sym)
-       subq $15*8, %rsp
+@@ -1047,8 +1277,24 @@ ENTRY(\sym)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11533,8 +11806,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
        call \do_sym
        addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1093,6 +1339,16 @@ ENTRY(\sym)
-       CFI_ADJUST_CFA_OFFSET 15*8
+@@ -1065,6 +1311,16 @@ ENTRY(\sym)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11550,7 +11823,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1112,6 +1368,16 @@ ENTRY(\sym)
+@@ -1084,6 +1340,16 @@ ENTRY(\sym)
        call save_paranoid
        DEFAULT_FRAME 0
        TRACE_IRQS_OFF
@@ -11567,7 +11840,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1373,14 +1639,27 @@ ENTRY(paranoid_exit)
+@@ -1343,14 +1609,27 @@ ENTRY(paranoid_exit)
        TRACE_IRQS_OFF
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz paranoid_restore
@@ -11596,7 +11869,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        TRACE_IRQS_IRETQ 0
        RESTORE_ALL 8
        jmp irq_return
-@@ -1438,7 +1717,7 @@ ENTRY(error_entry)
+@@ -1408,7 +1687,7 @@ ENTRY(error_entry)
        movq_cfi r14, R14+8
        movq_cfi r15, R15+8
        xorl %ebx,%ebx
@@ -11605,8 +11878,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        je error_kernelspace
  error_swapgs:
        SWAPGS
-@@ -1502,6 +1781,16 @@ ENTRY(nmi)
-       CFI_ADJUST_CFA_OFFSET 15*8
+@@ -1472,6 +1751,16 @@ ENTRY(nmi)
+       CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        DEFAULT_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11622,7 +11895,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
        movq %rsp,%rdi
        movq $-1,%rsi
-@@ -1512,11 +1801,12 @@ ENTRY(nmi)
+@@ -1482,11 +1771,12 @@ ENTRY(nmi)
        DISABLE_INTERRUPTS(CLBR_NONE)
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz nmi_restore
@@ -11636,9 +11909,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/entry_64.S linux-2.6.36/arch/x86/kernel/
        RESTORE_ALL 8
        jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ftrace.c
---- linux-2.6.36/arch/x86/kernel/ftrace.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/ftrace.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/ftrace.c linux-2.6.37/arch/x86/kernel/ftrace.c
+--- linux-2.6.37/arch/x86/kernel/ftrace.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/ftrace.c      2011-01-17 02:41:01.000000000 -0500
 @@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
  
        if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11649,16 +11922,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ft
                atomic_inc(&nmi_update_count);
        }
        /* Must have previous changes seen before executions */
-@@ -260,7 +262,7 @@ do_ftrace_mod_code(unsigned long ip, voi
- 
- 
- 
--static unsigned char ftrace_nop[MCOUNT_INSN_SIZE];
-+static unsigned char ftrace_nop[MCOUNT_INSN_SIZE] __read_only;
- 
- static unsigned char *ftrace_nop_replace(void)
- {
-@@ -273,6 +275,8 @@ ftrace_modify_code(unsigned long ip, uns
+@@ -268,6 +270,8 @@ ftrace_modify_code(unsigned long ip, uns
  {
        unsigned char replaced[MCOUNT_INSN_SIZE];
  
@@ -11667,7 +11931,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ft
        /*
         * Note: Due to modules and __init, code can
         *  disappear and change, we need to protect against faulting
-@@ -329,7 +333,7 @@ int ftrace_update_ftrace_func(ftrace_fun
+@@ -324,7 +328,7 @@ int ftrace_update_ftrace_func(ftrace_fun
        unsigned char old[MCOUNT_INSN_SIZE], *new;
        int ret;
  
@@ -11676,26 +11940,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ft
        new = ftrace_call_replace(ip, (unsigned long)func);
        ret = ftrace_modify_code(ip, old, new);
  
-@@ -382,15 +386,15 @@ int __init ftrace_dyn_arch_init(void *da
-       switch (faulted) {
-       case 0:
-               pr_info("converting mcount calls to 0f 1f 44 00 00\n");
--              memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
-+              memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE);
-               break;
-       case 1:
-               pr_info("converting mcount calls to 66 66 66 66 90\n");
--              memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
-+              memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE);
-               break;
-       case 2:
-               pr_info("converting mcount calls to jmp . + 5\n");
--              memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
-+              memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE);
-               break;
-       }
- 
-@@ -411,6 +415,8 @@ static int ftrace_mod_jmp(unsigned long 
+@@ -350,6 +354,8 @@ static int ftrace_mod_jmp(unsigned long 
  {
        unsigned char code[MCOUNT_INSN_SIZE];
  
@@ -11704,29 +11949,29 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ftrace.c linux-2.6.36/arch/x86/kernel/ft
        if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
                return -EFAULT;
  
-diff -urNp linux-2.6.36/arch/x86/kernel/head32.c linux-2.6.36/arch/x86/kernel/head32.c
---- linux-2.6.36/arch/x86/kernel/head32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/head32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -17,6 +17,7 @@
- #include <asm/apic.h>
+diff -urNp linux-2.6.37/arch/x86/kernel/head32.c linux-2.6.37/arch/x86/kernel/head32.c
+--- linux-2.6.37/arch/x86/kernel/head32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/head32.c      2011-01-17 02:41:01.000000000 -0500
+@@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
+ #include <asm/tlbflush.h>
 +#include <asm/boot.h>
  
  static void __init i386_default_early_setup(void)
  {
-@@ -40,7 +41,7 @@ void __init i386_start_kernel(void)
-                                        "EX TRAMPOLINE");
+@@ -43,7 +44,7 @@ void __init i386_start_kernel(void)
+       memblock_x86_reserve_range(PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE");
  #endif
  
--      reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
-+      reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
+-      memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
++      memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
  
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Reserve INITRD */
-diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/head_32.S
---- linux-2.6.36/arch/x86/kernel/head_32.S     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/head_32.S     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/head_32.S linux-2.6.37/arch/x86/kernel/head_32.S
+--- linux-2.6.37/arch/x86/kernel/head_32.S     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/head_32.S     2011-01-17 02:41:01.000000000 -0500
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -11751,9 +11996,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
 -#endif
 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
  
- /* Enough space to fit pagetables for the low memory linear map */
- MAPPING_BEYOND_END = \
-@@ -75,6 +77,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
+ /* Number of possible pages in the lowmem region */
+ LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
+@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
  RESERVE_BRK(pagetables, INIT_MAP_SIZE)
  
  /*
@@ -11766,7 +12011,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
   * 32-bit kernel entrypoint; only used by the boot CPU.  On entry,
   * %esi points to the real-mode code as a 32-bit pointer.
   * CS and DS must be 4 GB flat segments, but we don't depend on
-@@ -82,6 +90,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
+@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
   * can.
   */
  __HEAD
@@ -11780,7 +12025,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  ENTRY(startup_32)
        /* test KEEP_SEGMENTS flag to see if the bootloader is asking
                us to not reload segments */
-@@ -99,6 +114,55 @@ ENTRY(startup_32)
+@@ -101,6 +116,57 @@ ENTRY(startup_32)
        movl %eax,%gs
  2:
  
@@ -11801,6 +12046,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
 +      movl $pa(cpu_gdt_table),%edi
 +1:
 +      movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
++      movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
++      movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
 +      addl $PAGE_SIZE_asm,%edi
 +      loop 1b
 +#endif
@@ -11836,7 +12083,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  /*
   * Clear BSS first so that there are no surprises...
   */
-@@ -148,9 +212,7 @@ ENTRY(startup_32)
+@@ -150,9 +216,7 @@ ENTRY(startup_32)
        cmpl $num_subarch_entries, %eax
        jae bad_subarch
  
@@ -11847,7 +12094,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  
  bad_subarch:
  WEAK(lguest_entry)
-@@ -162,10 +224,10 @@ WEAK(xen_entry)
+@@ -164,10 +228,10 @@ WEAK(xen_entry)
        __INITDATA
  
  subarch_entries:
@@ -11862,35 +12109,35 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  num_subarch_entries = (. - subarch_entries) / 4
  .previous
  #endif /* CONFIG_PARAVIRT */
-@@ -226,8 +288,11 @@ default_entry:
+@@ -227,8 +291,11 @@ default_entry:
        movl %eax, pa(max_pfn_mapped)
  
        /* Do early initialization of the fixmap area */
--      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
--      movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8)
+-      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
+-      movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
 +#ifdef CONFIG_COMPAT_VDSO
-+      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8)
++      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
 +#else
-+      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8)
++      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
 +#endif
  #else /* Not PAE */
  
  page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -257,8 +322,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -258,8 +325,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
        movl %eax, pa(max_pfn_mapped)
  
        /* Do early initialization of the fixmap area */
--      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
--      movl %eax,pa(swapper_pg_dir+0xffc)
+-      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
+-      movl %eax,pa(initial_page_table+0xffc)
 +#ifdef CONFIG_COMPAT_VDSO
-+      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc)
++      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
 +#else
-+      movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc)
++      movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
 +#endif
  #endif
        jmp 3f
  /*
-@@ -305,6 +373,7 @@ ENTRY(startup_32_smp)
+@@ -306,6 +376,7 @@ ENTRY(startup_32_smp)
        orl %edx,%eax
        movl %eax,%cr4
  
@@ -11898,7 +12145,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
        testb $X86_CR4_PAE, %al         # check if PAE is enabled
        jz 6f
  
-@@ -329,6 +398,9 @@ ENTRY(startup_32_smp)
+@@ -330,6 +401,9 @@ ENTRY(startup_32_smp)
        /* Make changes effective */
        wrmsr
  
@@ -11908,7 +12155,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  6:
  
  /*
-@@ -354,9 +426,7 @@ ENTRY(startup_32_smp)
+@@ -355,9 +429,7 @@ ENTRY(startup_32_smp)
  
  #ifdef CONFIG_SMP
        cmpb $0, ready
@@ -11919,7 +12166,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  #endif /* CONFIG_SMP */
  
  /*
-@@ -434,7 +504,7 @@ is386:     movl $2,%ecx            # set MP
+@@ -435,7 +507,7 @@ is386:     movl $2,%ecx            # set MP
  1:    movl $(__KERNEL_DS),%eax        # reload all the segment registers
        movl %eax,%ss                   # after changing gdt.
  
@@ -11928,7 +12175,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
        movl %eax,%ds
        movl %eax,%es
  
-@@ -448,8 +518,11 @@ is386:    movl $2,%ecx            # set MP
+@@ -449,15 +521,22 @@ is386:   movl $2,%ecx            # set MP
         */
        cmpb $0,ready
        jne 1f
@@ -11941,7 +12188,19 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
        movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
        shrl $16, %ecx
        movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -467,10 +540,6 @@ is386:    movl $2,%ecx            # set MP
+       movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
+ 1:
+-#endif
+       movl $(__KERNEL_STACK_CANARY),%eax
++#elif defined(CONFIG_PAX_MEMORY_UDEREF)
++      movl $(__USER_DS),%eax
++#else
++      xorl %eax,%eax
++#endif
+       movl %eax,%gs
+ 
+       xorl %eax,%eax                  # Clear LDT
+@@ -468,10 +547,6 @@ is386:    movl $2,%ecx            # set MP
  #ifdef CONFIG_SMP
        movb ready, %cl
        movb $1, ready
@@ -11952,7 +12211,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  #endif /* CONFIG_SMP */
        jmp *(initial_code)
  
-@@ -556,22 +625,22 @@ early_page_fault:
+@@ -557,22 +632,22 @@ early_page_fault:
        jmp early_fault
  
  early_fault:
@@ -11980,7 +12239,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  hlt_loop:
        hlt
        jmp hlt_loop
-@@ -579,8 +648,11 @@ hlt_loop:
+@@ -580,8 +655,11 @@ hlt_loop:
  /* This is the default interrupt "handler" :-) */
        ALIGN
  ignore_int:
@@ -11993,7 +12252,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
        pushl %eax
        pushl %ecx
        pushl %edx
-@@ -589,9 +661,6 @@ ignore_int:
+@@ -590,9 +668,6 @@ ignore_int:
        movl $(__KERNEL_DS),%eax
        movl %eax,%ds
        movl %eax,%es
@@ -12003,39 +12262,35 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
        pushl 16(%esp)
        pushl 24(%esp)
        pushl 32(%esp)
-@@ -620,31 +689,47 @@ ENTRY(initial_page_table)
+@@ -619,29 +694,42 @@ ENTRY(initial_code)
  /*
   * BSS section
   */
 -__PAGE_ALIGNED_BSS
 -      .align PAGE_SIZE_asm
  #ifdef CONFIG_X86_PAE
-+.section .swapper_pg_pmd,"a",@progbits
- swapper_pg_pmd:
++.section .initial_pg_pmd,"a",@progbits
+ ENTRY(initial_pg_pmd)
        .fill 1024*KPMDS,4,0
  #else
-+.section .swapper_pg_dir,"a",@progbits
- ENTRY(swapper_pg_dir)
+ ENTRY(initial_page_table)
        .fill 1024,4,0
  #endif
-+.section .swapper_pg_fixmap,"a",@progbits
- swapper_pg_fixmap:
++.section .initial_pg_fixmap,"a",@progbits
+ ENTRY(initial_pg_fixmap)
        .fill 1024,4,0
- #ifdef CONFIG_X86_TRAMPOLINE
-+.section .trampoline_pg_dir,"a",@progbits
- ENTRY(trampoline_pg_dir)
++.section .empty_zero_page,"a",@progbits
+ ENTRY(empty_zero_page)
+       .fill 4096,1,0
++.section .swapper_pg_dir,"a",@progbits
+ ENTRY(swapper_pg_dir)
 +#ifdef CONFIG_X86_PAE
 +      .fill 4,8,0
 +#else
        .fill 1024,4,0
- #endif
 +#endif
 +
-+.section .empty_zero_page,"a",@progbits
- ENTRY(empty_zero_page)
-       .fill 4096,1,0
- 
- /*
++/*
 + * The IDT has to be page-aligned to simplify the Pentium
 + * F0 0F bug workaround.. We have a special link segment
 + * for this.
@@ -12043,20 +12298,19 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
 +.section .idt,"a",@progbits
 +ENTRY(idt_table)
 +      .fill 256,8,0
-+
-+/*
+ 
+ /*
   * This starts the data section.
   */
  #ifdef CONFIG_X86_PAE
 -__PAGE_ALIGNED_DATA
 -      /* Page-aligned for the benefit of paravirt? */
 -      .align PAGE_SIZE_asm
-+.section .swapper_pg_dir,"a",@progbits
-+
- ENTRY(swapper_pg_dir)
-       .long   pa(swapper_pg_pmd+PGD_IDENT_ATTR),0     /* low identity map */
++.section .initial_page_table,"a",@progbits
+ ENTRY(initial_page_table)
+       .long   pa(initial_pg_pmd+PGD_IDENT_ATTR),0     /* low identity map */
  # if KPMDS == 3
-@@ -663,15 +748,24 @@ ENTRY(swapper_pg_dir)
+@@ -660,15 +748,24 @@ ENTRY(initial_page_table)
  #  error "Kernel PMDs should be 1, 2 or 3"
  # endif
        .align PAGE_SIZE_asm            /* needs to be page-sized too */
@@ -12082,7 +12336,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  early_recursion_flag:
        .long 0
  
-@@ -707,7 +801,7 @@ fault_msg:
+@@ -704,7 +801,7 @@ fault_msg:
        .word 0                         # 32 bit align gdt_desc.address
  boot_gdt_descr:
        .word __BOOT_DS+7
@@ -12091,7 +12345,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  
        .word 0                         # 32-bit align idt_desc.address
  idt_descr:
-@@ -718,7 +812,7 @@ idt_descr:
+@@ -715,7 +812,7 @@ idt_descr:
        .word 0                         # 32 bit align gdt_desc.address
  ENTRY(early_gdt_descr)
        .word GDT_ENTRIES*8-1
@@ -12100,7 +12354,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
  
  /*
   * The boot_gdt must mirror the equivalent in setup.S and is
-@@ -727,5 +821,65 @@ ENTRY(early_gdt_descr)
+@@ -724,5 +821,65 @@ ENTRY(early_gdt_descr)
        .align L1_CACHE_BYTES
  ENTRY(boot_gdt)
        .fill GDT_ENTRY_BOOT_CS,8,0
@@ -12168,9 +12422,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_32.S linux-2.6.36/arch/x86/kernel/h
 +      /* Be sure this is zeroed to avoid false validations in Xen */
 +      .fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +      .endr
-diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/head_64.S
---- linux-2.6.36/arch/x86/kernel/head_64.S     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/head_64.S     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/head_64.S linux-2.6.37/arch/x86/kernel/head_64.S
+--- linux-2.6.37/arch/x86/kernel/head_64.S     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/head_64.S     2011-01-17 02:41:01.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -12297,7 +12551,15 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/h
  #define NEXT_PAGE(name) \
        .balign PAGE_SIZE; \
  ENTRY(name)
-@@ -350,13 +352,36 @@ NEXT_PAGE(init_level4_pgt)
+@@ -339,7 +341,6 @@ ENTRY(name)
+       i = i + 1 ;                                     \
+       .endr
+ 
+-      .data
+       /*
+        * This default setting generates an ident mapping at address 0x100000
+        * and a mapping for the kernel that precisely maps virtual address
+@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
        .quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
        .org    init_level4_pgt + L4_PAGE_OFFSET*8, 0
        .quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
@@ -12334,7 +12596,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/h
  
  NEXT_PAGE(level3_kernel_pgt)
        .fill   L3_START_KERNEL,8,0
-@@ -364,20 +389,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
        .quad   level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
        .quad   level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -12366,7 +12628,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/h
  
  NEXT_PAGE(level2_kernel_pgt)
        /*
-@@ -390,33 +418,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
         *  If you want to increase this then increase MODULES_VADDR
         *  too.)
         */
@@ -12432,9 +12694,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/head_64.S linux-2.6.36/arch/x86/kernel/h
  
        __PAGE_ALIGNED_BSS
        .align PAGE_SIZE
-diff -urNp linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/i386_ksyms_32.c       2011-01-17 02:41:01.000000000 -0500
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -12456,9 +12718,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/i386_ksyms_32.c linux-2.6.36/arch/x86/ke
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.36/arch/x86/kernel/init_task.c linux-2.6.36/arch/x86/kernel/init_task.c
---- linux-2.6.36/arch/x86/kernel/init_task.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/init_task.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/init_task.c linux-2.6.37/arch/x86/kernel/init_task.c
+--- linux-2.6.37/arch/x86/kernel/init_task.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/init_task.c   2011-01-17 02:41:01.000000000 -0500
 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
   * section. Since TSS's are completely CPU-local, we want them
   * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12467,9 +12729,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/init_task.c linux-2.6.36/arch/x86/kernel
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.36/arch/x86/kernel/ioport.c linux-2.6.36/arch/x86/kernel/ioport.c
---- linux-2.6.36/arch/x86/kernel/ioport.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/ioport.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/ioport.c linux-2.6.37/arch/x86/kernel/ioport.c
+--- linux-2.6.37/arch/x86/kernel/ioport.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/ioport.c      2011-01-17 02:41:01.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -12513,10 +12775,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ioport.c linux-2.6.36/arch/x86/kernel/io
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
        }
-diff -urNp linux-2.6.36/arch/x86/kernel/irq_32.c linux-2.6.36/arch/x86/kernel/irq_32.c
---- linux-2.6.36/arch/x86/kernel/irq_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/irq_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
+diff -urNp linux-2.6.37/arch/x86/kernel/irq_32.c linux-2.6.37/arch/x86/kernel/irq_32.c
+--- linux-2.6.37/arch/x86/kernel/irq_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/irq_32.c      2011-01-17 02:41:01.000000000 -0500
+@@ -91,7 +91,7 @@ execute_on_irq_stack(int overflow, struc
                return 0;
  
        /* build the stack frame on the IRQ stack */
@@ -12525,18 +12787,52 @@ diff -urNp linux-2.6.36/arch/x86/kernel/irq_32.c linux-2.6.36/arch/x86/kernel/ir
        irqctx->tinfo.task = curctx->tinfo.task;
        irqctx->tinfo.previous_esp = current_stack_pointer;
  
-@@ -175,7 +175,7 @@ asmlinkage void do_softirq(void)
+@@ -103,6 +103,10 @@ execute_on_irq_stack(int overflow, struc
+               (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+               (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
+ 
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      __set_fs(irqctx->tinfo.addr_limit);
++#endif
++
+       if (unlikely(overflow))
+               call_on_stack(print_stack_overflow, isp);
+ 
+@@ -113,6 +117,11 @@ execute_on_irq_stack(int overflow, struc
+                    :  "0" (irq),   "1" (desc),  "2" (isp),
+                       "D" (desc->handle_irq)
+                    : "memory", "cc", "ecx");
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      __set_fs(curctx->tinfo.addr_limit);
++#endif
++
+       return 1;
+ }
+ 
+@@ -171,9 +180,18 @@ asmlinkage void do_softirq(void)
                irqctx->tinfo.previous_esp = current_stack_pointer;
  
                /* build the stack frame on the softirq stack */
 -              isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
 +              isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++              __set_fs(irqctx->tinfo.addr_limit);
++#endif
  
                call_on_stack(__do_softirq, isp);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++              __set_fs(curctx->addr_limit);
++#endif
++
                /*
-diff -urNp linux-2.6.36/arch/x86/kernel/kgdb.c linux-2.6.36/arch/x86/kernel/kgdb.c
---- linux-2.6.36/arch/x86/kernel/kgdb.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/kgdb.c        2010-11-06 18:58:15.000000000 -0400
+                * Shouldnt happen, we returned above if in_interrupt():
+                */
+diff -urNp linux-2.6.37/arch/x86/kernel/kgdb.c linux-2.6.37/arch/x86/kernel/kgdb.c
+--- linux-2.6.37/arch/x86/kernel/kgdb.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/kgdb.c        2011-01-17 02:41:01.000000000 -0500
 @@ -123,11 +123,11 @@ char *dbg_get_reg(int regno, void *mem, 
        switch (regno) {
  #ifdef CONFIG_X86_32
@@ -12551,7 +12847,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kgdb.c linux-2.6.36/arch/x86/kernel/kgdb
                        *(unsigned long *)mem = kernel_stack_pointer(regs);
                break;
        case GDB_GS:
-@@ -715,7 +715,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
+@@ -722,7 +722,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
        regs->ip = ip;
  }
  
@@ -12560,15 +12856,13 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kgdb.c linux-2.6.36/arch/x86/kernel/kgdb
        /* Breakpoint instruction: */
        .gdb_bpt_instr          = { 0xcc },
        .flags                  = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/kprobes.c
---- linux-2.6.36/arch/x86/kernel/kprobes.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/kprobes.c     2010-11-06 18:58:15.000000000 -0400
-@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relat
-               s32 raddr;
+diff -urNp linux-2.6.37/arch/x86/kernel/kprobes.c linux-2.6.37/arch/x86/kernel/kprobes.c
+--- linux-2.6.37/arch/x86/kernel/kprobes.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/kprobes.c     2011-01-17 02:41:01.000000000 -0500
+@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
        } __attribute__((packed)) *insn;
  
--      insn = (struct __arch_relative_insn *)from;
-+      insn = (struct __arch_relative_insn *)(ktla_ktva(from));
+       insn = (struct __arch_relative_insn *)from;
 +
 +      pax_open_kernel();
        insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
@@ -12577,7 +12871,16 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
  }
  
  /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(
+@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_op
+       kprobe_opcode_t opcode;
+       kprobe_opcode_t *orig_opcodes = opcodes;
+ 
+-      if (search_exception_tables((unsigned long)opcodes))
++      if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
+               return 0;       /* Page fault may occur on this address. */
+ 
+ retry:
+@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction(
                }
        }
        insn_get_length(&insn);
@@ -12587,7 +12890,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
  
  #ifdef CONFIG_X86_64
        if (insn_rip_relative(&insn)) {
-@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(
+@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction(
                          (u8 *) dest;
                BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
                disp = (u8 *) dest + insn_offset_displacement(&insn);
@@ -12597,7 +12900,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
        }
  #endif
        return insn.length;
-@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(s
+@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(s
         */
        __copy_instruction(p->ainsn.insn, p->addr, 0);
  
@@ -12612,7 +12915,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
  }
  
  int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(s
+@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(s
                 * nor set current_kprobe, because it doesn't use single
                 * stepping.
                 */
@@ -12621,7 +12924,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
                preempt_enable_no_resched();
                return;
        }
-@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(s
+@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(s
        if (p->opcode == BREAKPOINT_INSTRUCTION)
                regs->ip = (unsigned long)p->addr;
        else
@@ -12630,7 +12933,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
  }
  
  /*
-@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(stru
+@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(stru
                                setup_singlestep(p, regs, kcb, 0);
                        return 1;
                }
@@ -12639,7 +12942,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
                /*
                 * The breakpoint instruction was removed right
                 * after we hit it.  Another cpu has removed
-@@ -820,7 +827,7 @@ static void __kprobes resume_execution(s
+@@ -817,7 +824,7 @@ static void __kprobes resume_execution(s
                struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
        unsigned long *tos = stack_addr(regs);
@@ -12648,7 +12951,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
        unsigned long orig_ip = (unsigned long)p->addr;
        kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -1002,7 +1009,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(s
        struct die_args *args = data;
        int ret = NOTIFY_DONE;
  
@@ -12657,9 +12960,41 @@ diff -urNp linux-2.6.36/arch/x86/kernel/kprobes.c linux-2.6.36/arch/x86/kernel/k
                return ret;
  
        switch (val) {
-diff -urNp linux-2.6.36/arch/x86/kernel/ldt.c linux-2.6.36/arch/x86/kernel/ldt.c
---- linux-2.6.36/arch/x86/kernel/ldt.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/ldt.c 2010-11-06 18:58:15.000000000 -0400
+@@ -1368,7 +1375,7 @@ int __kprobes arch_prepare_optimized_kpr
+        * Verify if the address gap is in 2GB range, because this uses
+        * a relative jump.
+        */
+-      rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
++      rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
+       if (abs(rel) > 0x7fffffff)
+               return -ERANGE;
+ 
+@@ -1389,11 +1396,11 @@ int __kprobes arch_prepare_optimized_kpr
+       synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
+ 
+       /* Set probe function call */
+-      synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
++      synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
+ 
+       /* Set returning jmp instruction at the tail of out-of-line buffer */
+       synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
+-                         (u8 *)op->kp.addr + op->optinsn.size);
++                         (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
+ 
+       flush_icache_range((unsigned long) buf,
+                          (unsigned long) buf + TMPL_END_IDX +
+@@ -1409,7 +1416,7 @@ int __kprobes arch_optimize_kprobe(struc
+                       ((long)op->kp.addr + RELATIVEJUMP_SIZE));
+ 
+       /* Backup instructions which will be replaced by jump address */
+-      memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
++      memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
+              RELATIVE_ADDR_SIZE);
+ 
+       jmp_code[0] = RELATIVEJUMP_OPCODE;
+diff -urNp linux-2.6.37/arch/x86/kernel/ldt.c linux-2.6.37/arch/x86/kernel/ldt.c
+--- linux-2.6.37/arch/x86/kernel/ldt.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/ldt.c 2011-01-17 02:41:01.000000000 -0500
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
        if (reload) {
  #ifdef CONFIG_SMP
@@ -12724,9 +13059,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ldt.c linux-2.6.36/arch/x86/kernel/ldt.c
        fill_ldt(&ldt, &ldt_info);
        if (oldmode)
                ldt.avl = 0;
-diff -urNp linux-2.6.36/arch/x86/kernel/machine_kexec_32.c linux-2.6.36/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.36/arch/x86/kernel/machine_kexec_32.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/machine_kexec_32.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/machine_kexec_32.c linux-2.6.37/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.37/arch/x86/kernel/machine_kexec_32.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/machine_kexec_32.c    2011-01-17 02:41:01.000000000 -0500
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -12754,9 +13089,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/machine_kexec_32.c linux-2.6.36/arch/x86
  
        relocate_kernel_ptr = control_page;
        page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.36/arch/x86/kernel/microcode_amd.c linux-2.6.36/arch/x86/kernel/microcode_amd.c
---- linux-2.6.36/arch/x86/kernel/microcode_amd.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/microcode_amd.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/microcode_amd.c linux-2.6.37/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.37/arch/x86/kernel/microcode_amd.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/microcode_amd.c       2011-01-17 02:41:01.000000000 -0500
 @@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
        uci->mc = NULL;
  }
@@ -12775,9 +13110,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/microcode_amd.c linux-2.6.36/arch/x86/ke
  {
        return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.36/arch/x86/kernel/microcode_core.c linux-2.6.36/arch/x86/kernel/microcode_core.c
---- linux-2.6.36/arch/x86/kernel/microcode_core.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/microcode_core.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/microcode_core.c linux-2.6.37/arch/x86/kernel/microcode_core.c
+--- linux-2.6.37/arch/x86/kernel/microcode_core.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/microcode_core.c      2011-01-17 02:41:01.000000000 -0500
 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION     "2.00"
@@ -12787,10 +13122,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/microcode_core.c linux-2.6.36/arch/x86/k
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.36/arch/x86/kernel/microcode_intel.c linux-2.6.36/arch/x86/kernel/microcode_intel.c
---- linux-2.6.36/arch/x86/kernel/microcode_intel.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/microcode_intel.c     2010-11-06 18:58:15.000000000 -0400
-@@ -446,13 +446,13 @@ static enum ucode_state request_microcod
+diff -urNp linux-2.6.37/arch/x86/kernel/microcode_intel.c linux-2.6.37/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.37/arch/x86/kernel/microcode_intel.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/microcode_intel.c     2011-01-17 02:41:01.000000000 -0500
+@@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
  {
@@ -12806,7 +13141,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/microcode_intel.c linux-2.6.36/arch/x86/
  }
  
  static void microcode_fini_cpu(int cpu)
-@@ -463,7 +463,7 @@ static void microcode_fini_cpu(int cpu)
+@@ -457,7 +457,7 @@ static void microcode_fini_cpu(int cpu)
        uci->mc = NULL;
  }
  
@@ -12815,7 +13150,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/microcode_intel.c linux-2.6.36/arch/x86/
        .request_microcode_user           = request_microcode_user,
        .request_microcode_fw             = request_microcode_fw,
        .collect_cpu_info                 = collect_cpu_info,
-@@ -471,7 +471,7 @@ static struct microcode_ops microcode_in
+@@ -465,7 +465,7 @@ static struct microcode_ops microcode_in
        .microcode_fini_cpu               = microcode_fini_cpu,
  };
  
@@ -12824,9 +13159,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/microcode_intel.c linux-2.6.36/arch/x86/
  {
        return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.36/arch/x86/kernel/module.c linux-2.6.36/arch/x86/kernel/module.c
---- linux-2.6.36/arch/x86/kernel/module.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/module.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/module.c linux-2.6.37/arch/x86/kernel/module.c
+--- linux-2.6.37/arch/x86/kernel/module.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/module.c      2011-01-17 02:41:01.000000000 -0500
 @@ -35,7 +35,7 @@
  #define DEBUGP(fmt...)
  #endif
@@ -12967,9 +13302,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/module.c linux-2.6.36/arch/x86/kernel/mo
  #if 0
                        if ((s64)val != *(s32 *)loc)
                                goto overflow;
-diff -urNp linux-2.6.36/arch/x86/kernel/paravirt.c linux-2.6.36/arch/x86/kernel/paravirt.c
---- linux-2.6.36/arch/x86/kernel/paravirt.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/paravirt.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/paravirt.c linux-2.6.37/arch/x86/kernel/paravirt.c
+--- linux-2.6.37/arch/x86/kernel/paravirt.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/paravirt.c    2011-01-17 02:41:01.000000000 -0500
 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
   * corresponding structure. */
  static void *get_call_destination(u8 type)
@@ -13060,7 +13395,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/paravirt.c linux-2.6.36/arch/x86/kernel/
  
        .read_cr2 = native_read_cr2,
        .write_cr2 = native_write_cr2,
-@@ -463,6 +463,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -462,6 +462,12 @@ struct pv_mmu_ops pv_mmu_ops = {
        },
  
        .set_fixmap = native_set_fixmap,
@@ -13073,9 +13408,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/paravirt.c linux-2.6.36/arch/x86/kernel/
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/paravirt-spinlocks.c  2011-01-17 02:41:01.000000000 -0500
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
        arch_spin_lock(lock);
  }
@@ -13085,10 +13420,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.36/arch/x
  #ifdef CONFIG_SMP
        .spin_is_locked = __ticket_spin_is_locked,
        .spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.36/arch/x86/kernel/pci-calgary_64.c linux-2.6.36/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.36/arch/x86/kernel/pci-calgary_64.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/pci-calgary_64.c      2010-11-06 18:58:15.000000000 -0400
-@@ -475,7 +475,7 @@ static void calgary_free_coherent(struct
+diff -urNp linux-2.6.37/arch/x86/kernel/pci-calgary_64.c linux-2.6.37/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.37/arch/x86/kernel/pci-calgary_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/pci-calgary_64.c      2011-01-17 02:41:01.000000000 -0500
+@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
        free_pages((unsigned long)vaddr, get_order(size));
  }
  
@@ -13097,10 +13432,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-calgary_64.c linux-2.6.36/arch/x86/k
        .alloc_coherent = calgary_alloc_coherent,
        .free_coherent = calgary_free_coherent,
        .map_sg = calgary_map_sg,
-diff -urNp linux-2.6.36/arch/x86/kernel/pci-dma.c linux-2.6.36/arch/x86/kernel/pci-dma.c
---- linux-2.6.36/arch/x86/kernel/pci-dma.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/pci-dma.c     2010-11-06 18:58:15.000000000 -0400
-@@ -17,7 +17,7 @@
+diff -urNp linux-2.6.37/arch/x86/kernel/pci-dma.c linux-2.6.37/arch/x86/kernel/pci-dma.c
+--- linux-2.6.37/arch/x86/kernel/pci-dma.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/pci-dma.c     2011-01-17 02:41:01.000000000 -0500
+@@ -16,7 +16,7 @@
  
  static int forbid_dac __read_mostly;
  
@@ -13109,7 +13444,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-dma.c linux-2.6.36/arch/x86/kernel/p
  EXPORT_SYMBOL(dma_ops);
  
  static int iommu_sac_force __read_mostly;
-@@ -251,7 +251,7 @@ early_param("iommu", iommu_setup);
+@@ -250,7 +250,7 @@ early_param("iommu", iommu_setup);
  
  int dma_supported(struct device *dev, u64 mask)
  {
@@ -13118,10 +13453,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-dma.c linux-2.6.36/arch/x86/kernel/p
  
  #ifdef CONFIG_PCI
        if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.36/arch/x86/kernel/pci-gart_64.c linux-2.6.36/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.36/arch/x86/kernel/pci-gart_64.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/pci-gart_64.c 2010-11-06 18:58:15.000000000 -0400
-@@ -699,7 +699,7 @@ static __init int init_k8_gatt(struct ag
+diff -urNp linux-2.6.37/arch/x86/kernel/pci-gart_64.c linux-2.6.37/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.37/arch/x86/kernel/pci-gart_64.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/pci-gart_64.c 2011-01-17 02:41:01.000000000 -0500
+@@ -706,7 +706,7 @@ static __init int init_k8_gatt(struct ag
        return -1;
  }
  
@@ -13130,9 +13465,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-gart_64.c linux-2.6.36/arch/x86/kern
        .map_sg                         = gart_map_sg,
        .unmap_sg                       = gart_unmap_sg,
        .map_page                       = gart_map_page,
-diff -urNp linux-2.6.36/arch/x86/kernel/pci-nommu.c linux-2.6.36/arch/x86/kernel/pci-nommu.c
---- linux-2.6.36/arch/x86/kernel/pci-nommu.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/pci-nommu.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/pci-nommu.c linux-2.6.37/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.37/arch/x86/kernel/pci-nommu.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/pci-nommu.c   2011-01-17 02:41:01.000000000 -0500
 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
        flush_write_buffers();
  }
@@ -13142,10 +13477,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-nommu.c linux-2.6.36/arch/x86/kernel
        .alloc_coherent         = dma_generic_alloc_coherent,
        .free_coherent          = nommu_free_coherent,
        .map_sg                 = nommu_map_sg,
-diff -urNp linux-2.6.36/arch/x86/kernel/pci-swiotlb.c linux-2.6.36/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.36/arch/x86/kernel/pci-swiotlb.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/pci-swiotlb.c 2010-11-06 18:58:15.000000000 -0400
-@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
+diff -urNp linux-2.6.37/arch/x86/kernel/pci-swiotlb.c linux-2.6.37/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.37/arch/x86/kernel/pci-swiotlb.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/pci-swiotlb.c 2011-01-17 02:41:01.000000000 -0500
+@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
        return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
  
@@ -13154,9 +13489,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/pci-swiotlb.c linux-2.6.36/arch/x86/kern
        .mapping_error = swiotlb_dma_mapping_error,
        .alloc_coherent = x86_swiotlb_alloc_coherent,
        .free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kernel/process_32.c
---- linux-2.6.36/arch/x86/kernel/process_32.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/process_32.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/process_32.c linux-2.6.37/arch/x86/kernel/process_32.c
+--- linux-2.6.37/arch/x86/kernel/process_32.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/process_32.c  2011-01-17 02:41:01.000000000 -0500
 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -13165,7 +13500,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kerne
  }
  
  #ifndef CONFIG_SMP
-@@ -130,7 +131,7 @@ void __show_regs(struct pt_regs *regs, i
+@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, i
        unsigned long sp;
        unsigned short ss, gs;
  
@@ -13173,8 +13508,17 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kerne
 +      if (user_mode(regs)) {
                sp = regs->sp;
                ss = regs->ss & 0xffff;
-               gs = get_user_gs(regs);
-@@ -200,7 +201,7 @@ int copy_thread(unsigned long clone_flag
+-              gs = get_user_gs(regs);
+       } else {
+               sp = kernel_stack_pointer(regs);
+               savesegment(ss, ss);
+-              savesegment(gs, gs);
+       }
++      gs = get_user_gs(regs);
+ 
+       show_regs_common();
+ 
+@@ -200,7 +200,7 @@ int copy_thread(unsigned long clone_flag
        struct task_struct *tsk;
        int err;
  
@@ -13183,15 +13527,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kerne
        *childregs = *regs;
        childregs->ax = 0;
        childregs->sp = sp;
-@@ -234,6 +235,7 @@ int copy_thread(unsigned long clone_flag
-        * Set a new TLS for the child thread?
-        */
-       if (clone_flags & CLONE_SETTLS)
-+//XXX needs set_fs()?
-               err = do_set_thread_area(p, -1,
-                       (struct user_desc __user *)childregs->si, 0);
- 
-@@ -297,7 +299,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -297,7 +297,7 @@ __switch_to(struct task_struct *prev_p, 
        struct thread_struct *prev = &prev_p->thread,
                                 *next = &next_p->thread;
        int cpu = smp_processor_id();
@@ -13200,19 +13536,18 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kerne
        bool preload_fpu;
  
        /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -332,6 +334,11 @@ __switch_to(struct task_struct *prev_p, 
+@@ -332,6 +332,10 @@ __switch_to(struct task_struct *prev_p, 
         */
        lazy_save_gs(prev->gs);
  
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
-+      if (!segment_eq(task_thread_info(prev_p)->addr_limit, task_thread_info(next_p)->addr_limit))
-+              __set_fs(task_thread_info(next_p)->addr_limit, cpu);
++      __set_fs(task_thread_info(next_p)->addr_limit);
 +#endif
 +
        /*
         * Load the per-thread Thread-Local Storage descriptor.
         */
-@@ -408,3 +415,27 @@ unsigned long get_wchan(struct task_stru
+@@ -408,3 +412,27 @@ unsigned long get_wchan(struct task_stru
        return 0;
  }
  
@@ -13240,9 +13575,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_32.c linux-2.6.36/arch/x86/kerne
 +      load_sp0(init_tss + smp_processor_id(), thread);
 +}
 +#endif
-diff -urNp linux-2.6.36/arch/x86/kernel/process_64.c linux-2.6.36/arch/x86/kernel/process_64.c
---- linux-2.6.36/arch/x86/kernel/process_64.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/process_64.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/process_64.c linux-2.6.37/arch/x86/kernel/process_64.c
+--- linux-2.6.37/arch/x86/kernel/process_64.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/process_64.c  2011-01-17 02:41:01.000000000 -0500
 @@ -89,7 +89,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -13276,9 +13611,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process_64.c linux-2.6.36/arch/x86/kerne
                        return 0;
                ip = *(u64 *)(fp+8);
                if (!in_sched_functions(ip))
-diff -urNp linux-2.6.36/arch/x86/kernel/process.c linux-2.6.36/arch/x86/kernel/process.c
---- linux-2.6.36/arch/x86/kernel/process.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/process.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/process.c linux-2.6.37/arch/x86/kernel/process.c
+--- linux-2.6.37/arch/x86/kernel/process.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/process.c     2011-01-17 02:41:01.000000000 -0500
 @@ -74,7 +74,7 @@ void exit_thread(void)
        unsigned long *bp = t->io_bitmap_ptr;
  
@@ -13301,13 +13636,13 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process.c linux-2.6.36/arch/x86/kernel/p
  {
        struct task_struct *tsk = current;
  
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
 +      loadsegment(gs, 0);
 +#endif
        flush_ptrace_hw_breakpoint(tsk);
        memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
        /*
-@@ -280,8 +283,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -280,10 +283,10 @@ int kernel_thread(int (*fn)(void *), voi
        regs.di = (unsigned long) arg;
  
  #ifdef CONFIG_X86_32
@@ -13316,8 +13651,11 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process.c linux-2.6.36/arch/x86/kernel/p
 +      regs.ds = __KERNEL_DS;
 +      regs.es = __KERNEL_DS;
        regs.fs = __KERNEL_PERCPU;
-       regs.gs = __KERNEL_STACK_CANARY;
+-      regs.gs = __KERNEL_STACK_CANARY;
++      savesegment(gs, regs.gs);
  #else
+       regs.ss = __KERNEL_DS;
+ #endif
 @@ -658,17 +661,3 @@ static int __init idle_setup(char *str)
        return 0;
  }
@@ -13336,11 +13674,11 @@ diff -urNp linux-2.6.36/arch/x86/kernel/process.c linux-2.6.36/arch/x86/kernel/p
 -      return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
 -}
 -
-diff -urNp linux-2.6.36/arch/x86/kernel/ptrace.c linux-2.6.36/arch/x86/kernel/ptrace.c
---- linux-2.6.36/arch/x86/kernel/ptrace.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/ptrace.c      2010-11-06 18:58:15.000000000 -0400
-@@ -804,7 +804,7 @@ static const struct user_regset_view use
- long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+diff -urNp linux-2.6.37/arch/x86/kernel/ptrace.c linux-2.6.37/arch/x86/kernel/ptrace.c
+--- linux-2.6.37/arch/x86/kernel/ptrace.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/ptrace.c      2011-01-17 02:41:01.000000000 -0500
+@@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
+                unsigned long addr, unsigned long data)
  {
        int ret;
 -      unsigned long __user *datap = (unsigned long __user *)data;
@@ -13348,24 +13686,24 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ptrace.c linux-2.6.36/arch/x86/kernel/pt
  
        switch (request) {
        /* read the word at location addr in the USER area. */
-@@ -891,14 +891,14 @@ long arch_ptrace(struct task_struct *chi
-               if (addr < 0)
+@@ -890,14 +890,14 @@ long arch_ptrace(struct task_struct *chi
+               if ((int) addr < 0)
                        return -EIO;
                ret = do_get_thread_area(child, addr,
--                                       (struct user_desc __user *) data);
-+                                       (__force struct user_desc __user *) data);
+-                                      (struct user_desc __user *)data);
++                                      (__force struct user_desc __user *) data);
                break;
  
        case PTRACE_SET_THREAD_AREA:
-               if (addr < 0)
+               if ((int) addr < 0)
                        return -EIO;
                ret = do_set_thread_area(child, addr,
--                                       (struct user_desc __user *) data, 0);
-+                                       (__force struct user_desc __user *) data, 0);
+-                                      (struct user_desc __user *)data, 0);
++                                      (__force struct user_desc __user *) data, 0);
                break;
  #endif
  
-@@ -1315,7 +1315,7 @@ static void fill_sigtrap_info(struct tas
+@@ -1314,7 +1314,7 @@ static void fill_sigtrap_info(struct tas
        memset(info, 0, sizeof(*info));
        info->si_signo = SIGTRAP;
        info->si_code = si_code;
@@ -13374,9 +13712,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/ptrace.c linux-2.6.36/arch/x86/kernel/pt
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-2.6.36/arch/x86/kernel/reboot.c linux-2.6.36/arch/x86/kernel/reboot.c
---- linux-2.6.36/arch/x86/kernel/reboot.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/reboot.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/reboot.c linux-2.6.37/arch/x86/kernel/reboot.c
+--- linux-2.6.37/arch/x86/kernel/reboot.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/reboot.c      2011-01-17 02:41:01.000000000 -0500
 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -13422,18 +13760,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/reboot.c linux-2.6.36/arch/x86/kernel/re
  {
        local_irq_disable();
  
-@@ -374,8 +374,8 @@ void machine_real_restart(const unsigned
-       /* Remap the kernel at virtual address zero, as well as offset zero
-          from the kernel segment.  This assumes the kernel segment starts at
-          virtual address PAGE_OFFSET. */
--      memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
--              sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
-+      clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-+                      min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
- 
-       /*
-        * Use `swapper_pg_dir' as our page directory.
-@@ -387,16 +387,15 @@ void machine_real_restart(const unsigned
+@@ -381,16 +381,15 @@ void machine_real_restart(const unsigned
           boot)".  This seems like a fairly standard thing that gets set by
           REBOOT.COM programs, and the previous reset routine did this
           too. */
@@ -13453,10 +13780,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/reboot.c linux-2.6.36/arch/x86/kernel/re
  
        /* Set up the IDT for real mode. */
        load_idt(&real_mode_idt);
-diff -urNp linux-2.6.36/arch/x86/kernel/setup.c linux-2.6.36/arch/x86/kernel/setup.c
---- linux-2.6.36/arch/x86/kernel/setup.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/setup.c       2010-11-06 18:58:15.000000000 -0400
-@@ -705,7 +705,7 @@ static void __init trim_bios_range(void)
+diff -urNp linux-2.6.37/arch/x86/kernel/setup.c linux-2.6.37/arch/x86/kernel/setup.c
+--- linux-2.6.37/arch/x86/kernel/setup.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/setup.c       2011-01-17 02:41:01.000000000 -0500
+@@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
         * area (640->1Mb) as ram even though it is not.
         * take them out.
         */
@@ -13465,7 +13792,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup.c linux-2.6.36/arch/x86/kernel/set
        sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
  }
  
-@@ -797,14 +797,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -790,14 +790,14 @@ void __init setup_arch(char **cmdline_p)
  
        if (!boot_params.hdr.root_flags)
                root_mountflags &= ~MS_RDONLY;
@@ -13485,9 +13812,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup.c linux-2.6.36/arch/x86/kernel/set
        data_resource.end = virt_to_phys(_edata)-1;
        bss_resource.start = virt_to_phys(&__bss_start);
        bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/kernel/setup_percpu.c
---- linux-2.6.36/arch/x86/kernel/setup_percpu.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/setup_percpu.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/setup_percpu.c linux-2.6.37/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.37/arch/x86/kernel/setup_percpu.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/setup_percpu.c        2011-01-17 02:41:01.000000000 -0500
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -13512,7 +13839,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/ker
        [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
  };
  EXPORT_SYMBOL(__per_cpu_offset);
-@@ -161,10 +159,10 @@ static inline void setup_percpu_segment(
+@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(
  {
  #ifdef CONFIG_X86_32
        struct desc_struct gdt;
@@ -13526,7 +13853,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/ker
        write_gdt_entry(get_cpu_gdt_table(cpu),
                        GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
  #endif
-@@ -213,6 +211,11 @@ void __init setup_per_cpu_areas(void)
+@@ -207,6 +205,11 @@ void __init setup_per_cpu_areas(void)
        /* alrighty, percpu areas up and running */
        delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
        for_each_possible_cpu(cpu) {
@@ -13538,7 +13865,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/ker
                per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
                per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
                per_cpu(cpu_number, cpu) = cpu;
-@@ -249,6 +252,12 @@ void __init setup_per_cpu_areas(void)
+@@ -243,6 +246,12 @@ void __init setup_per_cpu_areas(void)
                set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
  #endif
  #endif
@@ -13551,9 +13878,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/setup_percpu.c linux-2.6.36/arch/x86/ker
                /*
                 * Up to this point, the boot CPU has been using .init.data
                 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.36/arch/x86/kernel/signal.c linux-2.6.36/arch/x86/kernel/signal.c
---- linux-2.6.36/arch/x86/kernel/signal.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/signal.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/signal.c linux-2.6.37/arch/x86/kernel/signal.c
+--- linux-2.6.37/arch/x86/kernel/signal.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/signal.c      2011-01-17 02:41:01.000000000 -0500
 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
         * Align the stack pointer according to the i386 ABI,
         * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13628,10 +13955,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/signal.c linux-2.6.36/arch/x86/kernel/si
                return;
  
        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.36/arch/x86/kernel/smpboot.c linux-2.6.36/arch/x86/kernel/smpboot.c
---- linux-2.6.36/arch/x86/kernel/smpboot.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/smpboot.c     2010-11-06 18:58:15.000000000 -0400
-@@ -782,7 +782,11 @@ do_rest:
+diff -urNp linux-2.6.37/arch/x86/kernel/smpboot.c linux-2.6.37/arch/x86/kernel/smpboot.c
+--- linux-2.6.37/arch/x86/kernel/smpboot.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/smpboot.c     2011-01-17 02:41:01.000000000 -0500
+@@ -786,7 +786,11 @@ do_rest:
                (unsigned long)task_stack_page(c_idle.idle) -
                KERNEL_STACK_OFFSET + THREAD_SIZE;
  #endif
@@ -13643,7 +13970,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/smpboot.c linux-2.6.36/arch/x86/kernel/s
        initial_code = (unsigned long)start_secondary;
        stack_start.sp = (void *) c_idle.idle->thread.sp;
  
-@@ -922,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int
+@@ -926,6 +930,12 @@ int __cpuinit native_cpu_up(unsigned int
  
        per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  
@@ -13654,11 +13981,11 @@ diff -urNp linux-2.6.36/arch/x86/kernel/smpboot.c linux-2.6.36/arch/x86/kernel/s
 +#endif
 +
        err = do_boot_cpu(apicid, cpu);
- 
        if (err) {
-diff -urNp linux-2.6.36/arch/x86/kernel/step.c linux-2.6.36/arch/x86/kernel/step.c
---- linux-2.6.36/arch/x86/kernel/step.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/step.c        2010-11-06 18:58:15.000000000 -0400
+               pr_debug("do_boot_cpu failed %d\n", err);
+diff -urNp linux-2.6.37/arch/x86/kernel/step.c linux-2.6.37/arch/x86/kernel/step.c
+--- linux-2.6.37/arch/x86/kernel/step.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/step.c        2011-01-17 02:41:01.000000000 -0500
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
                struct desc_struct *desc;
                unsigned long base;
@@ -13672,7 +13999,17 @@ diff -urNp linux-2.6.36/arch/x86/kernel/step.c linux-2.6.36/arch/x86/kernel/step
                        addr = -1L; /* bogus selector, access would fault */
                else {
                        desc = child->mm->context.ldt + seg;
-@@ -53,6 +53,9 @@ static int is_setting_trap_flag(struct t
+@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc
+                       addr += base;
+               }
+               mutex_unlock(&child->mm->context.lock);
+-      }
++      } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
++              addr = ktla_ktva(addr);
+ 
+       return addr;
+ }
+@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t
        unsigned char opcode[15];
        unsigned long addr = convert_ip_to_linear(child, regs);
  
@@ -13682,7 +14019,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/step.c linux-2.6.36/arch/x86/kernel/step
        copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
        for (i = 0; i < copied; i++) {
                switch (opcode[i]) {
-@@ -74,7 +77,7 @@ static int is_setting_trap_flag(struct t
+@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
  
  #ifdef CONFIG_X86_64
                case 0x40 ... 0x4f:
@@ -13691,23 +14028,35 @@ diff -urNp linux-2.6.36/arch/x86/kernel/step.c linux-2.6.36/arch/x86/kernel/step
                                /* 32-bit mode: register increment */
                                return 0;
                        /* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.36/arch/x86/kernel/syscall_table_32.S linux-2.6.36/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.36/arch/x86/kernel/syscall_table_32.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/syscall_table_32.S    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/syscall_table_32.S linux-2.6.37/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.37/arch/x86/kernel/syscall_table_32.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/syscall_table_32.S    2011-01-17 02:41:01.000000000 -0500
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
        .long sys_exit
-diff -urNp linux-2.6.36/arch/x86/kernel/sys_i386_32.c linux-2.6.36/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.36/arch/x86/kernel/sys_i386_32.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/sys_i386_32.c 2010-11-06 18:58:15.000000000 -0400
-@@ -24,6 +24,228 @@
+diff -urNp linux-2.6.37/arch/x86/kernel/sys_i386_32.c linux-2.6.37/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.37/arch/x86/kernel/sys_i386_32.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/sys_i386_32.c 2011-01-17 02:41:01.000000000 -0500
+@@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
  
+-/*
+- * Do a system call from kernel instead of calling sys_execve so we
+- * end up with proper pt_regs.
+- */
+-int kernel_execve(const char *filename,
+-                const char *const argv[],
+-                const char *const envp[])
 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
-+{
+ {
+-      long __res;
+-      asm volatile ("int $0x80"
+-      : "=a" (__res)
+-      : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
+-      return __res;
 +      unsigned long pax_task_size = TASK_SIZE;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -13926,14 +14275,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/sys_i386_32.c linux-2.6.36/arch/x86/kern
 +      mm->cached_hole_size = ~0UL;
 +
 +      return addr;
-+}
-+
- /*
-  * Do a system call from kernel instead of calling sys_execve so we
-  * end up with proper pt_regs.
-diff -urNp linux-2.6.36/arch/x86/kernel/sys_x86_64.c linux-2.6.36/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.36/arch/x86/kernel/sys_x86_64.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/sys_x86_64.c  2010-11-06 18:58:15.000000000 -0400
+ }
+diff -urNp linux-2.6.37/arch/x86/kernel/sys_x86_64.c linux-2.6.37/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.37/arch/x86/kernel/sys_x86_64.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/sys_x86_64.c  2011-01-17 02:41:01.000000000 -0500
 @@ -32,8 +32,8 @@ out:
        return error;
  }
@@ -14055,9 +14400,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/sys_x86_64.c linux-2.6.36/arch/x86/kerne
        mm->cached_hole_size = ~0UL;
  
        return addr;
-diff -urNp linux-2.6.36/arch/x86/kernel/time.c linux-2.6.36/arch/x86/kernel/time.c
---- linux-2.6.36/arch/x86/kernel/time.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/time.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/time.c linux-2.6.37/arch/x86/kernel/time.c
+--- linux-2.6.37/arch/x86/kernel/time.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/time.c        2011-01-17 02:41:01.000000000 -0500
 @@ -26,17 +26,13 @@
  int timer_ack;
  #endif
@@ -14096,9 +14441,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/time.c linux-2.6.36/arch/x86/kernel/time
        }
        return pc;
  }
-diff -urNp linux-2.6.36/arch/x86/kernel/tls.c linux-2.6.36/arch/x86/kernel/tls.c
---- linux-2.6.36/arch/x86/kernel/tls.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/tls.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/tls.c linux-2.6.37/arch/x86/kernel/tls.c
+--- linux-2.6.37/arch/x86/kernel/tls.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/tls.c 2011-01-17 02:41:01.000000000 -0500
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
        if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
                return -EINVAL;
@@ -14111,9 +14456,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/tls.c linux-2.6.36/arch/x86/kernel/tls.c
        set_tls_desc(p, idx, &info, 1);
  
        return 0;
-diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_32.S linux-2.6.36/arch/x86/kernel/trampoline_32.S
---- linux-2.6.36/arch/x86/kernel/trampoline_32.S       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/trampoline_32.S       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_32.S linux-2.6.37/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.37/arch/x86/kernel/trampoline_32.S       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/trampoline_32.S       2011-01-17 02:41:01.000000000 -0500
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -14136,9 +14481,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_32.S linux-2.6.36/arch/x86/ke
  
        # These need to be in the same 64K segment as the above;
        # hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_64.S linux-2.6.36/arch/x86/kernel/trampoline_64.S
---- linux-2.6.36/arch/x86/kernel/trampoline_64.S       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/trampoline_64.S       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/trampoline_64.S linux-2.6.37/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.37/arch/x86/kernel/trampoline_64.S       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/trampoline_64.S       2011-01-17 02:41:01.000000000 -0500
 @@ -91,7 +91,7 @@ startup_32:
        movl    $__KERNEL_DS, %eax      # Initialize the %ds segment register
        movl    %eax, %ds
@@ -14157,9 +14502,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/trampoline_64.S linux-2.6.36/arch/x86/ke
        .long   tgdt - r_base
        .short 0
        .quad   0x00cf9b000000ffff      # __KERNEL32_CS
-diff -urNp linux-2.6.36/arch/x86/kernel/traps.c linux-2.6.36/arch/x86/kernel/traps.c
---- linux-2.6.36/arch/x86/kernel/traps.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/traps.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/traps.c linux-2.6.37/arch/x86/kernel/traps.c
+--- linux-2.6.37/arch/x86/kernel/traps.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/traps.c       2011-01-17 02:41:01.000000000 -0500
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -14283,8 +14628,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/traps.c linux-2.6.36/arch/x86/kernel/tra
 +      if (v8086_mode(regs)) {
                handle_vm86_trap((struct kernel_vm86_regs *) regs,
                                error_code, 1);
-               return;
-@@ -585,7 +614,7 @@ dotraplinkage void __kprobes do_debug(st
+               preempt_conditional_cli(regs);
+@@ -586,7 +615,7 @@ dotraplinkage void __kprobes do_debug(st
         * We already checked v86 mode above, so we can check for kernel mode
         * by just checking the CPL of CS.
         */
@@ -14293,7 +14638,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/traps.c linux-2.6.36/arch/x86/kernel/tra
                tsk->thread.debugreg6 &= ~DR_STEP;
                set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
                regs->flags &= ~X86_EFLAGS_TF;
-@@ -614,7 +643,7 @@ void math_error(struct pt_regs *regs, in
+@@ -615,7 +644,7 @@ void math_error(struct pt_regs *regs, in
                return;
        conditional_sti(regs);
  
@@ -14302,10 +14647,10 @@ diff -urNp linux-2.6.36/arch/x86/kernel/traps.c linux-2.6.36/arch/x86/kernel/tra
        {
                if (!fixup_exception(regs)) {
                        task->thread.error_code = error_code;
-diff -urNp linux-2.6.36/arch/x86/kernel/tsc.c linux-2.6.36/arch/x86/kernel/tsc.c
---- linux-2.6.36/arch/x86/kernel/tsc.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/tsc.c 2010-11-06 18:58:15.000000000 -0400
-@@ -832,7 +832,7 @@ static struct dmi_system_id __initdata b
+diff -urNp linux-2.6.37/arch/x86/kernel/tsc.c linux-2.6.37/arch/x86/kernel/tsc.c
+--- linux-2.6.37/arch/x86/kernel/tsc.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/tsc.c 2011-01-17 02:41:01.000000000 -0500
+@@ -837,7 +837,7 @@ static struct dmi_system_id __initdata b
                        DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
                },
        },
@@ -14314,9 +14659,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/tsc.c linux-2.6.36/arch/x86/kernel/tsc.c
  };
  
  static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.36/arch/x86/kernel/vm86_32.c linux-2.6.36/arch/x86/kernel/vm86_32.c
---- linux-2.6.36/arch/x86/kernel/vm86_32.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/vm86_32.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/vm86_32.c linux-2.6.37/arch/x86/kernel/vm86_32.c
+--- linux-2.6.37/arch/x86/kernel/vm86_32.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/vm86_32.c     2011-01-17 02:41:01.000000000 -0500
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -14381,171 +14726,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vm86_32.c linux-2.6.36/arch/x86/kernel/v
        if (get_user(segoffs, intr_ptr))
                goto cannot_handle;
        if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.36/arch/x86/kernel/vmi_32.c linux-2.6.36/arch/x86/kernel/vmi_32.c
---- linux-2.6.36/arch/x86/kernel/vmi_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/vmi_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -46,12 +46,17 @@ typedef u32 __attribute__((regparm(1))) 
- typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
- 
- #define call_vrom_func(rom,func) \
--   (((VROMFUNC *)(rom->func))())
-+   (((VROMFUNC *)(ktva_ktla(rom.func)))())
- 
- #define call_vrom_long_func(rom,func,arg) \
--   (((VROMLONGFUNC *)(rom->func)) (arg))
-+({\
-+      u64 __reloc = ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\
-+      struct vmi_relocation_info *const __rel = (struct vmi_relocation_info *)&__reloc;\
-+      __rel->eip = (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\
-+      __reloc;\
-+})
- 
--static struct vrom_header *vmi_rom;
-+static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"), __aligned__(PAGE_SIZE)));
- static int disable_pge;
- static int disable_pse;
- static int disable_sep;
-@@ -78,10 +83,10 @@ static struct {
-       void (*set_initial_ap_state)(int, int);
-       void (*halt)(void);
-       void (*set_lazy_mode)(int mode);
--} vmi_ops;
-+} vmi_ops __read_only;
- 
- /* Cached VMI operations */
--struct vmi_timer_ops vmi_timer_ops;
-+struct vmi_timer_ops vmi_timer_ops __read_only;
- 
- /*
-  * VMI patching routines.
-@@ -96,7 +101,7 @@ struct vmi_timer_ops vmi_timer_ops;
- static inline void patch_offset(void *insnbuf,
-                               unsigned long ip, unsigned long dest)
- {
--        *(unsigned long *)(insnbuf+1) = dest-ip-5;
-+      *(unsigned long *)(insnbuf+1) = dest-ip-5;
- }
- 
- static unsigned patch_internal(int call, unsigned len, void *insnbuf,
-@@ -104,6 +109,7 @@ static unsigned patch_internal(int call,
- {
-       u64 reloc;
-       struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
-+
-       reloc = call_vrom_long_func(vmi_rom, get_reloc, call);
-       switch(rel->type) {
-               case VMI_RELOCATION_CALL_REL:
-@@ -382,13 +388,13 @@ static void vmi_set_pud(pud_t *pudp, pud
- 
- static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
- {
--      const pte_t pte = { .pte = 0 };
-+      const pte_t pte = __pte(0ULL);
-       vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
- }
- 
- static void vmi_pmd_clear(pmd_t *pmd)
- {
--      const pte_t pte = { .pte = 0 };
-+      const pte_t pte = __pte(0ULL);
-       vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
- }
- #endif
-@@ -416,8 +422,8 @@ vmi_startup_ipi_hook(int phys_apicid, un
-       ap.ss = __KERNEL_DS;
-       ap.esp = (unsigned long) start_esp;
- 
--      ap.ds = __USER_DS;
--      ap.es = __USER_DS;
-+      ap.ds = __KERNEL_DS;
-+      ap.es = __KERNEL_DS;
-       ap.fs = __KERNEL_PERCPU;
-       ap.gs = __KERNEL_STACK_CANARY;
- 
-@@ -464,6 +470,18 @@ static void vmi_leave_lazy_mmu(void)
-       paravirt_leave_lazy_mmu();
- }
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+static unsigned long vmi_pax_open_kernel(void)
-+{
-+      return 0;
-+}
-+
-+static unsigned long vmi_pax_close_kernel(void)
-+{
-+      return 0;
-+}
-+#endif
-+
- static inline int __init check_vmi_rom(struct vrom_header *rom)
- {
-       struct pci_header *pci;
-@@ -476,6 +494,10 @@ static inline int __init check_vmi_rom(s
-               return 0;
-       if (rom->vrom_signature != VMI_SIGNATURE)
-               return 0;
-+      if (rom->rom_length * 512 > sizeof(*rom)) {
-+              printk(KERN_WARNING "PAX: VMI: ROM size too big: %x\n", rom->rom_length * 512);
-+              return 0;
-+      }
-       if (rom->api_version_maj != VMI_API_REV_MAJOR ||
-           rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
-               printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
-@@ -540,7 +562,7 @@ static inline int __init probe_vmi_rom(v
-               struct vrom_header *romstart;
-               romstart = (struct vrom_header *)isa_bus_to_virt(base);
-               if (check_vmi_rom(romstart)) {
--                      vmi_rom = romstart;
-+                      vmi_rom = *romstart;
-                       return 1;
-               }
-       }
-@@ -816,6 +838,11 @@ static inline int __init activate_vmi(vo
- 
-       para_fill(pv_irq_ops.safe_halt, Halt);
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+      pv_mmu_ops.pax_open_kernel = vmi_pax_open_kernel;
-+      pv_mmu_ops.pax_close_kernel = vmi_pax_close_kernel;
-+#endif
-+
-       /*
-        * Alternative instruction rewriting doesn't happen soon enough
-        * to convert VMI_IRET to a call instead of a jump; so we have
-@@ -833,16 +860,16 @@ static inline int __init activate_vmi(vo
- 
- void __init vmi_init(void)
- {
--      if (!vmi_rom)
-+      if (!vmi_rom.rom_signature)
-               probe_vmi_rom();
-       else
--              check_vmi_rom(vmi_rom);
-+              check_vmi_rom(&vmi_rom);
- 
-       /* In case probing for or validating the ROM failed, basil */
--      if (!vmi_rom)
-+      if (!vmi_rom.rom_signature)
-               return;
- 
--      reserve_top_address(-vmi_rom->virtual_top);
-+      reserve_top_address(-vmi_rom.virtual_top);
- 
- #ifdef CONFIG_X86_IO_APIC
-       /* This is virtual hardware; timer routing is wired correctly */
-@@ -854,7 +881,7 @@ void __init vmi_activate(void)
- {
-       unsigned long flags;
- 
--      if (!vmi_rom)
-+      if (!vmi_rom.rom_signature)
-               return;
- 
-       local_irq_save(flags);
-diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.36/arch/x86/kernel/vmlinux.lds.S 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/vmlinux.lds.S 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/vmlinux.lds.S linux-2.6.37/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.37/arch/x86/kernel/vmlinux.lds.S 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/vmlinux.lds.S 2011-01-17 02:41:01.000000000 -0500
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -14560,7 +14743,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
  
  #undef i386     /* in case the preprocessor is a 32bit one */
  
-@@ -34,13 +41,13 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
+@@ -34,11 +41,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF
  #ifdef CONFIG_X86_32
  OUTPUT_ARCH(i386)
  ENTRY(phys_startup_32)
@@ -14571,12 +14754,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 -jiffies_64 = jiffies;
  #endif
  
-+jiffies = jiffies_64;
-+
  #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
- /*
-  * On 64-bit, align RODATA to 2MB so that even with CONFIG_DEBUG_RODATA
-@@ -69,31 +76,46 @@ jiffies_64 = jiffies;
+@@ -69,31 +74,46 @@ jiffies_64 = jiffies;
  
  PHDRS {
        text PT_LOAD FLAGS(5);          /* R_E */
@@ -14631,7 +14810,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
                HEAD_TEXT
  #ifdef CONFIG_X86_32
                . = ALIGN(PAGE_SIZE);
-@@ -108,13 +130,52 @@ SECTIONS
+@@ -108,13 +128,47 @@ SECTIONS
                IRQENTRY_TEXT
                *(.fixup)
                *(.gnu.warning)
@@ -14644,11 +14823,6 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 +
 +#ifdef CONFIG_X86_32
 +      . = ALIGN(PAGE_SIZE);
-+      .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
-+              *(.vmi.rom)
-+      } :module
-+
-+      . = ALIGN(PAGE_SIZE);
 +      .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
 +
 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
@@ -14666,37 +14840,37 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 +              /* End of text section */
 +              _etext = . - __KERNEL_TEXT_OFFSET;
 +      }
-+
+ 
+-      EXCEPTION_TABLE(16) :text = 0x9090
 +#ifdef CONFIG_X86_32
 +      . = ALIGN(PAGE_SIZE);
 +      .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
 +              *(.idt)
 +              . = ALIGN(PAGE_SIZE);
 +              *(.empty_zero_page)
-+              *(.swapper_pg_fixmap)
-+              *(.swapper_pg_pmd)
++              *(.initial_pg_fixmap)
++              *(.initial_pg_pmd)
++              *(.initial_page_table)
 +              *(.swapper_pg_dir)
-+              *(.trampoline_pg_dir)
 +      } :rodata
 +#endif
 +
 +      . = ALIGN(PAGE_SIZE);
 +      NOTES :rodata :note
- 
--      EXCEPTION_TABLE(16) :text = 0x9090
++
 +      EXCEPTION_TABLE(16) :rodata
  
        X64_ALIGN_DEBUG_RODATA_BEGIN
        RO_DATA(PAGE_SIZE)
-@@ -122,16 +183,20 @@ SECTIONS
+@@ -122,16 +176,20 @@ SECTIONS
  
        /* Data */
        .data : AT(ADDR(.data) - LOAD_OFFSET) {
 +
 +#ifdef CONFIG_PAX_KERNEXEC
-+      . = ALIGN(HPAGE_SIZE);
++              . = ALIGN(HPAGE_SIZE);
 +#else
-+      . = ALIGN(PAGE_SIZE);
++              . = ALIGN(PAGE_SIZE);
 +#endif
 +
                /* Start of data section */
@@ -14712,7 +14886,16 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
  
                PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -194,12 +259,6 @@ SECTIONS
+@@ -140,6 +198,8 @@ SECTIONS
+               DATA_DATA
+               CONSTRUCTORS
+ 
++              jiffies = jiffies_64;
++
+               /* rarely changed data like cpu maps */
+               READ_MOSTLY_DATA(INTERNODE_CACHE_BYTES)
+ 
+@@ -194,12 +254,6 @@ SECTIONS
        }
        vgetcpu_mode = VVIRT(.vgetcpu_mode);
  
@@ -14725,7 +14908,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
        .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
                *(.vsyscall_3)
        }
-@@ -215,12 +274,19 @@ SECTIONS
+@@ -215,12 +269,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
        /* Init code and data - will be freed after init */
@@ -14748,7 +14931,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
        /*
         * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
         * output PHDR, so the next output section - .init.text - should
-@@ -229,12 +295,27 @@ SECTIONS
+@@ -229,12 +290,27 @@ SECTIONS
        PERCPU_VADDR(0, :percpu)
  #endif
  
@@ -14764,7 +14947,8 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 +              VMLINUX_SYMBOL(_einittext) = .;
 +              . = ALIGN(PAGE_SIZE);
 +      } :text.init
-+
+ 
+-      INIT_DATA_SECTION(16)
 +      /*
 +       * .exit.text is discard at runtime, not link time, to deal with
 +       *  references from .altinstructions and .eh_frame
@@ -14774,17 +14958,16 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 +              . = ALIGN(16);
 +      } :text.exit
 +      . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
- 
--      INIT_DATA_SECTION(16)
++
 +      . = ALIGN(PAGE_SIZE);
 +      INIT_DATA_SECTION(16) :init
  
        .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
                __x86_cpu_dev_start = .;
-@@ -260,19 +341,11 @@ SECTIONS
-               *(.altinstr_replacement)
+@@ -288,19 +364,12 @@ SECTIONS
+               __iommu_table_end = .;
        }
- 
+       . = ALIGN(8);
 -      /*
 -       * .exit.text is discard at runtime, not link time, to deal with
 -       *  references from .altinstructions and .eh_frame
@@ -14792,17 +14975,17 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
 -      .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
 -              EXIT_TEXT
 -      }
--
+ 
        .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
                EXIT_DATA
        }
  
 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
 +#ifndef CONFIG_SMP
-       PERCPU(PAGE_SIZE)
+       PERCPU(THREAD_SIZE)
  #endif
  
-@@ -291,16 +364,10 @@ SECTIONS
+@@ -319,16 +388,10 @@ SECTIONS
        .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
                __smp_locks = .;
                *(.smp_locks)
@@ -14820,7 +15003,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
        /* BSS */
        . = ALIGN(PAGE_SIZE);
        .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -316,6 +383,7 @@ SECTIONS
+@@ -344,6 +407,7 @@ SECTIONS
                __brk_base = .;
                . += 64 * 1024;         /* 64k alignment slop space */
                *(.brk_reservation)     /* areas brk users have reserved */
@@ -14828,7 +15011,7 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
                __brk_limit = .;
        }
  
-@@ -342,13 +410,12 @@ SECTIONS
+@@ -370,13 +434,12 @@ SECTIONS
   * for the boot processor.
   */
  #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -14843,9 +15026,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vmlinux.lds.S linux-2.6.36/arch/x86/kern
           "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.36/arch/x86/kernel/vsyscall_64.c linux-2.6.36/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.36/arch/x86/kernel/vsyscall_64.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/vsyscall_64.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/vsyscall_64.c linux-2.6.37/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.37/arch/x86/kernel/vsyscall_64.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/vsyscall_64.c 2011-01-17 02:41:01.000000000 -0500
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
        write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14863,9 +15046,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/vsyscall_64.c linux-2.6.36/arch/x86/kern
                p = tcache->blob[1];
        } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
                /* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/x8664_ksyms_64.c      2011-01-17 02:41:01.000000000 -0500
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -14875,9 +15058,9 @@ diff -urNp linux-2.6.36/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.36/arch/x86/k
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.36/arch/x86/kernel/xsave.c linux-2.6.36/arch/x86/kernel/xsave.c
---- linux-2.6.36/arch/x86/kernel/xsave.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kernel/xsave.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/kernel/xsave.c linux-2.6.37/arch/x86/kernel/xsave.c
+--- linux-2.6.37/arch/x86/kernel/xsave.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kernel/xsave.c       2011-01-17 02:41:01.000000000 -0500
 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
            fx_sw_user->xstate_size > fx_sw_user->extended_size)
                return -EINVAL;
@@ -14905,27 +15088,27 @@ diff -urNp linux-2.6.36/arch/x86/kernel/xsave.c linux-2.6.36/arch/x86/kernel/xsa
                                       buf);
        if (unlikely(err)) {
                /*
-diff -urNp linux-2.6.36/arch/x86/kvm/emulate.c linux-2.6.36/arch/x86/kvm/emulate.c
---- linux-2.6.36/arch/x86/kvm/emulate.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kvm/emulate.c        2010-11-06 18:58:15.000000000 -0400
-@@ -92,7 +92,7 @@
- #define Src2CL      (1<<29)
+diff -urNp linux-2.6.37/arch/x86/kvm/emulate.c linux-2.6.37/arch/x86/kvm/emulate.c
+--- linux-2.6.37/arch/x86/kvm/emulate.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kvm/emulate.c        2011-01-17 02:41:01.000000000 -0500
+@@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
+ #define Src2Imm     (4<<29)
 -#define Src2Mask    (7<<29)
 +#define Src2Mask    (7U<<29)
  
- enum {
-       Group1_80, Group1_81, Group1_82, Group1_83,
-@@ -446,6 +446,7 @@ static u32 group2_table[] = {
+ #define X2(x...) x, x
+ #define X3(x...) X2(x), x
+@@ -197,6 +197,7 @@ struct group_dual {
  
- #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix)    \
+ #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
        do {                                                            \
 +              unsigned long _tmp;                                     \
                __asm__ __volatile__ (                                  \
                        _PRE_EFLAGS("0", "4", "2")                      \
                        _op _suffix " %"_x"3,%1; "                      \
-@@ -459,8 +460,6 @@ static u32 group2_table[] = {
+@@ -210,8 +211,6 @@ struct group_dual {
  /* Raw emulation: instruction has two explicit operands. */
  #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
        do {                                                            \
@@ -14933,18 +15116,18 @@ diff -urNp linux-2.6.36/arch/x86/kvm/emulate.c linux-2.6.36/arch/x86/kvm/emulate
 -                                                                      \
                switch ((_dst).bytes) {                                 \
                case 2:                                                 \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
-@@ -476,7 +475,6 @@ static u32 group2_table[] = {
+                       ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
+@@ -227,7 +226,6 @@ struct group_dual {
  
  #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
        do {                                                                 \
 -              unsigned long _tmp;                                          \
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
-                       ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
-diff -urNp linux-2.6.36/arch/x86/kvm/lapic.c linux-2.6.36/arch/x86/kvm/lapic.c
---- linux-2.6.36/arch/x86/kvm/lapic.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kvm/lapic.c  2010-11-06 18:58:15.000000000 -0400
+                       ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
+diff -urNp linux-2.6.37/arch/x86/kvm/lapic.c linux-2.6.37/arch/x86/kvm/lapic.c
+--- linux-2.6.37/arch/x86/kvm/lapic.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kvm/lapic.c  2011-01-17 02:41:01.000000000 -0500
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -14954,10 +15137,10 @@ diff -urNp linux-2.6.36/arch/x86/kvm/lapic.c linux-2.6.36/arch/x86/kvm/lapic.c
  
  #define APIC_LVT_NUM                  6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.36/arch/x86/kvm/svm.c linux-2.6.36/arch/x86/kvm/svm.c
---- linux-2.6.36/arch/x86/kvm/svm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kvm/svm.c    2010-11-06 18:58:15.000000000 -0400
-@@ -2892,7 +2892,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.37/arch/x86/kvm/svm.c linux-2.6.37/arch/x86/kvm/svm.c
+--- linux-2.6.37/arch/x86/kvm/svm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kvm/svm.c    2011-01-17 02:41:01.000000000 -0500
+@@ -3023,7 +3023,11 @@ static void reload_tss(struct kvm_vcpu *
        int cpu = raw_smp_processor_id();
  
        struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -14969,7 +15152,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/svm.c linux-2.6.36/arch/x86/kvm/svm.c
        load_TR_desc();
  }
  
-@@ -3443,7 +3447,7 @@ static void svm_fpu_deactivate(struct kv
+@@ -3600,7 +3604,7 @@ static void svm_fpu_deactivate(struct kv
        update_cr0_intercept(svm);
  }
  
@@ -14978,13 +15161,13 @@ diff -urNp linux-2.6.36/arch/x86/kvm/svm.c linux-2.6.36/arch/x86/kvm/svm.c
        .cpu_has_kvm_support = has_svm,
        .disabled_by_bios = is_disabled,
        .hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
---- linux-2.6.36/arch/x86/kvm/vmx.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kvm/vmx.c    2010-11-06 18:58:15.000000000 -0400
-@@ -711,7 +711,11 @@ static void reload_tss(void)
+diff -urNp linux-2.6.37/arch/x86/kvm/vmx.c linux-2.6.37/arch/x86/kvm/vmx.c
+--- linux-2.6.37/arch/x86/kvm/vmx.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kvm/vmx.c    2011-01-17 02:41:01.000000000 -0500
+@@ -705,7 +705,11 @@ static void reload_tss(void)
+       struct desc_struct *descs;
  
-       native_store_gdt(&gdt);
-       descs = (void *)gdt.address;
+       descs = (void *)gdt->address;
 +
 +      pax_open_kernel();
        descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
@@ -14993,7 +15176,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
        load_TR_desc();
  }
  
-@@ -1616,8 +1620,11 @@ static __init int hardware_setup(void)
+@@ -1589,8 +1593,11 @@ static __init int hardware_setup(void)
        if (!cpu_has_vmx_flexpriority())
                flexpriority_enabled = 0;
  
@@ -15007,7 +15190,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
  
        if (enable_ept && !cpu_has_vmx_ept_2m_page())
                kvm_disable_largepages();
-@@ -2602,7 +2609,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2575,7 +2582,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
        vmcs_writel(HOST_IDTR_BASE, dt.address);   /* 22.2.4 */
  
        asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
@@ -15016,7 +15199,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
        vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
        vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
        vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));
-@@ -3985,6 +3992,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3959,6 +3966,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
                "jmp .Lkvm_vmx_return \n\t"
                ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
                ".Lkvm_vmx_return: "
@@ -15029,7 +15212,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
                /* Save guest registers, load host registers, keep flags */
                "xchg %0,     (%%"R"sp) \n\t"
                "mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -4031,8 +4044,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -4005,6 +4018,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
                [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
  #endif
                [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
@@ -15039,21 +15222,18 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
 +#endif
 +
              : "cc", "memory"
--              , R"bx", R"di", R"si"
-+              , R"ax", R"bx", R"di", R"si"
+               , R"ax", R"bx", R"di", R"si"
  #ifdef CONFIG_X86_64
-               , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
- #endif
-@@ -4046,7 +4064,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
-       if (vmx->rmode.irq.pending)
-               fixup_rmode_irq(vmx);
+@@ -4018,7 +4036,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+ 
+       vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
  
 -      asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 +      asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
        vmx->launched = 1;
  
-       vmx_complete_interrupts(vmx);
-@@ -4280,7 +4298,7 @@ static void vmx_set_supported_cpuid(u32 
+       vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
+@@ -4253,7 +4271,7 @@ static void vmx_set_supported_cpuid(u32 
  {
  }
  
@@ -15062,10 +15242,10 @@ diff -urNp linux-2.6.36/arch/x86/kvm/vmx.c linux-2.6.36/arch/x86/kvm/vmx.c
        .cpu_has_kvm_support = cpu_has_kvm_support,
        .disabled_by_bios = vmx_disabled_by_bios,
        .hardware_setup = hardware_setup,
-diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
---- linux-2.6.36/arch/x86/kvm/x86.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/kvm/x86.c    2010-11-06 18:58:15.000000000 -0400
-@@ -90,7 +90,7 @@ static void update_cr8_intercept(struct 
+diff -urNp linux-2.6.37/arch/x86/kvm/x86.c linux-2.6.37/arch/x86/kvm/x86.c
+--- linux-2.6.37/arch/x86/kvm/x86.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/kvm/x86.c    2011-01-17 02:41:01.000000000 -0500
+@@ -92,7 +92,7 @@ static void update_cr8_intercept(struct 
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
                                    struct kvm_cpuid_entry2 __user *entries);
  
@@ -15074,7 +15254,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
  EXPORT_SYMBOL_GPL(kvm_x86_ops);
  
  int ignore_msrs = 0;
-@@ -116,38 +116,38 @@ static struct kvm_shared_msrs_global __r
+@@ -118,38 +118,38 @@ static struct kvm_shared_msrs_global __r
  static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs);
  
  struct kvm_stats_debugfs_item debugfs_entries[] = {
@@ -15145,7 +15325,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
        { NULL }
  };
  
-@@ -1740,6 +1740,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -1979,6 +1979,8 @@ long kvm_arch_dev_ioctl(struct file *fil
                if (n < msr_list.nmsrs)
                        goto out;
                r = -EFAULT;
@@ -15154,7 +15334,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
                if (copy_to_user(user_msr_list->indices, &msrs_to_save,
                                 num_msrs_to_save * sizeof(u32)))
                        goto out;
-@@ -2197,7 +2199,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2446,7 +2448,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
                                    struct kvm_interrupt *irq)
  {
@@ -15163,7 +15343,7 @@ diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
                return -EINVAL;
        if (irqchip_in_kernel(vcpu->kvm))
                return -ENXIO;
-@@ -4214,10 +4216,10 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -4623,10 +4625,10 @@ void kvm_after_handle_nmi(struct kvm_vcp
  }
  EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
@@ -15176,9 +15356,9 @@ diff -urNp linux-2.6.36/arch/x86/kvm/x86.c linux-2.6.36/arch/x86/kvm/x86.c
  
        if (kvm_x86_ops) {
                printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/atomic64_cx8_32.S        2011-01-17 02:41:01.000000000 -0500
 @@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
        movl %edx, %ecx
        \ins\()l %esi, %ebx
@@ -15259,9 +15439,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/atomic64_cx8_32.S linux-2.6.36/arch/x86/lib
        LOCK_PREFIX
        cmpxchg8b (%esi)
        jne 1b
-diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/checksum_32.S
---- linux-2.6.36/arch/x86/lib/checksum_32.S    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/checksum_32.S    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/checksum_32.S linux-2.6.37/arch/x86/lib/checksum_32.S
+--- linux-2.6.37/arch/x86/lib/checksum_32.S    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/checksum_32.S    2011-01-17 02:41:01.000000000 -0500
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -15272,7 +15452,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
  /*
   * computes a partial checksum, e.g. for TCP/UDP fragments
   */
-@@ -304,9 +305,22 @@ unsigned int csum_partial_copy_generic (
+@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (
  
  #define ARGBASE 16            
  #define FP            12
@@ -15281,23 +15461,29 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
 +
 +ENTRY(csum_partial_copy_generic_to_user)
        CFI_STARTPROC
-+      pushl $(__USER_DS)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      pushl %gs
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %es
 +      CFI_ADJUST_CFA_OFFSET -4
 +      jmp csum_partial_copy_generic
++#endif
 +
 +ENTRY(csum_partial_copy_generic_from_user)
-+      pushl $(__USER_DS)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      pushl %gs
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %ds
 +      CFI_ADJUST_CFA_OFFSET -4
++#endif
 +
 +ENTRY(csum_partial_copy_generic)
        subl  $4,%esp   
        CFI_ADJUST_CFA_OFFSET 4
        pushl %edi
-@@ -331,7 +345,7 @@ ENTRY(csum_partial_copy_generic)
+@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
        jmp 4f
  SRC(1:        movw (%esi), %bx        )
        addl $2, %esi
@@ -15306,7 +15492,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        addl $2, %edi
        addw %bx, %ax   
        adcl $0, %eax
-@@ -343,30 +357,30 @@ DST(     movw %bx, (%edi)        )
+@@ -343,30 +363,30 @@ DST(     movw %bx, (%edi)        )
  SRC(1:        movl (%esi), %ebx       )
  SRC(  movl 4(%esi), %edx      )
        adcl %ebx, %eax
@@ -15345,7 +15531,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
  
        lea 32(%esi), %esi
        lea 32(%edi), %edi
-@@ -380,7 +394,7 @@ DST(       movl %edx, 28(%edi)     )
+@@ -380,7 +400,7 @@ DST(       movl %edx, 28(%edi)     )
        shrl $2, %edx                   # This clears CF
  SRC(3:        movl (%esi), %ebx       )
        adcl %ebx, %eax
@@ -15354,7 +15540,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        lea 4(%esi), %esi
        lea 4(%edi), %edi
        dec %edx
-@@ -392,12 +406,12 @@ DST(     movl %ebx, (%edi)       )
+@@ -392,12 +412,12 @@ DST(     movl %ebx, (%edi)       )
        jb 5f
  SRC(  movw (%esi), %cx        )
        leal 2(%esi), %esi
@@ -15369,7 +15555,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
  6:    addl %ecx, %eax
        adcl $0, %eax
  7:
-@@ -408,7 +422,7 @@ DST(       movb %cl, (%edi)        )
+@@ -408,7 +428,7 @@ DST(       movb %cl, (%edi)        )
  
  6001:
        movl ARGBASE+20(%esp), %ebx     # src_err_ptr
@@ -15378,7 +15564,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
  
        # zero the complete destination - computing the rest
        # is too much work 
-@@ -421,11 +435,19 @@ DST(     movb %cl, (%edi)        )
+@@ -421,11 +441,19 @@ DST(     movb %cl, (%edi)        )
  
  6002:
        movl ARGBASE+24(%esp), %ebx     # dst_err_ptr
@@ -15399,7 +15585,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        popl %ebx
        CFI_ADJUST_CFA_OFFSET -4
        CFI_RESTORE ebx
-@@ -439,26 +461,41 @@ DST(     movb %cl, (%edi)        )
+@@ -439,26 +467,47 @@ DST(     movb %cl, (%edi)        )
        CFI_ADJUST_CFA_OFFSET -4
        ret     
        CFI_ENDPROC
@@ -15430,23 +15616,29 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
 +
 +ENTRY(csum_partial_copy_generic_to_user)
        CFI_STARTPROC
-+      pushl $(__USER_DS)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      pushl %gs
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %es
 +      CFI_ADJUST_CFA_OFFSET -4
 +      jmp csum_partial_copy_generic
++#endif
 +
 +ENTRY(csum_partial_copy_generic_from_user)
-+      pushl $(__USER_DS)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      pushl %gs
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %ds
 +      CFI_ADJUST_CFA_OFFSET -4
++#endif
 +
 +ENTRY(csum_partial_copy_generic)
        pushl %ebx
        CFI_ADJUST_CFA_OFFSET 4
        CFI_REL_OFFSET ebx, 0
-@@ -482,7 +519,7 @@ ENTRY(csum_partial_copy_generic)
+@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
        subl %ebx, %edi  
        lea  -1(%esi),%edx
        andl $-32,%edx
@@ -15455,7 +15647,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        testl %esi, %esi 
        jmp *%ebx
  1:    addl $64,%esi
-@@ -503,19 +540,19 @@ ENTRY(csum_partial_copy_generic)
+@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
        jb 5f
  SRC(  movw (%esi), %dx         )
        leal 2(%esi), %esi
@@ -15478,7 +15670,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        # zero the complete destination (computing the rest is too much work)
        movl ARGBASE+8(%esp),%edi       # dst
        movl ARGBASE+12(%esp),%ecx      # len
-@@ -523,10 +560,18 @@ DST(     movb %dl, (%edi)         )
+@@ -523,10 +572,21 @@ DST(     movb %dl, (%edi)         )
        rep; stosb
        jmp 7b
  6002: movl ARGBASE+24(%esp), %ebx     # dst_err_ptr
@@ -15487,6 +15679,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
        jmp  7b                 
  .previous                             
  
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +      pushl %ss
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %ds
@@ -15495,10 +15688,12 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
 +      CFI_ADJUST_CFA_OFFSET 4
 +      popl %es
 +      CFI_ADJUST_CFA_OFFSET -4
++#endif
++
        popl %esi
        CFI_ADJUST_CFA_OFFSET -4
        CFI_RESTORE esi
-@@ -538,7 +583,7 @@ DST(       movb %dl, (%edi)         )
+@@ -538,7 +598,7 @@ DST(       movb %dl, (%edi)         )
        CFI_RESTORE ebx
        ret
        CFI_ENDPROC
@@ -15507,9 +15702,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/checksum_32.S linux-2.6.36/arch/x86/lib/che
                                
  #undef ROUND
  #undef ROUND1         
-diff -urNp linux-2.6.36/arch/x86/lib/clear_page_64.S linux-2.6.36/arch/x86/lib/clear_page_64.S
---- linux-2.6.36/arch/x86/lib/clear_page_64.S  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/clear_page_64.S  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/clear_page_64.S linux-2.6.37/arch/x86/lib/clear_page_64.S
+--- linux-2.6.37/arch/x86/lib/clear_page_64.S  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/clear_page_64.S  2011-01-17 02:41:01.000000000 -0500
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -15519,9 +15714,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/clear_page_64.S linux-2.6.36/arch/x86/lib/c
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (clear_page_c - clear_page) - (2f - 1b)   /* offset */
  2:
-diff -urNp linux-2.6.36/arch/x86/lib/copy_page_64.S linux-2.6.36/arch/x86/lib/copy_page_64.S
---- linux-2.6.36/arch/x86/lib/copy_page_64.S   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/copy_page_64.S   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/copy_page_64.S linux-2.6.37/arch/x86/lib/copy_page_64.S
+--- linux-2.6.37/arch/x86/lib/copy_page_64.S   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/copy_page_64.S   2011-01-17 02:41:01.000000000 -0500
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -15531,9 +15726,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/copy_page_64.S linux-2.6.36/arch/x86/lib/co
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (copy_page_c - copy_page) - (2f - 1b)     /* offset */
  2:
-diff -urNp linux-2.6.36/arch/x86/lib/copy_user_64.S linux-2.6.36/arch/x86/lib/copy_user_64.S
---- linux-2.6.36/arch/x86/lib/copy_user_64.S   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/copy_user_64.S   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/copy_user_64.S linux-2.6.37/arch/x86/lib/copy_user_64.S
+--- linux-2.6.37/arch/x86/lib/copy_user_64.S   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/copy_user_64.S   2011-01-17 02:41:01.000000000 -0500
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -15590,9 +15785,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/copy_user_64.S linux-2.6.36/arch/x86/lib/co
        movl %edx,%ecx
        xorl %eax,%eax
        rep
-diff -urNp linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/copy_user_nocache_64.S   2011-01-17 02:41:01.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -15617,9 +15812,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/copy_user_nocache_64.S linux-2.6.36/arch/x8
        cmpl $8,%edx
        jb 20f          /* less then 8 bytes, go to byte copy loop */
        ALIGN_DESTINATION
-diff -urNp linux-2.6.36/arch/x86/lib/csum-wrappers_64.c linux-2.6.36/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.36/arch/x86/lib/csum-wrappers_64.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/csum-wrappers_64.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/csum-wrappers_64.c linux-2.6.37/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.37/arch/x86/lib/csum-wrappers_64.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/csum-wrappers_64.c       2011-01-17 02:41:01.000000000 -0500
 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
                        len -= 2;
                }
@@ -15638,27 +15833,31 @@ diff -urNp linux-2.6.36/arch/x86/lib/csum-wrappers_64.c linux-2.6.36/arch/x86/li
        return csum_partial_copy_generic(src, (void __force *)dst,
                                         len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser.S
---- linux-2.6.36/arch/x86/lib/getuser.S        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/getuser.S        2010-11-06 18:58:15.000000000 -0400
-@@ -33,14 +33,38 @@
+diff -urNp linux-2.6.37/arch/x86/lib/getuser.S linux-2.6.37/arch/x86/lib/getuser.S
+--- linux-2.6.37/arch/x86/lib/getuser.S        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/getuser.S        2011-01-17 02:41:01.000000000 -0500
+@@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
  #include <asm/asm.h>
 +#include <asm/segment.h>
 +#include <asm/pgtable.h>
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg %gs:
++#else
++#define __copyuser_seg
++#endif
  
        .text
  ENTRY(__get_user_1)
        CFI_STARTPROC
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
+-1:    movzb (%_ASM_AX),%edx
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -15670,29 +15869,21 @@ diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser
 +
 +#endif
 +
- 1:    movzb (%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      pop %ds
-+#endif
-+
++1:    movzb __copyuser_seg (%_ASM_AX),%edx
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -49,11 +73,33 @@ ENDPROC(__get_user_1)
+@@ -49,11 +70,24 @@ ENDPROC(__get_user_1)
  ENTRY(__get_user_2)
        CFI_STARTPROC
        add $1,%_ASM_AX
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
        jc bad_get_user
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
+-2:    movzwl -1(%_ASM_AX),%edx
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -15704,29 +15895,21 @@ diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser
 +
 +#endif
 +
- 2:    movzwl -1(%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      pop %ds
-+#endif
-+
++2:    movzwl __copyuser_seg -1(%_ASM_AX),%edx
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -62,11 +108,33 @@ ENDPROC(__get_user_2)
+@@ -62,11 +96,24 @@ ENDPROC(__get_user_2)
  ENTRY(__get_user_4)
        CFI_STARTPROC
        add $3,%_ASM_AX
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
        jc bad_get_user
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
+-3:    mov -3(%_ASM_AX),%edx
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
@@ -15738,17 +15921,11 @@ diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser
 +
 +#endif
 +
- 3:    mov -3(%_ASM_AX),%edx
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      pop %ds
-+#endif
-+
++3:    mov __copyuser_seg -3(%_ASM_AX),%edx
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -80,6 +148,15 @@ ENTRY(__get_user_8)
+@@ -80,6 +127,15 @@ ENTRY(__get_user_8)
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae     bad_get_user
@@ -15764,22 +15941,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/getuser.S linux-2.6.36/arch/x86/lib/getuser
  4:    movq -7(%_ASM_AX),%_ASM_DX
        xor %eax,%eax
        ret
-@@ -89,6 +166,12 @@ ENDPROC(__get_user_8)
- 
- bad_get_user:
-       CFI_STARTPROC
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      pop %ds
-+#endif
-+
-       xor %edx,%edx
-       mov $(-EFAULT),%_ASM_AX
-       ret
-diff -urNp linux-2.6.36/arch/x86/lib/insn.c linux-2.6.36/arch/x86/lib/insn.c
---- linux-2.6.36/arch/x86/lib/insn.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/insn.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/insn.c linux-2.6.37/arch/x86/lib/insn.c
+--- linux-2.6.37/arch/x86/lib/insn.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/insn.c   2011-01-17 02:41:01.000000000 -0500
 @@ -21,6 +21,7 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -15799,9 +15963,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/insn.c linux-2.6.36/arch/x86/lib/insn.c
        insn->x86_64 = x86_64 ? 1 : 0;
        insn->opnd_bytes = 4;
        if (x86_64)
-diff -urNp linux-2.6.36/arch/x86/lib/mmx_32.c linux-2.6.36/arch/x86/lib/mmx_32.c
---- linux-2.6.36/arch/x86/lib/mmx_32.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/mmx_32.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/mmx_32.c linux-2.6.37/arch/x86/lib/mmx_32.c
+--- linux-2.6.37/arch/x86/lib/mmx_32.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/mmx_32.c 2011-01-17 02:41:01.000000000 -0500
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
        void *p;
@@ -16117,9 +16281,9 @@ diff -urNp linux-2.6.36/arch/x86/lib/mmx_32.c linux-2.6.36/arch/x86/lib/mmx_32.c
  
                from += 64;
                to += 64;
-diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser.S
---- linux-2.6.36/arch/x86/lib/putuser.S        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/putuser.S        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/lib/putuser.S linux-2.6.37/arch/x86/lib/putuser.S
+--- linux-2.6.37/arch/x86/lib/putuser.S        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/putuser.S        2011-01-17 02:41:01.000000000 -0500
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -16130,7 +16294,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
  
  /*
   * __put_user_X
-@@ -29,59 +30,162 @@
+@@ -29,52 +30,119 @@
   * as they get called from within inline assembly.
   */
  
@@ -16145,15 +16309,18 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
 +#else
 +#define _DEST %_ASM_CX
 +#endif
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __copyuser_seg %gs:
++#else
++#define __copyuser_seg
++#endif
 +
  .text
  ENTRY(__put_user_1)
        ENTER
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
 +      GET_THREAD_INFO(%_ASM_BX)
        cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
        jae bad_put_user
@@ -16169,13 +16336,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
 +
 +#endif
 +
-+1:    movb %al,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      popl %ds
-+#endif
-+
++1:    movb %al,__copyuser_seg (_DEST)
        xor %eax,%eax
        EXIT
  ENDPROC(__put_user_1)
@@ -16183,10 +16344,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
  ENTRY(__put_user_2)
        ENTER
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
 +      GET_THREAD_INFO(%_ASM_BX)
        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
        sub $1,%_ASM_BX
@@ -16204,13 +16362,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
 +
 +#endif
 +
-+2:    movw %ax,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      popl %ds
-+#endif
-+
++2:    movw %ax,__copyuser_seg (_DEST)
        xor %eax,%eax
        EXIT
  ENDPROC(__put_user_2)
@@ -16218,10 +16370,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
  ENTRY(__put_user_4)
        ENTER
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
 +      GET_THREAD_INFO(%_ASM_BX)
        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
        sub $3,%_ASM_BX
@@ -16239,13 +16388,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
 +
 +#endif
 +
-+3:    movl %eax,(_DEST)
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      popl %ds
-+#endif
-+
++3:    movl %eax,__copyuser_seg (_DEST)
        xor %eax,%eax
        EXIT
  ENDPROC(__put_user_4)
@@ -16253,10 +16396,7 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
  ENTRY(__put_user_8)
        ENTER
 +
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl $(__USER_DS)
-+      popl %ds
-+#else
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
 +      GET_THREAD_INFO(%_ASM_BX)
        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
        sub $7,%_ASM_BX
@@ -16274,278 +16414,126 @@ diff -urNp linux-2.6.36/arch/x86/lib/putuser.S linux-2.6.36/arch/x86/lib/putuser
 +
 +#endif
 +
-+4:    mov %_ASM_AX,(_DEST)
++4:    mov %_ASM_AX,__copyuser_seg (_DEST)
  #ifdef CONFIG_X86_32
 -5:    movl %edx,4(%_ASM_CX)
-+5:    movl %edx,4(_DEST)
++5:    movl %edx,__copyuser_seg 4(_DEST)
  #endif
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      popl %ds
-+#endif
-+
        xor %eax,%eax
        EXIT
- ENDPROC(__put_user_8)
- 
- bad_put_user:
-       CFI_STARTPROC
-+
-+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+      pushl %ss
-+      popl %ds
-+#endif
-+
-       movl $-EFAULT,%eax
-       EXIT
- END(bad_put_user)
-diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/usercopy_32.c
---- linux-2.6.36/arch/x86/lib/usercopy_32.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/usercopy_32.c    2010-11-06 18:58:15.000000000 -0400
-@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
-  * Copy a null terminated string from userspace.
-  */
- 
--#define __do_strncpy_from_user(dst, src, count, res)                     \
--do {                                                                     \
--      int __d0, __d1, __d2;                                              \
--      might_fault();                                                     \
--      __asm__ __volatile__(                                              \
--              "       testl %1,%1\n"                                     \
--              "       jz 2f\n"                                           \
+diff -urNp linux-2.6.37/arch/x86/lib/usercopy_32.c linux-2.6.37/arch/x86/lib/usercopy_32.c
+--- linux-2.6.37/arch/x86/lib/usercopy_32.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/usercopy_32.c    2011-01-17 02:41:01.000000000 -0500
+@@ -43,7 +43,7 @@ do {                                                                    \
+       __asm__ __volatile__(                                              \
+               "       testl %1,%1\n"                                     \
+               "       jz 2f\n"                                           \
 -              "0:     lodsb\n"                                           \
--              "       stosb\n"                                           \
--              "       testb %%al,%%al\n"                                 \
--              "       jz 1f\n"                                           \
--              "       decl %1\n"                                         \
--              "       jnz 0b\n"                                          \
--              "1:     subl %1,%0\n"                                      \
--              "2:\n"                                                     \
--              ".section .fixup,\"ax\"\n"                                 \
--              "3:     movl %5,%0\n"                                      \
--              "       jmp 2b\n"                                          \
--              ".previous\n"                                              \
--              _ASM_EXTABLE(0b,3b)                                        \
--              : "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1),    \
--                "=&D" (__d2)                                             \
--              : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \
--              : "memory");                                               \
--} while (0)
-+static long __do_strncpy_from_user(char *dst, const char __user *src, long count)
-+{
-+      int __d0, __d1, __d2;
-+      long res = -EFAULT;
-+
-+      might_fault();
-+      __asm__ __volatile__(
-+              "       movw %w10,%%ds\n"
-+              "       testl %1,%1\n"
-+              "       jz 2f\n"
-+              "0:     lodsb\n"
-+              "       stosb\n"
-+              "       testb %%al,%%al\n"
-+              "       jz 1f\n"
-+              "       decl %1\n"
-+              "       jnz 0b\n"
-+              "1:     subl %1,%0\n"
-+              "2:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%ds\n"
-+              ".section .fixup,\"ax\"\n"
-+              "3:     movl %5,%0\n"
-+              "       jmp 2b\n"
-+              ".previous\n"
-+              _ASM_EXTABLE(0b,3b)
-+              : "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1),
-+                "=&D" (__d2)
-+              : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst),
-+                "r"(__USER_DS)
-+              : "memory");
-+      return res;
-+}
- 
- /**
-  * __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking.
-@@ -85,9 +92,7 @@ do {                                                                    \
- long
- __strncpy_from_user(char *dst, const char __user *src, long count)
- {
--      long res;
--      __do_strncpy_from_user(dst, src, count, res);
--      return res;
-+      return __do_strncpy_from_user(dst, src, count);
- }
- EXPORT_SYMBOL(__strncpy_from_user);
- 
-@@ -114,7 +119,7 @@ strncpy_from_user(char *dst, const char 
- {
-       long res = -EFAULT;
-       if (access_ok(VERIFY_READ, src, 1))
--              __do_strncpy_from_user(dst, src, count, res);
-+              res = __do_strncpy_from_user(dst, src, count);
-       return res;
- }
- EXPORT_SYMBOL(strncpy_from_user);
-@@ -123,24 +128,30 @@ EXPORT_SYMBOL(strncpy_from_user);
-  * Zero Userspace
-  */
- 
--#define __do_clear_user(addr,size)                                    \
--do {                                                                  \
--      int __d0;                                                       \
--      might_fault();                                                  \
--      __asm__ __volatile__(                                           \
--              "0:     rep; stosl\n"                                   \
--              "       movl %2,%0\n"                                   \
--              "1:     rep; stosb\n"                                   \
--              "2:\n"                                                  \
--              ".section .fixup,\"ax\"\n"                              \
--              "3:     lea 0(%2,%0,4),%0\n"                            \
--              "       jmp 2b\n"                                       \
--              ".previous\n"                                           \
--              _ASM_EXTABLE(0b,3b)                                     \
--              _ASM_EXTABLE(1b,2b)                                     \
--              : "=&c"(size), "=&D" (__d0)                             \
--              : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0));     \
--} while (0)
-+static unsigned long __do_clear_user(void __user *addr, unsigned long size)
-+{
-+      int __d0;
-+
-+      might_fault();
-+      __asm__ __volatile__(
-+              "       movw %w6,%%es\n"
-+              "0:     rep; stosl\n"
-+              "       movl %2,%0\n"
-+              "1:     rep; stosb\n"
-+              "2:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%es\n"
-+              ".section .fixup,\"ax\"\n"
-+              "3:     lea 0(%2,%0,4),%0\n"
-+              "       jmp 2b\n"
-+              ".previous\n"
-+              _ASM_EXTABLE(0b,3b)
-+              _ASM_EXTABLE(1b,2b)
-+              : "=&c"(size), "=&D" (__d0)
-+              : "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0),
-+                "r"(__USER_DS));
-+      return size;
-+}
- 
- /**
-  * clear_user: - Zero a block of memory in user space.
-@@ -157,7 +168,7 @@ clear_user(void __user *to, unsigned lon
- {
-       might_fault();
-       if (access_ok(VERIFY_WRITE, to, n))
--              __do_clear_user(to, n);
-+              n = __do_clear_user(to, n);
-       return n;
- }
- EXPORT_SYMBOL(clear_user);
-@@ -176,8 +187,7 @@ EXPORT_SYMBOL(clear_user);
- unsigned long
- __clear_user(void __user *to, unsigned long n)
- {
--      __do_clear_user(to, n);
--      return n;
-+      return __do_clear_user(to, n);
- }
- EXPORT_SYMBOL(__clear_user);
- 
-@@ -200,14 +210,17 @@ long strnlen_user(const char __user *s, 
++              "0:     lodsb " __copyuser_seg" (%%esi)\n"                 \
+               "       stosb\n"                                           \
+               "       testb %%al,%%al\n"                                 \
+               "       jz 1f\n"                                           \
+@@ -128,10 +128,12 @@ do {                                                                     \
+       int __d0;                                                       \
+       might_fault();                                                  \
+       __asm__ __volatile__(                                           \
++              __COPYUSER_SET_ES                                       \
+               "0:     rep; stosl\n"                                   \
+               "       movl %2,%0\n"                                   \
+               "1:     rep; stosb\n"                                   \
+               "2:\n"                                                  \
++              __COPYUSER_RESTORE_ES                                   \
+               ".section .fixup,\"ax\"\n"                              \
+               "3:     lea 0(%2,%0,4),%0\n"                            \
+               "       jmp 2b\n"                                       \
+@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, 
        might_fault();
  
        __asm__ __volatile__(
-+              "       movw %w8,%%es\n"
++              __COPYUSER_SET_ES
                "       testl %0, %0\n"
                "       jz 3f\n"
--              "       andl %0,%%ecx\n"
-+              "       movl %0,%%ecx\n"
-               "0:     repne; scasb\n"
-               "       setne %%al\n"
+               "       andl %0,%%ecx\n"
+@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, 
                "       subl %%ecx,%0\n"
                "       addl %0,%%eax\n"
                "1:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%es\n"
++              __COPYUSER_RESTORE_ES
                ".section .fixup,\"ax\"\n"
                "2:     xorl %%eax,%%eax\n"
                "       jmp 1b\n"
-@@ -219,7 +232,7 @@ long strnlen_user(const char __user *s, 
-               "       .long 0b,2b\n"
-               ".previous"
-               :"=&r" (n), "=&D" (s), "=&a" (res), "=&c" (tmp)
--              :"0" (n), "1" (s), "2" (0), "3" (mask)
-+              :"0" (n), "1" (s), "2" (0), "3" (mask), "r" (__USER_DS)
-               :"cc");
-       return res & mask;
- }
-@@ -227,10 +240,121 @@ EXPORT_SYMBOL(strnlen_user);
+@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
  
  #ifdef CONFIG_X86_INTEL_USERCOPY
  static unsigned long
 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
-+{
-+      int d0, d1;
-+      __asm__ __volatile__(
-+                     "       movw %w6, %%es\n"
-+                     "       .align 2,0x90\n"
-+                     "1:     movl 32(%4), %%eax\n"
-+                     "       cmpl $67, %0\n"
-+                     "       jbe 3f\n"
-+                     "2:     movl 64(%4), %%eax\n"
-+                     "       .align 2,0x90\n"
-+                     "3:     movl 0(%4), %%eax\n"
-+                     "4:     movl 4(%4), %%edx\n"
-+                     "5:     movl %%eax, %%es:0(%3)\n"
-+                     "6:     movl %%edx, %%es:4(%3)\n"
-+                     "7:     movl 8(%4), %%eax\n"
-+                     "8:     movl 12(%4),%%edx\n"
-+                     "9:     movl %%eax, %%es:8(%3)\n"
-+                     "10:    movl %%edx, %%es:12(%3)\n"
-+                     "11:    movl 16(%4), %%eax\n"
-+                     "12:    movl 20(%4), %%edx\n"
-+                     "13:    movl %%eax, %%es:16(%3)\n"
-+                     "14:    movl %%edx, %%es:20(%3)\n"
-+                     "15:    movl 24(%4), %%eax\n"
-+                     "16:    movl 28(%4), %%edx\n"
-+                     "17:    movl %%eax, %%es:24(%3)\n"
-+                     "18:    movl %%edx, %%es:28(%3)\n"
-+                     "19:    movl 32(%4), %%eax\n"
-+                     "20:    movl 36(%4), %%edx\n"
-+                     "21:    movl %%eax, %%es:32(%3)\n"
-+                     "22:    movl %%edx, %%es:36(%3)\n"
-+                     "23:    movl 40(%4), %%eax\n"
-+                     "24:    movl 44(%4), %%edx\n"
-+                     "25:    movl %%eax, %%es:40(%3)\n"
-+                     "26:    movl %%edx, %%es:44(%3)\n"
-+                     "27:    movl 48(%4), %%eax\n"
-+                     "28:    movl 52(%4), %%edx\n"
-+                     "29:    movl %%eax, %%es:48(%3)\n"
-+                     "30:    movl %%edx, %%es:52(%3)\n"
-+                     "31:    movl 56(%4), %%eax\n"
-+                     "32:    movl 60(%4), %%edx\n"
-+                     "33:    movl %%eax, %%es:56(%3)\n"
-+                     "34:    movl %%edx, %%es:60(%3)\n"
-+                     "       addl $-64, %0\n"
-+                     "       addl $64, %4\n"
-+                     "       addl $64, %3\n"
-+                     "       cmpl $63, %0\n"
-+                     "       ja  1b\n"
-+                     "35:    movl  %0, %%eax\n"
-+                     "       shrl  $2, %0\n"
-+                     "       andl  $3, %%eax\n"
-+                     "       cld\n"
-+                     "99:    rep; movsl\n"
-+                     "36:    movl %%eax, %0\n"
-+                     "37:    rep; movsb\n"
-+                     "100:\n"
-+                     "       pushl %%ss\n"
-+                     "       popl %%es\n"
+ {
+       int d0, d1;
+       __asm__ __volatile__(
+@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const
+                      "       .align 2,0x90\n"
+                      "3:     movl 0(%4), %%eax\n"
+                      "4:     movl 4(%4), %%edx\n"
+-                     "5:     movl %%eax, 0(%3)\n"
+-                     "6:     movl %%edx, 4(%3)\n"
++                     "5:     movl %%eax, "__copyuser_seg" 0(%3)\n"
++                     "6:     movl %%edx, "__copyuser_seg" 4(%3)\n"
+                      "7:     movl 8(%4), %%eax\n"
+                      "8:     movl 12(%4),%%edx\n"
+-                     "9:     movl %%eax, 8(%3)\n"
+-                     "10:    movl %%edx, 12(%3)\n"
++                     "9:     movl %%eax, "__copyuser_seg" 8(%3)\n"
++                     "10:    movl %%edx, "__copyuser_seg" 12(%3)\n"
+                      "11:    movl 16(%4), %%eax\n"
+                      "12:    movl 20(%4), %%edx\n"
+-                     "13:    movl %%eax, 16(%3)\n"
+-                     "14:    movl %%edx, 20(%3)\n"
++                     "13:    movl %%eax, "__copyuser_seg" 16(%3)\n"
++                     "14:    movl %%edx, "__copyuser_seg" 20(%3)\n"
+                      "15:    movl 24(%4), %%eax\n"
+                      "16:    movl 28(%4), %%edx\n"
+-                     "17:    movl %%eax, 24(%3)\n"
+-                     "18:    movl %%edx, 28(%3)\n"
++                     "17:    movl %%eax, "__copyuser_seg" 24(%3)\n"
++                     "18:    movl %%edx, "__copyuser_seg" 28(%3)\n"
+                      "19:    movl 32(%4), %%eax\n"
+                      "20:    movl 36(%4), %%edx\n"
+-                     "21:    movl %%eax, 32(%3)\n"
+-                     "22:    movl %%edx, 36(%3)\n"
++                     "21:    movl %%eax, "__copyuser_seg" 32(%3)\n"
++                     "22:    movl %%edx, "__copyuser_seg" 36(%3)\n"
+                      "23:    movl 40(%4), %%eax\n"
+                      "24:    movl 44(%4), %%edx\n"
+-                     "25:    movl %%eax, 40(%3)\n"
+-                     "26:    movl %%edx, 44(%3)\n"
++                     "25:    movl %%eax, "__copyuser_seg" 40(%3)\n"
++                     "26:    movl %%edx, "__copyuser_seg" 44(%3)\n"
+                      "27:    movl 48(%4), %%eax\n"
+                      "28:    movl 52(%4), %%edx\n"
+-                     "29:    movl %%eax, 48(%3)\n"
+-                     "30:    movl %%edx, 52(%3)\n"
++                     "29:    movl %%eax, "__copyuser_seg" 48(%3)\n"
++                     "30:    movl %%edx, "__copyuser_seg" 52(%3)\n"
+                      "31:    movl 56(%4), %%eax\n"
+                      "32:    movl 60(%4), %%edx\n"
+-                     "33:    movl %%eax, 56(%3)\n"
+-                     "34:    movl %%edx, 60(%3)\n"
++                     "33:    movl %%eax, "__copyuser_seg" 56(%3)\n"
++                     "34:    movl %%edx, "__copyuser_seg" 60(%3)\n"
+                      "       addl $-64, %0\n"
+                      "       addl $64, %4\n"
+                      "       addl $64, %3\n"
+@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const
+                      "       shrl  $2, %0\n"
+                      "       andl  $3, %%eax\n"
+                      "       cld\n"
++                     __COPYUSER_SET_ES
+                      "99:    rep; movsl\n"
+                      "36:    movl %%eax, %0\n"
+                      "37:    rep; movsb\n"
+                      "100:\n"
++                     __COPYUSER_RESTORE_ES
 +                     ".section .fixup,\"ax\"\n"
 +                     "101:   lea 0(%%eax,%0,4),%0\n"
 +                     "       jmp 100b\n"
@@ -16592,329 +16580,287 @@ diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/use
 +                     "       .long 99b,101b\n"
 +                     ".previous"
 +                     : "=&c"(size), "=&D" (d0), "=&S" (d1)
-+                     :  "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
++                     :  "1"(to), "2"(from), "0"(size)
 +                     : "eax", "edx", "memory");
 +      return size;
 +}
 +
 +static unsigned long
 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
- {
-       int d0, d1;
-       __asm__ __volatile__(
-+                     "       movw %w6, %%ds\n"
-                      "       .align 2,0x90\n"
-                      "1:     movl 32(%4), %%eax\n"
-                      "       cmpl $67, %0\n"
-@@ -239,36 +363,36 @@ __copy_user_intel(void __user *to, const
-                      "       .align 2,0x90\n"
-                      "3:     movl 0(%4), %%eax\n"
-                      "4:     movl 4(%4), %%edx\n"
--                     "5:     movl %%eax, 0(%3)\n"
--                     "6:     movl %%edx, 4(%3)\n"
-+                     "5:     movl %%eax, %%es:0(%3)\n"
-+                     "6:     movl %%edx, %%es:4(%3)\n"
-                      "7:     movl 8(%4), %%eax\n"
-                      "8:     movl 12(%4),%%edx\n"
--                     "9:     movl %%eax, 8(%3)\n"
--                     "10:    movl %%edx, 12(%3)\n"
-+                     "9:     movl %%eax, %%es:8(%3)\n"
-+                     "10:    movl %%edx, %%es:12(%3)\n"
-                      "11:    movl 16(%4), %%eax\n"
-                      "12:    movl 20(%4), %%edx\n"
--                     "13:    movl %%eax, 16(%3)\n"
--                     "14:    movl %%edx, 20(%3)\n"
-+                     "13:    movl %%eax, %%es:16(%3)\n"
-+                     "14:    movl %%edx, %%es:20(%3)\n"
-                      "15:    movl 24(%4), %%eax\n"
-                      "16:    movl 28(%4), %%edx\n"
--                     "17:    movl %%eax, 24(%3)\n"
--                     "18:    movl %%edx, 28(%3)\n"
-+                     "17:    movl %%eax, %%es:24(%3)\n"
-+                     "18:    movl %%edx, %%es:28(%3)\n"
-                      "19:    movl 32(%4), %%eax\n"
-                      "20:    movl 36(%4), %%edx\n"
--                     "21:    movl %%eax, 32(%3)\n"
--                     "22:    movl %%edx, 36(%3)\n"
-+                     "21:    movl %%eax, %%es:32(%3)\n"
-+                     "22:    movl %%edx, %%es:36(%3)\n"
-                      "23:    movl 40(%4), %%eax\n"
-                      "24:    movl 44(%4), %%edx\n"
--                     "25:    movl %%eax, 40(%3)\n"
--                     "26:    movl %%edx, 44(%3)\n"
-+                     "25:    movl %%eax, %%es:40(%3)\n"
-+                     "26:    movl %%edx, %%es:44(%3)\n"
-                      "27:    movl 48(%4), %%eax\n"
-                      "28:    movl 52(%4), %%edx\n"
--                     "29:    movl %%eax, 48(%3)\n"
--                     "30:    movl %%edx, 52(%3)\n"
-+                     "29:    movl %%eax, %%es:48(%3)\n"
-+                     "30:    movl %%edx, %%es:52(%3)\n"
-                      "31:    movl 56(%4), %%eax\n"
-                      "32:    movl 60(%4), %%edx\n"
--                     "33:    movl %%eax, 56(%3)\n"
--                     "34:    movl %%edx, 60(%3)\n"
-+                     "33:    movl %%eax, %%es:56(%3)\n"
-+                     "34:    movl %%edx, %%es:60(%3)\n"
-                      "       addl $-64, %0\n"
-                      "       addl $64, %4\n"
-                      "       addl $64, %3\n"
-@@ -282,6 +406,8 @@ __copy_user_intel(void __user *to, const
-                      "36:    movl %%eax, %0\n"
-                      "37:    rep; movsb\n"
-                      "100:\n"
-+                     "       pushl %%ss\n"
-+                     "       popl %%ds\n"
++{
++      int d0, d1;
++      __asm__ __volatile__(
++                     "       .align 2,0x90\n"
++                     "1:     movl "__copyuser_seg" 32(%4), %%eax\n"
++                     "       cmpl $67, %0\n"
++                     "       jbe 3f\n"
++                     "2:     movl "__copyuser_seg" 64(%4), %%eax\n"
++                     "       .align 2,0x90\n"
++                     "3:     movl "__copyuser_seg" 0(%4), %%eax\n"
++                     "4:     movl "__copyuser_seg" 4(%4), %%edx\n"
++                     "5:     movl %%eax, 0(%3)\n"
++                     "6:     movl %%edx, 4(%3)\n"
++                     "7:     movl "__copyuser_seg" 8(%4), %%eax\n"
++                     "8:     movl "__copyuser_seg" 12(%4),%%edx\n"
++                     "9:     movl %%eax, 8(%3)\n"
++                     "10:    movl %%edx, 12(%3)\n"
++                     "11:    movl "__copyuser_seg" 16(%4), %%eax\n"
++                     "12:    movl "__copyuser_seg" 20(%4), %%edx\n"
++                     "13:    movl %%eax, 16(%3)\n"
++                     "14:    movl %%edx, 20(%3)\n"
++                     "15:    movl "__copyuser_seg" 24(%4), %%eax\n"
++                     "16:    movl "__copyuser_seg" 28(%4), %%edx\n"
++                     "17:    movl %%eax, 24(%3)\n"
++                     "18:    movl %%edx, 28(%3)\n"
++                     "19:    movl "__copyuser_seg" 32(%4), %%eax\n"
++                     "20:    movl "__copyuser_seg" 36(%4), %%edx\n"
++                     "21:    movl %%eax, 32(%3)\n"
++                     "22:    movl %%edx, 36(%3)\n"
++                     "23:    movl "__copyuser_seg" 40(%4), %%eax\n"
++                     "24:    movl "__copyuser_seg" 44(%4), %%edx\n"
++                     "25:    movl %%eax, 40(%3)\n"
++                     "26:    movl %%edx, 44(%3)\n"
++                     "27:    movl "__copyuser_seg" 48(%4), %%eax\n"
++                     "28:    movl "__copyuser_seg" 52(%4), %%edx\n"
++                     "29:    movl %%eax, 48(%3)\n"
++                     "30:    movl %%edx, 52(%3)\n"
++                     "31:    movl "__copyuser_seg" 56(%4), %%eax\n"
++                     "32:    movl "__copyuser_seg" 60(%4), %%edx\n"
++                     "33:    movl %%eax, 56(%3)\n"
++                     "34:    movl %%edx, 60(%3)\n"
++                     "       addl $-64, %0\n"
++                     "       addl $64, %4\n"
++                     "       addl $64, %3\n"
++                     "       cmpl $63, %0\n"
++                     "       ja  1b\n"
++                     "35:    movl  %0, %%eax\n"
++                     "       shrl  $2, %0\n"
++                     "       andl  $3, %%eax\n"
++                     "       cld\n"
++                     "99:    rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
++                     "36:    movl %%eax, %0\n"
++                     "37:    rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
++                     "100:\n"
                       ".section .fixup,\"ax\"\n"
                       "101:   lea 0(%%eax,%0,4),%0\n"
                       "       jmp 100b\n"
-@@ -328,7 +454,7 @@ __copy_user_intel(void __user *to, const
-                      "       .long 99b,101b\n"
-                      ".previous"
-                      : "=&c"(size), "=&D" (d0), "=&S" (d1)
--                     :  "1"(to), "2"(from), "0"(size)
-+                     :  "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
-                      : "eax", "edx", "memory");
-       return size;
- }
-@@ -338,6 +464,7 @@ __copy_user_zeroing_intel(void *to, cons
- {
+@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons
        int d0, d1;
        __asm__ __volatile__(
-+                     "        movw %w6, %%ds\n"
                       "        .align 2,0x90\n"
-                      "0:      movl 32(%4), %%eax\n"
+-                     "0:      movl 32(%4), %%eax\n"
++                     "0:      movl "__copyuser_seg" 32(%4), %%eax\n"
                       "        cmpl $67, %0\n"
-@@ -346,36 +473,36 @@ __copy_user_zeroing_intel(void *to, cons
+                      "        jbe 2f\n"
+-                     "1:      movl 64(%4), %%eax\n"
++                     "1:      movl "__copyuser_seg" 64(%4), %%eax\n"
                       "        .align 2,0x90\n"
-                      "2:      movl 0(%4), %%eax\n"
-                      "21:     movl 4(%4), %%edx\n"
--                     "        movl %%eax, 0(%3)\n"
--                     "        movl %%edx, 4(%3)\n"
-+                     "        movl %%eax, %%es:0(%3)\n"
-+                     "        movl %%edx, %%es:4(%3)\n"
-                      "3:      movl 8(%4), %%eax\n"
-                      "31:     movl 12(%4),%%edx\n"
--                     "        movl %%eax, 8(%3)\n"
--                     "        movl %%edx, 12(%3)\n"
-+                     "        movl %%eax, %%es:8(%3)\n"
-+                     "        movl %%edx, %%es:12(%3)\n"
-                      "4:      movl 16(%4), %%eax\n"
-                      "41:     movl 20(%4), %%edx\n"
--                     "        movl %%eax, 16(%3)\n"
--                     "        movl %%edx, 20(%3)\n"
-+                     "        movl %%eax, %%es:16(%3)\n"
-+                     "        movl %%edx, %%es:20(%3)\n"
-                      "10:     movl 24(%4), %%eax\n"
-                      "51:     movl 28(%4), %%edx\n"
--                     "        movl %%eax, 24(%3)\n"
--                     "        movl %%edx, 28(%3)\n"
-+                     "        movl %%eax, %%es:24(%3)\n"
-+                     "        movl %%edx, %%es:28(%3)\n"
-                      "11:     movl 32(%4), %%eax\n"
-                      "61:     movl 36(%4), %%edx\n"
--                     "        movl %%eax, 32(%3)\n"
--                     "        movl %%edx, 36(%3)\n"
-+                     "        movl %%eax, %%es:32(%3)\n"
-+                     "        movl %%edx, %%es:36(%3)\n"
-                      "12:     movl 40(%4), %%eax\n"
-                      "71:     movl 44(%4), %%edx\n"
--                     "        movl %%eax, 40(%3)\n"
--                     "        movl %%edx, 44(%3)\n"
-+                     "        movl %%eax, %%es:40(%3)\n"
-+                     "        movl %%edx, %%es:44(%3)\n"
-                      "13:     movl 48(%4), %%eax\n"
-                      "81:     movl 52(%4), %%edx\n"
--                     "        movl %%eax, 48(%3)\n"
--                     "        movl %%edx, 52(%3)\n"
-+                     "        movl %%eax, %%es:48(%3)\n"
-+                     "        movl %%edx, %%es:52(%3)\n"
-                      "14:     movl 56(%4), %%eax\n"
-                      "91:     movl 60(%4), %%edx\n"
--                     "        movl %%eax, 56(%3)\n"
--                     "        movl %%edx, 60(%3)\n"
-+                     "        movl %%eax, %%es:56(%3)\n"
-+                     "        movl %%edx, %%es:60(%3)\n"
+-                     "2:      movl 0(%4), %%eax\n"
+-                     "21:     movl 4(%4), %%edx\n"
++                     "2:      movl "__copyuser_seg" 0(%4), %%eax\n"
++                     "21:     movl "__copyuser_seg" 4(%4), %%edx\n"
+                      "        movl %%eax, 0(%3)\n"
+                      "        movl %%edx, 4(%3)\n"
+-                     "3:      movl 8(%4), %%eax\n"
+-                     "31:     movl 12(%4),%%edx\n"
++                     "3:      movl "__copyuser_seg" 8(%4), %%eax\n"
++                     "31:     movl "__copyuser_seg" 12(%4),%%edx\n"
+                      "        movl %%eax, 8(%3)\n"
+                      "        movl %%edx, 12(%3)\n"
+-                     "4:      movl 16(%4), %%eax\n"
+-                     "41:     movl 20(%4), %%edx\n"
++                     "4:      movl "__copyuser_seg" 16(%4), %%eax\n"
++                     "41:     movl "__copyuser_seg" 20(%4), %%edx\n"
+                      "        movl %%eax, 16(%3)\n"
+                      "        movl %%edx, 20(%3)\n"
+-                     "10:     movl 24(%4), %%eax\n"
+-                     "51:     movl 28(%4), %%edx\n"
++                     "10:     movl "__copyuser_seg" 24(%4), %%eax\n"
++                     "51:     movl "__copyuser_seg" 28(%4), %%edx\n"
+                      "        movl %%eax, 24(%3)\n"
+                      "        movl %%edx, 28(%3)\n"
+-                     "11:     movl 32(%4), %%eax\n"
+-                     "61:     movl 36(%4), %%edx\n"
++                     "11:     movl "__copyuser_seg" 32(%4), %%eax\n"
++                     "61:     movl "__copyuser_seg" 36(%4), %%edx\n"
+                      "        movl %%eax, 32(%3)\n"
+                      "        movl %%edx, 36(%3)\n"
+-                     "12:     movl 40(%4), %%eax\n"
+-                     "71:     movl 44(%4), %%edx\n"
++                     "12:     movl "__copyuser_seg" 40(%4), %%eax\n"
++                     "71:     movl "__copyuser_seg" 44(%4), %%edx\n"
+                      "        movl %%eax, 40(%3)\n"
+                      "        movl %%edx, 44(%3)\n"
+-                     "13:     movl 48(%4), %%eax\n"
+-                     "81:     movl 52(%4), %%edx\n"
++                     "13:     movl "__copyuser_seg" 48(%4), %%eax\n"
++                     "81:     movl "__copyuser_seg" 52(%4), %%edx\n"
+                      "        movl %%eax, 48(%3)\n"
+                      "        movl %%edx, 52(%3)\n"
+-                     "14:     movl 56(%4), %%eax\n"
+-                     "91:     movl 60(%4), %%edx\n"
++                     "14:     movl "__copyuser_seg" 56(%4), %%eax\n"
++                     "91:     movl "__copyuser_seg" 60(%4), %%edx\n"
+                      "        movl %%eax, 56(%3)\n"
+                      "        movl %%edx, 60(%3)\n"
                       "        addl $-64, %0\n"
-                      "        addl $64, %4\n"
-                      "        addl $64, %3\n"
-@@ -389,6 +516,8 @@ __copy_user_zeroing_intel(void *to, cons
+@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons
+                      "        shrl  $2, %0\n"
+                      "        andl $3, %%eax\n"
+                      "        cld\n"
+-                     "6:      rep; movsl\n"
++                     "6:      rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
                       "        movl %%eax,%0\n"
-                      "7:      rep; movsb\n"
+-                     "7:      rep; movsb\n"
++                     "7:      rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
                       "8:\n"
-+                     "        pushl %%ss\n"
-+                     "        popl %%ds\n"
                       ".section .fixup,\"ax\"\n"
                       "9:      lea 0(%%eax,%0,4),%0\n"
-                      "16:     pushl %0\n"
-@@ -423,7 +552,7 @@ __copy_user_zeroing_intel(void *to, cons
-                      "        .long 7b,16b\n"
-                      ".previous"
-                      : "=&c"(size), "=&D" (d0), "=&S" (d1)
--                     :  "1"(to), "2"(from), "0"(size)
-+                     :  "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
-                      : "eax", "edx", "memory");
-       return size;
- }
-@@ -439,6 +568,7 @@ static unsigned long __copy_user_zeroing
-       int d0, d1;
+@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing
  
        __asm__ __volatile__(
-+             "        movw %w6, %%ds\n"
               "        .align 2,0x90\n"
-              "0:      movl 32(%4), %%eax\n"
+-             "0:      movl 32(%4), %%eax\n"
++             "0:      movl "__copyuser_seg" 32(%4), %%eax\n"
               "        cmpl $67, %0\n"
-@@ -447,36 +577,36 @@ static unsigned long __copy_user_zeroing
+              "        jbe 2f\n"
+-             "1:      movl 64(%4), %%eax\n"
++             "1:      movl "__copyuser_seg" 64(%4), %%eax\n"
               "        .align 2,0x90\n"
-              "2:      movl 0(%4), %%eax\n"
-              "21:     movl 4(%4), %%edx\n"
--             "        movnti %%eax, 0(%3)\n"
--             "        movnti %%edx, 4(%3)\n"
-+             "        movnti %%eax, %%es:0(%3)\n"
-+             "        movnti %%edx, %%es:4(%3)\n"
-              "3:      movl 8(%4), %%eax\n"
-              "31:     movl 12(%4),%%edx\n"
--             "        movnti %%eax, 8(%3)\n"
--             "        movnti %%edx, 12(%3)\n"
-+             "        movnti %%eax, %%es:8(%3)\n"
-+             "        movnti %%edx, %%es:12(%3)\n"
-              "4:      movl 16(%4), %%eax\n"
-              "41:     movl 20(%4), %%edx\n"
--             "        movnti %%eax, 16(%3)\n"
--             "        movnti %%edx, 20(%3)\n"
-+             "        movnti %%eax, %%es:16(%3)\n"
-+             "        movnti %%edx, %%es:20(%3)\n"
-              "10:     movl 24(%4), %%eax\n"
-              "51:     movl 28(%4), %%edx\n"
--             "        movnti %%eax, 24(%3)\n"
--             "        movnti %%edx, 28(%3)\n"
-+             "        movnti %%eax, %%es:24(%3)\n"
-+             "        movnti %%edx, %%es:28(%3)\n"
-              "11:     movl 32(%4), %%eax\n"
-              "61:     movl 36(%4), %%edx\n"
--             "        movnti %%eax, 32(%3)\n"
--             "        movnti %%edx, 36(%3)\n"
-+             "        movnti %%eax, %%es:32(%3)\n"
-+             "        movnti %%edx, %%es:36(%3)\n"
-              "12:     movl 40(%4), %%eax\n"
-              "71:     movl 44(%4), %%edx\n"
--             "        movnti %%eax, 40(%3)\n"
--             "        movnti %%edx, 44(%3)\n"
-+             "        movnti %%eax, %%es:40(%3)\n"
-+             "        movnti %%edx, %%es:44(%3)\n"
-              "13:     movl 48(%4), %%eax\n"
-              "81:     movl 52(%4), %%edx\n"
--             "        movnti %%eax, 48(%3)\n"
--             "        movnti %%edx, 52(%3)\n"
-+             "        movnti %%eax, %%es:48(%3)\n"
-+             "        movnti %%edx, %%es:52(%3)\n"
-              "14:     movl 56(%4), %%eax\n"
-              "91:     movl 60(%4), %%edx\n"
--             "        movnti %%eax, 56(%3)\n"
--             "        movnti %%edx, 60(%3)\n"
-+             "        movnti %%eax, %%es:56(%3)\n"
-+             "        movnti %%edx, %%es:60(%3)\n"
+-             "2:      movl 0(%4), %%eax\n"
+-             "21:     movl 4(%4), %%edx\n"
++             "2:      movl "__copyuser_seg" 0(%4), %%eax\n"
++             "21:     movl "__copyuser_seg" 4(%4), %%edx\n"
+              "        movnti %%eax, 0(%3)\n"
+              "        movnti %%edx, 4(%3)\n"
+-             "3:      movl 8(%4), %%eax\n"
+-             "31:     movl 12(%4),%%edx\n"
++             "3:      movl "__copyuser_seg" 8(%4), %%eax\n"
++             "31:     movl "__copyuser_seg" 12(%4),%%edx\n"
+              "        movnti %%eax, 8(%3)\n"
+              "        movnti %%edx, 12(%3)\n"
+-             "4:      movl 16(%4), %%eax\n"
+-             "41:     movl 20(%4), %%edx\n"
++             "4:      movl "__copyuser_seg" 16(%4), %%eax\n"
++             "41:     movl "__copyuser_seg" 20(%4), %%edx\n"
+              "        movnti %%eax, 16(%3)\n"
+              "        movnti %%edx, 20(%3)\n"
+-             "10:     movl 24(%4), %%eax\n"
+-             "51:     movl 28(%4), %%edx\n"
++             "10:     movl "__copyuser_seg" 24(%4), %%eax\n"
++             "51:     movl "__copyuser_seg" 28(%4), %%edx\n"
+              "        movnti %%eax, 24(%3)\n"
+              "        movnti %%edx, 28(%3)\n"
+-             "11:     movl 32(%4), %%eax\n"
+-             "61:     movl 36(%4), %%edx\n"
++             "11:     movl "__copyuser_seg" 32(%4), %%eax\n"
++             "61:     movl "__copyuser_seg" 36(%4), %%edx\n"
+              "        movnti %%eax, 32(%3)\n"
+              "        movnti %%edx, 36(%3)\n"
+-             "12:     movl 40(%4), %%eax\n"
+-             "71:     movl 44(%4), %%edx\n"
++             "12:     movl "__copyuser_seg" 40(%4), %%eax\n"
++             "71:     movl "__copyuser_seg" 44(%4), %%edx\n"
+              "        movnti %%eax, 40(%3)\n"
+              "        movnti %%edx, 44(%3)\n"
+-             "13:     movl 48(%4), %%eax\n"
+-             "81:     movl 52(%4), %%edx\n"
++             "13:     movl "__copyuser_seg" 48(%4), %%eax\n"
++             "81:     movl "__copyuser_seg" 52(%4), %%edx\n"
+              "        movnti %%eax, 48(%3)\n"
+              "        movnti %%edx, 52(%3)\n"
+-             "14:     movl 56(%4), %%eax\n"
+-             "91:     movl 60(%4), %%edx\n"
++             "14:     movl "__copyuser_seg" 56(%4), %%eax\n"
++             "91:     movl "__copyuser_seg" 60(%4), %%edx\n"
+              "        movnti %%eax, 56(%3)\n"
+              "        movnti %%edx, 60(%3)\n"
               "        addl $-64, %0\n"
-              "        addl $64, %4\n"
-              "        addl $64, %3\n"
-@@ -491,6 +621,8 @@ static unsigned long __copy_user_zeroing
+@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing
+              "        shrl  $2, %0\n"
+              "        andl $3, %%eax\n"
+              "        cld\n"
+-             "6:      rep; movsl\n"
++             "6:      rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
               "        movl %%eax,%0\n"
-              "7:      rep; movsb\n"
+-             "7:      rep; movsb\n"
++             "7:      rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
               "8:\n"
-+             "        pushl %%ss\n"
-+             "        popl %%ds\n"
               ".section .fixup,\"ax\"\n"
               "9:      lea 0(%%eax,%0,4),%0\n"
-              "16:     pushl %0\n"
-@@ -525,7 +657,7 @@ static unsigned long __copy_user_zeroing
-              "        .long 7b,16b\n"
-              ".previous"
-              : "=&c"(size), "=&D" (d0), "=&S" (d1)
--             :  "1"(to), "2"(from), "0"(size)
-+             :  "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
-              : "eax", "edx", "memory");
-       return size;
- }
-@@ -536,6 +668,7 @@ static unsigned long __copy_user_intel_n
-       int d0, d1;
+@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n
  
        __asm__ __volatile__(
-+             "        movw %w6, %%ds\n"
               "        .align 2,0x90\n"
-              "0:      movl 32(%4), %%eax\n"
+-             "0:      movl 32(%4), %%eax\n"
++             "0:      movl "__copyuser_seg" 32(%4), %%eax\n"
               "        cmpl $67, %0\n"
-@@ -544,36 +677,36 @@ static unsigned long __copy_user_intel_n
+              "        jbe 2f\n"
+-             "1:      movl 64(%4), %%eax\n"
++             "1:      movl "__copyuser_seg" 64(%4), %%eax\n"
               "        .align 2,0x90\n"
-              "2:      movl 0(%4), %%eax\n"
-              "21:     movl 4(%4), %%edx\n"
--             "        movnti %%eax, 0(%3)\n"
--             "        movnti %%edx, 4(%3)\n"
-+             "        movnti %%eax, %%es:0(%3)\n"
-+             "        movnti %%edx, %%es:4(%3)\n"
-              "3:      movl 8(%4), %%eax\n"
-              "31:     movl 12(%4),%%edx\n"
--             "        movnti %%eax, 8(%3)\n"
--             "        movnti %%edx, 12(%3)\n"
-+             "        movnti %%eax, %%es:8(%3)\n"
-+             "        movnti %%edx, %%es:12(%3)\n"
-              "4:      movl 16(%4), %%eax\n"
-              "41:     movl 20(%4), %%edx\n"
--             "        movnti %%eax, 16(%3)\n"
--             "        movnti %%edx, 20(%3)\n"
-+             "        movnti %%eax, %%es:16(%3)\n"
-+             "        movnti %%edx, %%es:20(%3)\n"
-              "10:     movl 24(%4), %%eax\n"
-              "51:     movl 28(%4), %%edx\n"
--             "        movnti %%eax, 24(%3)\n"
--             "        movnti %%edx, 28(%3)\n"
-+             "        movnti %%eax, %%es:24(%3)\n"
-+             "        movnti %%edx, %%es:28(%3)\n"
-              "11:     movl 32(%4), %%eax\n"
-              "61:     movl 36(%4), %%edx\n"
--             "        movnti %%eax, 32(%3)\n"
--             "        movnti %%edx, 36(%3)\n"
-+             "        movnti %%eax, %%es:32(%3)\n"
-+             "        movnti %%edx, %%es:36(%3)\n"
-              "12:     movl 40(%4), %%eax\n"
-              "71:     movl 44(%4), %%edx\n"
--             "        movnti %%eax, 40(%3)\n"
--             "        movnti %%edx, 44(%3)\n"
-+             "        movnti %%eax, %%es:40(%3)\n"
-+             "        movnti %%edx, %%es:44(%3)\n"
-              "13:     movl 48(%4), %%eax\n"
-              "81:     movl 52(%4), %%edx\n"
--             "        movnti %%eax, 48(%3)\n"
--             "        movnti %%edx, 52(%3)\n"
-+             "        movnti %%eax, %%es:48(%3)\n"
-+             "        movnti %%edx, %%es:52(%3)\n"
-              "14:     movl 56(%4), %%eax\n"
-              "91:     movl 60(%4), %%edx\n"
--             "        movnti %%eax, 56(%3)\n"
--             "        movnti %%edx, 60(%3)\n"
-+             "        movnti %%eax, %%es:56(%3)\n"
-+             "        movnti %%edx, %%es:60(%3)\n"
+-             "2:      movl 0(%4), %%eax\n"
+-             "21:     movl 4(%4), %%edx\n"
++             "2:      movl "__copyuser_seg" 0(%4), %%eax\n"
++             "21:     movl "__copyuser_seg" 4(%4), %%edx\n"
+              "        movnti %%eax, 0(%3)\n"
+              "        movnti %%edx, 4(%3)\n"
+-             "3:      movl 8(%4), %%eax\n"
+-             "31:     movl 12(%4),%%edx\n"
++             "3:      movl "__copyuser_seg" 8(%4), %%eax\n"
++             "31:     movl "__copyuser_seg" 12(%4),%%edx\n"
+              "        movnti %%eax, 8(%3)\n"
+              "        movnti %%edx, 12(%3)\n"
+-             "4:      movl 16(%4), %%eax\n"
+-             "41:     movl 20(%4), %%edx\n"
++             "4:      movl "__copyuser_seg" 16(%4), %%eax\n"
++             "41:     movl "__copyuser_seg" 20(%4), %%edx\n"
+              "        movnti %%eax, 16(%3)\n"
+              "        movnti %%edx, 20(%3)\n"
+-             "10:     movl 24(%4), %%eax\n"
+-             "51:     movl 28(%4), %%edx\n"
++             "10:     movl "__copyuser_seg" 24(%4), %%eax\n"
++             "51:     movl "__copyuser_seg" 28(%4), %%edx\n"
+              "        movnti %%eax, 24(%3)\n"
+              "        movnti %%edx, 28(%3)\n"
+-             "11:     movl 32(%4), %%eax\n"
+-             "61:     movl 36(%4), %%edx\n"
++             "11:     movl "__copyuser_seg" 32(%4), %%eax\n"
++             "61:     movl "__copyuser_seg" 36(%4), %%edx\n"
+              "        movnti %%eax, 32(%3)\n"
+              "        movnti %%edx, 36(%3)\n"
+-             "12:     movl 40(%4), %%eax\n"
+-             "71:     movl 44(%4), %%edx\n"
++             "12:     movl "__copyuser_seg" 40(%4), %%eax\n"
++             "71:     movl "__copyuser_seg" 44(%4), %%edx\n"
+              "        movnti %%eax, 40(%3)\n"
+              "        movnti %%edx, 44(%3)\n"
+-             "13:     movl 48(%4), %%eax\n"
+-             "81:     movl 52(%4), %%edx\n"
++             "13:     movl "__copyuser_seg" 48(%4), %%eax\n"
++             "81:     movl "__copyuser_seg" 52(%4), %%edx\n"
+              "        movnti %%eax, 48(%3)\n"
+              "        movnti %%edx, 52(%3)\n"
+-             "14:     movl 56(%4), %%eax\n"
+-             "91:     movl 60(%4), %%edx\n"
++             "14:     movl "__copyuser_seg" 56(%4), %%eax\n"
++             "91:     movl "__copyuser_seg" 60(%4), %%edx\n"
+              "        movnti %%eax, 56(%3)\n"
+              "        movnti %%edx, 60(%3)\n"
               "        addl $-64, %0\n"
-              "        addl $64, %4\n"
-              "        addl $64, %3\n"
-@@ -588,6 +721,8 @@ static unsigned long __copy_user_intel_n
+@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n
+              "        shrl  $2, %0\n"
+              "        andl $3, %%eax\n"
+              "        cld\n"
+-             "6:      rep; movsl\n"
++             "6:      rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n"
               "        movl %%eax,%0\n"
-              "7:      rep; movsb\n"
+-             "7:      rep; movsb\n"
++             "7:      rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n"
               "8:\n"
-+             "        pushl %%ss\n"
-+             "        popl %%ds\n"
               ".section .fixup,\"ax\"\n"
               "9:      lea 0(%%eax,%0,4),%0\n"
-              "16:     jmp 8b\n"
-@@ -616,7 +751,7 @@ static unsigned long __copy_user_intel_n
-              "        .long 7b,16b\n"
-              ".previous"
-              : "=&c"(size), "=&D" (d0), "=&S" (d1)
--             :  "1"(to), "2"(from), "0"(size)
-+             :  "1"(to), "2"(from), "0"(size), "r"(__USER_DS)
-              : "eax", "edx", "memory");
-       return size;
- }
-@@ -629,90 +764,146 @@ static unsigned long __copy_user_intel_n
+@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n
   */
  unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
                                        unsigned long size);
@@ -16929,243 +16875,69 @@ diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/use
  
  /* Generic arbitrary sized copy.  */
 -#define __copy_user(to, from, size)                                   \
--do {                                                                  \
--      int __d0, __d1, __d2;                                           \
--      __asm__ __volatile__(                                           \
--              "       cmp  $7,%0\n"                                   \
--              "       jbe  1f\n"                                      \
--              "       movl %1,%0\n"                                   \
--              "       negl %0\n"                                      \
--              "       andl $7,%0\n"                                   \
--              "       subl %0,%3\n"                                   \
++#define __copy_user(to, from, size, prefix, set, restore)             \
+ do {                                                                  \
+       int __d0, __d1, __d2;                                           \
+       __asm__ __volatile__(                                           \
++              set                                                     \
+               "       cmp  $7,%0\n"                                   \
+               "       jbe  1f\n"                                      \
+               "       movl %1,%0\n"                                   \
+               "       negl %0\n"                                      \
+               "       andl $7,%0\n"                                   \
+               "       subl %0,%3\n"                                   \
 -              "4:     rep; movsb\n"                                   \
--              "       movl %3,%0\n"                                   \
--              "       shrl $2,%0\n"                                   \
--              "       andl $3,%3\n"                                   \
--              "       .align 2,0x90\n"                                \
++              "4:     rep; movsb "prefix" (%%esi), (%%edi)\n"         \
+               "       movl %3,%0\n"                                   \
+               "       shrl $2,%0\n"                                   \
+               "       andl $3,%3\n"                                   \
+               "       .align 2,0x90\n"                                \
 -              "0:     rep; movsl\n"                                   \
--              "       movl %3,%0\n"                                   \
++              "0:     rep; movsl "prefix" (%%esi), (%%edi)\n"         \
+               "       movl %3,%0\n"                                   \
 -              "1:     rep; movsb\n"                                   \
--              "2:\n"                                                  \
--              ".section .fixup,\"ax\"\n"                              \
--              "5:     addl %3,%0\n"                                   \
--              "       jmp 2b\n"                                       \
--              "3:     lea 0(%3,%0,4),%0\n"                            \
--              "       jmp 2b\n"                                       \
--              ".previous\n"                                           \
--              ".section __ex_table,\"a\"\n"                           \
--              "       .align 4\n"                                     \
--              "       .long 4b,5b\n"                                  \
--              "       .long 0b,3b\n"                                  \
--              "       .long 1b,2b\n"                                  \
--              ".previous"                                             \
--              : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)   \
--              : "3"(size), "0"(size), "1"(to), "2"(from)              \
--              : "memory");                                            \
--} while (0)
--
--#define __copy_user_zeroing(to, from, size)                           \
--do {                                                                  \
--      int __d0, __d1, __d2;                                           \
--      __asm__ __volatile__(                                           \
--              "       cmp  $7,%0\n"                                   \
--              "       jbe  1f\n"                                      \
--              "       movl %1,%0\n"                                   \
--              "       negl %0\n"                                      \
--              "       andl $7,%0\n"                                   \
--              "       subl %0,%3\n"                                   \
++              "1:     rep; movsb "prefix" (%%esi), (%%edi)\n"         \
+               "2:\n"                                                  \
++              restore                                                 \
+               ".section .fixup,\"ax\"\n"                              \
+               "5:     addl %3,%0\n"                                   \
+               "       jmp 2b\n"                                       \
+@@ -682,14 +799,14 @@ do {                                                                     \
+               "       negl %0\n"                                      \
+               "       andl $7,%0\n"                                   \
+               "       subl %0,%3\n"                                   \
 -              "4:     rep; movsb\n"                                   \
--              "       movl %3,%0\n"                                   \
--              "       shrl $2,%0\n"                                   \
--              "       andl $3,%3\n"                                   \
--              "       .align 2,0x90\n"                                \
++              "4:     rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
+               "       movl %3,%0\n"                                   \
+               "       shrl $2,%0\n"                                   \
+               "       andl $3,%3\n"                                   \
+               "       .align 2,0x90\n"                                \
 -              "0:     rep; movsl\n"                                   \
--              "       movl %3,%0\n"                                   \
++              "0:     rep; movsl "__copyuser_seg" (%%esi), (%%edi)\n" \
+               "       movl %3,%0\n"                                   \
 -              "1:     rep; movsb\n"                                   \
--              "2:\n"                                                  \
--              ".section .fixup,\"ax\"\n"                              \
--              "5:     addl %3,%0\n"                                   \
--              "       jmp 6f\n"                                       \
--              "3:     lea 0(%3,%0,4),%0\n"                            \
--              "6:     pushl %0\n"                                     \
--              "       pushl %%eax\n"                                  \
--              "       xorl %%eax,%%eax\n"                             \
--              "       rep; stosb\n"                                   \
--              "       popl %%eax\n"                                   \
--              "       popl %0\n"                                      \
--              "       jmp 2b\n"                                       \
--              ".previous\n"                                           \
--              ".section __ex_table,\"a\"\n"                           \
--              "       .align 4\n"                                     \
--              "       .long 4b,5b\n"                                  \
--              "       .long 0b,3b\n"                                  \
--              "       .long 1b,6b\n"                                  \
--              ".previous"                                             \
--              : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)   \
--              : "3"(size), "0"(size), "1"(to), "2"(from)              \
--              : "memory");                                            \
--} while (0)
-+static unsigned long
-+__generic_copy_to_user(void __user *to, const void *from, unsigned long size)
-+{
-+      int __d0, __d1, __d2;
-+
-+      __asm__ __volatile__(
-+              "       movw %w8,%%es\n"
-+              "       cmp  $7,%0\n"
-+              "       jbe  1f\n"
-+              "       movl %1,%0\n"
-+              "       negl %0\n"
-+              "       andl $7,%0\n"
-+              "       subl %0,%3\n"
-+              "4:     rep; movsb\n"
-+              "       movl %3,%0\n"
-+              "       shrl $2,%0\n"
-+              "       andl $3,%3\n"
-+              "       .align 2,0x90\n"
-+              "0:     rep; movsl\n"
-+              "       movl %3,%0\n"
-+              "1:     rep; movsb\n"
-+              "2:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%es\n"
-+              ".section .fixup,\"ax\"\n"
-+              "5:     addl %3,%0\n"
-+              "       jmp 2b\n"
-+              "3:     lea 0(%3,%0,4),%0\n"
-+              "       jmp 2b\n"
-+              ".previous\n"
-+              ".section __ex_table,\"a\"\n"
-+              "       .align 4\n"
-+              "       .long 4b,5b\n"
-+              "       .long 0b,3b\n"
-+              "       .long 1b,2b\n"
-+              ".previous"
-+              : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+              : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+              : "memory");
-+      return size;
-+}
-+
-+static unsigned long
-+__generic_copy_from_user(void *to, const void __user *from, unsigned long size)
-+{
-+      int __d0, __d1, __d2;
-+
-+      __asm__ __volatile__(
-+              "       movw %w8,%%ds\n"
-+              "       cmp  $7,%0\n"
-+              "       jbe  1f\n"
-+              "       movl %1,%0\n"
-+              "       negl %0\n"
-+              "       andl $7,%0\n"
-+              "       subl %0,%3\n"
-+              "4:     rep; movsb\n"
-+              "       movl %3,%0\n"
-+              "       shrl $2,%0\n"
-+              "       andl $3,%3\n"
-+              "       .align 2,0x90\n"
-+              "0:     rep; movsl\n"
-+              "       movl %3,%0\n"
-+              "1:     rep; movsb\n"
-+              "2:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%ds\n"
-+              ".section .fixup,\"ax\"\n"
-+              "5:     addl %3,%0\n"
-+              "       jmp 2b\n"
-+              "3:     lea 0(%3,%0,4),%0\n"
-+              "       jmp 2b\n"
-+              ".previous\n"
-+              ".section __ex_table,\"a\"\n"
-+              "       .align 4\n"
-+              "       .long 4b,5b\n"
-+              "       .long 0b,3b\n"
-+              "       .long 1b,2b\n"
-+              ".previous"
-+              : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+              : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+              : "memory");
-+      return size;
-+}
-+
-+static unsigned long
-+__copy_user_zeroing(void *to, const void __user *from, unsigned long size)
-+{
-+      int __d0, __d1, __d2;
-+
-+      __asm__ __volatile__(
-+              "       movw %w8,%%ds\n"
-+              "       cmp  $7,%0\n"
-+              "       jbe  1f\n"
-+              "       movl %1,%0\n"
-+              "       negl %0\n"
-+              "       andl $7,%0\n"
-+              "       subl %0,%3\n"
-+              "4:     rep; movsb\n"
-+              "       movl %3,%0\n"
-+              "       shrl $2,%0\n"
-+              "       andl $3,%3\n"
-+              "       .align 2,0x90\n"
-+              "0:     rep; movsl\n"
-+              "       movl %3,%0\n"
-+              "1:     rep; movsb\n"
-+              "2:\n"
-+              "       pushl %%ss\n"
-+              "       popl %%ds\n"
-+              ".section .fixup,\"ax\"\n"
-+              "5:     addl %3,%0\n"
-+              "       jmp 6f\n"
-+              "3:     lea 0(%3,%0,4),%0\n"
-+              "6:     pushl %0\n"
-+              "       pushl %%eax\n"
-+              "       xorl %%eax,%%eax\n"
-+              "       rep; stosb\n"
-+              "       popl %%eax\n"
-+              "       popl %0\n"
-+              "       jmp 2b\n"
-+              ".previous\n"
-+              ".section __ex_table,\"a\"\n"
-+              "       .align 4\n"
-+              "       .long 4b,5b\n"
-+              "       .long 0b,3b\n"
-+              "       .long 1b,6b\n"
-+              ".previous"
-+              : "=&c"(size), "=&D" (__d0), "=&S" (__d1), "=r"(__d2)
-+              : "3"(size), "0"(size), "1"(to), "2"(from), "r"(__USER_DS)
-+              : "memory");
-+      return size;
-+}
- 
- unsigned long __copy_to_user_ll(void __user *to, const void *from,
-                               unsigned long n)
-@@ -775,9 +966,9 @@ survive:
++              "1:     rep; movsb "__copyuser_seg" (%%esi), (%%edi)\n" \
+               "2:\n"                                                  \
+               ".section .fixup,\"ax\"\n"                              \
+               "5:     addl %3,%0\n"                                   \
+@@ -775,9 +892,9 @@ survive:
        }
  #endif
        if (movsl_is_ok(to, from, n))
 -              __copy_user(to, from, n);
-+              n = __generic_copy_to_user(to, from, n);
++              __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
        else
 -              n = __copy_user_intel(to, from, n);
 +              n = __generic_copy_to_user_intel(to, from, n);
        return n;
  }
  EXPORT_SYMBOL(__copy_to_user_ll);
-@@ -786,7 +977,7 @@ unsigned long __copy_from_user_ll(void *
-                                       unsigned long n)
- {
-       if (movsl_is_ok(to, from, n))
--              __copy_user_zeroing(to, from, n);
-+              n = __copy_user_zeroing(to, from, n);
-       else
-               n = __copy_user_zeroing_intel(to, from, n);
-       return n;
-@@ -797,10 +988,9 @@ unsigned long __copy_from_user_ll_nozero
+@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero
                                         unsigned long n)
  {
        if (movsl_is_ok(to, from, n))
 -              __copy_user(to, from, n);
-+              n = __generic_copy_from_user(to, from, n);
++              __copy_user(to, from, n, __copyuser_seg, "", "");
        else
 -              n = __copy_user_intel((void __user *)to,
 -                                    (const void *)from, n);
@@ -17173,27 +16945,15 @@ diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/use
        return n;
  }
  EXPORT_SYMBOL(__copy_from_user_ll_nozero);
-@@ -812,9 +1002,9 @@ unsigned long __copy_from_user_ll_nocach
-       if (n > 64 && cpu_has_xmm2)
-               n = __copy_user_zeroing_intel_nocache(to, from, n);
-       else
--              __copy_user_zeroing(to, from, n);
-+              n = __copy_user_zeroing(to, from, n);
- #else
--      __copy_user_zeroing(to, from, n);
-+      n = __copy_user_zeroing(to, from, n);
- #endif
-       return n;
- }
-@@ -827,65 +1017,53 @@ unsigned long __copy_from_user_ll_nocach
+@@ -827,65 +943,49 @@ unsigned long __copy_from_user_ll_nocach
        if (n > 64 && cpu_has_xmm2)
                n = __copy_user_intel_nocache(to, from, n);
        else
 -              __copy_user(to, from, n);
-+              n = __generic_copy_from_user(to, from, n);
++              __copy_user(to, from, n, __copyuser_seg, "", "");
  #else
 -      __copy_user(to, from, n);
-+      n = __generic_copy_from_user(to, from, n);
++      __copy_user(to, from, n, __copyuser_seg, "", "");
  #endif
        return n;
  }
@@ -17256,40 +17016,36 @@ diff -urNp linux-2.6.36/arch/x86/lib/usercopy_32.c linux-2.6.36/arch/x86/lib/use
  
 -void copy_from_user_overflow(void)
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
-+void __set_fs(mm_segment_t x, int cpu)
++void __set_fs(mm_segment_t x)
  {
 -      WARN(1, "Buffer overflow detected!\n");
-+      unsigned long limit = x.seg;
-+      struct desc_struct d;
-+
-+      current_thread_info()->addr_limit = x;
-+      if (unlikely(paravirt_enabled()))
-+              return;
-+
-+      if (likely(limit))
-+              limit = (limit - 1UL) >> PAGE_SHIFT;
-+      pack_descriptor(&d, 0UL, limit, 0xF3, 0xC);
-+      write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_DS, &d, DESCTYPE_S);
++      switch (x.seg) {
++      case 0:
++              loadsegment(gs, 0);
++              break;
++      case TASK_SIZE_MAX:
++              loadsegment(gs, __USER_DS);
++              break;
++      case -1UL:
++              loadsegment(gs, __KERNEL_DS);
++              break;
++      default:
++              BUG();
++      }
++      return;
  }
 -EXPORT_SYMBOL(copy_from_user_overflow);
 +
 +void set_fs(mm_segment_t x)
 +{
-+      __set_fs(x, get_cpu());
-+      put_cpu();
-+}
-+EXPORT_SYMBOL(copy_from_user);
-+#else
-+void set_fs(mm_segment_t x)
-+{
 +      current_thread_info()->addr_limit = x;
++      __set_fs(x);
 +}
-+#endif
-+
 +EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.36/arch/x86/lib/usercopy_64.c linux-2.6.36/arch/x86/lib/usercopy_64.c
---- linux-2.6.36/arch/x86/lib/usercopy_64.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/lib/usercopy_64.c    2010-11-06 18:58:15.000000000 -0400
++#endif
+diff -urNp linux-2.6.37/arch/x86/lib/usercopy_64.c linux-2.6.37/arch/x86/lib/usercopy_64.c
+--- linux-2.6.37/arch/x86/lib/usercopy_64.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/lib/usercopy_64.c    2011-01-17 02:41:01.000000000 -0500
 @@ -42,6 +42,8 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -17326,10 +17082,10 @@ diff -urNp linux-2.6.36/arch/x86/lib/usercopy_64.c linux-2.6.36/arch/x86/lib/use
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.36/arch/x86/Makefile linux-2.6.36/arch/x86/Makefile
---- linux-2.6.36/arch/x86/Makefile     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/Makefile     2010-11-06 18:58:15.000000000 -0400
-@@ -191,3 +191,12 @@ define archhelp
+diff -urNp linux-2.6.37/arch/x86/Makefile linux-2.6.37/arch/x86/Makefile
+--- linux-2.6.37/arch/x86/Makefile     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/Makefile     2011-01-17 02:41:01.000000000 -0500
+@@ -195,3 +195,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
  endef
@@ -17342,9 +17098,9 @@ diff -urNp linux-2.6.36/arch/x86/Makefile linux-2.6.36/arch/x86/Makefile
 +
 +archprepare:
 +      $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.36/arch/x86/mm/extable.c linux-2.6.36/arch/x86/mm/extable.c
---- linux-2.6.36/arch/x86/mm/extable.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/extable.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/extable.c linux-2.6.37/arch/x86/mm/extable.c
+--- linux-2.6.37/arch/x86/mm/extable.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/extable.c 2011-01-17 02:41:01.000000000 -0500
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -17418,13 +17174,13 @@ diff -urNp linux-2.6.36/arch/x86/mm/extable.c linux-2.6.36/arch/x86/mm/extable.c
                extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
                extern u32 pnp_bios_is_utter_crap;
                pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
---- linux-2.6.36/arch/x86/mm/fault.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/fault.c   2010-11-06 18:58:50.000000000 -0400
-@@ -11,10 +11,18 @@
- #include <linux/kprobes.h>            /* __kprobes, ...               */
+diff -urNp linux-2.6.37/arch/x86/mm/fault.c linux-2.6.37/arch/x86/mm/fault.c
+--- linux-2.6.37/arch/x86/mm/fault.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/fault.c   2011-01-17 02:41:01.000000000 -0500
+@@ -12,10 +12,18 @@
  #include <linux/mmiotrace.h>          /* kmmio_handler, ...           */
  #include <linux/perf_event.h>         /* perf_sw_event                */
+ #include <linux/hugetlb.h>            /* hstate_index_to_shift        */
 +#include <linux/unistd.h>
 +#include <linux/compiler.h>
  
@@ -17440,7 +17196,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
  
  /*
   * Page fault error code bits:
-@@ -52,7 +60,7 @@ static inline int __kprobes notify_page_
+@@ -53,7 +61,7 @@ static inline int __kprobes notify_page_
        int ret = 0;
  
        /* kprobe_running() needs smp_processor_id() */
@@ -17449,7 +17205,31 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
                preempt_disable();
                if (kprobe_running() && kprobe_fault_handler(regs, 14))
                        ret = 1;
-@@ -173,6 +181,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -114,7 +122,10 @@ check_prefetch_opcode(struct pt_regs *re
+               return !instr_lo || (instr_lo>>1) == 1;
+       case 0x00:
+               /* Prefetch instruction is 0x0F0D or 0x0F18 */
+-              if (probe_kernel_address(instr, opcode))
++              if (user_mode(regs)) {
++                      if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1))
++                              return 0;
++              } else if (probe_kernel_address(instr, opcode))
+                       return 0;
+ 
+               *prefetch = (instr_lo == 0xF) &&
+@@ -148,7 +159,10 @@ is_prefetch(struct pt_regs *regs, unsign
+       while (instr < max_instr) {
+               unsigned char opcode;
+ 
+-              if (probe_kernel_address(instr, opcode))
++              if (user_mode(regs)) {
++                      if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user *)(instr), 1))
++                              break;
++              } else if (probe_kernel_address(instr, opcode))
+                       break;
+ 
+               instr++;
+@@ -179,6 +193,30 @@ force_sig_info_fault(int si_signo, int s
        force_sig_info(si_signo, &info, tsk);
  }
  
@@ -17480,7 +17260,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -225,11 +257,24 @@ void vmalloc_sync_all(void)
+@@ -231,18 +269,35 @@ void vmalloc_sync_all(void)
             address += PMD_SIZE) {
  
                unsigned long flags;
@@ -17496,17 +17276,28 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
 +                      pgd_t *pgd = get_cpu_pgd(cpu);
++                      pmd_t *ret;
 +#else
                list_for_each_entry(page, &pgd_list, lru) {
--                      if (!vmalloc_sync_one(page_address(page), address))
 +                      pgd_t *pgd = page_address(page);
+                       spinlock_t *pgt_lock;
+                       pmd_t *ret;
+ 
+                       pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
+ 
+                       spin_lock(pgt_lock);
+-                      ret = vmalloc_sync_one(page_address(page), address);
 +#endif
 +
-+                      if (!vmalloc_sync_one(pgd, address))
++                      ret = vmalloc_sync_one(pgd, address);
++
++#ifndef CONFIG_PAX_PER_CPU_PGD
+                       spin_unlock(pgt_lock);
++#endif
+ 
+                       if (!ret)
                                break;
-               }
-               spin_unlock_irqrestore(&pgd_lock, flags);
-@@ -259,6 +304,11 @@ static noinline __kprobes int vmalloc_fa
+@@ -276,6 +331,11 @@ static noinline __kprobes int vmalloc_fa
         * an interrupt in the middle of a task switch..
         */
        pgd_paddr = read_cr3();
@@ -17518,35 +17309,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
        if (!pmd_k)
                return -1;
-@@ -333,15 +383,27 @@ void vmalloc_sync_all(void)
- 
-               const pgd_t *pgd_ref = pgd_offset_k(address);
-               unsigned long flags;
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+              unsigned long cpu;
-+#else
-               struct page *page;
-+#endif
- 
-               if (pgd_none(*pgd_ref))
-                       continue;
- 
-               spin_lock_irqsave(&pgd_lock, flags);
-+
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
-+                      pgd_t *pgd = pgd_offset_cpu(cpu, address);
-+#else
-               list_for_each_entry(page, &pgd_list, lru) {
-                       pgd_t *pgd;
-                       pgd = (pgd_t *)page_address(page) + pgd_index(address);
-+#endif
-+
-                       if (pgd_none(*pgd))
-                               set_pgd(pgd, *pgd_ref);
-                       else
-@@ -374,7 +436,14 @@ static noinline __kprobes int vmalloc_fa
+@@ -371,7 +431,14 @@ static noinline __kprobes int vmalloc_fa
         * happen within a race in page table update. In the later
         * case just flush:
         */
@@ -17561,7 +17324,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        pgd_ref = pgd_offset_k(address);
        if (pgd_none(*pgd_ref))
                return -1;
-@@ -536,7 +605,7 @@ static int is_errata93(struct pt_regs *r
+@@ -533,7 +600,7 @@ static int is_errata93(struct pt_regs *r
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -17570,7 +17333,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
                return 1;
  #endif
        return 0;
-@@ -563,7 +632,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -560,7 +627,7 @@ static int is_f00f_bug(struct pt_regs *r
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -17579,7 +17342,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -572,15 +641,26 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -569,15 +636,26 @@ show_fault_oops(struct pt_regs *regs, un
        if (!oops_may_print())
                return;
  
@@ -17608,7 +17371,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        printk(KERN_ALERT "BUG: unable to handle kernel ");
        if (address < PAGE_SIZE)
                printk(KERN_CONT "NULL pointer dereference");
-@@ -705,6 +785,68 @@ __bad_area_nosemaphore(struct pt_regs *r
+@@ -702,6 +780,68 @@ __bad_area_nosemaphore(struct pt_regs *r
                       unsigned long address, int si_code)
  {
        struct task_struct *tsk = current;
@@ -17677,7 +17440,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
  
        /* User mode accesses just cause a SIGSEGV */
        if (error_code & PF_USER) {
-@@ -851,6 +993,106 @@ static int spurious_fault_check(unsigned
+@@ -849,6 +989,99 @@ static int spurious_fault_check(unsigned
        return 1;
  }
  
@@ -17746,9 +17509,6 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
 +       * PaX: fill DTLB with user rights and retry
 +       */
 +      __asm__ __volatile__ (
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+              "movw %w4,%%es\n"
-+#endif
 +              "orb %2,(%1)\n"
 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
 +/*
@@ -17766,14 +17526,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
 + */
 +              "invlpg (%0)\n"
 +#endif
-+              "testb $0,%%es:(%0)\n"
++              "testb $0,"__copyuser_seg"(%0)\n"
 +              "xorb %3,(%1)\n"
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+              "pushl %%ss\n"
-+              "popl %%es\n"
-+#endif
 +              :
-+              : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER), "r" (__USER_DS)
++              : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
 +              : "memory", "cc");
 +      pte_unmap_unlock(pte, ptl);
 +      up_read(&mm->mmap_sem);
@@ -17784,24 +17540,26 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -917,6 +1159,9 @@ int show_unhandled_signals = 1;
+@@ -921,6 +1154,9 @@ int show_unhandled_signals = 1;
  static inline int
- access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
+ access_error(unsigned long error_code, struct vm_area_struct *vma)
  {
 +      if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
 +              return 1;
 +
-       if (write) {
+       if (error_code & PF_WRITE) {
                /* write, present and write, not present: */
                if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -950,17 +1195,31 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -954,19 +1190,33 @@ do_page_fault(struct pt_regs *regs, unsi
  {
        struct vm_area_struct *vma;
        struct task_struct *tsk;
 -      unsigned long address;
        struct mm_struct *mm;
-       int write;
        int fault;
+       int write = error_code & PF_WRITE;
+       unsigned int flags = FAULT_FLAG_ALLOW_RETRY |
+                                       (write ? FAULT_FLAG_WRITE : 0);
  
 +      /* Get the faulting address: */
 +      unsigned long address = read_cr2();
@@ -17814,7 +17572,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
 +              }
 +              if (address < PAX_USER_SHADOW_BASE) {
 +                      printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
-+                      printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
++                      printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
 +                      show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
 +              } else
 +                      address -= PAX_USER_SHADOW_BASE;
@@ -17830,7 +17588,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        /*
         * Detect and handle instructions that would cause a page fault for
         * both a tracked kernel page and a userspace page.
-@@ -1020,7 +1279,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1026,7 +1276,7 @@ do_page_fault(struct pt_regs *regs, unsi
         * User-mode registers count as a user access even for any
         * potential system fault or CPU buglet:
         */
@@ -17839,7 +17597,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
                local_irq_enable();
                error_code |= PF_USER;
        } else {
-@@ -1074,6 +1333,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1081,6 +1331,11 @@ retry:
                might_sleep();
        }
  
@@ -17851,7 +17609,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        vma = find_vma(mm, address);
        if (unlikely(!vma)) {
                bad_area(regs, error_code, address);
-@@ -1085,18 +1349,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1092,18 +1347,24 @@ retry:
                bad_area(regs, error_code, address);
                return;
        }
@@ -17887,7 +17645,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
        if (unlikely(expand_stack(vma, address))) {
                bad_area(regs, error_code, address);
                return;
-@@ -1140,3 +1410,199 @@ good_area:
+@@ -1158,3 +1419,199 @@ good_area:
  
        up_read(&mm->mmap_sem);
  }
@@ -18087,9 +17845,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/fault.c linux-2.6.36/arch/x86/mm/fault.c
 +
 +      return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.36/arch/x86/mm/gup.c linux-2.6.36/arch/x86/mm/gup.c
---- linux-2.6.36/arch/x86/mm/gup.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/gup.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/gup.c linux-2.6.37/arch/x86/mm/gup.c
+--- linux-2.6.37/arch/x86/mm/gup.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/gup.c     2011-01-17 02:41:01.000000000 -0500
 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 
        addr = start;
        len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18099,10 +17857,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/gup.c linux-2.6.36/arch/x86/mm/gup.c
                                        (void __user *)start, len)))
                return 0;
  
-diff -urNp linux-2.6.36/arch/x86/mm/highmem_32.c linux-2.6.36/arch/x86/mm/highmem_32.c
---- linux-2.6.36/arch/x86/mm/highmem_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/highmem_32.c      2010-11-06 18:58:15.000000000 -0400
-@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
+diff -urNp linux-2.6.37/arch/x86/mm/highmem_32.c linux-2.6.37/arch/x86/mm/highmem_32.c
+--- linux-2.6.37/arch/x86/mm/highmem_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/highmem_32.c      2011-01-17 02:41:01.000000000 -0500
+@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
        idx = type + KM_TYPE_NR*smp_processor_id();
        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
        BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -18113,9 +17871,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/highmem_32.c linux-2.6.36/arch/x86/mm/highme
  
        return (void *)vaddr;
  }
-diff -urNp linux-2.6.36/arch/x86/mm/hugetlbpage.c linux-2.6.36/arch/x86/mm/hugetlbpage.c
---- linux-2.6.36/arch/x86/mm/hugetlbpage.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/hugetlbpage.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/hugetlbpage.c linux-2.6.37/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.37/arch/x86/mm/hugetlbpage.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/hugetlbpage.c     2011-01-17 02:41:01.000000000 -0500
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
@@ -18319,10 +18077,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/hugetlbpage.c linux-2.6.36/arch/x86/mm/huget
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
---- linux-2.6.36/arch/x86/mm/init_32.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/init_32.c 2010-11-06 18:58:15.000000000 -0400
-@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
+diff -urNp linux-2.6.37/arch/x86/mm/init_32.c linux-2.6.37/arch/x86/mm/init_32.c
+--- linux-2.6.37/arch/x86/mm/init_32.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/init_32.c 2011-01-17 02:41:01.000000000 -0500
+@@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
  }
  
  /*
@@ -18359,7 +18117,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
   * Create a page table and place a pointer to it in a middle page
   * directory entry:
   */
-@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_ini
+@@ -122,13 +92,28 @@ static pte_t * __init one_page_table_ini
                        page_table = (pte_t *)alloc_low_page();
  
                paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
@@ -18388,7 +18146,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
  pmd_t * __init populate_extra_pmd(unsigned long vaddr)
  {
        int pgd_idx = pgd_index(vaddr);
-@@ -201,6 +186,7 @@ page_table_range_init(unsigned long star
+@@ -202,6 +187,7 @@ page_table_range_init(unsigned long star
        int pgd_idx, pmd_idx;
        unsigned long vaddr;
        pgd_t *pgd;
@@ -18396,7 +18154,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        pmd_t *pmd;
        pte_t *pte = NULL;
  
-@@ -210,8 +196,13 @@ page_table_range_init(unsigned long star
+@@ -211,8 +197,13 @@ page_table_range_init(unsigned long star
        pgd = pgd_base + pgd_idx;
  
        for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
@@ -18412,7 +18170,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
                                                        pmd++, pmd_idx++) {
                        pte = page_table_kmap_check(one_page_table_init(pmd),
-@@ -223,11 +214,20 @@ page_table_range_init(unsigned long star
+@@ -224,11 +215,20 @@ page_table_range_init(unsigned long star
        }
  }
  
@@ -18437,7 +18195,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
  }
  
  /*
-@@ -244,9 +244,10 @@ kernel_physical_mapping_init(unsigned lo
+@@ -245,9 +245,10 @@ kernel_physical_mapping_init(unsigned lo
        unsigned long last_map_addr = end;
        unsigned long start_pfn, end_pfn;
        pgd_t *pgd_base = swapper_pg_dir;
@@ -18449,7 +18207,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        pmd_t *pmd;
        pte_t *pte;
        unsigned pages_2m, pages_4k;
-@@ -279,8 +280,13 @@ repeat:
+@@ -280,8 +281,13 @@ repeat:
        pfn = start_pfn;
        pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
        pgd = pgd_base + pgd_idx;
@@ -18465,7 +18223,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
  
                if (pfn >= end_pfn)
                        continue;
-@@ -292,14 +298,13 @@ repeat:
+@@ -293,14 +299,13 @@ repeat:
  #endif
                for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
                     pmd++, pmd_idx++) {
@@ -18481,7 +18239,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                                pgprot_t prot = PAGE_KERNEL_LARGE;
                                /*
                                 * first pass will use the same initial
-@@ -309,11 +314,7 @@ repeat:
+@@ -310,11 +315,7 @@ repeat:
                                        __pgprot(PTE_IDENT_ATTR |
                                                 _PAGE_PSE);
  
@@ -18494,7 +18252,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                                        prot = PAGE_KERNEL_LARGE_EXEC;
  
                                pages_2m++;
-@@ -330,7 +331,7 @@ repeat:
+@@ -331,7 +332,7 @@ repeat:
                        pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
                        pte += pte_ofs;
                        for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
@@ -18503,7 +18261,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                                pgprot_t prot = PAGE_KERNEL;
                                /*
                                 * first pass will use the same initial
-@@ -338,7 +339,7 @@ repeat:
+@@ -339,7 +340,7 @@ repeat:
                                 */
                                pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
  
@@ -18512,7 +18270,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                                        prot = PAGE_KERNEL_EXEC;
  
                                pages_4k++;
-@@ -491,7 +492,7 @@ void __init native_pagetable_setup_start
+@@ -471,7 +472,7 @@ void __init native_pagetable_setup_start
  
                pud = pud_offset(pgd, va);
                pmd = pmd_offset(pud, va);
@@ -18521,7 +18279,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                        break;
  
                pte = pte_offset_kernel(pmd, va);
-@@ -543,9 +544,7 @@ void __init early_ioremap_page_table_ran
+@@ -523,12 +524,10 @@ void __init early_ioremap_page_table_ran
  
  static void __init pagetable_init(void)
  {
@@ -18531,41 +18289,12 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
 +      permanent_kmaps_init(swapper_pg_dir);
  }
  
- #ifdef CONFIG_ACPI_SLEEP
-@@ -553,12 +552,12 @@ static void __init pagetable_init(void)
-  * ACPI suspend needs this for resume, because things like the intel-agp
-  * driver might have split up a kernel 4MB mapping.
-  */
--char swsusp_pg_dir[PAGE_SIZE]
-+pgd_t swsusp_pg_dir[PTRS_PER_PGD]
-       __attribute__ ((aligned(PAGE_SIZE)));
- 
- static inline void save_pg_dir(void)
- {
--      memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
-+      clone_pgd_range(swsusp_pg_dir, swapper_pg_dir, PTRS_PER_PGD);
- }
- #else /* !CONFIG_ACPI_SLEEP */
- static inline void save_pg_dir(void)
-@@ -590,7 +589,7 @@ void zap_low_mappings(bool early)
-               flush_tlb_all();
- }
- 
 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  /* user-defined highmem size */
-@@ -781,7 +780,7 @@ void __init setup_bootmem_allocator(void
-        * Initialize the boot-time allocator (with low memory only):
-        */
-       bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
--      bootmap = find_e820_area(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
-+      bootmap = find_e820_area(0x100000, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
-                                PAGE_SIZE);
-       if (bootmap == -1L)
-               panic("Cannot find bootmem map of size %ld\n", bootmap_size);
-@@ -871,6 +870,12 @@ void __init mem_init(void)
+@@ -753,6 +752,12 @@ void __init mem_init(void)
  
        pci_iommu_alloc();
  
@@ -18578,7 +18307,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
  #ifdef CONFIG_FLATMEM
        BUG_ON(!mem_map);
  #endif
-@@ -888,7 +893,7 @@ void __init mem_init(void)
+@@ -770,7 +775,7 @@ void __init mem_init(void)
        set_highmem_pages_init();
  
        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
@@ -18587,7 +18316,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
  
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -929,10 +934,10 @@ void __init mem_init(void)
+@@ -811,10 +816,10 @@ void __init mem_init(void)
                ((unsigned long)&__init_end -
                 (unsigned long)&__init_begin) >> 10,
  
@@ -18601,7 +18330,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
                ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
  
        /*
-@@ -1013,6 +1018,7 @@ void set_kernel_text_rw(void)
+@@ -892,6 +897,7 @@ void set_kernel_text_rw(void)
        if (!kernel_set_to_readonly)
                return;
  
@@ -18609,7 +18338,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        pr_debug("Set kernel text: %lx - %lx for read write\n",
                 start, start+size);
  
-@@ -1027,6 +1033,7 @@ void set_kernel_text_ro(void)
+@@ -906,6 +912,7 @@ void set_kernel_text_ro(void)
        if (!kernel_set_to_readonly)
                return;
  
@@ -18617,7 +18346,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        pr_debug("Set kernel text: %lx - %lx for read only\n",
                 start, start+size);
  
-@@ -1038,6 +1045,7 @@ void mark_rodata_ro(void)
+@@ -917,6 +924,7 @@ void mark_rodata_ro(void)
        unsigned long start = PFN_ALIGN(_text);
        unsigned long size = PFN_ALIGN(_etext) - start;
  
@@ -18625,18 +18354,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_32.c linux-2.6.36/arch/x86/mm/init_32.c
        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
        printk(KERN_INFO "Write protecting the kernel text: %luk\n",
                size >> 10);
-diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
---- linux-2.6.36/arch/x86/mm/init_64.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/init_64.c 2010-11-06 18:58:15.000000000 -0400
-@@ -50,7 +50,6 @@
- #include <asm/numa.h>
- #include <asm/cacheflush.h>
- #include <asm/init.h>
--#include <linux/bootmem.h>
- 
- static unsigned long dma_reserve __initdata;
- 
-@@ -74,7 +73,7 @@ early_param("gbpages", parse_direct_gbpa
+diff -urNp linux-2.6.37/arch/x86/mm/init_64.c linux-2.6.37/arch/x86/mm/init_64.c
+--- linux-2.6.37/arch/x86/mm/init_64.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/init_64.c 2011-01-17 02:41:01.000000000 -0500
+@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
  
@@ -18645,7 +18366,49 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  int force_personality32;
-@@ -165,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
+@@ -106,12 +106,22 @@ void sync_global_pgds(unsigned long star
+       for (address = start; address <= end; address += PGDIR_SIZE) {
+               const pgd_t *pgd_ref = pgd_offset_k(address);
+               unsigned long flags;
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              unsigned long cpu;
++#else
+               struct page *page;
++#endif
+ 
+               if (pgd_none(*pgd_ref))
+                       continue;
+ 
+               spin_lock_irqsave(&pgd_lock, flags);
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++                      pgd_t *pgd = pgd_offset_cpu(cpu, address);
++#else
+               list_for_each_entry(page, &pgd_list, lru) {
+                       pgd_t *pgd;
+                       spinlock_t *pgt_lock;
+@@ -119,6 +129,7 @@ void sync_global_pgds(unsigned long star
+                       pgd = (pgd_t *)page_address(page) + pgd_index(address);
+                       pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
+                       spin_lock(pgt_lock);
++#endif
+ 
+                       if (pgd_none(*pgd))
+                               set_pgd(pgd, *pgd_ref);
+@@ -126,7 +137,10 @@ void sync_global_pgds(unsigned long star
+                               BUG_ON(pgd_page_vaddr(*pgd)
+                                      != pgd_page_vaddr(*pgd_ref));
+ 
++#ifndef CONFIG_PAX_PER_CPU_PGD
+                       spin_unlock(pgt_lock);
++#endif
++
+               }
+               spin_unlock_irqrestore(&pgd_lock, flags);
+       }
+@@ -200,7 +214,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
        pmd = fill_pmd(pud, vaddr);
        pte = fill_pte(pmd, vaddr);
  
@@ -18655,7 +18418,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
  
        /*
         * It's enough to flush this one mapping.
-@@ -224,14 +225,12 @@ static void __init __init_extra_mapping(
+@@ -259,14 +275,12 @@ static void __init __init_extra_mapping(
                pgd = pgd_offset_k((unsigned long)__va(phys));
                if (pgd_none(*pgd)) {
                        pud = (pud_t *) spp_getpage();
@@ -18672,7 +18435,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
                }
                pmd = pmd_offset(pud, phys);
                BUG_ON(!pmd_none(*pmd));
-@@ -680,6 +679,12 @@ void __init mem_init(void)
+@@ -706,6 +720,12 @@ void __init mem_init(void)
  
        pci_iommu_alloc();
  
@@ -18685,7 +18448,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
        /* clear_bss() already clear the empty_zero_page */
  
        reservedpages = 0;
-@@ -886,8 +891,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -866,8 +886,8 @@ int kern_addr_valid(unsigned long addr)
  static struct vm_area_struct gate_vma = {
        .vm_start       = VSYSCALL_START,
        .vm_end         = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -18696,7 +18459,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
  };
  
  struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-@@ -921,7 +926,7 @@ int in_gate_area_no_task(unsigned long a
+@@ -901,7 +921,7 @@ int in_gate_area_no_task(unsigned long a
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -18705,10 +18468,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/init_64.c linux-2.6.36/arch/x86/mm/init_64.c
                return "[vdso]";
        if (vma == &gate_vma)
                return "[vsyscall]";
-diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
---- linux-2.6.36/arch/x86/mm/init.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/init.c    2010-11-06 18:58:15.000000000 -0400
-@@ -70,11 +70,7 @@ static void __init find_early_table_spac
+diff -urNp linux-2.6.37/arch/x86/mm/init.c linux-2.6.37/arch/x86/mm/init.c
+--- linux-2.6.37/arch/x86/mm/init.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/init.c    2011-01-17 02:41:01.000000000 -0500
+@@ -72,11 +72,7 @@ static void __init find_early_table_spac
         * cause a hotspot and fill up ZONE_DMA. The page tables
         * need roughly 0.5KB per GB.
         */
@@ -18718,10 +18481,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
 -      start = 0x8000;
 -#endif
 +      start = 0x100000;
-       e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
+       base = memblock_find_in_range(start, max_pfn_mapped<<PAGE_SHIFT,
                                        tables, PAGE_SIZE);
-       if (e820_table_start == -1UL)
-@@ -321,7 +317,13 @@ unsigned long __init_refok init_memory_m
+       if (base == MEMBLOCK_ERROR)
+@@ -323,7 +319,13 @@ unsigned long __init_refok init_memory_m
   */
  int devmem_is_allowed(unsigned long pagenr)
  {
@@ -18736,7 +18499,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
                return 1;
        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
                return 0;
-@@ -380,6 +382,88 @@ void free_init_pages(char *what, unsigne
+@@ -382,6 +384,86 @@ void free_init_pages(char *what, unsigne
  
  void free_initmem(void)
  {
@@ -18814,8 +18577,6 @@ diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
 +                      continue;
 +              if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
 +                      set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+              else
-+                      set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
 +      }
 +#endif
 +
@@ -18825,11 +18586,11 @@ diff -urNp linux-2.6.36/arch/x86/mm/init.c linux-2.6.36/arch/x86/mm/init.c
        free_init_pages("unused kernel memory",
                        (unsigned long)(&__init_begin),
                        (unsigned long)(&__init_end));
-diff -urNp linux-2.6.36/arch/x86/mm/iomap_32.c linux-2.6.36/arch/x86/mm/iomap_32.c
---- linux-2.6.36/arch/x86/mm/iomap_32.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/iomap_32.c        2010-11-06 18:58:15.000000000 -0400
-@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
-       debug_kmap_atomic(type);
+diff -urNp linux-2.6.37/arch/x86/mm/iomap_32.c linux-2.6.37/arch/x86/mm/iomap_32.c
+--- linux-2.6.37/arch/x86/mm/iomap_32.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/iomap_32.c        2011-01-17 02:41:01.000000000 -0500
+@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
+       type = kmap_atomic_idx_push();
        idx = type + KM_TYPE_NR * smp_processor_id();
        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
 +
@@ -18840,9 +18601,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/iomap_32.c linux-2.6.36/arch/x86/mm/iomap_32
        arch_flush_lazy_mmu_mode();
  
        return (void *)vaddr;
-diff -urNp linux-2.6.36/arch/x86/mm/ioremap.c linux-2.6.36/arch/x86/mm/ioremap.c
---- linux-2.6.36/arch/x86/mm/ioremap.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/ioremap.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/ioremap.c linux-2.6.37/arch/x86/mm/ioremap.c
+--- linux-2.6.37/arch/x86/mm/ioremap.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/ioremap.c 2011-01-17 02:41:01.000000000 -0500
 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
        for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
                int is_ram = page_is_ram(pfn);
@@ -18861,7 +18622,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/ioremap.c linux-2.6.36/arch/x86/mm/ioremap.c
  
  static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
  {
-@@ -376,8 +376,7 @@ void __init early_ioremap_init(void)
+@@ -381,8 +381,7 @@ void __init early_ioremap_init(void)
                slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
  
        pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
@@ -18871,9 +18632,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/ioremap.c linux-2.6.36/arch/x86/mm/ioremap.c
  
        /*
         * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/kmemcheck/kmemcheck.c     2011-01-17 02:41:01.000000000 -0500
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
         * memory (e.g. tracked pages)? For now, we need this to avoid
         * invoking kmemcheck for PnP BIOS calls.
@@ -18886,9 +18647,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.36/arch/x86/
                return false;
  
        pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.36/arch/x86/mm/mmap.c linux-2.6.36/arch/x86/mm/mmap.c
---- linux-2.6.36/arch/x86/mm/mmap.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/mmap.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/mmap.c linux-2.6.37/arch/x86/mm/mmap.c
+--- linux-2.6.37/arch/x86/mm/mmap.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/mmap.c    2011-01-17 02:41:01.000000000 -0500
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -18970,10 +18731,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/mmap.c linux-2.6.36/arch/x86/mm/mmap.c
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.36/arch/x86/mm/numa_32.c linux-2.6.36/arch/x86/mm/numa_32.c
---- linux-2.6.36/arch/x86/mm/numa_32.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/numa_32.c 2010-11-06 18:58:15.000000000 -0400
-@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
+diff -urNp linux-2.6.37/arch/x86/mm/numa_32.c linux-2.6.37/arch/x86/mm/numa_32.c
+--- linux-2.6.37/arch/x86/mm/numa_32.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/numa_32.c 2011-01-17 02:41:01.000000000 -0500
+@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
  
@@ -18981,9 +18742,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/numa_32.c linux-2.6.36/arch/x86/mm/numa_32.c
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.36/arch/x86/mm/pageattr.c linux-2.6.36/arch/x86/mm/pageattr.c
---- linux-2.6.36/arch/x86/mm/pageattr.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/pageattr.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/pageattr.c linux-2.6.37/arch/x86/mm/pageattr.c
+--- linux-2.6.37/arch/x86/mm/pageattr.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/pageattr.c        2011-01-17 02:41:01.000000000 -0500
 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
         * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
         */
@@ -19067,9 +18828,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/pageattr.c linux-2.6.36/arch/x86/mm/pageattr
  }
  
  static int
-diff -urNp linux-2.6.36/arch/x86/mm/pageattr-test.c linux-2.6.36/arch/x86/mm/pageattr-test.c
---- linux-2.6.36/arch/x86/mm/pageattr-test.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/pageattr-test.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/pageattr-test.c linux-2.6.37/arch/x86/mm/pageattr-test.c
+--- linux-2.6.37/arch/x86/mm/pageattr-test.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/pageattr-test.c   2011-01-17 02:41:01.000000000 -0500
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -19079,9 +18840,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/pageattr-test.c linux-2.6.36/arch/x86/mm/pag
  }
  
  struct split_state {
-diff -urNp linux-2.6.36/arch/x86/mm/pat.c linux-2.6.36/arch/x86/mm/pat.c
---- linux-2.6.36/arch/x86/mm/pat.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/pat.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/pat.c linux-2.6.37/arch/x86/mm/pat.c
+--- linux-2.6.37/arch/x86/mm/pat.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/pat.c     2011-01-17 02:41:01.000000000 -0500
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
        if (!entry) {
@@ -19129,9 +18890,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/pat.c linux-2.6.36/arch/x86/mm/pat.c
                                cattr_name(want_flags),
                                (unsigned long long)paddr,
                                (unsigned long long)(paddr + size),
-diff -urNp linux-2.6.36/arch/x86/mm/pgtable_32.c linux-2.6.36/arch/x86/mm/pgtable_32.c
---- linux-2.6.36/arch/x86/mm/pgtable_32.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/pgtable_32.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/pgtable_32.c linux-2.6.37/arch/x86/mm/pgtable_32.c
+--- linux-2.6.37/arch/x86/mm/pgtable_32.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/pgtable_32.c      2011-01-17 02:41:01.000000000 -0500
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
                return;
        }
@@ -19146,10 +18907,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable_32.c linux-2.6.36/arch/x86/mm/pgtabl
  
        /*
         * It's enough to flush this one mapping.
-diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
---- linux-2.6.36/arch/x86/mm/pgtable.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/pgtable.c 2010-11-06 18:58:15.000000000 -0400
-@@ -84,8 +84,58 @@ static inline void pgd_list_del(pgd_t *p
+diff -urNp linux-2.6.37/arch/x86/mm/pgtable.c linux-2.6.37/arch/x86/mm/pgtable.c
+--- linux-2.6.37/arch/x86/mm/pgtable.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/pgtable.c 2011-01-17 02:41:01.000000000 -0500
+@@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
        list_del(&page->lru);
  }
  
@@ -19157,11 +18918,11 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
 -      (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
-+
+ 
 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
 +{
 +      while (count--)
-+              *dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
++              *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
 +}
 +#endif
 +
@@ -19180,7 +18941,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
 +#endif
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
-+static inline void pgd_ctor(pgd_t *pgd) {}
++static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
 +static inline void pgd_dtor(pgd_t *pgd) {}
 +#ifdef CONFIG_X86_64
 +#define pxd_t                         pud_t
@@ -19208,9 +18969,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
 +#define pyd_offset(mm ,address)               pud_offset((mm), (address))
 +#define PYD_SIZE                      PUD_SIZE
  
- static void pgd_ctor(pgd_t *pgd)
+ static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
  {
-@@ -120,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -130,6 +179,7 @@ static void pgd_dtor(pgd_t *pgd)
        pgd_list_del(pgd);
        spin_unlock_irqrestore(&pgd_lock, flags);
  }
@@ -19218,7 +18979,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
  
  /*
   * List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -132,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -142,7 +192,7 @@ static void pgd_dtor(pgd_t *pgd)
   * -- wli
   */
  
@@ -19227,7 +18988,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
  /*
   * In PAE mode, we need to do a cr3 reload (=tlb flush) when
   * updating the top-level pagetable entries to guarantee the
-@@ -144,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -154,7 +204,7 @@ static void pgd_dtor(pgd_t *pgd)
   * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
   * and initialize the kernel pmds here.
   */
@@ -19236,7 +18997,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -163,36 +214,38 @@ void pud_populate(struct mm_struct *mm, 
+@@ -173,36 +223,38 @@ void pud_populate(struct mm_struct *mm, 
        if (mm == current->active_mm)
                write_cr3(read_cr3());
  }
@@ -19286,7 +19047,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
                return -ENOMEM;
        }
  
-@@ -205,51 +258,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -215,51 +267,56 @@ static int preallocate_pmds(pmd_t *pmds[
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -19360,7 +19121,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
        unsigned long flags;
  
        pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -259,11 +317,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -269,11 +326,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
        mm->pgd = pgd;
  
@@ -19374,10 +19135,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
  
        /*
         * Make sure that pre-populating the pmds is atomic with
-@@ -273,14 +331,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -283,14 +340,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
        spin_lock_irqsave(&pgd_lock, flags);
  
-       pgd_ctor(pgd);
+       pgd_ctor(mm, pgd);
 -      pgd_prepopulate_pmd(mm, pgd, pmds);
 +      pgd_prepopulate_pxd(mm, pgd, pxds);
  
@@ -19392,7 +19153,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
  out_free_pgd:
        free_page((unsigned long)pgd);
  out:
-@@ -289,7 +347,7 @@ out:
+@@ -299,7 +356,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -19401,9 +19162,9 @@ diff -urNp linux-2.6.36/arch/x86/mm/pgtable.c linux-2.6.36/arch/x86/mm/pgtable.c
        pgd_dtor(pgd);
        paravirt_pgd_free(mm, pgd);
        free_page((unsigned long)pgd);
-diff -urNp linux-2.6.36/arch/x86/mm/setup_nx.c linux-2.6.36/arch/x86/mm/setup_nx.c
---- linux-2.6.36/arch/x86/mm/setup_nx.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/setup_nx.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/mm/setup_nx.c linux-2.6.37/arch/x86/mm/setup_nx.c
+--- linux-2.6.37/arch/x86/mm/setup_nx.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/setup_nx.c        2011-01-17 02:41:01.000000000 -0500
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -19433,10 +19194,10 @@ diff -urNp linux-2.6.36/arch/x86/mm/setup_nx.c linux-2.6.36/arch/x86/mm/setup_nx
                __supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-2.6.36/arch/x86/mm/tlb.c linux-2.6.36/arch/x86/mm/tlb.c
---- linux-2.6.36/arch/x86/mm/tlb.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/mm/tlb.c     2010-11-06 18:58:15.000000000 -0400
-@@ -13,7 +13,7 @@
+diff -urNp linux-2.6.37/arch/x86/mm/tlb.c linux-2.6.37/arch/x86/mm/tlb.c
+--- linux-2.6.37/arch/x86/mm/tlb.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/mm/tlb.c     2011-01-17 02:41:01.000000000 -0500
+@@ -14,7 +14,7 @@
  #include <asm/uv/uv.h>
  
  DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate)
@@ -19445,7 +19206,7 @@ diff -urNp linux-2.6.36/arch/x86/mm/tlb.c linux-2.6.36/arch/x86/mm/tlb.c
  
  /*
   *    Smarter SMP flushing macros.
-@@ -62,7 +62,11 @@ void leave_mm(int cpu)
+@@ -65,7 +65,11 @@ void leave_mm(int cpu)
                BUG();
        cpumask_clear_cpu(cpu,
                          mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
@@ -19457,11 +19218,11 @@ diff -urNp linux-2.6.36/arch/x86/mm/tlb.c linux-2.6.36/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.36/arch/x86/oprofile/backtrace.c linux-2.6.36/arch/x86/oprofile/backtrace.c
---- linux-2.6.36/arch/x86/oprofile/backtrace.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/oprofile/backtrace.c 2010-11-06 18:58:15.000000000 -0400
-@@ -58,7 +58,7 @@ static struct frame_head *dump_user_back
-       struct frame_head bufhead[2];
+diff -urNp linux-2.6.37/arch/x86/oprofile/backtrace.c linux-2.6.37/arch/x86/oprofile/backtrace.c
+--- linux-2.6.37/arch/x86/oprofile/backtrace.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/oprofile/backtrace.c 2011-01-17 02:41:01.000000000 -0500
+@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
+       struct stack_frame_ia32 *fp;
  
        /* Also check accessibility of one struct frame_head beyond */
 -      if (!access_ok(VERIFY_READ, head, sizeof(bufhead)))
@@ -19469,18 +19230,18 @@ diff -urNp linux-2.6.36/arch/x86/oprofile/backtrace.c linux-2.6.36/arch/x86/opro
                return NULL;
        if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))
                return NULL;
-@@ -78,7 +78,7 @@ x86_backtrace(struct pt_regs * const reg
+@@ -123,7 +123,7 @@ x86_backtrace(struct pt_regs * const reg
  {
-       struct frame_head *head = (struct frame_head *)frame_pointer(regs);
+       struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
  
 -      if (!user_mode_vm(regs)) {
 +      if (!user_mode(regs)) {
                unsigned long stack = kernel_stack_pointer(regs);
                if (depth)
                        dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.36/arch/x86/oprofile/op_model_p4.c linux-2.6.36/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.36/arch/x86/oprofile/op_model_p4.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/oprofile/op_model_p4.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/oprofile/op_model_p4.c linux-2.6.37/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.37/arch/x86/oprofile/op_model_p4.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/oprofile/op_model_p4.c       2011-01-17 02:41:01.000000000 -0500
 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
  #endif
  }
@@ -19490,9 +19251,9 @@ diff -urNp linux-2.6.36/arch/x86/oprofile/op_model_p4.c linux-2.6.36/arch/x86/op
  {
  #ifdef CONFIG_SMP
        return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.36/arch/x86/pci/common.c linux-2.6.36/arch/x86/pci/common.c
---- linux-2.6.36/arch/x86/pci/common.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/common.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/common.c linux-2.6.37/arch/x86/pci/common.c
+--- linux-2.6.37/arch/x86/pci/common.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/common.c 2011-01-17 02:41:01.000000000 -0500
 @@ -32,8 +32,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
@@ -19513,9 +19274,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/common.c linux-2.6.36/arch/x86/pci/common.c
  };
  
  void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.36/arch/x86/pci/direct.c linux-2.6.36/arch/x86/pci/direct.c
---- linux-2.6.36/arch/x86/pci/direct.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/direct.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/direct.c linux-2.6.37/arch/x86/pci/direct.c
+--- linux-2.6.37/arch/x86/pci/direct.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/direct.c 2011-01-17 02:41:01.000000000 -0500
 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
  
  #undef PCI_CONF1_ADDRESS
@@ -19543,9 +19304,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/direct.c linux-2.6.36/arch/x86/pci/direct.c
  {
        u32 x = 0;
        int year, devfn;
-diff -urNp linux-2.6.36/arch/x86/pci/fixup.c linux-2.6.36/arch/x86/pci/fixup.c
---- linux-2.6.36/arch/x86/pci/fixup.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/fixup.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/fixup.c linux-2.6.37/arch/x86/pci/fixup.c
+--- linux-2.6.37/arch/x86/pci/fixup.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/fixup.c  2011-01-17 02:41:01.000000000 -0500
 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
                        DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
                },
@@ -19564,9 +19325,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/fixup.c linux-2.6.36/arch/x86/pci/fixup.c
  };
  
  static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.36/arch/x86/pci/irq.c linux-2.6.36/arch/x86/pci/irq.c
---- linux-2.6.36/arch/x86/pci/irq.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/irq.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/irq.c linux-2.6.37/arch/x86/pci/irq.c
+--- linux-2.6.37/arch/x86/pci/irq.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/irq.c    2011-01-17 02:41:01.000000000 -0500
 @@ -542,7 +542,7 @@ static __init int intel_router_probe(str
        static struct pci_device_id __initdata pirq_440gx[] = {
                { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -19576,7 +19337,7 @@ diff -urNp linux-2.6.36/arch/x86/pci/irq.c linux-2.6.36/arch/x86/pci/irq.c
        };
  
        /* 440GX has a proprietary PIRQ router -- don't use it */
-@@ -1113,7 +1113,7 @@ static struct dmi_system_id __initdata p
+@@ -1114,7 +1114,7 @@ static struct dmi_system_id __initdata p
                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
                },
        },
@@ -19585,9 +19346,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/irq.c linux-2.6.36/arch/x86/pci/irq.c
  };
  
  void __init pcibios_irq_init(void)
-diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_32.c linux-2.6.36/arch/x86/pci/mmconfig_32.c
---- linux-2.6.36/arch/x86/pci/mmconfig_32.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/mmconfig_32.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_32.c linux-2.6.37/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.37/arch/x86/pci/mmconfig_32.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/mmconfig_32.c    2011-01-17 02:41:01.000000000 -0500
 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int 
        return 0;
  }
@@ -19597,9 +19358,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_32.c linux-2.6.36/arch/x86/pci/mmc
        .read =         pci_mmcfg_read,
        .write =        pci_mmcfg_write,
  };
-diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_64.c linux-2.6.36/arch/x86/pci/mmconfig_64.c
---- linux-2.6.36/arch/x86/pci/mmconfig_64.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/mmconfig_64.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/mmconfig_64.c linux-2.6.37/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.37/arch/x86/pci/mmconfig_64.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/mmconfig_64.c    2011-01-17 02:41:01.000000000 -0500
 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int 
        return 0;
  }
@@ -19609,9 +19370,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/mmconfig_64.c linux-2.6.36/arch/x86/pci/mmc
        .read =         pci_mmcfg_read,
        .write =        pci_mmcfg_write,
  };
-diff -urNp linux-2.6.36/arch/x86/pci/numaq_32.c linux-2.6.36/arch/x86/pci/numaq_32.c
---- linux-2.6.36/arch/x86/pci/numaq_32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/numaq_32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/numaq_32.c linux-2.6.37/arch/x86/pci/numaq_32.c
+--- linux-2.6.37/arch/x86/pci/numaq_32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/numaq_32.c       2011-01-17 02:41:01.000000000 -0500
 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
  
  #undef PCI_CONF1_MQ_ADDRESS
@@ -19621,9 +19382,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/numaq_32.c linux-2.6.36/arch/x86/pci/numaq_
        .read   = pci_conf1_mq_read,
        .write  = pci_conf1_mq_write
  };
-diff -urNp linux-2.6.36/arch/x86/pci/olpc.c linux-2.6.36/arch/x86/pci/olpc.c
---- linux-2.6.36/arch/x86/pci/olpc.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/olpc.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/olpc.c linux-2.6.37/arch/x86/pci/olpc.c
+--- linux-2.6.37/arch/x86/pci/olpc.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/olpc.c   2011-01-17 02:41:01.000000000 -0500
 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
        return 0;
  }
@@ -19633,9 +19394,9 @@ diff -urNp linux-2.6.36/arch/x86/pci/olpc.c linux-2.6.36/arch/x86/pci/olpc.c
        .read = pci_olpc_read,
        .write = pci_olpc_write,
  };
-diff -urNp linux-2.6.36/arch/x86/pci/pcbios.c linux-2.6.36/arch/x86/pci/pcbios.c
---- linux-2.6.36/arch/x86/pci/pcbios.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/pci/pcbios.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/pci/pcbios.c linux-2.6.37/arch/x86/pci/pcbios.c
+--- linux-2.6.37/arch/x86/pci/pcbios.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/pci/pcbios.c 2011-01-17 02:41:01.000000000 -0500
 @@ -57,50 +57,93 @@ union bios32 {
  static struct {
        unsigned long address;
@@ -19958,9 +19719,193 @@ diff -urNp linux-2.6.36/arch/x86/pci/pcbios.c linux-2.6.36/arch/x86/pci/pcbios.c
        return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.36/arch/x86/power/cpu.c linux-2.6.36/arch/x86/power/cpu.c
---- linux-2.6.36/arch/x86/power/cpu.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/power/cpu.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_32.c linux-2.6.37/arch/x86/platform/efi/efi_32.c
+--- linux-2.6.37/arch/x86/platform/efi/efi_32.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/platform/efi/efi_32.c        2011-01-17 02:41:01.000000000 -0500
+@@ -38,70 +38,37 @@
+  */
+ 
+ static unsigned long efi_rt_eflags;
+-static pgd_t efi_bak_pg_dir_pointer[2];
++static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS];
+ 
+-void efi_call_phys_prelog(void)
++void __init efi_call_phys_prelog(void)
+ {
+-      unsigned long cr4;
+-      unsigned long temp;
+       struct desc_ptr gdt_descr;
+ 
+       local_irq_save(efi_rt_eflags);
+ 
+-      /*
+-       * If I don't have PAE, I should just duplicate two entries in page
+-       * directory. If I have PAE, I just need to duplicate one entry in
+-       * page directory.
+-       */
+-      cr4 = read_cr4_safe();
+-
+-      if (cr4 & X86_CR4_PAE) {
+-              efi_bak_pg_dir_pointer[0].pgd =
+-                  swapper_pg_dir[pgd_index(0)].pgd;
+-              swapper_pg_dir[0].pgd =
+-                  swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
+-      } else {
+-              efi_bak_pg_dir_pointer[0].pgd =
+-                  swapper_pg_dir[pgd_index(0)].pgd;
+-              efi_bak_pg_dir_pointer[1].pgd =
+-                  swapper_pg_dir[pgd_index(0x400000)].pgd;
+-              swapper_pg_dir[pgd_index(0)].pgd =
+-                  swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
+-              temp = PAGE_OFFSET + 0x400000;
+-              swapper_pg_dir[pgd_index(0x400000)].pgd =
+-                  swapper_pg_dir[pgd_index(temp)].pgd;
+-      }
++      clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS);
++      clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
++                      min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
+ 
+       /*
+        * After the lock is released, the original page table is restored.
+        */
+       __flush_tlb_all();
+ 
+-      gdt_descr.address = __pa(get_cpu_gdt_table(0));
++      gdt_descr.address = (struct desc_struct *)__pa(get_cpu_gdt_table(0));
+       gdt_descr.size = GDT_SIZE - 1;
+       load_gdt(&gdt_descr);
+ }
+ 
+-void efi_call_phys_epilog(void)
++void __init efi_call_phys_epilog(void)
+ {
+-      unsigned long cr4;
+       struct desc_ptr gdt_descr;
+ 
+-      gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
++      gdt_descr.address = get_cpu_gdt_table(0);
+       gdt_descr.size = GDT_SIZE - 1;
+       load_gdt(&gdt_descr);
+ 
+-      cr4 = read_cr4_safe();
+-
+-      if (cr4 & X86_CR4_PAE) {
+-              swapper_pg_dir[pgd_index(0)].pgd =
+-                  efi_bak_pg_dir_pointer[0].pgd;
+-      } else {
+-              swapper_pg_dir[pgd_index(0)].pgd =
+-                  efi_bak_pg_dir_pointer[0].pgd;
+-              swapper_pg_dir[pgd_index(0x400000)].pgd =
+-                  efi_bak_pg_dir_pointer[1].pgd;
+-      }
++      clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS);
+ 
+       /*
+        * After the lock is released, the original page table is restored.
+diff -urNp linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S
+--- linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/platform/efi/efi_stub_32.S   2011-01-17 02:41:01.000000000 -0500
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <linux/linkage.h>
++#include <linux/init.h>
+ #include <asm/page_types.h>
+ 
+ /*
+@@ -20,7 +21,7 @@
+  * service functions will comply with gcc calling convention, too.
+  */
+ 
+-.text
++__INIT
+ ENTRY(efi_call_phys)
+       /*
+        * 0. The function can only be called in Linux kernel. So CS has been
+@@ -36,9 +37,7 @@ ENTRY(efi_call_phys)
+        * The mapping of lower virtual memory has been created in prelog and
+        * epilog.
+        */
+-      movl    $1f, %edx
+-      subl    $__PAGE_OFFSET, %edx
+-      jmp     *%edx
++      jmp     1f-__PAGE_OFFSET
+ 1:
+ 
+       /*
+@@ -47,14 +46,8 @@ ENTRY(efi_call_phys)
+        * parameter 2, ..., param n. To make things easy, we save the return
+        * address of efi_call_phys in a global variable.
+        */
+-      popl    %edx
+-      movl    %edx, saved_return_addr
+-      /* get the function pointer into ECX*/
+-      popl    %ecx
+-      movl    %ecx, efi_rt_function_ptr
+-      movl    $2f, %edx
+-      subl    $__PAGE_OFFSET, %edx
+-      pushl   %edx
++      popl    (saved_return_addr)
++      popl    (efi_rt_function_ptr)
+ 
+       /*
+        * 3. Clear PG bit in %CR0.
+@@ -73,9 +66,8 @@ ENTRY(efi_call_phys)
+       /*
+        * 5. Call the physical function.
+        */
+-      jmp     *%ecx
++      call    *(efi_rt_function_ptr-__PAGE_OFFSET)
+ 
+-2:
+       /*
+        * 6. After EFI runtime service returns, control will return to
+        * following instruction. We'd better readjust stack pointer first.
+@@ -88,35 +80,28 @@ ENTRY(efi_call_phys)
+       movl    %cr0, %edx
+       orl     $0x80000000, %edx
+       movl    %edx, %cr0
+-      jmp     1f
+-1:
++
+       /*
+        * 8. Now restore the virtual mode from flat mode by
+        * adding EIP with PAGE_OFFSET.
+        */
+-      movl    $1f, %edx
+-      jmp     *%edx
++      jmp     1f+__PAGE_OFFSET
+ 1:
+ 
+       /*
+        * 9. Balance the stack. And because EAX contain the return value,
+        * we'd better not clobber it.
+        */
+-      leal    efi_rt_function_ptr, %edx
+-      movl    (%edx), %ecx
+-      pushl   %ecx
++      pushl   (efi_rt_function_ptr)
+ 
+       /*
+-       * 10. Push the saved return address onto the stack and return.
++       * 10. Return to the saved return address.
+        */
+-      leal    saved_return_addr, %edx
+-      movl    (%edx), %ecx
+-      pushl   %ecx
+-      ret
++      jmpl    *(saved_return_addr)
+ ENDPROC(efi_call_phys)
+ .previous
+ 
+-.data
++__INITDATA
+ saved_return_addr:
+       .long 0
+ efi_rt_function_ptr:
+diff -urNp linux-2.6.37/arch/x86/power/cpu.c linux-2.6.37/arch/x86/power/cpu.c
+--- linux-2.6.37/arch/x86/power/cpu.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/power/cpu.c  2011-01-17 02:41:01.000000000 -0500
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -19980,9 +19925,9 @@ diff -urNp linux-2.6.36/arch/x86/power/cpu.c linux-2.6.36/arch/x86/power/cpu.c
  
        syscall_init();                         /* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.36/arch/x86/vdso/Makefile linux-2.6.36/arch/x86/vdso/Makefile
---- linux-2.6.36/arch/x86/vdso/Makefile        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/Makefile        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/Makefile linux-2.6.37/arch/x86/vdso/Makefile
+--- linux-2.6.37/arch/x86/vdso/Makefile        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/Makefile        2011-01-17 02:41:01.000000000 -0500
 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO    $@
                       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
                 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -19992,9 +19937,9 @@ diff -urNp linux-2.6.36/arch/x86/vdso/Makefile linux-2.6.36/arch/x86/vdso/Makefi
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.36/arch/x86/vdso/vclock_gettime.c linux-2.6.36/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.36/arch/x86/vdso/vclock_gettime.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/vclock_gettime.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/vclock_gettime.c linux-2.6.37/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.37/arch/x86/vdso/vclock_gettime.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/vclock_gettime.c        2011-01-17 02:41:01.000000000 -0500
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -20093,9 +20038,9 @@ diff -urNp linux-2.6.36/arch/x86/vdso/vclock_gettime.c linux-2.6.36/arch/x86/vds
  }
  int gettimeofday(struct timeval *, struct timezone *)
        __attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.36/arch/x86/vdso/vdso32-setup.c linux-2.6.36/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.36/arch/x86/vdso/vdso32-setup.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/vdso32-setup.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/vdso32-setup.c linux-2.6.37/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.37/arch/x86/vdso/vdso32-setup.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/vdso32-setup.c  2011-01-17 02:41:01.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -20178,9 +20123,9 @@ diff -urNp linux-2.6.36/arch/x86/vdso/vdso32-setup.c linux-2.6.36/arch/x86/vdso/
                return &gate_vma;
        return NULL;
  }
-diff -urNp linux-2.6.36/arch/x86/vdso/vdso.lds.S linux-2.6.36/arch/x86/vdso/vdso.lds.S
---- linux-2.6.36/arch/x86/vdso/vdso.lds.S      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/vdso.lds.S      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/vdso.lds.S linux-2.6.37/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.37/arch/x86/vdso/vdso.lds.S      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/vdso.lds.S      2011-01-17 02:41:01.000000000 -0500
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)    VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -20191,9 +20136,9 @@ diff -urNp linux-2.6.36/arch/x86/vdso/vdso.lds.S linux-2.6.36/arch/x86/vdso/vdso
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef        VEXTERN
-diff -urNp linux-2.6.36/arch/x86/vdso/vextern.h linux-2.6.36/arch/x86/vdso/vextern.h
---- linux-2.6.36/arch/x86/vdso/vextern.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/vextern.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/vextern.h linux-2.6.37/arch/x86/vdso/vextern.h
+--- linux-2.6.37/arch/x86/vdso/vextern.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/vextern.h       2011-01-17 02:41:01.000000000 -0500
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -20201,9 +20146,9 @@ diff -urNp linux-2.6.36/arch/x86/vdso/vextern.h linux-2.6.36/arch/x86/vdso/vexte
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.36/arch/x86/vdso/vma.c linux-2.6.36/arch/x86/vdso/vma.c
---- linux-2.6.36/arch/x86/vdso/vma.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/vdso/vma.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/vdso/vma.c linux-2.6.37/arch/x86/vdso/vma.c
+--- linux-2.6.37/arch/x86/vdso/vma.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/vdso/vma.c   2011-01-17 02:41:01.000000000 -0500
 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
        if (!vbase)
                goto oom;
@@ -20242,10 +20187,10 @@ diff -urNp linux-2.6.36/arch/x86/vdso/vma.c linux-2.6.36/arch/x86/vdso/vma.c
 -      return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlighten.c
---- linux-2.6.36/arch/x86/xen/enlighten.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/enlighten.c      2010-11-06 18:58:15.000000000 -0400
-@@ -79,8 +79,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+diff -urNp linux-2.6.37/arch/x86/xen/enlighten.c linux-2.6.37/arch/x86/xen/enlighten.c
+--- linux-2.6.37/arch/x86/xen/enlighten.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/enlighten.c      2011-01-17 02:41:01.000000000 -0500
+@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
  
@@ -20254,7 +20199,7 @@ diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlig
  RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
  __read_mostly int xen_have_vector_callback;
  EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -573,7 +571,7 @@ static void xen_write_idt_entry(gate_des
+@@ -574,7 +572,7 @@ static void xen_write_idt_entry(gate_des
  
        preempt_disable();
  
@@ -20263,7 +20208,7 @@ diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlig
        end = start + __get_cpu_var(idt_desc).size + 1;
  
        xen_mc_flush();
-@@ -1130,7 +1128,17 @@ asmlinkage void __init xen_start_kernel(
+@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(
        __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
        /* Work out if we support NX */
@@ -20282,7 +20227,7 @@ diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlig
  
        xen_setup_features();
  
-@@ -1161,13 +1169,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(
  
        machine_ops = xen_machine_ops;
  
@@ -20296,10 +20241,10 @@ diff -urNp linux-2.6.36/arch/x86/xen/enlighten.c linux-2.6.36/arch/x86/xen/enlig
        xen_smp_init();
  
        pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.36/arch/x86/xen/mmu.c linux-2.6.36/arch/x86/xen/mmu.c
---- linux-2.6.36/arch/x86/xen/mmu.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/mmu.c    2010-11-06 18:58:15.000000000 -0400
-@@ -1773,6 +1773,8 @@ __init pgd_t *xen_setup_kernel_pagetable
+diff -urNp linux-2.6.37/arch/x86/xen/mmu.c linux-2.6.37/arch/x86/xen/mmu.c
+--- linux-2.6.37/arch/x86/xen/mmu.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/mmu.c    2011-01-17 02:41:01.000000000 -0500
+@@ -2084,6 +2084,8 @@ __init pgd_t *xen_setup_kernel_pagetable
        convert_pfn_mfn(init_level4_pgt);
        convert_pfn_mfn(level3_ident_pgt);
        convert_pfn_mfn(level3_kernel_pgt);
@@ -20308,7 +20253,7 @@ diff -urNp linux-2.6.36/arch/x86/xen/mmu.c linux-2.6.36/arch/x86/xen/mmu.c
  
        l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
        l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1791,7 +1793,10 @@ __init pgd_t *xen_setup_kernel_pagetable
+@@ -2102,7 +2104,10 @@ __init pgd_t *xen_setup_kernel_pagetable
        set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
        set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
        set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -20319,10 +20264,10 @@ diff -urNp linux-2.6.36/arch/x86/xen/mmu.c linux-2.6.36/arch/x86/xen/mmu.c
        set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
        set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c
---- linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c        2010-11-06 18:58:15.000000000 -0400
-@@ -8,7 +8,7 @@
+diff -urNp linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c
+--- linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/pci-swiotlb-xen.c        2011-01-17 02:41:01.000000000 -0500
+@@ -10,7 +10,7 @@
  
  int xen_swiotlb __read_mostly;
  
@@ -20331,10 +20276,10 @@ diff -urNp linux-2.6.36/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.36/arch/x86/xen
        .mapping_error = xen_swiotlb_dma_mapping_error,
        .alloc_coherent = xen_swiotlb_alloc_coherent,
        .free_coherent = xen_swiotlb_free_coherent,
-diff -urNp linux-2.6.36/arch/x86/xen/smp.c linux-2.6.36/arch/x86/xen/smp.c
---- linux-2.6.36/arch/x86/xen/smp.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/smp.c    2010-11-06 18:58:15.000000000 -0400
-@@ -169,11 +169,6 @@ static void __init xen_smp_prepare_boot_
+diff -urNp linux-2.6.37/arch/x86/xen/smp.c linux-2.6.37/arch/x86/xen/smp.c
+--- linux-2.6.37/arch/x86/xen/smp.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/smp.c    2011-01-17 02:41:01.000000000 -0500
+@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
        BUG_ON(smp_processor_id() != 0);
        native_smp_prepare_boot_cpu();
@@ -20343,10 +20288,10 @@ diff -urNp linux-2.6.36/arch/x86/xen/smp.c linux-2.6.36/arch/x86/xen/smp.c
 -         old memory can be recycled */
 -      make_lowmem_page_readwrite(xen_initial_gdt);
 -
+       xen_filter_cpu_maps();
        xen_setup_vcpu_info_placement();
  }
- 
-@@ -233,8 +228,8 @@ cpu_initialize_context(unsigned int cpu,
+@@ -259,12 +254,12 @@ cpu_initialize_context(unsigned int cpu,
        gdt = get_cpu_gdt_table(cpu);
  
        ctxt->flags = VGCF_IN_KERNEL;
@@ -20357,9 +20302,14 @@ diff -urNp linux-2.6.36/arch/x86/xen/smp.c linux-2.6.36/arch/x86/xen/smp.c
        ctxt->user_regs.ss = __KERNEL_DS;
  #ifdef CONFIG_X86_32
        ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.36/arch/x86/xen/xen-head.S linux-2.6.36/arch/x86/xen/xen-head.S
---- linux-2.6.36/arch/x86/xen/xen-head.S       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/xen-head.S       2010-11-06 18:58:15.000000000 -0400
+-      ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
++      savesegment(gs, ctxt->user_regs.gs);
+ #else
+       ctxt->gs_base_kernel = per_cpu_offset(cpu);
+ #endif
+diff -urNp linux-2.6.37/arch/x86/xen/xen-head.S linux-2.6.37/arch/x86/xen/xen-head.S
+--- linux-2.6.37/arch/x86/xen/xen-head.S       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/xen-head.S       2011-01-17 02:41:01.000000000 -0500
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
        mov %esi,xen_start_info
@@ -20378,9 +20328,9 @@ diff -urNp linux-2.6.36/arch/x86/xen/xen-head.S linux-2.6.36/arch/x86/xen/xen-he
  #else
        mov %rsi,xen_start_info
        mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.36/arch/x86/xen/xen-ops.h linux-2.6.36/arch/x86/xen/xen-ops.h
---- linux-2.6.36/arch/x86/xen/xen-ops.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/arch/x86/xen/xen-ops.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/arch/x86/xen/xen-ops.h linux-2.6.37/arch/x86/xen/xen-ops.h
+--- linux-2.6.37/arch/x86/xen/xen-ops.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/arch/x86/xen/xen-ops.h        2011-01-17 02:41:01.000000000 -0500
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -20390,9 +20340,9 @@ diff -urNp linux-2.6.36/arch/x86/xen/xen-ops.h linux-2.6.36/arch/x86/xen/xen-ops
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.36/block/blk-iopoll.c linux-2.6.36/block/blk-iopoll.c
---- linux-2.6.36/block/blk-iopoll.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/block/blk-iopoll.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/block/blk-iopoll.c linux-2.6.37/block/blk-iopoll.c
+--- linux-2.6.37/block/blk-iopoll.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/block/blk-iopoll.c    2011-01-17 02:41:01.000000000 -0500
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20402,30 +20352,21 @@ diff -urNp linux-2.6.36/block/blk-iopoll.c linux-2.6.36/block/blk-iopoll.c
  {
        struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
        int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.36/block/blk-map.c linux-2.6.36/block/blk-map.c
---- linux-2.6.36/block/blk-map.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/block/blk-map.c       2010-11-06 18:58:15.000000000 -0400
-@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
-        * direct dma. else, set up kernel bounce buffers
-        */
-       uaddr = (unsigned long) ubuf;
--      if (blk_rq_aligned(q, ubuf, len) && !map_data)
-+      if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data)
-               bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);
-       else
-               bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);
-@@ -297,7 +297,7 @@ int blk_rq_map_kern(struct request_queue
+diff -urNp linux-2.6.37/block/blk-map.c linux-2.6.37/block/blk-map.c
+--- linux-2.6.37/block/blk-map.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/block/blk-map.c       2011-01-17 02:41:01.000000000 -0500
+@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
        if (!len || !kbuf)
                return -EINVAL;
  
--      do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf);
-+      do_copy = !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kbuf);
+-      do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
++      do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
        if (do_copy)
                bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
        else
-diff -urNp linux-2.6.36/block/blk-softirq.c linux-2.6.36/block/blk-softirq.c
---- linux-2.6.36/block/blk-softirq.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/block/blk-softirq.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/block/blk-softirq.c linux-2.6.37/block/blk-softirq.c
+--- linux-2.6.37/block/blk-softirq.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/block/blk-softirq.c   2011-01-17 02:41:01.000000000 -0500
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -20435,9 +20376,9 @@ diff -urNp linux-2.6.36/block/blk-softirq.c linux-2.6.36/block/blk-softirq.c
  {
        struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.36/crypto/lrw.c linux-2.6.36/crypto/lrw.c
---- linux-2.6.36/crypto/lrw.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/crypto/lrw.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/crypto/lrw.c linux-2.6.37/crypto/lrw.c
+--- linux-2.6.37/crypto/lrw.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/crypto/lrw.c  2011-01-17 02:41:01.000000000 -0500
 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
        struct priv *ctx = crypto_tfm_ctx(parent);
        struct crypto_cipher *child = ctx->child;
@@ -20447,9 +20388,9 @@ diff -urNp linux-2.6.36/crypto/lrw.c linux-2.6.36/crypto/lrw.c
        int bsize = crypto_cipher_blocksize(child);
  
        crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdiff
---- linux-2.6.36/Documentation/dontdiff        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/Documentation/dontdiff        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/Documentation/dontdiff linux-2.6.37/Documentation/dontdiff
+--- linux-2.6.37/Documentation/dontdiff        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/Documentation/dontdiff        2011-01-17 02:41:01.000000000 -0500
 @@ -3,6 +3,7 @@
  *.bin
  *.cpio
@@ -20486,7 +20427,15 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  SCCS
  System.map*
  TAGS
-@@ -76,7 +84,10 @@ btfixupprep
+@@ -62,6 +70,7 @@ aic7*reg_print.c*
+ aic7*seq.h*
+ aicasm
+ aicdb.h*
++altivec[0-9].c
+ asm-offsets.h
+ asm_offsets.h
+ autoconf.h*
+@@ -76,7 +85,10 @@ btfixupprep
  build
  bvmlinux
  bzImage*
@@ -20497,7 +20446,7 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  comp*.log
  compile.h*
  conf
-@@ -100,19 +111,22 @@ fore200e_mkfirm
+@@ -100,19 +112,23 @@ fore200e_mkfirm
  fore200e_pca_fw.c*
  gconf
  gen-devlist
@@ -20516,12 +20465,13 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
 +initramfs_data.cpio.bz2
  initramfs_data.cpio.gz
  initramfs_list
++int[0-9]*.c
  kallsyms
 -kconfig
  keywords.c
  ksym.c*
  ksym.h*
-@@ -136,10 +150,13 @@ mkboot
+@@ -136,10 +152,13 @@ mkboot
  mkbugboot
  mkcpustr
  mkdep
@@ -20535,7 +20485,7 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  modules.order
  modversions.h*
  ncscope.*
-@@ -151,7 +168,9 @@ parse.h
+@@ -151,7 +170,9 @@ parse.h
  patches*
  pca200e.bin
  pca200e_ecd.bin2
@@ -20545,7 +20495,7 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  piggyback
  pnmtologo
  ppc_defs.h*
-@@ -160,12 +179,14 @@ qconf
+@@ -160,15 +181,18 @@ qconf
  raid6altivec*.c
  raid6int*.c
  raid6tables.c
@@ -20560,7 +20510,11 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  sm_tbl*
  split-include
  syscalltab.h
-@@ -189,14 +210,20 @@ version.h*
++tables.c
+ tags
+ tftpboot.img
+ timeconst.h
+@@ -189,14 +213,20 @@ version.h*
  vmlinux
  vmlinux-*
  vmlinux.aout
@@ -20581,9 +20535,9 @@ diff -urNp linux-2.6.36/Documentation/dontdiff linux-2.6.36/Documentation/dontdi
  zImage*
  zconf.hash.c
 +zoffset.h
-diff -urNp linux-2.6.36/Documentation/filesystems/sysfs.txt linux-2.6.36/Documentation/filesystems/sysfs.txt
---- linux-2.6.36/Documentation/filesystems/sysfs.txt   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/Documentation/filesystems/sysfs.txt   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/Documentation/filesystems/sysfs.txt linux-2.6.37/Documentation/filesystems/sysfs.txt
+--- linux-2.6.37/Documentation/filesystems/sysfs.txt   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/Documentation/filesystems/sysfs.txt   2011-01-17 02:41:01.000000000 -0500
 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
  show and store methods of the attribute owners. 
  
@@ -20595,26 +20549,27 @@ diff -urNp linux-2.6.36/Documentation/filesystems/sysfs.txt linux-2.6.36/Documen
  };
  
  [ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.36/Documentation/kernel-parameters.txt linux-2.6.36/Documentation/kernel-parameters.txt
---- linux-2.6.36/Documentation/kernel-parameters.txt   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/Documentation/kernel-parameters.txt   2010-11-06 18:58:15.000000000 -0400
-@@ -1835,6 +1835,12 @@ and is between 256 and 4096 characters. 
+diff -urNp linux-2.6.37/Documentation/kernel-parameters.txt linux-2.6.37/Documentation/kernel-parameters.txt
+--- linux-2.6.37/Documentation/kernel-parameters.txt   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/Documentation/kernel-parameters.txt   2011-01-17 02:41:01.000000000 -0500
+@@ -1849,6 +1849,13 @@ and is between 256 and 4096 characters. 
                        the specified number of seconds.  This is to be used if
                        your oopses keep scrolling off the screen.
  
-+      pax_nouderef    [X86-32] disables UDEREF.  Most likely needed under certain
++      pax_nouderef    [X86] disables UDEREF.  Most likely needed under certain
 +                      virtualization environments that don't cope well with the
-+                      expand down segment used by UDEREF on X86-32.
++                      expand down segment used by UDEREF on X86-32 or the frequent
++                      page table updates on X86-64.
 +
 +      pax_softmode=   [X86-32] 0/1 to disable/enable PaX softmode on boot already.
 +
        pcbit=          [HW,ISDN]
  
        pcd.            [PARIDE]
-diff -urNp linux-2.6.36/drivers/acpi/battery.c linux-2.6.36/drivers/acpi/battery.c
---- linux-2.6.36/drivers/acpi/battery.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/battery.c        2010-11-06 18:58:15.000000000 -0400
-@@ -809,7 +809,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff -urNp linux-2.6.37/drivers/acpi/battery.c linux-2.6.37/drivers/acpi/battery.c
+--- linux-2.6.37/drivers/acpi/battery.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/battery.c        2011-01-17 02:41:01.000000000 -0500
+@@ -851,7 +851,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
        }
  
  static struct battery_file {
@@ -20623,9 +20578,9 @@ diff -urNp linux-2.6.36/drivers/acpi/battery.c linux-2.6.36/drivers/acpi/battery
        mode_t mode;
        const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.36/drivers/acpi/blacklist.c linux-2.6.36/drivers/acpi/blacklist.c
---- linux-2.6.36/drivers/acpi/blacklist.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/blacklist.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/acpi/blacklist.c linux-2.6.37/drivers/acpi/blacklist.c
+--- linux-2.6.37/drivers/acpi/blacklist.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/blacklist.c      2011-01-17 02:41:01.000000000 -0500
 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
        {"IBM   ", "TP600E  ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
         "Incorrect _ADR", 1},
@@ -20635,9 +20590,9 @@ diff -urNp linux-2.6.36/drivers/acpi/blacklist.c linux-2.6.36/drivers/acpi/black
  };
  
  #if   CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.36/drivers/acpi/dock.c linux-2.6.36/drivers/acpi/dock.c
---- linux-2.6.36/drivers/acpi/dock.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/dock.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/acpi/dock.c linux-2.6.37/drivers/acpi/dock.c
+--- linux-2.6.37/drivers/acpi/dock.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/dock.c   2011-01-17 02:41:01.000000000 -0500
 @@ -77,7 +77,7 @@ struct dock_dependent_device {
        struct list_head list;
        struct list_head hotplug_list;
@@ -20656,30 +20611,42 @@ diff -urNp linux-2.6.36/drivers/acpi/dock.c linux-2.6.36/drivers/acpi/dock.c
                             void *context)
  {
        struct dock_dependent_device *dd;
-diff -urNp linux-2.6.36/drivers/acpi/osl.c linux-2.6.36/drivers/acpi/osl.c
---- linux-2.6.36/drivers/acpi/osl.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/osl.c    2010-11-06 18:58:15.000000000 -0400
-@@ -497,6 +497,8 @@ acpi_os_read_memory(acpi_physical_addres
-       void __iomem *virt_addr;
- 
-       virt_addr = ioremap(phys_addr, width);
-+      if (!virt_addr)
-+              return AE_NO_MEMORY;
-       if (!value)
-               value = &dummy;
- 
-@@ -525,6 +527,8 @@ acpi_os_write_memory(acpi_physical_addre
-       void __iomem *virt_addr;
+diff -urNp linux-2.6.37/drivers/acpi/ec_sys.c linux-2.6.37/drivers/acpi/ec_sys.c
+--- linux-2.6.37/drivers/acpi/ec_sys.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/ec_sys.c 2011-01-17 02:41:01.000000000 -0500
+@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
+       return count;
+ }
  
-       virt_addr = ioremap(phys_addr, width);
-+      if (!virt_addr)
-+              return AE_NO_MEMORY;
+-static struct file_operations acpi_ec_io_ops = {
++static const struct file_operations acpi_ec_io_ops = {
+       .owner = THIS_MODULE,
+       .open  = acpi_ec_open_io,
+       .read  = acpi_ec_read_io,
+diff -urNp linux-2.6.37/drivers/acpi/osl.c linux-2.6.37/drivers/acpi/osl.c
+--- linux-2.6.37/drivers/acpi/osl.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/osl.c    2011-01-17 02:41:01.000000000 -0500
+@@ -643,6 +643,8 @@ acpi_os_read_memory(acpi_physical_addres
+       rcu_read_unlock();
+       if (!virt_addr) {
+               virt_addr = ioremap(phys_addr, size);
++              if (!virt_addr)
++                      return AE_NO_MEMORY;
+               unmap = 1;
+       }
+       if (!value)
+@@ -679,6 +681,8 @@ acpi_os_write_memory(acpi_physical_addre
+       rcu_read_unlock();
+       if (!virt_addr) {
+               virt_addr = ioremap(phys_addr, size);
++              if (!virt_addr)
++                      return AE_NO_MEMORY;
+               unmap = 1;
+       }
  
-       switch (width) {
-       case 8:
-diff -urNp linux-2.6.36/drivers/acpi/power_meter.c linux-2.6.36/drivers/acpi/power_meter.c
---- linux-2.6.36/drivers/acpi/power_meter.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/power_meter.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/acpi/power_meter.c linux-2.6.37/drivers/acpi/power_meter.c
+--- linux-2.6.37/drivers/acpi/power_meter.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/power_meter.c    2011-01-17 02:41:01.000000000 -0500
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
                return res;
  
@@ -20689,9 +20656,9 @@ diff -urNp linux-2.6.36/drivers/acpi/power_meter.c linux-2.6.36/drivers/acpi/pow
  
        mutex_lock(&resource->lock);
        resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.36/drivers/acpi/proc.c linux-2.6.36/drivers/acpi/proc.c
---- linux-2.6.36/drivers/acpi/proc.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/proc.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/acpi/proc.c linux-2.6.37/drivers/acpi/proc.c
+--- linux-2.6.37/drivers/acpi/proc.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/proc.c   2011-01-17 02:41:01.000000000 -0500
 @@ -338,20 +338,15 @@ acpi_system_write_wakeup_device(struct f
                                size_t count, loff_t * ppos)
  {
@@ -20727,10 +20694,10 @@ diff -urNp linux-2.6.36/drivers/acpi/proc.c linux-2.6.36/drivers/acpi/proc.c
                        dev->wakeup.state.enabled =
                            dev->wakeup.state.enabled ? 0 : 1;
                        found_dev = dev;
-diff -urNp linux-2.6.36/drivers/acpi/processor_driver.c linux-2.6.36/drivers/acpi/processor_driver.c
---- linux-2.6.36/drivers/acpi/processor_driver.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/processor_driver.c       2010-11-06 18:58:15.000000000 -0400
-@@ -507,7 +507,7 @@ static int __cpuinit acpi_processor_add(
+diff -urNp linux-2.6.37/drivers/acpi/processor_driver.c linux-2.6.37/drivers/acpi/processor_driver.c
+--- linux-2.6.37/drivers/acpi/processor_driver.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/processor_driver.c       2011-01-17 02:41:01.000000000 -0500
+@@ -519,7 +519,7 @@ static int __cpuinit acpi_processor_add(
                return 0;
  #endif
  
@@ -20739,10 +20706,10 @@ diff -urNp linux-2.6.36/drivers/acpi/processor_driver.c linux-2.6.36/drivers/acp
  
        /*
         * Buggy BIOS check
-diff -urNp linux-2.6.36/drivers/acpi/processor_idle.c linux-2.6.36/drivers/acpi/processor_idle.c
---- linux-2.6.36/drivers/acpi/processor_idle.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/processor_idle.c 2010-11-06 18:58:15.000000000 -0400
-@@ -115,7 +115,7 @@ static struct dmi_system_id __cpuinitdat
+diff -urNp linux-2.6.37/drivers/acpi/processor_idle.c linux-2.6.37/drivers/acpi/processor_idle.c
+--- linux-2.6.37/drivers/acpi/processor_idle.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/processor_idle.c 2011-01-17 02:41:01.000000000 -0500
+@@ -114,7 +114,7 @@ static struct dmi_system_id __cpuinitdat
          DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
          DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
         (void *)1},
@@ -20751,9 +20718,9 @@ diff -urNp linux-2.6.36/drivers/acpi/processor_idle.c linux-2.6.36/drivers/acpi/
  };
  
  
-diff -urNp linux-2.6.36/drivers/acpi/sleep.c linux-2.6.36/drivers/acpi/sleep.c
---- linux-2.6.36/drivers/acpi/sleep.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/sleep.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/acpi/sleep.c linux-2.6.37/drivers/acpi/sleep.c
+--- linux-2.6.37/drivers/acpi/sleep.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/sleep.c  2011-01-17 02:41:01.000000000 -0500
 @@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(susp
        }
  }
@@ -20772,7 +20739,7 @@ diff -urNp linux-2.6.36/drivers/acpi/sleep.c linux-2.6.36/drivers/acpi/sleep.c
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin_old,
        .prepare_late = acpi_pm_pre_suspend,
-@@ -490,7 +490,7 @@ static void acpi_pm_thaw(void)
+@@ -506,7 +506,7 @@ static void acpi_pm_thaw(void)
        acpi_enable_all_runtime_gpes();
  }
  
@@ -20781,7 +20748,7 @@ diff -urNp linux-2.6.36/drivers/acpi/sleep.c linux-2.6.36/drivers/acpi/sleep.c
        .begin = acpi_hibernation_begin,
        .end = acpi_pm_end,
        .pre_snapshot = acpi_pm_prepare,
-@@ -533,7 +533,7 @@ static int acpi_hibernation_begin_old(vo
+@@ -549,7 +549,7 @@ static int acpi_hibernation_begin_old(vo
   * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
   * been requested.
   */
@@ -20790,10 +20757,10 @@ diff -urNp linux-2.6.36/drivers/acpi/sleep.c linux-2.6.36/drivers/acpi/sleep.c
        .begin = acpi_hibernation_begin_old,
        .end = acpi_pm_end,
        .pre_snapshot = acpi_pm_pre_suspend,
-diff -urNp linux-2.6.36/drivers/acpi/video.c linux-2.6.36/drivers/acpi/video.c
---- linux-2.6.36/drivers/acpi/video.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/acpi/video.c  2010-11-06 18:58:15.000000000 -0400
-@@ -367,7 +367,7 @@ static int acpi_video_set_brightness(str
+diff -urNp linux-2.6.37/drivers/acpi/video.c linux-2.6.37/drivers/acpi/video.c
+--- linux-2.6.37/drivers/acpi/video.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/acpi/video.c  2011-01-17 02:41:01.000000000 -0500
+@@ -260,7 +260,7 @@ static int acpi_video_set_brightness(str
                                vd->brightness->levels[request_level]);
  }
  
@@ -20802,9 +20769,9 @@ diff -urNp linux-2.6.36/drivers/acpi/video.c linux-2.6.36/drivers/acpi/video.c
        .get_brightness = acpi_video_get_brightness,
        .update_status  = acpi_video_set_brightness,
  };
-diff -urNp linux-2.6.36/drivers/ata/ahci.c linux-2.6.36/drivers/ata/ahci.c
---- linux-2.6.36/drivers/ata/ahci.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/ahci.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/ahci.c linux-2.6.37/drivers/ata/ahci.c
+--- linux-2.6.37/drivers/ata/ahci.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/ahci.c    2011-01-17 02:41:01.000000000 -0500
 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
        AHCI_SHT("ahci"),
  };
@@ -20835,9 +20802,9 @@ diff -urNp linux-2.6.36/drivers/ata/ahci.c linux-2.6.36/drivers/ata/ahci.c
  };
  
  
-diff -urNp linux-2.6.36/drivers/ata/ahci.h linux-2.6.36/drivers/ata/ahci.h
---- linux-2.6.36/drivers/ata/ahci.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/ahci.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/ahci.h linux-2.6.37/drivers/ata/ahci.h
+--- linux-2.6.37/drivers/ata/ahci.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/ahci.h    2011-01-17 02:41:01.000000000 -0500
 @@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
        .shost_attrs            = ahci_shost_attrs,                     \
        .sdev_attrs             = ahci_sdev_attrs
@@ -20847,10 +20814,10 @@ diff -urNp linux-2.6.36/drivers/ata/ahci.h linux-2.6.36/drivers/ata/ahci.h
  
  void ahci_save_initial_config(struct device *dev,
                              struct ahci_host_priv *hpriv,
-diff -urNp linux-2.6.36/drivers/ata/ata_generic.c linux-2.6.36/drivers/ata/ata_generic.c
---- linux-2.6.36/drivers/ata/ata_generic.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/ata_generic.c     2010-11-06 18:58:15.000000000 -0400
-@@ -100,7 +100,7 @@ static struct scsi_host_template generic
+diff -urNp linux-2.6.37/drivers/ata/ata_generic.c linux-2.6.37/drivers/ata/ata_generic.c
+--- linux-2.6.37/drivers/ata/ata_generic.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/ata_generic.c     2011-01-17 02:41:01.000000000 -0500
+@@ -101,7 +101,7 @@ static struct scsi_host_template generic
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20859,10 +20826,10 @@ diff -urNp linux-2.6.36/drivers/ata/ata_generic.c linux-2.6.36/drivers/ata/ata_g
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_unknown,
        .set_mode       = generic_set_mode,
-diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix.c
---- linux-2.6.36/drivers/ata/ata_piix.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/ata_piix.c        2010-11-06 18:58:15.000000000 -0400
-@@ -306,7 +306,7 @@ static const struct pci_device_id piix_p
+diff -urNp linux-2.6.37/drivers/ata/ata_piix.c linux-2.6.37/drivers/ata/ata_piix.c
+--- linux-2.6.37/drivers/ata/ata_piix.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/ata_piix.c        2011-01-17 02:41:01.000000000 -0500
+@@ -309,7 +309,7 @@ static const struct pci_device_id piix_p
        { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
        /* SATA Controller IDE (PBG) */
        { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
@@ -20871,7 +20838,7 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
  };
  
  static struct pci_driver piix_pci_driver = {
-@@ -324,12 +324,12 @@ static struct scsi_host_template piix_sh
+@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20886,7 +20853,7 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
        .inherits               = &piix_sata_ops,
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = piix_set_piomode,
-@@ -337,18 +337,18 @@ static struct ata_port_operations piix_p
+@@ -340,12 +340,12 @@ static struct ata_port_operations piix_p
        .prereset               = piix_pata_prereset,
  };
  
@@ -20901,6 +20868,8 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
        .inherits               = &piix_pata_ops,
        .cable_detect           = ich_pata_cable_detect,
        .set_dmamode            = ich_set_dmamode,
+@@ -361,7 +361,7 @@ static struct scsi_host_template piix_si
+       .shost_attrs            = piix_sidpr_shost_attrs,
  };
  
 -static struct ata_port_operations piix_sidpr_sata_ops = {
@@ -20908,7 +20877,7 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
        .inherits               = &piix_sata_ops,
        .hardreset              = sata_std_hardreset,
        .scr_read               = piix_sidpr_scr_read,
-@@ -624,7 +624,7 @@ static const struct ich_laptop ich_lapto
+@@ -638,7 +638,7 @@ static const struct ich_laptop ich_lapto
        { 0x2653, 0x1043, 0x82D8 },     /* ICH6M on Asus Eee 701 */
        { 0x27df, 0x104d, 0x900e },     /* ICH7 on Sony TZ-90 */
        /* end marker */
@@ -20917,7 +20886,7 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
  };
  
  /**
-@@ -1116,7 +1116,7 @@ static int piix_broken_suspend(void)
+@@ -1130,7 +1130,7 @@ static int piix_broken_suspend(void)
                        },
                },
  
@@ -20926,10 +20895,10 @@ diff -urNp linux-2.6.36/drivers/ata/ata_piix.c linux-2.6.36/drivers/ata/ata_piix
        };
        static const char *oemstrs[] = {
                "Tecra M3,",
-diff -urNp linux-2.6.36/drivers/ata/libahci.c linux-2.6.36/drivers/ata/libahci.c
---- linux-2.6.36/drivers/ata/libahci.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/libahci.c 2010-11-06 18:58:15.000000000 -0400
-@@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs
+diff -urNp linux-2.6.37/drivers/ata/libahci.c linux-2.6.37/drivers/ata/libahci.c
+--- linux-2.6.37/drivers/ata/libahci.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/libahci.c 2011-01-17 02:41:01.000000000 -0500
+@@ -140,7 +140,7 @@ struct device_attribute *ahci_sdev_attrs
  };
  EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
  
@@ -20938,9 +20907,9 @@ diff -urNp linux-2.6.36/drivers/ata/libahci.c linux-2.6.36/drivers/ata/libahci.c
        .inherits               = &sata_pmp_port_ops,
  
        .qc_defer               = ahci_pmp_qc_defer,
-diff -urNp linux-2.6.36/drivers/ata/libata-acpi.c linux-2.6.36/drivers/ata/libata-acpi.c
---- linux-2.6.36/drivers/ata/libata-acpi.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/libata-acpi.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/libata-acpi.c linux-2.6.37/drivers/ata/libata-acpi.c
+--- linux-2.6.37/drivers/ata/libata-acpi.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/libata-acpi.c     2011-01-17 02:41:01.000000000 -0500
 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
        ata_acpi_uevent(dev->link->ap, dev, event);
  }
@@ -20956,10 +20925,10 @@ diff -urNp linux-2.6.36/drivers/ata/libata-acpi.c linux-2.6.36/drivers/ata/libat
        .handler = ata_acpi_ap_notify_dock,
        .uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libata-core.c
---- linux-2.6.36/drivers/ata/libata-core.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/libata-core.c     2010-11-06 18:58:15.000000000 -0400
-@@ -899,7 +899,7 @@ static const struct ata_xfer_ent {
+diff -urNp linux-2.6.37/drivers/ata/libata-core.c linux-2.6.37/drivers/ata/libata-core.c
+--- linux-2.6.37/drivers/ata/libata-core.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/libata-core.c     2011-01-17 02:41:01.000000000 -0500
+@@ -897,7 +897,7 @@ static const struct ata_xfer_ent {
        { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
        { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
        { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 },
@@ -20968,7 +20937,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
  };
  
  /**
-@@ -3071,7 +3071,7 @@ static const struct ata_timing ata_timin
+@@ -2885,7 +2885,7 @@ static const struct ata_timing ata_timin
        { XFER_UDMA_5,     0,   0,   0,   0,   0,   0, 0,    0,  20 },
        { XFER_UDMA_6,     0,   0,   0,   0,   0,   0, 0,    0,  15 },
  
@@ -20977,7 +20946,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
  };
  
  #define ENOUGH(v, unit)               (((v)-1)/(unit)+1)
-@@ -4260,7 +4260,7 @@ static const struct ata_blacklist_entry 
+@@ -4140,7 +4140,7 @@ static const struct ata_blacklist_entry 
        { "PIONEER DVD-RW  DVRTD08",    "1.00", ATA_HORKAGE_NOSETXFER },
  
        /* End Marker */
@@ -20986,7 +20955,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
  };
  
  /**
-@@ -4865,7 +4865,7 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4745,7 +4745,7 @@ void ata_qc_free(struct ata_queued_cmd *
        struct ata_port *ap;
        unsigned int tag;
  
@@ -20995,7 +20964,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
        ap = qc->ap;
  
        qc->flags = 0;
-@@ -4881,7 +4881,7 @@ void __ata_qc_complete(struct ata_queued
+@@ -4761,7 +4761,7 @@ void __ata_qc_complete(struct ata_queued
        struct ata_port *ap;
        struct ata_link *link;
  
@@ -21004,7 +20973,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
        WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
        ap = qc->ap;
        link = qc->dev->link;
-@@ -5866,7 +5866,7 @@ static void ata_host_stop(struct device 
+@@ -5754,7 +5754,7 @@ static void ata_host_stop(struct device 
   *    LOCKING:
   *    None.
   */
@@ -21013,7 +20982,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
  {
        static DEFINE_SPINLOCK(lock);
        const struct ata_port_operations *cur;
-@@ -5878,6 +5878,7 @@ static void ata_finalize_port_ops(struct
+@@ -5766,6 +5766,7 @@ static void ata_finalize_port_ops(struct
                return;
  
        spin_lock(&lock);
@@ -21021,7 +20990,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
  
        for (cur = ops->inherits; cur; cur = cur->inherits) {
                void **inherit = (void **)cur;
-@@ -5891,8 +5892,9 @@ static void ata_finalize_port_ops(struct
+@@ -5779,8 +5780,9 @@ static void ata_finalize_port_ops(struct
                if (IS_ERR(*pp))
                        *pp = NULL;
  
@@ -21032,7 +21001,7 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
        spin_unlock(&lock);
  }
  
-@@ -5989,7 +5991,7 @@ int ata_host_start(struct ata_host *host
+@@ -5877,7 +5879,7 @@ int ata_host_start(struct ata_host *host
   */
  /* KILLME - the only user left is ipr */
  void ata_host_init(struct ata_host *host, struct device *dev,
@@ -21040,8 +21009,8 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
 +                 unsigned long flags, const struct ata_port_operations *ops)
  {
        spin_lock_init(&host->lock);
-       host->dev = dev;
-@@ -6630,7 +6632,7 @@ static void ata_dummy_error_handler(stru
+       mutex_init(&host->eh_mutex);
+@@ -6583,7 +6585,7 @@ static void ata_dummy_error_handler(stru
        /* truly dummy */
  }
  
@@ -21050,10 +21019,10 @@ diff -urNp linux-2.6.36/drivers/ata/libata-core.c linux-2.6.36/drivers/ata/libat
        .qc_prep                = ata_noop_qc_prep,
        .qc_issue               = ata_dummy_qc_issue,
        .error_handler          = ata_dummy_error_handler,
-diff -urNp linux-2.6.36/drivers/ata/libata-eh.c linux-2.6.36/drivers/ata/libata-eh.c
---- linux-2.6.36/drivers/ata/libata-eh.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/libata-eh.c       2010-11-06 18:58:15.000000000 -0400
-@@ -3685,7 +3685,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.37/drivers/ata/libata-eh.c linux-2.6.37/drivers/ata/libata-eh.c
+--- linux-2.6.37/drivers/ata/libata-eh.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/libata-eh.c       2011-01-17 02:41:01.000000000 -0500
+@@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
   */
  void ata_std_error_handler(struct ata_port *ap)
  {
@@ -21062,10 +21031,10 @@ diff -urNp linux-2.6.36/drivers/ata/libata-eh.c linux-2.6.36/drivers/ata/libata-
        ata_reset_fn_t hardreset = ops->hardreset;
  
        /* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.36/drivers/ata/libata-pmp.c linux-2.6.36/drivers/ata/libata-pmp.c
---- linux-2.6.36/drivers/ata/libata-pmp.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/libata-pmp.c      2010-11-06 18:58:15.000000000 -0400
-@@ -868,7 +868,7 @@ static int sata_pmp_handle_link_fail(str
+diff -urNp linux-2.6.37/drivers/ata/libata-pmp.c linux-2.6.37/drivers/ata/libata-pmp.c
+--- linux-2.6.37/drivers/ata/libata-pmp.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/libata-pmp.c      2011-01-17 02:41:01.000000000 -0500
+@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
  {
@@ -21074,9 +21043,9 @@ diff -urNp linux-2.6.36/drivers/ata/libata-pmp.c linux-2.6.36/drivers/ata/libata
        int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
        struct ata_link *pmp_link = &ap->link;
        struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.36/drivers/ata/pata_acpi.c linux-2.6.36/drivers/ata/pata_acpi.c
---- linux-2.6.36/drivers/ata/pata_acpi.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_acpi.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_acpi.c linux-2.6.37/drivers/ata/pata_acpi.c
+--- linux-2.6.37/drivers/ata/pata_acpi.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_acpi.c       2011-01-17 02:41:01.000000000 -0500
 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21086,9 +21055,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_acpi.c linux-2.6.36/drivers/ata/pata_ac
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = pacpi_qc_issue,
        .cable_detect           = pacpi_cable_detect,
-diff -urNp linux-2.6.36/drivers/ata/pata_ali.c linux-2.6.36/drivers/ata/pata_ali.c
---- linux-2.6.36/drivers/ata/pata_ali.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_ali.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_ali.c linux-2.6.37/drivers/ata/pata_ali.c
+--- linux-2.6.37/drivers/ata/pata_ali.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_ali.c        2011-01-17 02:41:01.000000000 -0500
 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
   *    Port operations for PIO only ALi
   */
@@ -21134,9 +21103,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_ali.c linux-2.6.36/drivers/ata/pata_ali
        .inherits       = &ali_dma_base_ops,
        .check_atapi_dma = ali_check_atapi_dma,
        .dev_config     = ali_warn_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/pata_amd.c linux-2.6.36/drivers/ata/pata_amd.c
---- linux-2.6.36/drivers/ata/pata_amd.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_amd.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_amd.c linux-2.6.37/drivers/ata/pata_amd.c
+--- linux-2.6.37/drivers/ata/pata_amd.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_amd.c        2011-01-17 02:41:01.000000000 -0500
 @@ -397,28 +397,28 @@ static const struct ata_port_operations 
        .prereset       = amd_pre_reset,
  };
@@ -21186,9 +21155,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_amd.c linux-2.6.36/drivers/ata/pata_amd
        .inherits       = &nv_base_port_ops,
        .set_piomode    = nv133_set_piomode,
        .set_dmamode    = nv133_set_dmamode,
-diff -urNp linux-2.6.36/drivers/ata/pata_artop.c linux-2.6.36/drivers/ata/pata_artop.c
---- linux-2.6.36/drivers/ata/pata_artop.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_artop.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_artop.c linux-2.6.37/drivers/ata/pata_artop.c
+--- linux-2.6.37/drivers/ata/pata_artop.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_artop.c      2011-01-17 02:41:01.000000000 -0500
 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21207,9 +21176,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_artop.c linux-2.6.36/drivers/ata/pata_a
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = artop6260_cable_detect,
        .set_piomode            = artop6260_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_at32.c linux-2.6.36/drivers/ata/pata_at32.c
---- linux-2.6.36/drivers/ata/pata_at32.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_at32.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_at32.c linux-2.6.37/drivers/ata/pata_at32.c
+--- linux-2.6.37/drivers/ata/pata_at32.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_at32.c       2011-01-17 02:41:01.000000000 -0500
 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21219,9 +21188,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_at32.c linux-2.6.36/drivers/ata/pata_at
        .inherits               = &ata_sff_port_ops,
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = pata_at32_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_at91.c linux-2.6.36/drivers/ata/pata_at91.c
---- linux-2.6.36/drivers/ata/pata_at91.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_at91.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_at91.c linux-2.6.37/drivers/ata/pata_at91.c
+--- linux-2.6.37/drivers/ata/pata_at91.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_at91.c       2011-01-17 02:41:01.000000000 -0500
 @@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21231,9 +21200,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_at91.c linux-2.6.36/drivers/ata/pata_at
        .inherits       = &ata_sff_port_ops,
  
        .sff_data_xfer  = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.36/drivers/ata/pata_atiixp.c linux-2.6.36/drivers/ata/pata_atiixp.c
---- linux-2.6.36/drivers/ata/pata_atiixp.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_atiixp.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_atiixp.c linux-2.6.37/drivers/ata/pata_atiixp.c
+--- linux-2.6.37/drivers/ata/pata_atiixp.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_atiixp.c     2011-01-17 02:41:01.000000000 -0500
 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
  };
@@ -21243,9 +21212,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_atiixp.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
  
        .qc_prep        = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.36/drivers/ata/pata_atp867x.c linux-2.6.36/drivers/ata/pata_atp867x.c
---- linux-2.6.36/drivers/ata/pata_atp867x.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_atp867x.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_atp867x.c linux-2.6.37/drivers/ata/pata_atp867x.c
+--- linux-2.6.37/drivers/ata/pata_atp867x.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_atp867x.c    2011-01-17 02:41:01.000000000 -0500
 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21255,9 +21224,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_atp867x.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = atp867x_cable_detect,
        .set_piomode            = atp867x_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_bf54x.c linux-2.6.36/drivers/ata/pata_bf54x.c
---- linux-2.6.36/drivers/ata/pata_bf54x.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_bf54x.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_bf54x.c linux-2.6.37/drivers/ata/pata_bf54x.c
+--- linux-2.6.37/drivers/ata/pata_bf54x.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_bf54x.c      2011-01-17 02:41:01.000000000 -0500
 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
        .dma_boundary           = ATA_DMA_BOUNDARY,
  };
@@ -21267,10 +21236,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_bf54x.c linux-2.6.36/drivers/ata/pata_b
        .inherits               = &ata_bmdma_port_ops,
  
        .set_piomode            = bfin_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_cmd640.c linux-2.6.36/drivers/ata/pata_cmd640.c
---- linux-2.6.36/drivers/ata/pata_cmd640.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cmd640.c     2010-11-06 18:58:15.000000000 -0400
-@@ -165,7 +165,7 @@ static struct scsi_host_template cmd640_
+diff -urNp linux-2.6.37/drivers/ata/pata_cmd640.c linux-2.6.37/drivers/ata/pata_cmd640.c
+--- linux-2.6.37/drivers/ata/pata_cmd640.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cmd640.c     2011-01-17 02:41:01.000000000 -0500
+@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
        ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21279,9 +21248,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cmd640.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_sff_port_ops,
        /* In theory xfer_noirq is not needed once we kill the prefetcher */
        .sff_data_xfer  = ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.36/drivers/ata/pata_cmd64x.c linux-2.6.36/drivers/ata/pata_cmd64x.c
---- linux-2.6.36/drivers/ata/pata_cmd64x.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cmd64x.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_cmd64x.c linux-2.6.37/drivers/ata/pata_cmd64x.c
+--- linux-2.6.37/drivers/ata/pata_cmd64x.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cmd64x.c     2011-01-17 02:41:01.000000000 -0500
 @@ -268,18 +268,18 @@ static const struct ata_port_operations 
        .set_dmamode    = cmd64x_set_dmamode,
  };
@@ -21304,9 +21273,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cmd64x.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &cmd64x_base_ops,
        .bmdma_stop     = cmd648_bmdma_stop,
        .cable_detect   = cmd648_cable_detect,
-diff -urNp linux-2.6.36/drivers/ata/pata_cs5520.c linux-2.6.36/drivers/ata/pata_cs5520.c
---- linux-2.6.36/drivers/ata/pata_cs5520.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cs5520.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_cs5520.c linux-2.6.37/drivers/ata/pata_cs5520.c
+--- linux-2.6.37/drivers/ata/pata_cs5520.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cs5520.c     2011-01-17 02:41:01.000000000 -0500
 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
  };
@@ -21316,9 +21285,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cs5520.c linux-2.6.36/drivers/ata/pata_
        .inherits               = &ata_bmdma_port_ops,
        .qc_prep                = ata_bmdma_dumb_qc_prep,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_cs5530.c linux-2.6.36/drivers/ata/pata_cs5530.c
---- linux-2.6.36/drivers/ata/pata_cs5530.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cs5530.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_cs5530.c linux-2.6.37/drivers/ata/pata_cs5530.c
+--- linux-2.6.37/drivers/ata/pata_cs5530.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cs5530.c     2011-01-17 02:41:01.000000000 -0500
 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
  };
@@ -21328,9 +21297,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cs5530.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
  
        .qc_prep        = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.36/drivers/ata/pata_cs5535.c linux-2.6.36/drivers/ata/pata_cs5535.c
---- linux-2.6.36/drivers/ata/pata_cs5535.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cs5535.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_cs5535.c linux-2.6.37/drivers/ata/pata_cs5535.c
+--- linux-2.6.37/drivers/ata/pata_cs5535.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cs5535.c     2011-01-17 02:41:01.000000000 -0500
 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21340,10 +21309,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cs5535.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = cs5535_cable_detect,
        .set_piomode    = cs5535_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_cs5536.c linux-2.6.36/drivers/ata/pata_cs5536.c
---- linux-2.6.36/drivers/ata/pata_cs5536.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cs5536.c     2010-11-06 18:58:15.000000000 -0400
-@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
+diff -urNp linux-2.6.37/drivers/ata/pata_cs5536.c linux-2.6.37/drivers/ata/pata_cs5536.c
+--- linux-2.6.37/drivers/ata/pata_cs5536.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cs5536.c     2011-01-17 02:41:01.000000000 -0500
+@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21352,9 +21321,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cs5536.c linux-2.6.36/drivers/ata/pata_
        .inherits               = &ata_bmdma32_port_ops,
        .cable_detect           = cs5536_cable_detect,
        .set_piomode            = cs5536_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_cypress.c linux-2.6.36/drivers/ata/pata_cypress.c
---- linux-2.6.36/drivers/ata/pata_cypress.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_cypress.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_cypress.c linux-2.6.37/drivers/ata/pata_cypress.c
+--- linux-2.6.37/drivers/ata/pata_cypress.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_cypress.c    2011-01-17 02:41:01.000000000 -0500
 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21364,9 +21333,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_cypress.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = cy82c693_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_efar.c linux-2.6.36/drivers/ata/pata_efar.c
---- linux-2.6.36/drivers/ata/pata_efar.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_efar.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_efar.c linux-2.6.37/drivers/ata/pata_efar.c
+--- linux-2.6.37/drivers/ata/pata_efar.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_efar.c       2011-01-17 02:41:01.000000000 -0500
 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21376,9 +21345,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_efar.c linux-2.6.36/drivers/ata/pata_ef
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = efar_cable_detect,
        .set_piomode            = efar_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_hpt366.c linux-2.6.36/drivers/ata/pata_hpt366.c
---- linux-2.6.36/drivers/ata/pata_hpt366.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_hpt366.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_hpt366.c linux-2.6.37/drivers/ata/pata_hpt366.c
+--- linux-2.6.37/drivers/ata/pata_hpt366.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_hpt366.c     2011-01-17 02:41:01.000000000 -0500
 @@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_
   *    Configuration for HPT366/68
   */
@@ -21388,9 +21357,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_hpt366.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = hpt36x_cable_detect,
        .mode_filter    = hpt366_filter,
-diff -urNp linux-2.6.36/drivers/ata/pata_hpt37x.c linux-2.6.36/drivers/ata/pata_hpt37x.c
---- linux-2.6.36/drivers/ata/pata_hpt37x.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_hpt37x.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_hpt37x.c linux-2.6.37/drivers/ata/pata_hpt37x.c
+--- linux-2.6.37/drivers/ata/pata_hpt37x.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_hpt37x.c     2011-01-17 02:41:01.000000000 -0500
 @@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
   *    Configuration for HPT370
   */
@@ -21427,9 +21396,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_hpt37x.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &hpt372_port_ops,
        .cable_detect   = hpt374_fn1_cable_detect,
        .prereset       = hpt37x_pre_reset,
-diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x2n.c linux-2.6.36/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.36/drivers/ata/pata_hpt3x2n.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_hpt3x2n.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x2n.c linux-2.6.37/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.37/drivers/ata/pata_hpt3x2n.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_hpt3x2n.c    2011-01-17 02:41:01.000000000 -0500
 @@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
   *    Configuration for HPT3x2n.
   */
@@ -21439,9 +21408,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x2n.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
  
        .bmdma_stop     = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x3.c linux-2.6.36/drivers/ata/pata_hpt3x3.c
---- linux-2.6.36/drivers/ata/pata_hpt3x3.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_hpt3x3.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_hpt3x3.c linux-2.6.37/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.37/drivers/ata/pata_hpt3x3.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_hpt3x3.c     2011-01-17 02:41:01.000000000 -0500
 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21451,9 +21420,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_hpt3x3.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = hpt3x3_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_icside.c linux-2.6.36/drivers/ata/pata_icside.c
---- linux-2.6.36/drivers/ata/pata_icside.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_icside.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_icside.c linux-2.6.37/drivers/ata/pata_icside.c
+--- linux-2.6.37/drivers/ata/pata_icside.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_icside.c     2011-01-17 02:41:01.000000000 -0500
 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
        }
  }
@@ -21463,9 +21432,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_icside.c linux-2.6.36/drivers/ata/pata_
        .inherits               = &ata_bmdma_port_ops,
        /* no need to build any PRD tables for DMA */
        .qc_prep                = ata_noop_qc_prep,
-diff -urNp linux-2.6.36/drivers/ata/pata_isapnp.c linux-2.6.36/drivers/ata/pata_isapnp.c
---- linux-2.6.36/drivers/ata/pata_isapnp.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_isapnp.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_isapnp.c linux-2.6.37/drivers/ata/pata_isapnp.c
+--- linux-2.6.37/drivers/ata/pata_isapnp.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_isapnp.c     2011-01-17 02:41:01.000000000 -0500
 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21481,9 +21450,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_isapnp.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        /* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.36/drivers/ata/pata_it8213.c linux-2.6.36/drivers/ata/pata_it8213.c
---- linux-2.6.36/drivers/ata/pata_it8213.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_it8213.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_it8213.c linux-2.6.37/drivers/ata/pata_it8213.c
+--- linux-2.6.37/drivers/ata/pata_it8213.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_it8213.c     2011-01-17 02:41:01.000000000 -0500
 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
  };
  
@@ -21493,9 +21462,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_it8213.c linux-2.6.36/drivers/ata/pata_
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = it8213_cable_detect,
        .set_piomode            = it8213_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_it821x.c linux-2.6.36/drivers/ata/pata_it821x.c
---- linux-2.6.36/drivers/ata/pata_it821x.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_it821x.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_it821x.c linux-2.6.37/drivers/ata/pata_it821x.c
+--- linux-2.6.37/drivers/ata/pata_it821x.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_it821x.c     2011-01-17 02:41:01.000000000 -0500
 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21523,9 +21492,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_it821x.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
  
        .check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_ixp4xx_cf.c  2011-01-17 02:41:01.000000000 -0500
 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21535,9 +21504,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_ixp4xx_cf.c linux-2.6.36/drivers/ata/pa
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ixp4xx_mmio_data_xfer,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_jmicron.c linux-2.6.36/drivers/ata/pata_jmicron.c
---- linux-2.6.36/drivers/ata/pata_jmicron.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_jmicron.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_jmicron.c linux-2.6.37/drivers/ata/pata_jmicron.c
+--- linux-2.6.37/drivers/ata/pata_jmicron.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_jmicron.c    2011-01-17 02:41:01.000000000 -0500
 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21547,9 +21516,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_jmicron.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .prereset               = jmicron_pre_reset,
  };
-diff -urNp linux-2.6.36/drivers/ata/pata_legacy.c linux-2.6.36/drivers/ata/pata_legacy.c
---- linux-2.6.36/drivers/ata/pata_legacy.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_legacy.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_legacy.c linux-2.6.37/drivers/ata/pata_legacy.c
+--- linux-2.6.37/drivers/ata/pata_legacy.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_legacy.c     2011-01-17 02:41:01.000000000 -0500
 @@ -116,7 +116,7 @@ struct legacy_probe {
  
  struct legacy_controller {
@@ -21661,9 +21630,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_legacy.c linux-2.6.36/drivers/ata/pata_
        struct legacy_data *ld = &legacy_data[probe->slot];
        struct ata_host *host = NULL;
        struct ata_port *ap;
-diff -urNp linux-2.6.36/drivers/ata/pata_macio.c linux-2.6.36/drivers/ata/pata_macio.c
---- linux-2.6.36/drivers/ata/pata_macio.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_macio.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_macio.c linux-2.6.37/drivers/ata/pata_macio.c
+--- linux-2.6.37/drivers/ata/pata_macio.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_macio.c      2011-01-17 02:41:01.000000000 -0500
 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
        .slave_configure        = pata_macio_slave_config,
  };
@@ -21675,9 +21644,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_macio.c linux-2.6.36/drivers/ata/pata_m
        .freeze                 = pata_macio_freeze,
        .set_piomode            = pata_macio_set_timings,
        .set_dmamode            = pata_macio_set_timings,
-diff -urNp linux-2.6.36/drivers/ata/pata_marvell.c linux-2.6.36/drivers/ata/pata_marvell.c
---- linux-2.6.36/drivers/ata/pata_marvell.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_marvell.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_marvell.c linux-2.6.37/drivers/ata/pata_marvell.c
+--- linux-2.6.37/drivers/ata/pata_marvell.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_marvell.c    2011-01-17 02:41:01.000000000 -0500
 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21687,9 +21656,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_marvell.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = marvell_cable_detect,
        .prereset               = marvell_pre_reset,
-diff -urNp linux-2.6.36/drivers/ata/pata_mpc52xx.c linux-2.6.36/drivers/ata/pata_mpc52xx.c
---- linux-2.6.36/drivers/ata/pata_mpc52xx.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_mpc52xx.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_mpc52xx.c linux-2.6.37/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.37/drivers/ata/pata_mpc52xx.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_mpc52xx.c    2011-01-17 02:41:01.000000000 -0500
 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21699,9 +21668,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_mpc52xx.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_sff_port_ops,
        .sff_dev_select         = mpc52xx_ata_dev_select,
        .set_piomode            = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_mpiix.c linux-2.6.36/drivers/ata/pata_mpiix.c
---- linux-2.6.36/drivers/ata/pata_mpiix.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_mpiix.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_mpiix.c linux-2.6.37/drivers/ata/pata_mpiix.c
+--- linux-2.6.37/drivers/ata/pata_mpiix.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_mpiix.c      2011-01-17 02:41:01.000000000 -0500
 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21711,9 +21680,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_mpiix.c linux-2.6.36/drivers/ata/pata_m
        .inherits       = &ata_sff_port_ops,
        .qc_issue       = mpiix_qc_issue,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_netcell.c linux-2.6.36/drivers/ata/pata_netcell.c
---- linux-2.6.36/drivers/ata/pata_netcell.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_netcell.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_netcell.c linux-2.6.37/drivers/ata/pata_netcell.c
+--- linux-2.6.37/drivers/ata/pata_netcell.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_netcell.c    2011-01-17 02:41:01.000000000 -0500
 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21723,9 +21692,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_netcell.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_80wire,
        .read_id        = netcell_read_id,
-diff -urNp linux-2.6.36/drivers/ata/pata_ninja32.c linux-2.6.36/drivers/ata/pata_ninja32.c
---- linux-2.6.36/drivers/ata/pata_ninja32.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_ninja32.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_ninja32.c linux-2.6.37/drivers/ata/pata_ninja32.c
+--- linux-2.6.37/drivers/ata/pata_ninja32.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_ninja32.c    2011-01-17 02:41:01.000000000 -0500
 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21735,9 +21704,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_ninja32.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .sff_dev_select = ninja32_dev_select,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_ns87410.c linux-2.6.36/drivers/ata/pata_ns87410.c
---- linux-2.6.36/drivers/ata/pata_ns87410.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_ns87410.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_ns87410.c linux-2.6.37/drivers/ata/pata_ns87410.c
+--- linux-2.6.37/drivers/ata/pata_ns87410.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_ns87410.c    2011-01-17 02:41:01.000000000 -0500
 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21747,9 +21716,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_ns87410.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_sff_port_ops,
        .qc_issue       = ns87410_qc_issue,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_ns87415.c linux-2.6.36/drivers/ata/pata_ns87415.c
---- linux-2.6.36/drivers/ata/pata_ns87415.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_ns87415.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_ns87415.c linux-2.6.37/drivers/ata/pata_ns87415.c
+--- linux-2.6.37/drivers/ata/pata_ns87415.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_ns87415.c    2011-01-17 02:41:01.000000000 -0500
 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
  }
  #endif                /* 87560 SuperIO Support */
@@ -21768,10 +21737,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_ns87415.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ns87415_pata_ops,
        .sff_tf_read            = ns87560_tf_read,
        .sff_check_status       = ns87560_check_status,
-diff -urNp linux-2.6.36/drivers/ata/pata_octeon_cf.c linux-2.6.36/drivers/ata/pata_octeon_cf.c
---- linux-2.6.36/drivers/ata/pata_octeon_cf.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_octeon_cf.c  2010-11-06 18:58:15.000000000 -0400
-@@ -782,6 +782,7 @@ static unsigned int octeon_cf_qc_issue(s
+diff -urNp linux-2.6.37/drivers/ata/pata_octeon_cf.c linux-2.6.37/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.37/drivers/ata/pata_octeon_cf.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_octeon_cf.c  2011-01-17 02:41:01.000000000 -0500
+@@ -780,6 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
        return 0;
  }
  
@@ -21779,9 +21748,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_octeon_cf.c linux-2.6.36/drivers/ata/pa
  static struct ata_port_operations octeon_cf_ops = {
        .inherits               = &ata_sff_port_ops,
        .check_atapi_dma        = octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/pata_oldpiix.c linux-2.6.36/drivers/ata/pata_oldpiix.c
---- linux-2.6.36/drivers/ata/pata_oldpiix.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_oldpiix.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_oldpiix.c linux-2.6.37/drivers/ata/pata_oldpiix.c
+--- linux-2.6.37/drivers/ata/pata_oldpiix.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_oldpiix.c    2011-01-17 02:41:01.000000000 -0500
 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21791,9 +21760,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_oldpiix.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = oldpiix_qc_issue,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_opti.c linux-2.6.36/drivers/ata/pata_opti.c
---- linux-2.6.36/drivers/ata/pata_opti.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_opti.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_opti.c linux-2.6.37/drivers/ata/pata_opti.c
+--- linux-2.6.37/drivers/ata/pata_opti.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_opti.c       2011-01-17 02:41:01.000000000 -0500
 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21803,9 +21772,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_opti.c linux-2.6.36/drivers/ata/pata_op
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = opti_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_optidma.c linux-2.6.36/drivers/ata/pata_optidma.c
---- linux-2.6.36/drivers/ata/pata_optidma.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_optidma.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_optidma.c linux-2.6.37/drivers/ata/pata_optidma.c
+--- linux-2.6.37/drivers/ata/pata_optidma.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_optidma.c    2011-01-17 02:41:01.000000000 -0500
 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21824,9 +21793,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_optidma.c linux-2.6.36/drivers/ata/pata
        .inherits       = &optidma_port_ops,
        .set_piomode    = optiplus_set_pio_mode,
        .set_dmamode    = optiplus_set_dma_mode,
-diff -urNp linux-2.6.36/drivers/ata/pata_palmld.c linux-2.6.36/drivers/ata/pata_palmld.c
---- linux-2.6.36/drivers/ata/pata_palmld.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_palmld.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_palmld.c linux-2.6.37/drivers/ata/pata_palmld.c
+--- linux-2.6.37/drivers/ata/pata_palmld.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_palmld.c     2011-01-17 02:41:01.000000000 -0500
 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21836,10 +21805,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_palmld.c linux-2.6.36/drivers/ata/pata_
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.36/drivers/ata/pata_pcmcia.c linux-2.6.36/drivers/ata/pata_pcmcia.c
---- linux-2.6.36/drivers/ata/pata_pcmcia.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_pcmcia.c     2010-11-06 18:58:15.000000000 -0400
-@@ -152,14 +152,14 @@ static struct scsi_host_template pcmcia_
+diff -urNp linux-2.6.37/drivers/ata/pata_pcmcia.c linux-2.6.37/drivers/ata/pata_pcmcia.c
+--- linux-2.6.37/drivers/ata/pata_pcmcia.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_pcmcia.c     2011-01-17 02:41:01.000000000 -0500
+@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
        ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -21856,7 +21825,7 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pcmcia.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_sff_port_ops,
        .sff_data_xfer  = ata_data_xfer_8bit,
        .cable_detect   = ata_cable_40wire,
-@@ -244,7 +244,7 @@ static int pcmcia_init_one(struct pcmcia
+@@ -205,7 +205,7 @@ static int pcmcia_init_one(struct pcmcia
        unsigned long io_base, ctl_base;
        void __iomem *io_addr, *ctl_addr;
        int n_ports = 1;
@@ -21864,10 +21833,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pcmcia.c linux-2.6.36/drivers/ata/pata_
 +      const struct ata_port_operations *ops = &pcmcia_port_ops;
  
        /* Set up attributes in order to probe card and get resources */
-       pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-diff -urNp linux-2.6.36/drivers/ata/pata_pdc2027x.c linux-2.6.36/drivers/ata/pata_pdc2027x.c
---- linux-2.6.36/drivers/ata/pata_pdc2027x.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_pdc2027x.c   2010-11-06 18:58:15.000000000 -0400
+       pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
+diff -urNp linux-2.6.37/drivers/ata/pata_pdc2027x.c linux-2.6.37/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.37/drivers/ata/pata_pdc2027x.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_pdc2027x.c   2011-01-17 02:41:01.000000000 -0500
 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21885,10 +21854,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pdc2027x.c linux-2.6.36/drivers/ata/pat
        .inherits               = &pdc2027x_pata100_ops,
        .mode_filter            = pdc2027x_mode_filter,
        .set_piomode            = pdc2027x_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_pdc202xx_old.c linux-2.6.36/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.36/drivers/ata/pata_pdc202xx_old.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_pdc202xx_old.c       2010-11-06 18:58:15.000000000 -0400
-@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
+diff -urNp linux-2.6.37/drivers/ata/pata_pdc202xx_old.c linux-2.6.37/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.37/drivers/ata/pata_pdc202xx_old.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_pdc202xx_old.c       2011-01-17 02:41:01.000000000 -0500
+@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -21897,8 +21866,8 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pdc202xx_old.c linux-2.6.36/drivers/ata
        .inherits               = &ata_bmdma_port_ops,
  
        .cable_detect           = ata_cable_40wire,
-@@ -284,7 +284,7 @@ static struct ata_port_operations pdc202
-       .sff_exec_command       = pdc202xx_exec_command,
+@@ -306,7 +306,7 @@ static struct ata_port_operations pdc202
+       .sff_irq_check          = pdc202xx_irq_check,
  };
  
 -static struct ata_port_operations pdc2026x_port_ops = {
@@ -21906,9 +21875,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pdc202xx_old.c linux-2.6.36/drivers/ata
        .inherits               = &pdc2024x_port_ops,
  
        .check_atapi_dma        = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/pata_piccolo.c linux-2.6.36/drivers/ata/pata_piccolo.c
---- linux-2.6.36/drivers/ata/pata_piccolo.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_piccolo.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_piccolo.c linux-2.6.37/drivers/ata/pata_piccolo.c
+--- linux-2.6.37/drivers/ata/pata_piccolo.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_piccolo.c    2011-01-17 02:41:01.000000000 -0500
 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21918,9 +21887,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_piccolo.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_unknown,
        .set_piomode    = tosh_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_platform.c linux-2.6.36/drivers/ata/pata_platform.c
---- linux-2.6.36/drivers/ata/pata_platform.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_platform.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_platform.c linux-2.6.37/drivers/ata/pata_platform.c
+--- linux-2.6.37/drivers/ata/pata_platform.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_platform.c   2011-01-17 02:41:01.000000000 -0500
 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21930,9 +21899,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_platform.c linux-2.6.36/drivers/ata/pat
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
        .cable_detect           = ata_cable_unknown,
-diff -urNp linux-2.6.36/drivers/ata/pata_pxa.c linux-2.6.36/drivers/ata/pata_pxa.c
---- linux-2.6.36/drivers/ata/pata_pxa.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_pxa.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_pxa.c linux-2.6.37/drivers/ata/pata_pxa.c
+--- linux-2.6.37/drivers/ata/pata_pxa.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_pxa.c        2011-01-17 02:41:01.000000000 -0500
 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21942,9 +21911,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_pxa.c linux-2.6.36/drivers/ata/pata_pxa
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = ata_cable_40wire,
  
-diff -urNp linux-2.6.36/drivers/ata/pata_qdi.c linux-2.6.36/drivers/ata/pata_qdi.c
---- linux-2.6.36/drivers/ata/pata_qdi.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_qdi.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_qdi.c linux-2.6.37/drivers/ata/pata_qdi.c
+--- linux-2.6.37/drivers/ata/pata_qdi.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_qdi.c        2011-01-17 02:41:01.000000000 -0500
 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -21963,9 +21932,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_qdi.c linux-2.6.36/drivers/ata/pata_qdi
        .inherits       = &qdi6500_port_ops,
        .set_piomode    = qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.36/drivers/ata/pata_radisys.c linux-2.6.36/drivers/ata/pata_radisys.c
---- linux-2.6.36/drivers/ata/pata_radisys.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_radisys.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_radisys.c linux-2.6.37/drivers/ata/pata_radisys.c
+--- linux-2.6.37/drivers/ata/pata_radisys.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_radisys.c    2011-01-17 02:41:01.000000000 -0500
 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21975,9 +21944,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_radisys.c linux-2.6.36/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = radisys_qc_issue,
        .cable_detect           = ata_cable_unknown,
-diff -urNp linux-2.6.36/drivers/ata/pata_rb532_cf.c linux-2.6.36/drivers/ata/pata_rb532_cf.c
---- linux-2.6.36/drivers/ata/pata_rb532_cf.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_rb532_cf.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_rb532_cf.c linux-2.6.37/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.37/drivers/ata/pata_rb532_cf.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_rb532_cf.c   2011-01-17 02:41:01.000000000 -0500
 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
        return IRQ_HANDLED;
  }
@@ -21987,9 +21956,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_rb532_cf.c linux-2.6.36/drivers/ata/pat
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.36/drivers/ata/pata_rdc.c linux-2.6.36/drivers/ata/pata_rdc.c
---- linux-2.6.36/drivers/ata/pata_rdc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_rdc.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_rdc.c linux-2.6.37/drivers/ata/pata_rdc.c
+--- linux-2.6.37/drivers/ata/pata_rdc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_rdc.c        2011-01-17 02:41:01.000000000 -0500
 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
        pci_write_config_byte(dev, 0x48, udma_enable);
  }
@@ -21999,9 +21968,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_rdc.c linux-2.6.36/drivers/ata/pata_rdc
        .inherits               = &ata_bmdma32_port_ops,
        .cable_detect           = rdc_pata_cable_detect,
        .set_piomode            = rdc_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_rz1000.c linux-2.6.36/drivers/ata/pata_rz1000.c
---- linux-2.6.36/drivers/ata/pata_rz1000.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_rz1000.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_rz1000.c linux-2.6.37/drivers/ata/pata_rz1000.c
+--- linux-2.6.37/drivers/ata/pata_rz1000.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_rz1000.c     2011-01-17 02:41:01.000000000 -0500
 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -22011,9 +21980,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_rz1000.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_mode       = rz1000_set_mode,
-diff -urNp linux-2.6.36/drivers/ata/pata_samsung_cf.c linux-2.6.36/drivers/ata/pata_samsung_cf.c
---- linux-2.6.36/drivers/ata/pata_samsung_cf.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_samsung_cf.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_samsung_cf.c linux-2.6.37/drivers/ata/pata_samsung_cf.c
+--- linux-2.6.37/drivers/ata/pata_samsung_cf.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_samsung_cf.c 2011-01-17 02:41:01.000000000 -0500
 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -22032,9 +22001,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_samsung_cf.c linux-2.6.36/drivers/ata/p
        .inherits               = &ata_sff_port_ops,
        .set_piomode            = pata_s3c_set_piomode,
  };
-diff -urNp linux-2.6.36/drivers/ata/pata_sc1200.c linux-2.6.36/drivers/ata/pata_sc1200.c
---- linux-2.6.36/drivers/ata/pata_sc1200.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_sc1200.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_sc1200.c linux-2.6.37/drivers/ata/pata_sc1200.c
+--- linux-2.6.37/drivers/ata/pata_sc1200.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_sc1200.c     2011-01-17 02:41:01.000000000 -0500
 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
  };
@@ -22044,9 +22013,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_sc1200.c linux-2.6.36/drivers/ata/pata_
        .inherits       = &ata_bmdma_port_ops,
        .qc_prep        = ata_bmdma_dumb_qc_prep,
        .qc_issue       = sc1200_qc_issue,
-diff -urNp linux-2.6.36/drivers/ata/pata_scc.c linux-2.6.36/drivers/ata/pata_scc.c
---- linux-2.6.36/drivers/ata/pata_scc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_scc.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_scc.c linux-2.6.37/drivers/ata/pata_scc.c
+--- linux-2.6.37/drivers/ata/pata_scc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_scc.c        2011-01-17 02:41:01.000000000 -0500
 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22056,9 +22025,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_scc.c linux-2.6.36/drivers/ata/pata_scc
        .inherits               = &ata_bmdma_port_ops,
  
        .set_piomode            = scc_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_sch.c linux-2.6.36/drivers/ata/pata_sch.c
---- linux-2.6.36/drivers/ata/pata_sch.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_sch.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_sch.c linux-2.6.37/drivers/ata/pata_sch.c
+--- linux-2.6.37/drivers/ata/pata_sch.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_sch.c        2011-01-17 02:41:01.000000000 -0500
 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22068,9 +22037,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_sch.c linux-2.6.36/drivers/ata/pata_sch
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = ata_cable_unknown,
        .set_piomode            = sch_set_piomode,
-diff -urNp linux-2.6.36/drivers/ata/pata_serverworks.c linux-2.6.36/drivers/ata/pata_serverworks.c
---- linux-2.6.36/drivers/ata/pata_serverworks.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_serverworks.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_serverworks.c linux-2.6.37/drivers/ata/pata_serverworks.c
+--- linux-2.6.37/drivers/ata/pata_serverworks.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_serverworks.c        2011-01-17 02:41:01.000000000 -0500
 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22089,10 +22058,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_serverworks.c linux-2.6.36/drivers/ata/
        .inherits       = &serverworks_osb4_port_ops,
        .mode_filter    = serverworks_csb_filter,
  };
-diff -urNp linux-2.6.36/drivers/ata/pata_sil680.c linux-2.6.36/drivers/ata/pata_sil680.c
---- linux-2.6.36/drivers/ata/pata_sil680.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_sil680.c     2010-11-06 18:58:15.000000000 -0400
-@@ -214,8 +214,7 @@ static struct scsi_host_template sil680_
+diff -urNp linux-2.6.37/drivers/ata/pata_sil680.c linux-2.6.37/drivers/ata/pata_sil680.c
+--- linux-2.6.37/drivers/ata/pata_sil680.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_sil680.c     2011-01-17 02:41:01.000000000 -0500
+@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -22101,10 +22070,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_sil680.c linux-2.6.36/drivers/ata/pata_
 +static const struct ata_port_operations sil680_port_ops = {
        .inherits               = &ata_bmdma32_port_ops,
        .sff_exec_command       = sil680_sff_exec_command,
-       .cable_detect           = sil680_cable_detect,
-diff -urNp linux-2.6.36/drivers/ata/pata_sis.c linux-2.6.36/drivers/ata/pata_sis.c
---- linux-2.6.36/drivers/ata/pata_sis.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_sis.c        2010-11-06 18:58:15.000000000 -0400
+       .sff_irq_check          = sil680_sff_irq_check,
+diff -urNp linux-2.6.37/drivers/ata/pata_sis.c linux-2.6.37/drivers/ata/pata_sis.c
+--- linux-2.6.37/drivers/ata/pata_sis.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_sis.c        2011-01-17 02:41:01.000000000 -0500
 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22160,10 +22129,10 @@ diff -urNp linux-2.6.36/drivers/ata/pata_sis.c linux-2.6.36/drivers/ata/pata_sis
        .inherits               = &sis_base_ops,
        .set_piomode            = sis_old_set_piomode,
        .set_dmamode            = sis_old_set_dmamode,
-diff -urNp linux-2.6.36/drivers/ata/pata_sl82c105.c linux-2.6.36/drivers/ata/pata_sl82c105.c
---- linux-2.6.36/drivers/ata/pata_sl82c105.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_sl82c105.c   2010-11-06 18:58:15.000000000 -0400
-@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
+diff -urNp linux-2.6.37/drivers/ata/pata_sl82c105.c linux-2.6.37/drivers/ata/pata_sl82c105.c
+--- linux-2.6.37/drivers/ata/pata_sl82c105.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_sl82c105.c   2011-01-17 02:41:01.000000000 -0500
+@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -22172,9 +22141,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_sl82c105.c linux-2.6.36/drivers/ata/pat
        .inherits       = &ata_bmdma_port_ops,
        .qc_defer       = sl82c105_qc_defer,
        .bmdma_start    = sl82c105_bmdma_start,
-diff -urNp linux-2.6.36/drivers/ata/pata_triflex.c linux-2.6.36/drivers/ata/pata_triflex.c
---- linux-2.6.36/drivers/ata/pata_triflex.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_triflex.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_triflex.c linux-2.6.37/drivers/ata/pata_triflex.c
+--- linux-2.6.37/drivers/ata/pata_triflex.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_triflex.c    2011-01-17 02:41:01.000000000 -0500
 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22184,9 +22153,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_triflex.c linux-2.6.36/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .bmdma_start    = triflex_bmdma_start,
        .bmdma_stop     = triflex_bmdma_stop,
-diff -urNp linux-2.6.36/drivers/ata/pata_via.c linux-2.6.36/drivers/ata/pata_via.c
---- linux-2.6.36/drivers/ata/pata_via.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pata_via.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pata_via.c linux-2.6.37/drivers/ata/pata_via.c
+--- linux-2.6.37/drivers/ata/pata_via.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pata_via.c        2011-01-17 02:41:01.000000000 -0500
 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22205,9 +22174,9 @@ diff -urNp linux-2.6.36/drivers/ata/pata_via.c linux-2.6.36/drivers/ata/pata_via
        .inherits       = &via_port_ops,
        .sff_data_xfer  = ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.36/drivers/ata/pdc_adma.c linux-2.6.36/drivers/ata/pdc_adma.c
---- linux-2.6.36/drivers/ata/pdc_adma.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/pdc_adma.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/pdc_adma.c linux-2.6.37/drivers/ata/pdc_adma.c
+--- linux-2.6.37/drivers/ata/pdc_adma.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/pdc_adma.c        2011-01-17 02:41:01.000000000 -0500
 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
        .dma_boundary           = ADMA_DMA_BOUNDARY,
  };
@@ -22217,9 +22186,9 @@ diff -urNp linux-2.6.36/drivers/ata/pdc_adma.c linux-2.6.36/drivers/ata/pdc_adma
        .inherits               = &ata_sff_port_ops,
  
        .lost_interrupt         = ATA_OP_NULL,
-diff -urNp linux-2.6.36/drivers/ata/sata_dwc_460ex.c linux-2.6.36/drivers/ata/sata_dwc_460ex.c
---- linux-2.6.36/drivers/ata/sata_dwc_460ex.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_dwc_460ex.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_dwc_460ex.c linux-2.6.37/drivers/ata/sata_dwc_460ex.c
+--- linux-2.6.37/drivers/ata/sata_dwc_460ex.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_dwc_460ex.c  2011-01-17 02:41:01.000000000 -0500
 @@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
        .dma_boundary           = ATA_DMA_BOUNDARY,
  };
@@ -22229,10 +22198,10 @@ diff -urNp linux-2.6.36/drivers/ata/sata_dwc_460ex.c linux-2.6.36/drivers/ata/sa
        .inherits               = &ata_sff_port_ops,
  
        .error_handler          = sata_dwc_error_handler,
-diff -urNp linux-2.6.36/drivers/ata/sata_fsl.c linux-2.6.36/drivers/ata/sata_fsl.c
---- linux-2.6.36/drivers/ata/sata_fsl.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_fsl.c        2010-11-06 18:58:15.000000000 -0400
-@@ -1261,7 +1261,7 @@ static struct scsi_host_template sata_fs
+diff -urNp linux-2.6.37/drivers/ata/sata_fsl.c linux-2.6.37/drivers/ata/sata_fsl.c
+--- linux-2.6.37/drivers/ata/sata_fsl.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_fsl.c        2011-01-17 02:41:01.000000000 -0500
+@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
        .dma_boundary = ATA_DMA_BOUNDARY,
  };
  
@@ -22241,9 +22210,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_fsl.c linux-2.6.36/drivers/ata/sata_fsl
        .inherits               = &sata_pmp_port_ops,
  
        .qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.36/drivers/ata/sata_inic162x.c linux-2.6.36/drivers/ata/sata_inic162x.c
---- linux-2.6.36/drivers/ata/sata_inic162x.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_inic162x.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_inic162x.c linux-2.6.37/drivers/ata/sata_inic162x.c
+--- linux-2.6.37/drivers/ata/sata_inic162x.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_inic162x.c   2011-01-17 02:41:01.000000000 -0500
 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
        return 0;
  }
@@ -22253,9 +22222,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_inic162x.c linux-2.6.36/drivers/ata/sat
        .inherits               = &sata_port_ops,
  
        .check_atapi_dma        = inic_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/sata_mv.c linux-2.6.36/drivers/ata/sata_mv.c
---- linux-2.6.36/drivers/ata/sata_mv.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_mv.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_mv.c linux-2.6.37/drivers/ata/sata_mv.c
+--- linux-2.6.37/drivers/ata/sata_mv.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_mv.c 2011-01-17 02:41:01.000000000 -0500
 @@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
        .dma_boundary           = MV_DMA_BOUNDARY,
  };
@@ -22283,9 +22252,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_mv.c linux-2.6.36/drivers/ata/sata_mv.c
        .inherits               = &mv6_ops,
        .dev_config             = ATA_OP_NULL,
        .qc_prep                = mv_qc_prep_iie,
-diff -urNp linux-2.6.36/drivers/ata/sata_nv.c linux-2.6.36/drivers/ata/sata_nv.c
---- linux-2.6.36/drivers/ata/sata_nv.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_nv.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_nv.c linux-2.6.37/drivers/ata/sata_nv.c
+--- linux-2.6.37/drivers/ata/sata_nv.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_nv.c 2011-01-17 02:41:01.000000000 -0500
 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
@@ -22328,9 +22297,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_nv.c linux-2.6.36/drivers/ata/sata_nv.c
        .inherits               = &nv_generic_ops,
  
        .qc_defer               = ata_std_qc_defer,
-diff -urNp linux-2.6.36/drivers/ata/sata_promise.c linux-2.6.36/drivers/ata/sata_promise.c
---- linux-2.6.36/drivers/ata/sata_promise.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_promise.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_promise.c linux-2.6.37/drivers/ata/sata_promise.c
+--- linux-2.6.37/drivers/ata/sata_promise.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_promise.c    2011-01-17 02:41:01.000000000 -0500
 @@ -196,7 +196,7 @@ static const struct ata_port_operations 
        .error_handler          = pdc_error_handler,
  };
@@ -22357,9 +22326,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_promise.c linux-2.6.36/drivers/ata/sata
        .inherits               = &pdc_common_ops,
        .cable_detect           = pdc_pata_cable_detect,
        .freeze                 = pdc_freeze,
-diff -urNp linux-2.6.36/drivers/ata/sata_qstor.c linux-2.6.36/drivers/ata/sata_qstor.c
---- linux-2.6.36/drivers/ata/sata_qstor.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_qstor.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_qstor.c linux-2.6.37/drivers/ata/sata_qstor.c
+--- linux-2.6.37/drivers/ata/sata_qstor.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_qstor.c      2011-01-17 02:41:01.000000000 -0500
 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
        .dma_boundary           = QS_DMA_BOUNDARY,
  };
@@ -22369,9 +22338,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_qstor.c linux-2.6.36/drivers/ata/sata_q
        .inherits               = &ata_sff_port_ops,
  
        .check_atapi_dma        = qs_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/sata_sil24.c linux-2.6.36/drivers/ata/sata_sil24.c
---- linux-2.6.36/drivers/ata/sata_sil24.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_sil24.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_sil24.c linux-2.6.37/drivers/ata/sata_sil24.c
+--- linux-2.6.37/drivers/ata/sata_sil24.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_sil24.c      2011-01-17 02:41:01.000000000 -0500
 @@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
        .dma_boundary           = ATA_DMA_BOUNDARY,
  };
@@ -22381,9 +22350,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_sil24.c linux-2.6.36/drivers/ata/sata_s
        .inherits               = &sata_pmp_port_ops,
  
        .qc_defer               = sil24_qc_defer,
-diff -urNp linux-2.6.36/drivers/ata/sata_sil.c linux-2.6.36/drivers/ata/sata_sil.c
---- linux-2.6.36/drivers/ata/sata_sil.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_sil.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_sil.c linux-2.6.37/drivers/ata/sata_sil.c
+--- linux-2.6.37/drivers/ata/sata_sil.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_sil.c        2011-01-17 02:41:01.000000000 -0500
 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
        .sg_tablesize           = ATA_MAX_PRD
  };
@@ -22393,9 +22362,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_sil.c linux-2.6.36/drivers/ata/sata_sil
        .inherits               = &ata_bmdma32_port_ops,
        .dev_config             = sil_dev_config,
        .set_mode               = sil_set_mode,
-diff -urNp linux-2.6.36/drivers/ata/sata_sis.c linux-2.6.36/drivers/ata/sata_sis.c
---- linux-2.6.36/drivers/ata/sata_sis.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_sis.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_sis.c linux-2.6.37/drivers/ata/sata_sis.c
+--- linux-2.6.37/drivers/ata/sata_sis.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_sis.c        2011-01-17 02:41:01.000000000 -0500
 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22405,9 +22374,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_sis.c linux-2.6.36/drivers/ata/sata_sis
        .inherits               = &ata_bmdma_port_ops,
        .scr_read               = sis_scr_read,
        .scr_write              = sis_scr_write,
-diff -urNp linux-2.6.36/drivers/ata/sata_svw.c linux-2.6.36/drivers/ata/sata_svw.c
---- linux-2.6.36/drivers/ata/sata_svw.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_svw.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_svw.c linux-2.6.37/drivers/ata/sata_svw.c
+--- linux-2.6.37/drivers/ata/sata_svw.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_svw.c        2011-01-17 02:41:01.000000000 -0500
 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
  };
  
@@ -22417,9 +22386,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_svw.c linux-2.6.36/drivers/ata/sata_svw
        .inherits               = &ata_bmdma_port_ops,
        .sff_tf_load            = k2_sata_tf_load,
        .sff_tf_read            = k2_sata_tf_read,
-diff -urNp linux-2.6.36/drivers/ata/sata_sx4.c linux-2.6.36/drivers/ata/sata_sx4.c
---- linux-2.6.36/drivers/ata/sata_sx4.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_sx4.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_sx4.c linux-2.6.37/drivers/ata/sata_sx4.c
+--- linux-2.6.37/drivers/ata/sata_sx4.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_sx4.c        2011-01-17 02:41:01.000000000 -0500
 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
  };
  
@@ -22429,9 +22398,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_sx4.c linux-2.6.36/drivers/ata/sata_sx4
        .inherits               = &ata_sff_port_ops,
  
        .check_atapi_dma        = pdc_check_atapi_dma,
-diff -urNp linux-2.6.36/drivers/ata/sata_uli.c linux-2.6.36/drivers/ata/sata_uli.c
---- linux-2.6.36/drivers/ata/sata_uli.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_uli.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_uli.c linux-2.6.37/drivers/ata/sata_uli.c
+--- linux-2.6.37/drivers/ata/sata_uli.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_uli.c        2011-01-17 02:41:01.000000000 -0500
 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22441,9 +22410,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_uli.c linux-2.6.36/drivers/ata/sata_uli
        .inherits               = &ata_bmdma_port_ops,
        .scr_read               = uli_scr_read,
        .scr_write              = uli_scr_write,
-diff -urNp linux-2.6.36/drivers/ata/sata_via.c linux-2.6.36/drivers/ata/sata_via.c
---- linux-2.6.36/drivers/ata/sata_via.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_via.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_via.c linux-2.6.37/drivers/ata/sata_via.c
+--- linux-2.6.37/drivers/ata/sata_via.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_via.c        2011-01-17 02:41:01.000000000 -0500
 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22482,9 +22451,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_via.c linux-2.6.36/drivers/ata/sata_via
        .inherits               = &svia_base_ops,
        .hardreset              = sata_std_hardreset,
        .scr_read               = vt8251_scr_read,
-diff -urNp linux-2.6.36/drivers/ata/sata_vsc.c linux-2.6.36/drivers/ata/sata_vsc.c
---- linux-2.6.36/drivers/ata/sata_vsc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ata/sata_vsc.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ata/sata_vsc.c linux-2.6.37/drivers/ata/sata_vsc.c
+--- linux-2.6.37/drivers/ata/sata_vsc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ata/sata_vsc.c        2011-01-17 02:41:01.000000000 -0500
 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
  };
  
@@ -22494,9 +22463,9 @@ diff -urNp linux-2.6.36/drivers/ata/sata_vsc.c linux-2.6.36/drivers/ata/sata_vsc
        .inherits               = &ata_bmdma_port_ops,
        /* The IRQ handling is not quite standard SFF behaviour so we
           cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.36/drivers/atm/adummy.c linux-2.6.36/drivers/atm/adummy.c
---- linux-2.6.36/drivers/atm/adummy.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/adummy.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/adummy.c linux-2.6.37/drivers/atm/adummy.c
+--- linux-2.6.37/drivers/atm/adummy.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/adummy.c  2011-01-17 02:41:01.000000000 -0500
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
                vcc->pop(vcc, skb);
        else
@@ -22506,9 +22475,9 @@ diff -urNp linux-2.6.36/drivers/atm/adummy.c linux-2.6.36/drivers/atm/adummy.c
  
        return 0;
  }
-diff -urNp linux-2.6.36/drivers/atm/ambassador.c linux-2.6.36/drivers/atm/ambassador.c
---- linux-2.6.36/drivers/atm/ambassador.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/ambassador.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/ambassador.c linux-2.6.37/drivers/atm/ambassador.c
+--- linux-2.6.37/drivers/atm/ambassador.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/ambassador.c      2011-01-17 02:41:01.000000000 -0500
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -22545,9 +22514,9 @@ diff -urNp linux-2.6.36/drivers/atm/ambassador.c linux-2.6.36/drivers/atm/ambass
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.36/drivers/atm/atmtcp.c linux-2.6.36/drivers/atm/atmtcp.c
---- linux-2.6.36/drivers/atm/atmtcp.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/atmtcp.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/atmtcp.c linux-2.6.37/drivers/atm/atmtcp.c
+--- linux-2.6.37/drivers/atm/atmtcp.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/atmtcp.c  2011-01-17 02:41:01.000000000 -0500
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
                if (vcc->pop) vcc->pop(vcc,skb);
                else dev_kfree_skb(skb);
@@ -22597,9 +22566,9 @@ diff -urNp linux-2.6.36/drivers/atm/atmtcp.c linux-2.6.36/drivers/atm/atmtcp.c
  done:
        if (vcc->pop) vcc->pop(vcc,skb);
        else dev_kfree_skb(skb);
-diff -urNp linux-2.6.36/drivers/atm/eni.c linux-2.6.36/drivers/atm/eni.c
---- linux-2.6.36/drivers/atm/eni.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/eni.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/eni.c linux-2.6.37/drivers/atm/eni.c
+--- linux-2.6.37/drivers/atm/eni.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/eni.c     2011-01-17 02:41:01.000000000 -0500
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
                DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
                    vcc->dev->number);
@@ -22645,9 +22614,9 @@ diff -urNp linux-2.6.36/drivers/atm/eni.c linux-2.6.36/drivers/atm/eni.c
                wake_up(&eni_dev->tx_wait);
  dma_complete++;
        }
-diff -urNp linux-2.6.36/drivers/atm/firestream.c linux-2.6.36/drivers/atm/firestream.c
---- linux-2.6.36/drivers/atm/firestream.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/firestream.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/firestream.c linux-2.6.37/drivers/atm/firestream.c
+--- linux-2.6.37/drivers/atm/firestream.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/firestream.c      2011-01-17 02:41:01.000000000 -0500
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
                                }
                        }
@@ -22681,9 +22650,9 @@ diff -urNp linux-2.6.36/drivers/atm/firestream.c linux-2.6.36/drivers/atm/firest
                        break;
                default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
                        printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.36/drivers/atm/fore200e.c linux-2.6.36/drivers/atm/fore200e.c
---- linux-2.6.36/drivers/atm/fore200e.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/fore200e.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/fore200e.c linux-2.6.37/drivers/atm/fore200e.c
+--- linux-2.6.37/drivers/atm/fore200e.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/fore200e.c        2011-01-17 02:41:01.000000000 -0500
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
                /* check error condition */
@@ -22740,9 +22709,9 @@ diff -urNp linux-2.6.36/drivers/atm/fore200e.c linux-2.6.36/drivers/atm/fore200e
  
            fore200e->tx_sat++;
            DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.36/drivers/atm/he.c linux-2.6.36/drivers/atm/he.c
---- linux-2.6.36/drivers/atm/he.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/he.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/he.c linux-2.6.37/drivers/atm/he.c
+--- linux-2.6.37/drivers/atm/he.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/he.c      2011-01-17 02:41:01.000000000 -0500
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
                if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22824,9 +22793,9 @@ diff -urNp linux-2.6.36/drivers/atm/he.c linux-2.6.36/drivers/atm/he.c
  
        return 0;
  }
-diff -urNp linux-2.6.36/drivers/atm/horizon.c linux-2.6.36/drivers/atm/horizon.c
---- linux-2.6.36/drivers/atm/horizon.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/horizon.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/horizon.c linux-2.6.37/drivers/atm/horizon.c
+--- linux-2.6.37/drivers/atm/horizon.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/horizon.c 2011-01-17 02:41:01.000000000 -0500
 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
        {
          struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22845,9 +22814,9 @@ diff -urNp linux-2.6.36/drivers/atm/horizon.c linux-2.6.36/drivers/atm/horizon.c
        
        // free the skb
        hrz_kfree_skb (skb);
-diff -urNp linux-2.6.36/drivers/atm/idt77252.c linux-2.6.36/drivers/atm/idt77252.c
---- linux-2.6.36/drivers/atm/idt77252.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/idt77252.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/idt77252.c linux-2.6.37/drivers/atm/idt77252.c
+--- linux-2.6.37/drivers/atm/idt77252.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/idt77252.c        2011-01-17 02:41:01.000000000 -0500
 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
                else
                        dev_kfree_skb(skb);
@@ -23002,9 +22971,9 @@ diff -urNp linux-2.6.36/drivers/atm/idt77252.c linux-2.6.36/drivers/atm/idt77252
                return -ENOMEM;
        }
        atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.36/drivers/atm/iphase.c linux-2.6.36/drivers/atm/iphase.c
---- linux-2.6.36/drivers/atm/iphase.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/iphase.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/iphase.c linux-2.6.37/drivers/atm/iphase.c
+--- linux-2.6.37/drivers/atm/iphase.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/iphase.c  2011-01-17 02:41:01.000000000 -0500
 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)  
        status = (u_short) (buf_desc_ptr->desc_mode);  
        if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -23101,9 +23070,9 @@ diff -urNp linux-2.6.36/drivers/atm/iphase.c linux-2.6.36/drivers/atm/iphase.c
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.36/drivers/atm/lanai.c linux-2.6.36/drivers/atm/lanai.c
---- linux-2.6.36/drivers/atm/lanai.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/lanai.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/lanai.c linux-2.6.37/drivers/atm/lanai.c
+--- linux-2.6.37/drivers/atm/lanai.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/lanai.c   2011-01-17 02:41:01.000000000 -0500
 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
        vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
        lanai_endtx(lanai, lvcc);
@@ -23158,10 +23127,10 @@ diff -urNp linux-2.6.36/drivers/atm/lanai.c linux-2.6.36/drivers/atm/lanai.c
        lvcc->stats.x.aal5.service_rxcrc++;
        lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
        cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
---- linux-2.6.36/drivers/atm/nicstar.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/nicstar.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1653,7 +1653,7 @@ static int ns_send(struct atm_vcc *vcc, 
+diff -urNp linux-2.6.37/drivers/atm/nicstar.c linux-2.6.37/drivers/atm/nicstar.c
+--- linux-2.6.37/drivers/atm/nicstar.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/nicstar.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
        if ((vc = (vc_map *) vcc->dev_data) == NULL) {
                printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
                       card->index);
@@ -23170,7 +23139,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                dev_kfree_skb_any(skb);
                return -EINVAL;
        }
-@@ -1661,7 +1661,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, 
        if (!vc->tx) {
                printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
                       card->index);
@@ -23179,7 +23148,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                dev_kfree_skb_any(skb);
                return -EINVAL;
        }
-@@ -1669,14 +1669,14 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, 
        if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
                printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
                       card->index);
@@ -23196,7 +23165,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                dev_kfree_skb_any(skb);
                return -EINVAL;
        }
-@@ -1724,11 +1724,11 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, 
        }
  
        if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
@@ -23210,7 +23179,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
  
        return 0;
  }
-@@ -2045,14 +2045,14 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns
                                printk
                                    ("nicstar%d: Can't allocate buffers for aal0.\n",
                                     card->index);
@@ -23227,7 +23196,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                dev_kfree_skb_any(sb);
                                break;
                        }
-@@ -2067,7 +2067,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns
                        ATM_SKB(sb)->vcc = vcc;
                        __net_timestamp(sb);
                        vcc->push(vcc, sb);
@@ -23236,7 +23205,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        cell += ATM_CELL_PAYLOAD;
                }
  
-@@ -2084,7 +2084,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns
                        if (iovb == NULL) {
                                printk("nicstar%d: Out of iovec buffers.\n",
                                       card->index);
@@ -23245,7 +23214,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                recycle_rx_buf(card, skb);
                                return;
                        }
-@@ -2108,7 +2108,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns
                   small or large buffer itself. */
        } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
                printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -23254,7 +23223,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
                                      NS_MAX_IOVECS);
                NS_PRV_IOVCNT(iovb) = 0;
-@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns
                            ("nicstar%d: Expected a small buffer, and this is not one.\n",
                             card->index);
                        which_list(card, skb);
@@ -23263,7 +23232,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        recycle_rx_buf(card, skb);
                        vc->rx_iov = NULL;
                        recycle_iov_buf(card, iovb);
-@@ -2141,7 +2141,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns
                            ("nicstar%d: Expected a large buffer, and this is not one.\n",
                             card->index);
                        which_list(card, skb);
@@ -23272,7 +23241,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
                                              NS_PRV_IOVCNT(iovb));
                        vc->rx_iov = NULL;
-@@ -2164,7 +2164,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns
                                printk(" - PDU size mismatch.\n");
                        else
                                printk(".\n");
@@ -23281,7 +23250,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
                                              NS_PRV_IOVCNT(iovb));
                        vc->rx_iov = NULL;
-@@ -2178,7 +2178,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns
                        /* skb points to a small buffer */
                        if (!atm_charge(vcc, skb->truesize)) {
                                push_rxbufs(card, skb);
@@ -23290,7 +23259,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        } else {
                                skb_put(skb, len);
                                dequeue_sm_buf(card, skb);
-@@ -2188,7 +2188,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns
                                ATM_SKB(skb)->vcc = vcc;
                                __net_timestamp(skb);
                                vcc->push(vcc, skb);
@@ -23299,7 +23268,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        }
                } else if (NS_PRV_IOVCNT(iovb) == 2) {  /* One small plus one large buffer */
                        struct sk_buff *sb;
-@@ -2199,7 +2199,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns
                        if (len <= NS_SMBUFSIZE) {
                                if (!atm_charge(vcc, sb->truesize)) {
                                        push_rxbufs(card, sb);
@@ -23308,7 +23277,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                } else {
                                        skb_put(sb, len);
                                        dequeue_sm_buf(card, sb);
-@@ -2209,7 +2209,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns
                                        ATM_SKB(sb)->vcc = vcc;
                                        __net_timestamp(sb);
                                        vcc->push(vcc, sb);
@@ -23317,7 +23286,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                }
  
                                push_rxbufs(card, skb);
-@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns
  
                                if (!atm_charge(vcc, skb->truesize)) {
                                        push_rxbufs(card, skb);
@@ -23326,7 +23295,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                } else {
                                        dequeue_lg_buf(card, skb);
  #ifdef NS_USE_DESTRUCTORS
-@@ -2231,7 +2231,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns
                                        ATM_SKB(skb)->vcc = vcc;
                                        __net_timestamp(skb);
                                        vcc->push(vcc, skb);
@@ -23335,7 +23304,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                }
  
                                push_rxbufs(card, sb);
-@@ -2252,7 +2252,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns
                                        printk
                                            ("nicstar%d: Out of huge buffers.\n",
                                             card->index);
@@ -23344,7 +23313,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                                        recycle_iovec_rx_bufs(card,
                                                              (struct iovec *)
                                                              iovb->data,
-@@ -2303,7 +2303,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns
                                        card->hbpool.count++;
                                } else
                                        dev_kfree_skb_any(hb);
@@ -23353,7 +23322,7 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        } else {
                                /* Copy the small buffer to the huge buffer */
                                sb = (struct sk_buff *)iov->iov_base;
-@@ -2340,7 +2340,7 @@ static void dequeue_rx(ns_dev * card, ns
+@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns
  #endif /* NS_USE_DESTRUCTORS */
                                __net_timestamp(hb);
                                vcc->push(vcc, hb);
@@ -23362,9 +23331,9 @@ diff -urNp linux-2.6.36/drivers/atm/nicstar.c linux-2.6.36/drivers/atm/nicstar.c
                        }
                }
  
-diff -urNp linux-2.6.36/drivers/atm/solos-pci.c linux-2.6.36/drivers/atm/solos-pci.c
---- linux-2.6.36/drivers/atm/solos-pci.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/solos-pci.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/solos-pci.c linux-2.6.37/drivers/atm/solos-pci.c
+--- linux-2.6.37/drivers/atm/solos-pci.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/solos-pci.c       2011-01-17 02:41:01.000000000 -0500
 @@ -717,7 +717,7 @@ void solos_bh(unsigned long card_arg)
                                }
                                atm_charge(vcc, skb->truesize);
@@ -23383,9 +23352,9 @@ diff -urNp linux-2.6.36/drivers/atm/solos-pci.c linux-2.6.36/drivers/atm/solos-p
                                solos_pop(vcc, oldskb);
                        } else
                                dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.36/drivers/atm/suni.c linux-2.6.36/drivers/atm/suni.c
---- linux-2.6.36/drivers/atm/suni.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/suni.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/suni.c linux-2.6.37/drivers/atm/suni.c
+--- linux-2.6.37/drivers/atm/suni.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/suni.c    2011-01-17 02:41:01.000000000 -0500
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -23397,9 +23366,9 @@ diff -urNp linux-2.6.36/drivers/atm/suni.c linux-2.6.36/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.36/drivers/atm/uPD98402.c linux-2.6.36/drivers/atm/uPD98402.c
---- linux-2.6.36/drivers/atm/uPD98402.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/uPD98402.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/uPD98402.c linux-2.6.37/drivers/atm/uPD98402.c
+--- linux-2.6.37/drivers/atm/uPD98402.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/uPD98402.c        2011-01-17 02:41:01.000000000 -0500
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
        struct sonet_stats tmp;
        int error = 0;
@@ -23444,9 +23413,9 @@ diff -urNp linux-2.6.36/drivers/atm/uPD98402.c linux-2.6.36/drivers/atm/uPD98402
        return 0;
  }
  
-diff -urNp linux-2.6.36/drivers/atm/zatm.c linux-2.6.36/drivers/atm/zatm.c
---- linux-2.6.36/drivers/atm/zatm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/atm/zatm.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/atm/zatm.c linux-2.6.37/drivers/atm/zatm.c
+--- linux-2.6.37/drivers/atm/zatm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/atm/zatm.c    2011-01-17 02:41:01.000000000 -0500
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                }
                if (!size) {
@@ -23474,10 +23443,22 @@ diff -urNp linux-2.6.36/drivers/atm/zatm.c linux-2.6.36/drivers/atm/zatm.c
        wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.36/drivers/char/agp/frontend.c linux-2.6.36/drivers/char/agp/frontend.c
---- linux-2.6.36/drivers/char/agp/frontend.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/agp/frontend.c   2010-11-06 18:58:15.000000000 -0400
-@@ -818,7 +818,7 @@ static int agpioc_reserve_wrap(struct ag
+diff -urNp linux-2.6.37/drivers/block/cciss.c linux-2.6.37/drivers/block/cciss.c
+--- linux-2.6.37/drivers/block/cciss.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/block/cciss.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
+       int err;
+       u32 cp;
+ 
++      memset(&arg64, 0, sizeof(arg64));
++
+       err = 0;
+       err |=
+           copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
+diff -urNp linux-2.6.37/drivers/char/agp/frontend.c linux-2.6.37/drivers/char/agp/frontend.c
+--- linux-2.6.37/drivers/char/agp/frontend.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/agp/frontend.c   2011-01-17 02:41:01.000000000 -0500
+@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
        if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
                return -EFAULT;
  
@@ -23486,10 +23467,10 @@ diff -urNp linux-2.6.36/drivers/char/agp/frontend.c linux-2.6.36/drivers/char/ag
                return -EFAULT;
  
        client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.36/drivers/char/agp/intel-agp.c linux-2.6.36/drivers/char/agp/intel-agp.c
---- linux-2.6.36/drivers/char/agp/intel-agp.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/agp/intel-agp.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1056,7 +1056,7 @@ static struct pci_device_id agp_intel_pc
+diff -urNp linux-2.6.37/drivers/char/agp/intel-agp.c linux-2.6.37/drivers/char/agp/intel-agp.c
+--- linux-2.6.37/drivers/char/agp/intel-agp.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/agp/intel-agp.c  2011-01-17 02:41:01.000000000 -0500
+@@ -903,7 +903,7 @@ static struct pci_device_id agp_intel_pc
        ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
        ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
        ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
@@ -23498,42 +23479,19 @@ diff -urNp linux-2.6.36/drivers/char/agp/intel-agp.c linux-2.6.36/drivers/char/a
  };
  
  MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.36/drivers/char/hpet.c linux-2.6.36/drivers/char/hpet.c
---- linux-2.6.36/drivers/char/hpet.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/hpet.c   2010-11-06 18:58:50.000000000 -0400
-@@ -429,7 +429,7 @@ static int hpet_release(struct inode *in
-       return 0;
- }
- 
--static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
-+static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
- 
- static long hpet_ioctl(struct file *file, unsigned int cmd,
-                       unsigned long arg)
+diff -urNp linux-2.6.37/drivers/char/hpet.c linux-2.6.37/drivers/char/hpet.c
+--- linux-2.6.37/drivers/char/hpet.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/hpet.c   2011-01-17 02:41:01.000000000 -0500
 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
  }
  
  static int
--hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
-+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
+-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
++hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
+                 struct hpet_info *info)
  {
        struct hpet_timer __iomem *timer;
-       struct hpet __iomem *hpet;
-@@ -596,11 +596,11 @@ hpet_ioctl_common(struct hpet_dev *devp,
-               {
-                       struct hpet_info info;
- 
-+                      memset(&info, 0, sizeof(info));
-+
-                       if (devp->hd_ireqfreq)
-                               info.hi_ireqfreq =
-                                       hpet_time_div(hpetp, devp->hd_ireqfreq);
--                      else
--                              info.hi_ireqfreq = 0;
-                       info.hi_flags =
-                           readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
-                       info.hi_hpet = hpetp->hp_which;
-@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
+@@ -1043,7 +1043,7 @@ static struct acpi_driver hpet_acpi_driv
                },
  };
  
@@ -23542,9 +23500,9 @@ diff -urNp linux-2.6.36/drivers/char/hpet.c linux-2.6.36/drivers/char/hpet.c
  
  static int __init hpet_init(void)
  {
-diff -urNp linux-2.6.36/drivers/char/hvc_console.h linux-2.6.36/drivers/char/hvc_console.h
---- linux-2.6.36/drivers/char/hvc_console.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/hvc_console.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/hvc_console.h linux-2.6.37/drivers/char/hvc_console.h
+--- linux-2.6.37/drivers/char/hvc_console.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/hvc_console.h    2011-01-17 02:41:01.000000000 -0500
 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
  /* register a vterm for hvc tty operation (module_init or hotplug add) */
  extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
@@ -23553,9 +23511,9 @@ diff -urNp linux-2.6.36/drivers/char/hvc_console.h linux-2.6.36/drivers/char/hvc
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.36/drivers/char/hvcs.c linux-2.6.36/drivers/char/hvcs.c
---- linux-2.6.36/drivers/char/hvcs.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/hvcs.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/hvcs.c linux-2.6.37/drivers/char/hvcs.c
+--- linux-2.6.37/drivers/char/hvcs.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/hvcs.c   2011-01-17 02:41:01.000000000 -0500
 @@ -270,7 +270,7 @@ struct hvcs_struct {
        unsigned int index;
  
@@ -23650,9 +23608,48 @@ diff -urNp linux-2.6.36/drivers/char/hvcs.c linux-2.6.36/drivers/char/hvcs.c
                return 0;
  
        return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/hvc_xen.c linux-2.6.37/drivers/char/hvc_xen.c
+--- linux-2.6.37/drivers/char/hvc_xen.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/hvc_xen.c        2011-01-17 02:41:01.000000000 -0500
+@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
+       return recv;
+ }
+ 
+-static struct hv_ops domU_hvc_ops = {
++static const struct hv_ops domU_hvc_ops = {
+       .get_chars = domU_read_console,
+       .put_chars = domU_write_console,
+       .notifier_add = notifier_add_irq,
+@@ -149,7 +149,7 @@ static int dom0_write_console(uint32_t v
+       return len;
+ }
+ 
+-static struct hv_ops dom0_hvc_ops = {
++static const struct hv_ops dom0_hvc_ops = {
+       .get_chars = dom0_read_console,
+       .put_chars = dom0_write_console,
+       .notifier_add = notifier_add_irq,
+@@ -160,7 +160,7 @@ static struct hv_ops dom0_hvc_ops = {
+ static int __init xen_hvc_init(void)
+ {
+       struct hvc_struct *hp;
+-      struct hv_ops *ops;
++      const struct hv_ops *ops;
+ 
+       if (!xen_pv_domain())
+               return -ENODEV;
+@@ -203,7 +203,7 @@ static void __exit xen_hvc_fini(void)
+ 
+ static int xen_cons_init(void)
+ {
+-      struct hv_ops *ops;
++      const struct hv_ops *ops;
+ 
+       if (!xen_pv_domain())
+               return 0;
+diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/ipmi/ipmi_msghandler.c   2011-01-17 02:41:01.000000000 -0500
 @@ -414,7 +414,7 @@ struct ipmi_smi {
        struct proc_dir_entry *proc_dir;
        char                  proc_dir_name[10];
@@ -23683,9 +23680,9 @@ diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.36/drivers
  
        intf->proc_dir = NULL;
  
-diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/ipmi/ipmi_si_intf.c      2011-01-17 02:41:01.000000000 -0500
 @@ -286,7 +286,7 @@ struct smi_info {
        unsigned char slave_addr;
  
@@ -23707,7 +23704,7 @@ diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.36/drivers/ch
  
  #define SI_MAX_PARMS 4
  
-@@ -3171,7 +3171,7 @@ static int try_smi_init(struct smi_info 
+@@ -3178,7 +3178,7 @@ static int try_smi_init(struct smi_info 
        atomic_set(&new_smi->req_events, 0);
        new_smi->run_to_completion = 0;
        for (i = 0; i < SI_NUM_STATS; i++)
@@ -23716,38 +23713,9 @@ diff -urNp linux-2.6.36/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.36/drivers/ch
  
        new_smi->interrupt_disabled = 1;
        atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.36/drivers/char/keyboard.c linux-2.6.36/drivers/char/keyboard.c
---- linux-2.6.36/drivers/char/keyboard.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/keyboard.c       2010-11-06 18:58:50.000000000 -0400
-@@ -640,6 +640,16 @@ static void k_spec(struct vc_data *vc, u
-            kbd->kbdmode == VC_MEDIUMRAW) &&
-            value != KVAL(K_SAK))
-               return;         /* SAK is allowed even in raw mode */
-+
-+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
-+      {
-+              void *func = fn_handler[value];
-+              if (func == fn_show_state || func == fn_show_ptregs ||
-+                  func == fn_show_mem)
-+                      return;
-+      }
-+#endif
-+
-       fn_handler[value](vc);
- }
- 
-@@ -1396,7 +1406,7 @@ static const struct input_device_id kbd_
-                 .evbit = { BIT_MASK(EV_SND) },
-         },
- 
--      { },    /* Terminating entry */
-+      { 0 },    /* Terminating entry */
- };
- 
- MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.36/drivers/char/mem.c linux-2.6.36/drivers/char/mem.c
---- linux-2.6.36/drivers/char/mem.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/mem.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/mem.c linux-2.6.37/drivers/char/mem.c
+--- linux-2.6.37/drivers/char/mem.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/mem.c    2011-01-17 02:41:01.000000000 -0500
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -23905,7 +23873,7 @@ diff -urNp linux-2.6.36/drivers/char/mem.c linux-2.6.36/drivers/char/mem.c
  #define open_kmem     open_mem
  #define open_oldmem   open_mem
  
-@@ -855,6 +917,9 @@ static const struct memdev {
+@@ -857,6 +919,9 @@ static const struct memdev {
  #ifdef CONFIG_CRASH_DUMP
        [12] = { "oldmem", 0, &oldmem_fops, NULL },
  #endif
@@ -23915,34 +23883,10 @@ diff -urNp linux-2.6.36/drivers/char/mem.c linux-2.6.36/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.36/drivers/char/n_gsm.c linux-2.6.36/drivers/char/n_gsm.c
---- linux-2.6.36/drivers/char/n_gsm.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/n_gsm.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1577,7 +1577,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
-               return NULL;
-       spin_lock_init(&dlci->lock);
-       dlci->fifo = &dlci->_fifo;
--      if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
-+      if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
-               kfree(dlci);
-               return NULL;
-       }
-diff -urNp linux-2.6.36/drivers/char/n_tty.c linux-2.6.36/drivers/char/n_tty.c
---- linux-2.6.36/drivers/char/n_tty.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/n_tty.c  2010-11-06 18:58:15.000000000 -0400
-@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
- {
-       *ops = tty_ldisc_N_TTY;
-       ops->owner = NULL;
--      ops->refcount = ops->flags = 0;
-+      atomic_set(&ops->refcount, 0);
-+      ops->flags = 0;
- }
- EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.36/drivers/char/nvram.c linux-2.6.36/drivers/char/nvram.c
---- linux-2.6.36/drivers/char/nvram.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/nvram.c  2010-11-06 18:58:15.000000000 -0400
-@@ -245,7 +245,7 @@ static ssize_t nvram_read(struct file *f
+diff -urNp linux-2.6.37/drivers/char/nvram.c linux-2.6.37/drivers/char/nvram.c
+--- linux-2.6.37/drivers/char/nvram.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/nvram.c  2011-01-17 02:41:01.000000000 -0500
+@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
        spin_unlock_irq(&rtc_lock);
  
@@ -23951,7 +23895,7 @@ diff -urNp linux-2.6.36/drivers/char/nvram.c linux-2.6.36/drivers/char/nvram.c
                return -EFAULT;
  
        *ppos = i;
-@@ -434,7 +434,10 @@ static const struct file_operations nvra
+@@ -435,7 +435,10 @@ static const struct file_operations nvra
  static struct miscdevice nvram_dev = {
        NVRAM_MINOR,
        "nvram",
@@ -23963,9 +23907,9 @@ diff -urNp linux-2.6.36/drivers/char/nvram.c linux-2.6.36/drivers/char/nvram.c
  };
  
  static int __init nvram_init(void)
-diff -urNp linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/pcmcia/ipwireless/tty.c  2011-01-17 02:41:01.000000000 -0500
 @@ -51,7 +51,7 @@ struct ipw_tty {
        int tty_type;
        struct ipw_network *network;
@@ -24080,42 +24024,9 @@ diff -urNp linux-2.6.36/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.36/driver
                                do_ipw_close(ttyj);
                        ipwireless_disassociate_network_ttys(network,
                                                             ttyj->channel_idx);
-diff -urNp linux-2.6.36/drivers/char/pty.c linux-2.6.36/drivers/char/pty.c
---- linux-2.6.36/drivers/char/pty.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/pty.c    2010-11-06 18:58:15.000000000 -0400
-@@ -698,7 +698,18 @@ out:
-       return retval;
- }
- 
--static struct file_operations ptmx_fops;
-+static const struct file_operations ptmx_fops = {
-+      .llseek         = no_llseek,
-+      .read           = tty_read,
-+      .write          = tty_write,
-+      .poll           = tty_poll,
-+      .unlocked_ioctl = tty_ioctl,
-+      .compat_ioctl   = tty_compat_ioctl,
-+      .open           = ptmx_open,
-+      .release        = tty_release,
-+      .fasync         = tty_fasync,
-+};
-+
- 
- static void __init unix98_pty_init(void)
- {
-@@ -752,9 +763,6 @@ static void __init unix98_pty_init(void)
-       register_sysctl_table(pty_root_table);
- 
-       /* Now create the /dev/ptmx special device */
--      tty_default_fops(&ptmx_fops);
--      ptmx_fops.open = ptmx_open;
--
-       cdev_init(&ptmx_cdev, &ptmx_fops);
-       if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-           register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.36/drivers/char/random.c linux-2.6.36/drivers/char/random.c
---- linux-2.6.36/drivers/char/random.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/random.c 2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/random.c linux-2.6.37/drivers/char/random.c
+--- linux-2.6.37/drivers/char/random.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/random.c 2011-01-17 02:41:01.000000000 -0500
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -24157,7 +24068,7 @@ diff -urNp linux-2.6.36/drivers/char/random.c linux-2.6.36/drivers/char/random.c
                        ret = -EFAULT;
                        break;
                }
-@@ -1205,7 +1217,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1207,7 +1219,7 @@ EXPORT_SYMBOL(generate_random_uuid);
  #include <linux/sysctl.h>
  
  static int min_read_thresh = 8, min_write_thresh;
@@ -24166,9 +24077,9 @@ diff -urNp linux-2.6.36/drivers/char/random.c linux-2.6.36/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.36/drivers/char/sonypi.c linux-2.6.36/drivers/char/sonypi.c
---- linux-2.6.36/drivers/char/sonypi.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/sonypi.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/sonypi.c linux-2.6.37/drivers/char/sonypi.c
+--- linux-2.6.37/drivers/char/sonypi.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/sonypi.c 2011-01-17 02:41:01.000000000 -0500
 @@ -491,7 +491,7 @@ static struct sonypi_device {
        spinlock_t fifo_lock;
        wait_queue_head_t fifo_proc_list;
@@ -24199,9 +24110,9 @@ diff -urNp linux-2.6.36/drivers/char/sonypi.c linux-2.6.36/drivers/char/sonypi.c
        mutex_unlock(&sonypi_device.lock);
  
        return 0;
-diff -urNp linux-2.6.36/drivers/char/tpm/tpm_bios.c linux-2.6.36/drivers/char/tpm/tpm_bios.c
---- linux-2.6.36/drivers/char/tpm/tpm_bios.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/tpm/tpm_bios.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/char/tpm/tpm_bios.c linux-2.6.37/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.37/drivers/char/tpm/tpm_bios.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/char/tpm/tpm_bios.c   2011-01-17 02:41:01.000000000 -0500
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
        event = addr;
  
@@ -24242,236 +24153,9 @@ diff -urNp linux-2.6.36/drivers/char/tpm/tpm_bios.c linux-2.6.36/drivers/char/tp
  
        memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.36/drivers/char/tty_io.c linux-2.6.36/drivers/char/tty_io.c
---- linux-2.6.36/drivers/char/tty_io.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/tty_io.c 2010-11-06 18:58:15.000000000 -0400
-@@ -139,21 +139,11 @@ EXPORT_SYMBOL(tty_mutex);
- /* Spinlock to protect the tty->tty_files list */
- DEFINE_SPINLOCK(tty_files_lock);
- 
--static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
--static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
- ssize_t redirected_tty_write(struct file *, const char __user *,
-                                                       size_t, loff_t *);
--static unsigned int tty_poll(struct file *, poll_table *);
- static int tty_open(struct inode *, struct file *);
- long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
--#ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
--                              unsigned long arg);
--#else
--#define tty_compat_ioctl NULL
--#endif
- static int __tty_fasync(int fd, struct file *filp, int on);
--static int tty_fasync(int fd, struct file *filp, int on);
- static void release_tty(struct tty_struct *tty, int idx);
- static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
- static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -925,7 +915,7 @@ EXPORT_SYMBOL(start_tty);
-  *    read calls may be outstanding in parallel.
-  */
- 
--static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-+ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-                       loff_t *ppos)
- {
-       int i;
-@@ -951,6 +941,8 @@ static ssize_t tty_read(struct file *fil
-       return i;
- }
- 
-+EXPORT_SYMBOL(tty_read);
-+
- void tty_write_unlock(struct tty_struct *tty)
- {
-       mutex_unlock(&tty->atomic_write_lock);
-@@ -1100,7 +1092,7 @@ void tty_write_message(struct tty_struct
-  *    write method will not be invoked in parallel for each device.
-  */
- 
--static ssize_t tty_write(struct file *file, const char __user *buf,
-+ssize_t tty_write(struct file *file, const char __user *buf,
-                                               size_t count, loff_t *ppos)
- {
-       struct inode *inode = file->f_path.dentry->d_inode;
-@@ -1126,6 +1118,8 @@ static ssize_t tty_write(struct file *fi
-       return ret;
- }
- 
-+EXPORT_SYMBOL(tty_write);
-+
- ssize_t redirected_tty_write(struct file *file, const char __user *buf,
-                                               size_t count, loff_t *ppos)
- {
-@@ -1938,6 +1932,8 @@ got_driver:
- 
- 
- 
-+EXPORT_SYMBOL(tty_release);
-+
- /**
-  *    tty_poll        -       check tty status
-  *    @filp: file being polled
-@@ -1950,7 +1946,7 @@ got_driver:
-  *    may be re-entered freely by other callers.
-  */
- 
--static unsigned int tty_poll(struct file *filp, poll_table *wait)
-+unsigned int tty_poll(struct file *filp, poll_table *wait)
- {
-       struct tty_struct *tty = file_tty(filp);
-       struct tty_ldisc *ld;
-@@ -2007,7 +2003,9 @@ out:
-       return retval;
- }
- 
--static int tty_fasync(int fd, struct file *filp, int on)
-+EXPORT_SYMBOL(tty_poll);
-+
-+int tty_fasync(int fd, struct file *filp, int on)
- {
-       int retval;
-       tty_lock();
-@@ -2016,6 +2014,8 @@ static int tty_fasync(int fd, struct fil
-       return retval;
- }
- 
-+EXPORT_SYMBOL(tty_fasync);
-+
- /**
-  *    tiocsti                 -       fake input character
-  *    @tty: tty to fake input into
-@@ -2648,8 +2648,10 @@ long tty_ioctl(struct file *file, unsign
-       return retval;
- }
- 
-+EXPORT_SYMBOL(tty_ioctl);
-+
- #ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+long tty_compat_ioctl(struct file *file, unsigned int cmd,
-                               unsigned long arg)
- {
-       struct inode *inode = file->f_dentry->d_inode;
-@@ -2673,6 +2675,9 @@ static long tty_compat_ioctl(struct file
- 
-       return retval;
- }
-+
-+EXPORT_SYMBOL(tty_compat_ioctl);
-+
- #endif
- 
- /*
-@@ -3116,11 +3121,6 @@ struct tty_struct *get_current_tty(void)
- }
- EXPORT_SYMBOL_GPL(get_current_tty);
- 
--void tty_default_fops(struct file_operations *fops)
--{
--      *fops = tty_fops;
--}
--
- /*
-  * Initialize the console device. This is called *early*, so
-  * we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.36/drivers/char/tty_ldisc.c linux-2.6.36/drivers/char/tty_ldisc.c
---- linux-2.6.36/drivers/char/tty_ldisc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/tty_ldisc.c      2010-11-06 18:58:15.000000000 -0400
-@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *
-       if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
-               struct tty_ldisc_ops *ldo = ld->ops;
- 
--              ldo->refcount--;
-+              atomic_dec(&ldo->refcount);
-               module_put(ldo->owner);
-               spin_unlock_irqrestore(&tty_ldisc_lock, flags);
- 
-@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct 
-       spin_lock_irqsave(&tty_ldisc_lock, flags);
-       tty_ldiscs[disc] = new_ldisc;
-       new_ldisc->num = disc;
--      new_ldisc->refcount = 0;
-+      atomic_set(&new_ldisc->refcount, 0);
-       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
- 
-       return ret;
-@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
-               return -EINVAL;
- 
-       spin_lock_irqsave(&tty_ldisc_lock, flags);
--      if (tty_ldiscs[disc]->refcount)
-+      if (atomic_read(&tty_ldiscs[disc]->refcount))
-               ret = -EBUSY;
-       else
-               tty_ldiscs[disc] = NULL;
-@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i
-       if (ldops) {
-               ret = ERR_PTR(-EAGAIN);
-               if (try_module_get(ldops->owner)) {
--                      ldops->refcount++;
-+                      atomic_inc(&ldops->refcount);
-                       ret = ldops;
-               }
-       }
-@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o
-       unsigned long flags;
- 
-       spin_lock_irqsave(&tty_ldisc_lock, flags);
--      ldops->refcount--;
-+      atomic_dec(&ldops->refcount);
-       module_put(ldops->owner);
-       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
- }
-diff -urNp linux-2.6.36/drivers/char/vt_ioctl.c linux-2.6.36/drivers/char/vt_ioctl.c
---- linux-2.6.36/drivers/char/vt_ioctl.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/char/vt_ioctl.c       2010-11-06 18:58:50.000000000 -0400
-@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
-       if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
-               return -EFAULT;
- 
--      if (!capable(CAP_SYS_TTY_CONFIG))
--              perm = 0;
--
-       switch (cmd) {
-       case KDGKBENT:
-               key_map = key_maps[s];
-@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
-                   val = (i ? K_HOLE : K_NOSUCHMAP);
-               return put_user(val, &user_kbe->kb_value);
-       case KDSKBENT:
-+              if (!capable(CAP_SYS_TTY_CONFIG))
-+                      perm = 0;
-+
-               if (!perm)
-                       return -EPERM;
-+
-               if (!i && v == K_NOSUCHMAP) {
-                       /* deallocate map */
-                       key_map = key_maps[s];
-@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
-       int i, j, k;
-       int ret;
- 
--      if (!capable(CAP_SYS_TTY_CONFIG))
--              perm = 0;
--
-       kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
-       if (!kbs) {
-               ret = -ENOMEM;
-@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
-               kfree(kbs);
-               return ((p && *p) ? -EOVERFLOW : 0);
-       case KDSKBSENT:
-+              if (!capable(CAP_SYS_TTY_CONFIG))
-+                      perm = 0;
-+
-               if (!perm) {
-                       ret = -EPERM;
-                       goto reterr;
-diff -urNp linux-2.6.36/drivers/cpuidle/sysfs.c linux-2.6.36/drivers/cpuidle/sysfs.c
---- linux-2.6.36/drivers/cpuidle/sysfs.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/cpuidle/sysfs.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/cpuidle/sysfs.c linux-2.6.37/drivers/cpuidle/sysfs.c
+--- linux-2.6.37/drivers/cpuidle/sysfs.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/cpuidle/sysfs.c       2011-01-17 02:41:01.000000000 -0500
 @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
        .release = cpuidle_state_sysfs_release,
  };
@@ -24481,10 +24165,10 @@ diff -urNp linux-2.6.36/drivers/cpuidle/sysfs.c linux-2.6.36/drivers/cpuidle/sys
  {
        kobject_put(&device->kobjs[i]->kobj);
        wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.36/drivers/edac/edac_core.h linux-2.6.36/drivers/edac/edac_core.h
---- linux-2.6.36/drivers/edac/edac_core.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/edac/edac_core.h      2010-11-06 18:58:15.000000000 -0400
-@@ -85,11 +85,11 @@ extern const char *edac_mem_types[];
+diff -urNp linux-2.6.37/drivers/edac/edac_core.h linux-2.6.37/drivers/edac/edac_core.h
+--- linux-2.6.37/drivers/edac/edac_core.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/edac/edac_core.h      2011-01-17 02:41:01.000000000 -0500
+@@ -87,11 +87,11 @@ extern const char *edac_mem_types[];
  
  #else                         /* !CONFIG_EDAC_DEBUG */
  
@@ -24501,10 +24185,10 @@ diff -urNp linux-2.6.36/drivers/edac/edac_core.h linux-2.6.36/drivers/edac/edac_
  
  #endif                                /* !CONFIG_EDAC_DEBUG */
  
-diff -urNp linux-2.6.36/drivers/edac/edac_mc_sysfs.c linux-2.6.36/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.36/drivers/edac/edac_mc_sysfs.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/edac/edac_mc_sysfs.c  2010-11-06 18:58:15.000000000 -0400
-@@ -764,7 +764,7 @@ static void edac_inst_grp_release(struct
+diff -urNp linux-2.6.37/drivers/edac/edac_mc_sysfs.c linux-2.6.37/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.37/drivers/edac/edac_mc_sysfs.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/edac/edac_mc_sysfs.c  2011-01-17 02:41:01.000000000 -0500
+@@ -762,7 +762,7 @@ static void edac_inst_grp_release(struct
  }
  
  /* Intermediate show/store table */
@@ -24513,9 +24197,9 @@ diff -urNp linux-2.6.36/drivers/edac/edac_mc_sysfs.c linux-2.6.36/drivers/edac/e
        .show = inst_grp_show,
        .store = inst_grp_store
  };
-diff -urNp linux-2.6.36/drivers/firewire/core-cdev.c linux-2.6.36/drivers/firewire/core-cdev.c
---- linux-2.6.36/drivers/firewire/core-cdev.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/firewire/core-cdev.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/firewire/core-cdev.c linux-2.6.37/drivers/firewire/core-cdev.c
+--- linux-2.6.37/drivers/firewire/core-cdev.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/firewire/core-cdev.c  2011-01-17 02:41:01.000000000 -0500
 @@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
        int ret;
  
@@ -24526,10 +24210,10 @@ diff -urNp linux-2.6.36/drivers/firewire/core-cdev.c linux-2.6.36/drivers/firewi
                return -EINVAL;
  
        r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.36/drivers/firmware/dmi_scan.c linux-2.6.36/drivers/firmware/dmi_scan.c
---- linux-2.6.36/drivers/firmware/dmi_scan.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/firmware/dmi_scan.c   2010-11-06 18:58:15.000000000 -0400
-@@ -412,11 +412,6 @@ void __init dmi_scan_machine(void)
+diff -urNp linux-2.6.37/drivers/firmware/dmi_scan.c linux-2.6.37/drivers/firmware/dmi_scan.c
+--- linux-2.6.37/drivers/firmware/dmi_scan.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/firmware/dmi_scan.c   2011-01-17 02:41:01.000000000 -0500
+@@ -442,11 +442,6 @@ void __init dmi_scan_machine(void)
                }
        }
        else {
@@ -24541,22 +24225,22 @@ diff -urNp linux-2.6.36/drivers/firmware/dmi_scan.c linux-2.6.36/drivers/firmwar
                p = dmi_ioremap(0xF0000, 0x10000);
                if (p == NULL)
                        goto error;
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_crtc_helper.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_crtc_helper.c     2011-01-17 02:41:01.000000000 -0500
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
        struct drm_crtc *tmp;
        int crtc_mask = 1;
  
--      WARN(!crtc, "checking null crtc?");
+-      WARN(!crtc, "checking null crtc?\n");
 +      BUG_ON(!crtc);
  
        dev = crtc->dev;
  
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_drv.c linux-2.6.36/drivers/gpu/drm/drm_drv.c
---- linux-2.6.36/drivers/gpu/drm/drm_drv.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_drv.c     2010-11-06 18:58:15.000000000 -0400
-@@ -428,7 +428,7 @@ long drm_ioctl(struct file *filp,
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_drv.c linux-2.6.37/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.37/drivers/gpu/drm/drm_drv.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_drv.c     2011-01-17 02:41:01.000000000 -0500
+@@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
  
        dev = file_priv->minor->dev;
        atomic_inc(&dev->ioctl_count);
@@ -24565,10 +24249,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_drv.c linux-2.6.36/drivers/gpu/drm/d
        ++file_priv->ioctl_count;
  
        DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/drm_fops.c
---- linux-2.6.36/drivers/gpu/drm/drm_fops.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_fops.c    2010-11-06 18:58:15.000000000 -0400
-@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device *
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_fops.c linux-2.6.37/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.37/drivers/gpu/drm/drm_fops.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_fops.c    2011-01-17 02:41:01.000000000 -0500
+@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
        }
  
        for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
@@ -24577,7 +24261,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/
  
        dev->sigdata.lock = NULL;
  
-@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct
+@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct
  
        retcode = drm_open_helper(inode, filp, dev);
        if (!retcode) {
@@ -24588,7 +24272,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/
                        retcode = drm_setup(dev);
        }
        if (!retcode) {
-@@ -471,7 +471,7 @@ int drm_release(struct inode *inode, str
+@@ -470,7 +470,7 @@ int drm_release(struct inode *inode, str
  
        mutex_lock(&drm_global_mutex);
  
@@ -24597,7 +24281,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/
  
        if (dev->driver->preclose)
                dev->driver->preclose(dev, file_priv);
-@@ -483,7 +483,7 @@ int drm_release(struct inode *inode, str
+@@ -482,7 +482,7 @@ int drm_release(struct inode *inode, str
        DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
                  task_pid_nr(current),
                  (long)old_encode_dev(file_priv->minor->device),
@@ -24606,7 +24290,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/
  
        /* if the master has gone away we can't do anything with the lock */
        if (file_priv->minor->master)
-@@ -564,8 +564,8 @@ int drm_release(struct inode *inode, str
+@@ -563,8 +563,8 @@ int drm_release(struct inode *inode, str
         * End inline drm_release
         */
  
@@ -24617,9 +24301,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_fops.c linux-2.6.36/drivers/gpu/drm/
                if (atomic_read(&dev->ioctl_count)) {
                        DRM_ERROR("Device busy: %d\n",
                                  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_global.c linux-2.6.36/drivers/gpu/drm/drm_global.c
---- linux-2.6.36/drivers/gpu/drm/drm_global.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_global.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_global.c linux-2.6.37/drivers/gpu/drm/drm_global.c
+--- linux-2.6.37/drivers/gpu/drm/drm_global.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_global.c  2011-01-17 02:41:01.000000000 -0500
 @@ -36,7 +36,7 @@
  struct drm_global_item {
        struct mutex mutex;
@@ -24677,9 +24361,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_global.c linux-2.6.36/drivers/gpu/dr
                ref->release(ref);
                item->object = NULL;
        }
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_info.c linux-2.6.36/drivers/gpu/drm/drm_info.c
---- linux-2.6.36/drivers/gpu/drm/drm_info.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_info.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_info.c linux-2.6.37/drivers/gpu/drm/drm_info.c
+--- linux-2.6.37/drivers/gpu/drm/drm_info.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_info.c    2011-01-17 02:41:01.000000000 -0500
 @@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
        struct drm_local_map *map;
        struct drm_map_list *r_list;
@@ -24708,9 +24392,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_info.c linux-2.6.36/drivers/gpu/drm/
                        type = "??";
                else
                        type = types[map->type];
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_ioctl.c linux-2.6.36/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.36/drivers/gpu/drm/drm_ioctl.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_ioctl.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_ioctl.c linux-2.6.37/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.37/drivers/gpu/drm/drm_ioctl.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_ioctl.c   2011-01-17 02:41:01.000000000 -0500
 @@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev,
                        stats->data[i].value =
                            (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24720,10 +24404,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_ioctl.c linux-2.6.36/drivers/gpu/drm
                stats->data[i].type = dev->types[i];
        }
  
-diff -urNp linux-2.6.36/drivers/gpu/drm/drm_lock.c linux-2.6.36/drivers/gpu/drm/drm_lock.c
---- linux-2.6.36/drivers/gpu/drm/drm_lock.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/drm_lock.c    2010-11-06 18:58:15.000000000 -0400
-@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
+diff -urNp linux-2.6.37/drivers/gpu/drm/drm_lock.c linux-2.6.37/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.37/drivers/gpu/drm/drm_lock.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/drm_lock.c    2011-01-17 02:41:01.000000000 -0500
+@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
                if (drm_lock_take(&master->lock, lock->context)) {
                        master->lock.file_priv = file_priv;
                        master->lock.lock_time = jiffies;
@@ -24732,19 +24416,19 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/drm_lock.c linux-2.6.36/drivers/gpu/drm/
                        break;  /* Got lock */
                }
  
-@@ -167,7 +167,7 @@ int drm_unlock(struct drm_device *dev, v
+@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, v
                return -EINVAL;
        }
  
 -      atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
 +      atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
  
-       /* kernel_context_switch isn't used by any of the x86 drm
-        * modules but is required by the Sparc driver.
-diff -urNp linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c       2010-11-06 18:58:15.000000000 -0400
-@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
+       if (drm_lock_free(&master->lock, lock->context)) {
+               /* FIXME: Should really bail out here. */
+diff -urNp linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i810/i810_dma.c       2011-01-17 02:41:01.000000000 -0500
+@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
                                 dma->buflist[vertex->idx],
                                 vertex->discard, vertex->used);
  
@@ -24755,7 +24439,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c linux-2.6.36/drivers/gpu
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-@@ -1113,8 +1113,8 @@ static int i810_dma_mc(struct drm_device
+@@ -1114,8 +1114,8 @@ static int i810_dma_mc(struct drm_device
        i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
                             mc->last_render);
  
@@ -24766,10 +24450,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i810/i810_dma.c linux-2.6.36/drivers/gpu
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c     2010-11-06 18:58:15.000000000 -0400
-@@ -402,7 +402,7 @@ static void ch7017_destroy(struct intel_
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7017.c     2011-01-17 02:41:01.000000000 -0500
+@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_
        }
  }
  
@@ -24778,10 +24462,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.36/drivers/g
        .init = ch7017_init,
        .detect = ch7017_detect,
        .mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c     2010-11-06 18:58:15.000000000 -0400
-@@ -322,7 +322,7 @@ static void ch7xxx_destroy(struct intel_
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ch7xxx.c     2011-01-17 02:41:01.000000000 -0500
+@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_
        }
  }
  
@@ -24790,9 +24474,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.36/drivers/g
        .init = ch7xxx_init,
        .detect = ch7xxx_detect,
        .mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo.h linux-2.6.36/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.36/drivers/gpu/drm/i915/dvo.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo.h linux-2.6.37/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo.h    2011-01-17 02:41:01.000000000 -0500
 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
         *
         * \return singly-linked list of modes or NULL if no modes found.
@@ -24825,10 +24509,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo.h linux-2.6.36/drivers/gpu/drm/
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c       2010-11-06 18:58:15.000000000 -0400
-@@ -412,7 +412,7 @@ static void ivch_destroy(struct intel_dv
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo_ivch.c       2011-01-17 02:41:01.000000000 -0500
+@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
        }
  }
  
@@ -24837,10 +24521,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.36/drivers/gpu
        .init = ivch_init,
        .dpms = ivch_dpms,
        .mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c     2010-11-06 18:58:15.000000000 -0400
-@@ -254,7 +254,7 @@ static void sil164_destroy(struct intel_
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo_sil164.c     2011-01-17 02:41:01.000000000 -0500
+@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_
        }
  }
  
@@ -24849,10 +24533,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.36/drivers/g
        .init = sil164_init,
        .detect = sil164_detect,
        .mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c     2010-11-06 18:58:15.000000000 -0400
-@@ -295,7 +295,7 @@ static void tfp410_destroy(struct intel_
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/dvo_tfp410.c     2011-01-17 02:41:01.000000000 -0500
+@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_
        }
  }
  
@@ -24861,10 +24545,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.36/drivers/g
        .init = tfp410_init,
        .detect = tfp410_detect,
        .mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c       2010-11-06 18:58:15.000000000 -0400
-@@ -1357,7 +1357,7 @@ static bool i915_switcheroo_can_switch(s
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/i915_dma.c       2011-01-17 02:41:01.000000000 -0500
+@@ -1191,7 +1191,7 @@ static bool i915_switcheroo_can_switch(s
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -24873,10 +24557,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_dma.c linux-2.6.36/drivers/gpu
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c       2010-11-06 18:58:15.000000000 -0400
-@@ -492,7 +492,7 @@ static const struct dev_pm_ops i915_pm_o
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/i915_drv.c       2011-01-17 02:41:01.000000000 -0500
+@@ -579,7 +579,7 @@ static const struct dev_pm_ops i915_pm_o
       .restore = i915_pm_resume,
  };
  
@@ -24885,51 +24569,21 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_drv.c linux-2.6.36/drivers/gpu
        .fault = i915_gem_fault,
        .open = drm_gem_vm_open,
        .close = drm_gem_vm_close,
-diff -urNp linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/i915/i915_gem.c       2010-11-06 18:58:50.000000000 -0400
-@@ -476,12 +476,17 @@ i915_gem_pread_ioctl(struct drm_device *
-       }
- 
-       if (!access_ok(VERIFY_WRITE,
--                     (char __user *)(uintptr_t)args->data_ptr,
-+                     (char __user *) (uintptr_t)args->data_ptr,
-                      args->size)) {
-               ret = -EFAULT;
-               goto err;
-       }
- 
-+      if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
-+              drm_gem_object_unreference_unlocked(obj);
-+              return -EFAULT;
-+      }
-+
-       if (i915_gem_object_needs_bit17_swizzle(obj)) {
-               ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv);
-       } else {
-@@ -940,12 +945,17 @@ i915_gem_pwrite_ioctl(struct drm_device 
-       }
- 
-       if (!access_ok(VERIFY_READ,
--                     (char __user *)(uintptr_t)args->data_ptr,
-+                     (char __user *) (uintptr_t)args->data_ptr,
-                      args->size)) {
-               ret = -EFAULT;
-               goto err;
-       }
+diff -urNp linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/i915/i915_gem.c       2011-01-17 02:41:01.000000000 -0500
+@@ -587,6 +587,7 @@ i915_gem_pread_ioctl(struct drm_device *
+               goto out_put;
  
-+      if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
-+              drm_gem_object_unreference_unlocked(obj);
-+              return -EFAULT;
-+      }
+       ret = -EFAULT;
 +
-       /* We can only do the GTT pwrite on untiled buffers, as otherwise
-        * it would end up going through the fenced access, and we'll get
-        * different detiling behavior between reading and writing.
-diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c
---- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c   2010-11-06 18:58:15.000000000 -0400
-@@ -58,7 +58,7 @@ static int nv40_set_intensity(struct bac
+       if (!i915_gem_object_needs_bit17_swizzle(obj))
+               ret = i915_gem_shmem_pread_fast(dev, obj, args, file_priv);
+       if (ret == -EFAULT)
+diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c
+--- linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_backlight.c   2011-01-17 02:41:01.000000000 -0500
+@@ -59,7 +59,7 @@ static int nv40_set_intensity(struct bac
        return 0;
  }
  
@@ -24938,7 +24592,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.36
        .options = BL_CORE_SUSPENDRESUME,
        .get_brightness = nv40_get_intensity,
        .update_status = nv40_set_intensity,
-@@ -81,7 +81,7 @@ static int nv50_set_intensity(struct bac
+@@ -82,7 +82,7 @@ static int nv50_set_intensity(struct bac
        return 0;
  }
  
@@ -24947,10 +24601,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.36
        .options = BL_CORE_SUSPENDRESUME,
        .get_brightness = nv50_get_intensity,
        .update_status = nv50_set_intensity,
-diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c       2010-11-06 18:58:15.000000000 -0400
-@@ -501,7 +501,7 @@ static bool nouveau_switcheroo_can_switc
+diff -urNp linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/nouveau/nouveau_state.c       2011-01-17 02:41:01.000000000 -0500
+@@ -546,7 +546,7 @@ static bool nouveau_switcheroo_can_switc
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -24959,9 +24613,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.36/dri
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/radeon/mkregtable.c   2011-01-17 02:41:01.000000000 -0500
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
        regex_t mask_rex;
        regmatch_t match[4];
@@ -24979,10 +24633,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.36/drivers
  
        if (regcomp
            (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c        2010-11-06 18:58:15.000000000 -0400
-@@ -578,7 +578,7 @@ static bool radeon_switcheroo_can_switch
+diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_device.c        2011-01-17 02:41:01.000000000 -0500
+@@ -659,7 +659,7 @@ static bool radeon_switcheroo_can_switch
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -24991,9 +24645,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.36/driv
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_state.c 2011-01-17 02:41:01.000000000 -0500
 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
        if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
                sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -25012,10 +24666,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.36/drive
  
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c   2010-11-06 18:58:15.000000000 -0400
-@@ -601,8 +601,9 @@ void radeon_ttm_fini(struct radeon_devic
+diff -urNp linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/radeon/radeon_ttm.c   2011-01-17 02:41:01.000000000 -0500
+@@ -589,8 +589,9 @@ void radeon_ttm_fini(struct radeon_devic
        DRM_INFO("radeon: ttm finalized\n");
  }
  
@@ -25027,7 +24681,7 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36/drivers
  
  static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
  {
-@@ -610,17 +611,22 @@ static int radeon_ttm_fault(struct vm_ar
+@@ -598,17 +599,22 @@ static int radeon_ttm_fault(struct vm_ar
        struct radeon_device *rdev;
        int r;
  
@@ -25054,9 +24708,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36/drivers
  int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
  {
        struct drm_file *file_priv;
-@@ -633,18 +639,11 @@ int radeon_mmap(struct file *filp, struc
+@@ -621,18 +627,11 @@ int radeon_mmap(struct file *filp, struc
  
-       file_priv = (struct drm_file *)filp->private_data;
+       file_priv = filp->private_data;
        rdev = file_priv->minor->dev->dev_private;
 -      if (rdev == NULL) {
 +      if (!rdev)
@@ -25075,11 +24729,11 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36/drivers
        vma->vm_ops = &radeon_ttm_vm_ops;
        return 0;
  }
-diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c  2010-11-06 18:58:15.000000000 -0400
-@@ -47,7 +47,7 @@
- #include <linux/module.h>
+diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo.c  2011-01-17 02:41:01.000000000 -0500
+@@ -40,7 +40,7 @@
+ #include <asm/atomic.h>
  
  #define TTM_ASSERT_LOCKED(param)
 -#define TTM_DEBUG(fmt, arg...)
@@ -25087,9 +24741,9 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.36/drivers/gpu/dr
  #define TTM_BO_HASH_ORDER 13
  
  static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
-diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/gpu/drm/ttm/ttm_bo_vm.c       2011-01-17 02:41:01.000000000 -0500
 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
        return best_bo;
  }
@@ -25143,22 +24797,10 @@ diff -urNp linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.36/drivers/gpu
  
  static const struct vm_operations_struct ttm_bo_vm_ops = {
        .fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.36/drivers/hid/hidraw.c linux-2.6.36/drivers/hid/hidraw.c
---- linux-2.6.36/drivers/hid/hidraw.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hid/hidraw.c  2010-11-06 18:58:50.000000000 -0400
-@@ -250,7 +250,7 @@ static long hidraw_ioctl(struct file *fi
- 
-       mutex_lock(&minors_lock);
-       dev = hidraw_table[minor];
--      if (!dev) {
-+      if (dev == NULL) {
-               ret = -ENODEV;
-               goto out;
-       }
-diff -urNp linux-2.6.36/drivers/hid/usbhid/hiddev.c linux-2.6.36/drivers/hid/usbhid/hiddev.c
---- linux-2.6.36/drivers/hid/usbhid/hiddev.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hid/usbhid/hiddev.c   2010-11-06 18:58:15.000000000 -0400
-@@ -614,7 +614,7 @@ static long hiddev_ioctl(struct file *fi
+diff -urNp linux-2.6.37/drivers/hid/usbhid/hiddev.c linux-2.6.37/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.37/drivers/hid/usbhid/hiddev.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hid/usbhid/hiddev.c   2011-01-17 02:41:01.000000000 -0500
+@@ -611,7 +611,7 @@ static long hiddev_ioctl(struct file *fi
                return put_user(HID_VERSION, (int __user *)arg);
  
        case HIDIOCAPPLICATION:
@@ -25167,9 +24809,9 @@ diff -urNp linux-2.6.36/drivers/hid/usbhid/hiddev.c linux-2.6.36/drivers/hid/usb
                        return -EINVAL;
  
                for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.36/drivers/hwmon/k8temp.c linux-2.6.36/drivers/hwmon/k8temp.c
---- linux-2.6.36/drivers/hwmon/k8temp.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hwmon/k8temp.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/hwmon/k8temp.c linux-2.6.37/drivers/hwmon/k8temp.c
+--- linux-2.6.37/drivers/hwmon/k8temp.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hwmon/k8temp.c        2011-01-17 02:41:01.000000000 -0500
 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
  
  static const struct pci_device_id k8temp_ids[] = {
@@ -25179,9 +24821,9 @@ diff -urNp linux-2.6.36/drivers/hwmon/k8temp.c linux-2.6.36/drivers/hwmon/k8temp
  };
  
  MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.36/drivers/hwmon/sis5595.c linux-2.6.36/drivers/hwmon/sis5595.c
---- linux-2.6.36/drivers/hwmon/sis5595.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hwmon/sis5595.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/hwmon/sis5595.c linux-2.6.37/drivers/hwmon/sis5595.c
+--- linux-2.6.37/drivers/hwmon/sis5595.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hwmon/sis5595.c       2011-01-17 02:41:01.000000000 -0500
 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
  
  static const struct pci_device_id sis5595_pci_ids[] = {
@@ -25191,9 +24833,9 @@ diff -urNp linux-2.6.36/drivers/hwmon/sis5595.c linux-2.6.36/drivers/hwmon/sis55
  };
  
  MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.36/drivers/hwmon/via686a.c linux-2.6.36/drivers/hwmon/via686a.c
---- linux-2.6.36/drivers/hwmon/via686a.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hwmon/via686a.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/hwmon/via686a.c linux-2.6.37/drivers/hwmon/via686a.c
+--- linux-2.6.37/drivers/hwmon/via686a.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hwmon/via686a.c       2011-01-17 02:41:01.000000000 -0500
 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
  
  static const struct pci_device_id via686a_pci_ids[] = {
@@ -25203,9 +24845,9 @@ diff -urNp linux-2.6.36/drivers/hwmon/via686a.c linux-2.6.36/drivers/hwmon/via68
  };
  
  MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.36/drivers/hwmon/vt8231.c linux-2.6.36/drivers/hwmon/vt8231.c
---- linux-2.6.36/drivers/hwmon/vt8231.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hwmon/vt8231.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/hwmon/vt8231.c linux-2.6.37/drivers/hwmon/vt8231.c
+--- linux-2.6.37/drivers/hwmon/vt8231.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hwmon/vt8231.c        2011-01-17 02:41:01.000000000 -0500
 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
  
  static const struct pci_device_id vt8231_pci_ids[] = {
@@ -25215,9 +24857,9 @@ diff -urNp linux-2.6.36/drivers/hwmon/vt8231.c linux-2.6.36/drivers/hwmon/vt8231
  };
  
  MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.36/drivers/hwmon/w83791d.c linux-2.6.36/drivers/hwmon/w83791d.c
---- linux-2.6.36/drivers/hwmon/w83791d.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/hwmon/w83791d.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/hwmon/w83791d.c linux-2.6.37/drivers/hwmon/w83791d.c
+--- linux-2.6.37/drivers/hwmon/w83791d.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/hwmon/w83791d.c       2011-01-17 02:41:01.000000000 -0500
 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
                          struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -25229,21 +24871,21 @@ diff -urNp linux-2.6.36/drivers/hwmon/w83791d.c linux-2.6.36/drivers/hwmon/w8379
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-i801.c linux-2.6.36/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.36/drivers/i2c/busses/i2c-i801.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/i2c/busses/i2c-i801.c 2010-11-06 18:58:15.000000000 -0400
-@@ -592,7 +592,7 @@ static const struct pci_device_id i801_i
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-i801.c linux-2.6.37/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.37/drivers/i2c/busses/i2c-i801.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/i2c/busses/i2c-i801.c 2011-01-17 02:41:01.000000000 -0500
+@@ -620,7 +620,7 @@ static const struct pci_device_id i801_i
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
 -      { 0, }
 +      { 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, i801_ids);
-diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-piix4.c linux-2.6.36/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.36/drivers/i2c/busses/i2c-piix4.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/i2c/busses/i2c-piix4.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-piix4.c linux-2.6.37/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.37/drivers/i2c/busses/i2c-piix4.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/i2c/busses/i2c-piix4.c        2011-01-17 02:41:01.000000000 -0500
 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
                .ident = "IBM",
                .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25262,9 +24904,9 @@ diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-piix4.c linux-2.6.36/drivers/i2c/
  };
  
  MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis630.c linux-2.6.36/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.36/drivers/i2c/busses/i2c-sis630.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/i2c/busses/i2c-sis630.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis630.c linux-2.6.37/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.37/drivers/i2c/busses/i2c-sis630.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/i2c/busses/i2c-sis630.c       2011-01-17 02:41:01.000000000 -0500
 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
  static const struct pci_device_id sis630_ids[] __devinitconst = {
        { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -25274,9 +24916,9 @@ diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis630.c linux-2.6.36/drivers/i2c
  };
  
  MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/i2c/busses/i2c-sis96x.c       2011-01-17 02:41:01.000000000 -0500
 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
  
  static const struct pci_device_id sis96x_ids[] = {
@@ -25286,9 +24928,9 @@ diff -urNp linux-2.6.36/drivers/i2c/busses/i2c-sis96x.c linux-2.6.36/drivers/i2c
  };
  
  MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.36/drivers/ide/ide-cd.c linux-2.6.36/drivers/ide/ide-cd.c
---- linux-2.6.36/drivers/ide/ide-cd.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ide/ide-cd.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/ide/ide-cd.c linux-2.6.37/drivers/ide/ide-cd.c
+--- linux-2.6.37/drivers/ide/ide-cd.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/ide/ide-cd.c  2011-01-17 02:41:01.000000000 -0500
 @@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
                alignment = queue_dma_alignment(q) | q->dma_pad_mask;
                if ((unsigned long)buf & alignment
@@ -25298,122 +24940,9 @@ diff -urNp linux-2.6.36/drivers/ide/ide-cd.c linux-2.6.36/drivers/ide/ide-cd.c
                        drive->dma = 0;
        }
  }
-diff -urNp linux-2.6.36/drivers/ieee1394/dv1394.c linux-2.6.36/drivers/ieee1394/dv1394.c
---- linux-2.6.36/drivers/ieee1394/dv1394.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/dv1394.c     2010-11-06 18:58:15.000000000 -0400
-@@ -738,7 +738,7 @@ static void frame_prepare(struct video_c
-       based upon DIF section and sequence
- */
- 
--static void inline
-+static inline void
- frame_put_packet (struct frame *f, struct packet *p)
- {
-       int section_type = p->data[0] >> 5;           /* section type is in bits 5 - 7 */
-@@ -2173,7 +2173,7 @@ static const struct ieee1394_device_id d
-               .specifier_id   = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
-               .version        = AVC_SW_VERSION_ENTRY & 0xffffff
-       },
--      { }
-+      { 0, 0, 0, 0, 0, 0 }
- };
- 
- MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.36/drivers/ieee1394/eth1394.c linux-2.6.36/drivers/ieee1394/eth1394.c
---- linux-2.6.36/drivers/ieee1394/eth1394.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/eth1394.c    2010-11-06 18:58:15.000000000 -0400
-@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
-               .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
-               .version = ETHER1394_GASP_VERSION,
-       },
--      {}
-+      { 0, 0, 0, 0, 0, 0 }
- };
- 
- MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.36/drivers/ieee1394/hosts.c linux-2.6.36/drivers/ieee1394/hosts.c
---- linux-2.6.36/drivers/ieee1394/hosts.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/hosts.c      2010-11-06 18:58:15.000000000 -0400
-@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 
- }
- 
- static struct hpsb_host_driver dummy_driver = {
-+      .name =            "dummy",
-       .transmit_packet = dummy_transmit_packet,
-       .devctl =          dummy_devctl,
-       .isoctl =          dummy_isoctl
-diff -urNp linux-2.6.36/drivers/ieee1394/ohci1394.c linux-2.6.36/drivers/ieee1394/ohci1394.c
---- linux-2.6.36/drivers/ieee1394/ohci1394.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/ohci1394.c   2010-11-06 18:58:15.000000000 -0400
-@@ -148,9 +148,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
- printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
- 
- /* Module Parameters */
--static int phys_dma = 1;
-+static int phys_dma;
- module_param(phys_dma, int, 0444);
--MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 1).");
-+MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 0).");
- 
- static void dma_trm_tasklet(unsigned long data);
- static void dma_trm_reset(struct dma_trm_ctx *d);
-@@ -3445,7 +3445,7 @@ static struct pci_device_id ohci1394_pci
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
--      { 0, },
-+      { 0, 0, 0, 0, 0, 0, 0 },
- };
- 
- MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.36/drivers/ieee1394/raw1394.c linux-2.6.36/drivers/ieee1394/raw1394.c
---- linux-2.6.36/drivers/ieee1394/raw1394.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/raw1394.c    2010-11-06 18:58:15.000000000 -0400
-@@ -3001,7 +3001,7 @@ static const struct ieee1394_device_id r
-        .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
-        .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
-        .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff},
--      {}
-+      { 0, 0, 0, 0, 0, 0 }
- };
- 
- MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.36/drivers/ieee1394/sbp2.c linux-2.6.36/drivers/ieee1394/sbp2.c
---- linux-2.6.36/drivers/ieee1394/sbp2.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/sbp2.c       2010-11-06 18:58:15.000000000 -0400
-@@ -289,7 +289,7 @@ static const struct ieee1394_device_id s
-        .match_flags   = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
-        .specifier_id  = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
-        .version       = SBP2_SW_VERSION_ENTRY & 0xffffff},
--      {}
-+      { 0, 0, 0, 0, 0, 0 }
- };
- MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
- 
-@@ -2107,7 +2107,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
- MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
- MODULE_LICENSE("GPL");
- 
--static int sbp2_module_init(void)
-+static int __init sbp2_module_init(void)
- {
-       int ret;
- 
-diff -urNp linux-2.6.36/drivers/ieee1394/video1394.c linux-2.6.36/drivers/ieee1394/video1394.c
---- linux-2.6.36/drivers/ieee1394/video1394.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/ieee1394/video1394.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1307,7 +1307,7 @@ static const struct ieee1394_device_id v
-                 .specifier_id   = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
-                 .version        = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
-         },
--      { }
-+      { 0, 0, 0, 0, 0, 0 }
- };
- 
- MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.36/drivers/infiniband/core/cm.c linux-2.6.36/drivers/infiniband/core/cm.c
---- linux-2.6.36/drivers/infiniband/core/cm.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/infiniband/core/cm.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/infiniband/core/cm.c linux-2.6.37/drivers/infiniband/core/cm.c
+--- linux-2.6.37/drivers/infiniband/core/cm.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/infiniband/core/cm.c  2011-01-17 02:41:01.000000000 -0500
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -25553,9 +25082,9 @@ diff -urNp linux-2.6.36/drivers/infiniband/core/cm.c linux-2.6.36/drivers/infini
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.36/drivers/infiniband/hw/qib/qib.h linux-2.6.36/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.36/drivers/infiniband/hw/qib/qib.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/infiniband/hw/qib/qib.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/infiniband/hw/qib/qib.h linux-2.6.37/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.37/drivers/infiniband/hw/qib/qib.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/infiniband/hw/qib/qib.h       2011-01-17 02:41:01.000000000 -0500
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -25564,10 +25093,10 @@ diff -urNp linux-2.6.36/drivers/infiniband/hw/qib/qib.h linux-2.6.36/drivers/inf
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-2.6.36/drivers/input/keyboard/atkbd.c linux-2.6.36/drivers/input/keyboard/atkbd.c
---- linux-2.6.36/drivers/input/keyboard/atkbd.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/keyboard/atkbd.c        2010-11-06 18:58:15.000000000 -0400
-@@ -1240,7 +1240,7 @@ static struct serio_device_id atkbd_seri
+diff -urNp linux-2.6.37/drivers/input/keyboard/atkbd.c linux-2.6.37/drivers/input/keyboard/atkbd.c
+--- linux-2.6.37/drivers/input/keyboard/atkbd.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/keyboard/atkbd.c        2011-01-17 02:41:01.000000000 -0500
+@@ -1250,7 +1250,7 @@ static struct serio_device_id atkbd_seri
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
        },
@@ -25576,9 +25105,9 @@ diff -urNp linux-2.6.36/drivers/input/keyboard/atkbd.c linux-2.6.36/drivers/inpu
  };
  
  MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.36/drivers/input/mouse/lifebook.c linux-2.6.36/drivers/input/mouse/lifebook.c
---- linux-2.6.36/drivers/input/mouse/lifebook.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/mouse/lifebook.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/input/mouse/lifebook.c linux-2.6.37/drivers/input/mouse/lifebook.c
+--- linux-2.6.37/drivers/input/mouse/lifebook.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/mouse/lifebook.c        2011-01-17 02:41:01.000000000 -0500
 @@ -123,7 +123,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
                },
@@ -25588,9 +25117,9 @@ diff -urNp linux-2.6.36/drivers/input/mouse/lifebook.c linux-2.6.36/drivers/inpu
  };
  
  void __init lifebook_module_init(void)
-diff -urNp linux-2.6.36/drivers/input/mouse/psmouse-base.c linux-2.6.36/drivers/input/mouse/psmouse-base.c
---- linux-2.6.36/drivers/input/mouse/psmouse-base.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/mouse/psmouse-base.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/input/mouse/psmouse-base.c linux-2.6.37/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.37/drivers/input/mouse/psmouse-base.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/mouse/psmouse-base.c    2011-01-17 02:41:01.000000000 -0500
 @@ -1462,7 +1462,7 @@ static struct serio_device_id psmouse_se
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
@@ -25600,10 +25129,10 @@ diff -urNp linux-2.6.36/drivers/input/mouse/psmouse-base.c linux-2.6.36/drivers/
  };
  
  MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.36/drivers/input/mouse/synaptics.c linux-2.6.36/drivers/input/mouse/synaptics.c
---- linux-2.6.36/drivers/input/mouse/synaptics.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/mouse/synaptics.c       2010-11-06 18:58:15.000000000 -0400
-@@ -476,7 +476,7 @@ static void synaptics_process_packet(str
+diff -urNp linux-2.6.37/drivers/input/mouse/synaptics.c linux-2.6.37/drivers/input/mouse/synaptics.c
+--- linux-2.6.37/drivers/input/mouse/synaptics.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/mouse/synaptics.c       2011-01-17 02:41:01.000000000 -0500
+@@ -499,7 +499,7 @@ static void synaptics_process_packet(str
                                break;
                        case 2:
                                if (SYN_MODEL_PEN(priv->model_id))
@@ -25612,7 +25141,7 @@ diff -urNp linux-2.6.36/drivers/input/mouse/synaptics.c linux-2.6.36/drivers/inp
                                break;
                        case 4 ... 15:
                                if (SYN_CAP_PALMDETECT(priv->capabilities))
-@@ -705,7 +705,6 @@ static const struct dmi_system_id __init
+@@ -729,7 +729,6 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
                },
@@ -25620,7 +25149,7 @@ diff -urNp linux-2.6.36/drivers/input/mouse/synaptics.c linux-2.6.36/drivers/inp
        },
        {
                /* Toshiba Portege M300 */
-@@ -714,9 +713,8 @@ static const struct dmi_system_id __init
+@@ -738,9 +737,8 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
                        DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
                },
@@ -25631,9 +25160,9 @@ diff -urNp linux-2.6.36/drivers/input/mouse/synaptics.c linux-2.6.36/drivers/inp
  #endif
  };
  
-diff -urNp linux-2.6.36/drivers/input/mousedev.c linux-2.6.36/drivers/input/mousedev.c
---- linux-2.6.36/drivers/input/mousedev.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/mousedev.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/input/mousedev.c linux-2.6.37/drivers/input/mousedev.c
+--- linux-2.6.37/drivers/input/mousedev.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/mousedev.c      2011-01-17 02:41:01.000000000 -0500
 @@ -762,7 +762,7 @@ static ssize_t mousedev_read(struct file
  
        spin_unlock_irq(&client->packet_lock);
@@ -25643,7 +25172,7 @@ diff -urNp linux-2.6.36/drivers/input/mousedev.c linux-2.6.36/drivers/input/mous
                return -EFAULT;
  
        return count;
-@@ -1064,7 +1064,7 @@ static struct input_handler mousedev_han
+@@ -1065,7 +1065,7 @@ static struct input_handler mousedev_han
  
  #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
  static struct miscdevice psaux_mouse = {
@@ -25652,9 +25181,9 @@ diff -urNp linux-2.6.36/drivers/input/mousedev.c linux-2.6.36/drivers/input/mous
  };
  static int psaux_registered;
  #endif
-diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/serio/i8042-x86ia64io.h 2011-01-17 02:41:01.000000000 -0500
 @@ -183,7 +183,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
                },
@@ -25664,7 +25193,7 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  
  /*
-@@ -413,7 +413,7 @@ static const struct dmi_system_id __init
+@@ -424,7 +424,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
                },
        },
@@ -25673,7 +25202,7 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
-@@ -487,7 +487,7 @@ static const struct dmi_system_id __init
+@@ -498,7 +498,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
                },
        },
@@ -25682,7 +25211,7 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  
  #ifdef CONFIG_PNP
-@@ -506,7 +506,7 @@ static const struct dmi_system_id __init
+@@ -517,7 +517,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
                },
        },
@@ -25691,7 +25220,7 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
-@@ -530,7 +530,7 @@ static const struct dmi_system_id __init
+@@ -541,7 +541,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
                },
        },
@@ -25700,7 +25229,7 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  #endif
  
-@@ -604,7 +604,7 @@ static const struct dmi_system_id __init
+@@ -615,7 +615,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
                },
        },
@@ -25709,9 +25238,9 @@ diff -urNp linux-2.6.36/drivers/input/serio/i8042-x86ia64io.h linux-2.6.36/drive
  };
  
  #endif /* CONFIG_X86 */
-diff -urNp linux-2.6.36/drivers/input/serio/serio_raw.c linux-2.6.36/drivers/input/serio/serio_raw.c
---- linux-2.6.36/drivers/input/serio/serio_raw.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/input/serio/serio_raw.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/input/serio/serio_raw.c linux-2.6.37/drivers/input/serio/serio_raw.c
+--- linux-2.6.37/drivers/input/serio/serio_raw.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/input/serio/serio_raw.c       2011-01-17 02:41:01.000000000 -0500
 @@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
@@ -25721,9 +25250,9 @@ diff -urNp linux-2.6.36/drivers/input/serio/serio_raw.c linux-2.6.36/drivers/inp
  };
  
  MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.36/drivers/isdn/gigaset/common.c linux-2.6.36/drivers/isdn/gigaset/common.c
---- linux-2.6.36/drivers/isdn/gigaset/common.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/isdn/gigaset/common.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/isdn/gigaset/common.c linux-2.6.37/drivers/isdn/gigaset/common.c
+--- linux-2.6.37/drivers/isdn/gigaset/common.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/isdn/gigaset/common.c 2011-01-17 02:41:01.000000000 -0500
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
        cs->commands_pending = 0;
        cs->cur_at_seq = 0;
@@ -25733,10 +25262,10 @@ diff -urNp linux-2.6.36/drivers/isdn/gigaset/common.c linux-2.6.36/drivers/isdn/
        cs->dev = NULL;
        cs->tty = NULL;
        cs->tty_dev = NULL;
-diff -urNp linux-2.6.36/drivers/isdn/gigaset/gigaset.h linux-2.6.36/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.36/drivers/isdn/gigaset/gigaset.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/isdn/gigaset/gigaset.h        2010-11-06 18:58:15.000000000 -0400
-@@ -434,7 +434,7 @@ struct cardstate {
+diff -urNp linux-2.6.37/drivers/isdn/gigaset/gigaset.h linux-2.6.37/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.37/drivers/isdn/gigaset/gigaset.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/isdn/gigaset/gigaset.h        2011-01-17 02:41:01.000000000 -0500
+@@ -433,7 +433,7 @@ struct cardstate {
        spinlock_t cmdlock;
        unsigned curlen, cmdbytes;
  
@@ -25745,9 +25274,9 @@ diff -urNp linux-2.6.36/drivers/isdn/gigaset/gigaset.h linux-2.6.36/drivers/isdn
        struct tty_struct *tty;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;
-diff -urNp linux-2.6.36/drivers/isdn/gigaset/interface.c linux-2.6.36/drivers/isdn/gigaset/interface.c
---- linux-2.6.36/drivers/isdn/gigaset/interface.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/isdn/gigaset/interface.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/isdn/gigaset/interface.c linux-2.6.37/drivers/isdn/gigaset/interface.c
+--- linux-2.6.37/drivers/isdn/gigaset/interface.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/isdn/gigaset/interface.c      2011-01-17 02:41:01.000000000 -0500
 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
                return -ERESTARTSYS;
        tty->driver_data = cs;
@@ -25835,15 +25364,15 @@ diff -urNp linux-2.6.36/drivers/isdn/gigaset/interface.c linux-2.6.36/drivers/is
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
                goto out;
        }
-diff -urNp linux-2.6.36/drivers/isdn/hardware/avm/b1.c linux-2.6.36/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.36/drivers/isdn/hardware/avm/b1.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/isdn/hardware/avm/b1.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/isdn/hardware/avm/b1.c linux-2.6.37/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.37/drivers/isdn/hardware/avm/b1.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/isdn/hardware/avm/b1.c        2011-01-17 02:41:01.000000000 -0500
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
        }
        if (left) {
                if (t4file->user) {
 -                      if (copy_from_user(buf, dp, left))
-+                      if (left > sizeof(buf) || copy_from_user(buf, dp, left))
++                      if (left > sizeof buf || copy_from_user(buf, dp, left))
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
@@ -25852,25 +25381,25 @@ diff -urNp linux-2.6.36/drivers/isdn/hardware/avm/b1.c linux-2.6.36/drivers/isdn
        if (left) {
                if (config->user) {
 -                      if (copy_from_user(buf, dp, left))
-+                      if (left > sizeof(buf) || copy_from_user(buf, dp, left))
++                      if (left > sizeof buf || copy_from_user(buf, dp, left))
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
-diff -urNp linux-2.6.36/drivers/isdn/icn/icn.c linux-2.6.36/drivers/isdn/icn/icn.c
---- linux-2.6.36/drivers/isdn/icn/icn.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/isdn/icn/icn.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/isdn/icn/icn.c linux-2.6.37/drivers/isdn/icn/icn.c
+--- linux-2.6.37/drivers/isdn/icn/icn.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/isdn/icn/icn.c        2011-01-17 02:41:01.000000000 -0500
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
                if (count > len)
                        count = len;
                if (user) {
 -                      if (copy_from_user(msg, buf, count))
-+                      if (count > sizeof(msg) || copy_from_user(msg, buf, count))
++                      if (count > sizeof msg || copy_from_user(msg, buf, count))
                                return -EFAULT;
                } else
                        memcpy(msg, buf, count);
-diff -urNp linux-2.6.36/drivers/lguest/core.c linux-2.6.36/drivers/lguest/core.c
---- linux-2.6.36/drivers/lguest/core.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/lguest/core.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/lguest/core.c linux-2.6.37/drivers/lguest/core.c
+--- linux-2.6.37/drivers/lguest/core.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/lguest/core.c 2011-01-17 02:41:01.000000000 -0500
 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
         * it's worked so far.  The end address needs +1 because __get_vm_area
         * allocates an extra guard page, so we need space for that.
@@ -25889,9 +25418,123 @@ diff -urNp linux-2.6.36/drivers/lguest/core.c linux-2.6.36/drivers/lguest/core.c
        if (!switcher_vma) {
                err = -ENOMEM;
                printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.36/drivers/macintosh/via-pmu-backlight.c linux-2.6.36/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.36/drivers/macintosh/via-pmu-backlight.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/macintosh/via-pmu-backlight.c 2010-11-06 18:58:15.000000000 -0400
+@@ -119,7 +127,7 @@ static __init int map_switcher(void)
+        * Now the Switcher is mapped at the right address, we can't fail!
+        * Copy in the compiled-in Switcher code (from <arch>_switcher.S).
+        */
+-      memcpy(switcher_vma->addr, start_switcher_text,
++      memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
+              end_switcher_text - start_switcher_text);
+ 
+       printk(KERN_INFO "lguest: mapped switcher at %p\n",
+diff -urNp linux-2.6.37/drivers/lguest/x86/core.c linux-2.6.37/drivers/lguest/x86/core.c
+--- linux-2.6.37/drivers/lguest/x86/core.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/lguest/x86/core.c     2011-01-17 02:41:01.000000000 -0500
+@@ -59,7 +59,7 @@ static struct {
+ /* Offset from where switcher.S was compiled to where we've copied it */
+ static unsigned long switcher_offset(void)
+ {
+-      return SWITCHER_ADDR - (unsigned long)start_switcher_text;
++      return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
+ }
+ 
+ /* This cpu's struct lguest_pages. */
+@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg
+        * These copies are pretty cheap, so we do them unconditionally: */
+       /* Save the current Host top-level page directory.
+        */
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      pages->state.host_cr3 = read_cr3();
++#else
+       pages->state.host_cr3 = __pa(current->mm->pgd);
++#endif
++
+       /*
+        * Set up the Guest's page tables to see this CPU's pages (and no
+        * other CPU's pages).
+@@ -547,7 +553,7 @@ void __init lguest_arch_host_init(void)
+        * compiled-in switcher code and the high-mapped copy we just made.
+        */
+       for (i = 0; i < IDT_ENTRIES; i++)
+-              default_idt_entries[i] += switcher_offset();
++              default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
+ 
+       /*
+        * Set up the Switcher's per-cpu areas.
+@@ -630,7 +636,7 @@ void __init lguest_arch_host_init(void)
+        * it will be undisturbed when we switch.  To change %cs and jump we
+        * need this structure to feed to Intel's "lcall" instruction.
+        */
+-      lguest_entry.offset = (long)switch_to_guest + switcher_offset();
++      lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
+       lguest_entry.segment = LGUEST_CS;
+ 
+       /*
+diff -urNp linux-2.6.37/drivers/lguest/x86/switcher_32.S linux-2.6.37/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.37/drivers/lguest/x86/switcher_32.S      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/lguest/x86/switcher_32.S      2011-01-17 02:41:01.000000000 -0500
+@@ -87,6 +87,7 @@
+ #include <asm/page.h>
+ #include <asm/segment.h>
+ #include <asm/lguest.h>
++#include <asm/processor-flags.h>
+ 
+ // We mark the start of the code to copy
+ // It's placed in .text tho it's never run here
+@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
+       // Changes type when we load it: damn Intel!
+       // For after we switch over our page tables
+       // That entry will be read-only: we'd crash.
++
++#ifdef CONFIG_PAX_KERNEXEC
++      mov     %cr0, %edx
++      xor     $X86_CR0_WP, %edx
++      mov     %edx, %cr0
++#endif
++
+       movl    $(GDT_ENTRY_TSS*8), %edx
+       ltr     %dx
+ 
+@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
+       // Let's clear it again for our return.
+       // The GDT descriptor of the Host
+       // Points to the table after two "size" bytes
+-      movl    (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
++      movl    (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
+       // Clear "used" from type field (byte 5, bit 2)
+-      andb    $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
++      andb    $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
++
++#ifdef CONFIG_PAX_KERNEXEC
++      mov     %cr0, %eax
++      xor     $X86_CR0_WP, %eax
++      mov     %eax, %cr0
++#endif
+ 
+       // Once our page table's switched, the Guest is live!
+       // The Host fades as we run this final step.
+@@ -295,13 +309,12 @@ deliver_to_host:
+       // I consulted gcc, and it gave
+       // These instructions, which I gladly credit:
+       leal    (%edx,%ebx,8), %eax
+-      movzwl  (%eax),%edx
+-      movl    4(%eax), %eax
+-      xorw    %ax, %ax
+-      orl     %eax, %edx
++      movl    4(%eax), %edx
++      movw    (%eax), %dx
+       // Now the address of the handler's in %edx
+       // We call it now: its "iret" drops us home.
+-      jmp     *%edx
++      ljmp    $__KERNEL_CS, $1f
++1:    jmp     *%edx
+ 
+ // Every interrupt can come to us here
+ // But we must truly tell each apart.
+diff -urNp linux-2.6.37/drivers/macintosh/via-pmu-backlight.c linux-2.6.37/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.37/drivers/macintosh/via-pmu-backlight.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/macintosh/via-pmu-backlight.c 2011-01-17 02:41:01.000000000 -0500
 @@ -15,7 +15,7 @@
  
  #define MAX_PMU_LEVEL 0xFF
@@ -25910,10 +25553,10 @@ diff -urNp linux-2.6.36/drivers/macintosh/via-pmu-backlight.c linux-2.6.36/drive
        .get_brightness = pmu_backlight_get_brightness,
        .update_status  = pmu_backlight_update_status,
  
-diff -urNp linux-2.6.36/drivers/macintosh/via-pmu.c linux-2.6.36/drivers/macintosh/via-pmu.c
---- linux-2.6.36/drivers/macintosh/via-pmu.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/macintosh/via-pmu.c   2010-11-06 18:58:15.000000000 -0400
-@@ -2256,7 +2256,7 @@ static int pmu_sleep_valid(suspend_state
+diff -urNp linux-2.6.37/drivers/macintosh/via-pmu.c linux-2.6.37/drivers/macintosh/via-pmu.c
+--- linux-2.6.37/drivers/macintosh/via-pmu.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/macintosh/via-pmu.c   2011-01-17 02:41:01.000000000 -0500
+@@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state
                && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
  }
  
@@ -25922,9 +25565,9 @@ diff -urNp linux-2.6.36/drivers/macintosh/via-pmu.c linux-2.6.36/drivers/macinto
        .enter = powerbook_sleep,
        .valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.36/drivers/md/bitmap.c linux-2.6.36/drivers/md/bitmap.c
---- linux-2.6.36/drivers/md/bitmap.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/md/bitmap.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/md/bitmap.c linux-2.6.37/drivers/md/bitmap.c
+--- linux-2.6.37/drivers/md/bitmap.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/md/bitmap.c   2011-01-17 02:41:01.000000000 -0500
 @@ -55,7 +55,7 @@
  #  if DEBUG > 0
  #    define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25934,9 +25577,9 @@ diff -urNp linux-2.6.36/drivers/md/bitmap.c linux-2.6.36/drivers/md/bitmap.c
  #  endif
  #endif
  
-diff -urNp linux-2.6.36/drivers/md/dm-table.c linux-2.6.36/drivers/md/dm-table.c
---- linux-2.6.36/drivers/md/dm-table.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/md/dm-table.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/md/dm-table.c linux-2.6.37/drivers/md/dm-table.c
+--- linux-2.6.37/drivers/md/dm-table.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/md/dm-table.c 2011-01-17 02:41:01.000000000 -0500
 @@ -366,7 +366,7 @@ static int device_area_is_invalid(struct
        if (!dev_size)
                return 0;
@@ -25946,10 +25589,37 @@ diff -urNp linux-2.6.36/drivers/md/dm-table.c linux-2.6.36/drivers/md/dm-table.c
                DMWARN("%s: %s too small for target: "
                       "start=%llu, len=%llu, dev_size=%llu",
                       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.36/drivers/md/md.c linux-2.6.36/drivers/md/md.c
---- linux-2.6.36/drivers/md/md.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/md/md.c       2010-11-06 18:58:15.000000000 -0400
-@@ -6403,7 +6403,7 @@ static int md_seq_show(struct seq_file *
+diff -urNp linux-2.6.37/drivers/md/md.c linux-2.6.37/drivers/md/md.c
+--- linux-2.6.37/drivers/md/md.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/md/md.c       2011-01-17 02:41:01.000000000 -0500
+@@ -1875,7 +1875,7 @@ static int bind_rdev_to_array(mdk_rdev_t
+ 
+       ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
+       if (sysfs_create_link(&rdev->kobj, ko, "block"))
+-              /* failure here is OK */;
++              /* failure here is OK */{}
+       rdev->sysfs_state = sysfs_get_dirent_safe(rdev->kobj.sd, "state");
+ 
+       list_add_rcu(&rdev->same_set, &mddev->disks);
+@@ -2487,7 +2487,7 @@ slot_store(mdk_rdev_t *rdev, const char 
+                       sysfs_notify_dirent_safe(rdev->sysfs_state);
+               sprintf(nm, "rd%d", rdev->raid_disk);
+               if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm))
+-                      /* failure here is OK */;
++                      /* failure here is OK */{}
+               /* don't wakeup anyone, leave that to userspace. */
+       } else {
+               if (slot >= rdev->mddev->raid_disks)
+@@ -4570,7 +4570,7 @@ int md_run(mddev_t *mddev)
+                       char nm[20];
+                       sprintf(nm, "rd%d", rdev->raid_disk);
+                       if (sysfs_create_link(&mddev->kobj, &rdev->kobj, nm))
+-                              /* failure here is OK */;
++                              /* failure here is OK */{}
+               }
+       
+       set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
+@@ -6408,7 +6408,7 @@ static int md_seq_show(struct seq_file *
                                chunk_kb ? "KB" : "B");
                        if (bitmap->file) {
                                seq_printf(seq, ", file: ");
@@ -25958,7 +25628,7 @@ diff -urNp linux-2.6.36/drivers/md/md.c linux-2.6.36/drivers/md/md.c
                        }
  
                        seq_printf(seq, "\n");
-@@ -6497,7 +6497,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6502,7 +6502,7 @@ static int is_mddev_idle(mddev_t *mddev,
                struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
                curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
                              (int)part_stat_read(&disk->part0, sectors[1]) -
@@ -25967,10 +25637,19 @@ diff -urNp linux-2.6.36/drivers/md/md.c linux-2.6.36/drivers/md/md.c
                /* sync IO will cause sync_io to increase before the disk_stats
                 * as sync_io is counted when a request starts, and
                 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.36/drivers/md/md.h linux-2.6.36/drivers/md/md.h
---- linux-2.6.36/drivers/md/md.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/md/md.h       2010-11-06 18:58:15.000000000 -0400
-@@ -362,7 +362,7 @@ static inline void rdev_dec_pending(mdk_
+@@ -7020,7 +7020,7 @@ static int remove_and_add_spares(mddev_t
+                                       sprintf(nm, "rd%d", rdev->raid_disk);
+                                       if (sysfs_create_link(&mddev->kobj,
+                                                             &rdev->kobj, nm))
+-                                              /* failure here is OK */;
++                                              /* failure here is OK */{}
+                                       spares++;
+                                       md_new_event(mddev);
+                                       set_bit(MD_CHANGE_DEVS, &mddev->flags);
+diff -urNp linux-2.6.37/drivers/md/md.h linux-2.6.37/drivers/md/md.h
+--- linux-2.6.37/drivers/md/md.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/md/md.h       2011-01-17 02:41:01.000000000 -0500
+@@ -353,7 +353,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -25979,10 +25658,10 @@ diff -urNp linux-2.6.36/drivers/md/md.h linux-2.6.36/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c   2010-11-06 18:58:15.000000000 -0400
-@@ -196,6 +196,7 @@ int dvb_register_device(struct dvb_adapt
+diff -urNp linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/media/dvb/dvb-core/dvbdev.c   2011-01-17 02:41:01.000000000 -0500
+@@ -192,6 +192,7 @@ int dvb_register_device(struct dvb_adapt
                        const struct dvb_device *template, void *priv, int type)
  {
        struct dvb_device *dvbdev;
@@ -25990,34 +25669,58 @@ diff -urNp linux-2.6.36/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.36/drivers
        struct file_operations *dvbdevfops;
        struct device *clsdev;
        int minor;
-diff -urNp linux-2.6.36/drivers/media/IR/lirc_dev.c linux-2.6.36/drivers/media/IR/lirc_dev.c
---- linux-2.6.36/drivers/media/IR/lirc_dev.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/media/IR/lirc_dev.c   2010-11-06 18:58:15.000000000 -0400
-@@ -155,7 +155,7 @@ static int lirc_thread(void *irctl)
+diff -urNp linux-2.6.37/drivers/media/IR/ir-lirc-codec.c linux-2.6.37/drivers/media/IR/ir-lirc-codec.c
+--- linux-2.6.37/drivers/media/IR/ir-lirc-codec.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/media/IR/ir-lirc-codec.c      2011-01-17 02:41:01.000000000 -0500
+@@ -275,7 +275,7 @@ static void ir_lirc_close(void *data)
+       return;
+ }
+ 
+-static struct file_operations lirc_fops = {
++static const struct file_operations lirc_fops = {
+       .owner          = THIS_MODULE,
+       .write          = ir_lirc_transmit_ir,
+       .unlocked_ioctl = ir_lirc_ioctl,
+diff -urNp linux-2.6.37/drivers/media/IR/lirc_dev.c linux-2.6.37/drivers/media/IR/lirc_dev.c
+--- linux-2.6.37/drivers/media/IR/lirc_dev.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/media/IR/lirc_dev.c   2011-01-17 02:41:01.000000000 -0500
+@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
  }
  
  
--static struct file_operations fops = {
-+static const struct file_operations fops = {
+-static struct file_operations lirc_dev_fops = {
++static const struct file_operations lirc_dev_fops = {
        .owner          = THIS_MODULE,
        .read           = lirc_dev_fop_read,
        .write          = lirc_dev_fop_write,
-diff -urNp linux-2.6.36/drivers/media/radio/radio-cadet.c linux-2.6.36/drivers/media/radio/radio-cadet.c
---- linux-2.6.36/drivers/media/radio/radio-cadet.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/media/radio/radio-cadet.c     2010-11-06 18:58:50.000000000 -0400
-@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
-       while (i < count && dev->rdsin != dev->rdsout)
+diff -urNp linux-2.6.37/drivers/media/radio/radio-cadet.c linux-2.6.37/drivers/media/radio/radio-cadet.c
+--- linux-2.6.37/drivers/media/radio/radio-cadet.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/media/radio/radio-cadet.c     2011-01-17 02:41:01.000000000 -0500
+@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
                readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+       mutex_unlock(&dev->lock);
  
 -      if (copy_to_user(data, readbuf, i))
-+      if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
++      if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
                return -EFAULT;
        return i;
  }
-diff -urNp linux-2.6.36/drivers/message/fusion/mptbase.c linux-2.6.36/drivers/message/fusion/mptbase.c
---- linux-2.6.36/drivers/message/fusion/mptbase.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/message/fusion/mptbase.c      2010-11-06 19:06:37.000000000 -0400
-@@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct 
+diff -urNp linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c
+--- linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/media/video/saa7164/saa7164-core.c    2011-01-17 02:41:01.000000000 -0500
+@@ -1169,7 +1169,7 @@ static int saa7164_proc_open(struct inod
+       return single_open(filp, saa7164_proc_show, NULL);
+ }
+ 
+-static struct file_operations saa7164_proc_fops = {
++static const struct file_operations saa7164_proc_fops = {
+       .open           = saa7164_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+diff -urNp linux-2.6.37/drivers/message/fusion/mptbase.c linux-2.6.37/drivers/message/fusion/mptbase.c
+--- linux-2.6.37/drivers/message/fusion/mptbase.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/message/fusion/mptbase.c      2011-01-17 02:41:01.000000000 -0500
+@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct 
        seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
        seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
  
@@ -26031,9 +25734,9 @@ diff -urNp linux-2.6.36/drivers/message/fusion/mptbase.c linux-2.6.36/drivers/me
        /*
         *  Rounding UP to nearest 4-kB boundary here...
         */
-diff -urNp linux-2.6.36/drivers/message/fusion/mptdebug.h linux-2.6.36/drivers/message/fusion/mptdebug.h
---- linux-2.6.36/drivers/message/fusion/mptdebug.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/message/fusion/mptdebug.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/message/fusion/mptdebug.h linux-2.6.37/drivers/message/fusion/mptdebug.h
+--- linux-2.6.37/drivers/message/fusion/mptdebug.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/message/fusion/mptdebug.h     2011-01-17 02:41:01.000000000 -0500
 @@ -71,7 +71,7 @@
                CMD;                                            \
  }
@@ -26043,9 +25746,9 @@ diff -urNp linux-2.6.36/drivers/message/fusion/mptdebug.h linux-2.6.36/drivers/m
  #endif
  
  
-diff -urNp linux-2.6.36/drivers/message/fusion/mptsas.c linux-2.6.36/drivers/message/fusion/mptsas.c
---- linux-2.6.36/drivers/message/fusion/mptsas.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/message/fusion/mptsas.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/message/fusion/mptsas.c linux-2.6.37/drivers/message/fusion/mptsas.c
+--- linux-2.6.37/drivers/message/fusion/mptsas.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/message/fusion/mptsas.c       2011-01-17 02:41:01.000000000 -0500
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
                return 0;
  }
@@ -26094,9 +25797,9 @@ diff -urNp linux-2.6.36/drivers/message/fusion/mptsas.c linux-2.6.36/drivers/mes
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.36/drivers/message/fusion/mptscsih.c linux-2.6.36/drivers/message/fusion/mptscsih.c
---- linux-2.6.36/drivers/message/fusion/mptscsih.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/message/fusion/mptscsih.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/message/fusion/mptscsih.c linux-2.6.37/drivers/message/fusion/mptscsih.c
+--- linux-2.6.37/drivers/message/fusion/mptscsih.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/message/fusion/mptscsih.c     2011-01-17 02:41:01.000000000 -0500
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
        h = shost_priv(SChost);
@@ -26122,9 +25825,9 @@ diff -urNp linux-2.6.36/drivers/message/fusion/mptscsih.c linux-2.6.36/drivers/m
  
        return h->info_kbuf;
  }
-diff -urNp linux-2.6.36/drivers/message/i2o/i2o_proc.c linux-2.6.36/drivers/message/i2o/i2o_proc.c
---- linux-2.6.36/drivers/message/i2o/i2o_proc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/message/i2o/i2o_proc.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/message/i2o/i2o_proc.c linux-2.6.37/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.37/drivers/message/i2o/i2o_proc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/message/i2o/i2o_proc.c        2011-01-17 02:41:01.000000000 -0500
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
        "Array Controller Device"
  };
@@ -26211,9 +25914,9 @@ diff -urNp linux-2.6.36/drivers/message/i2o/i2o_proc.c linux-2.6.36/drivers/mess
  
        return 0;
  }
-diff -urNp linux-2.6.36/drivers/mfd/janz-cmodio.c linux-2.6.36/drivers/mfd/janz-cmodio.c
---- linux-2.6.36/drivers/mfd/janz-cmodio.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/mfd/janz-cmodio.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/mfd/janz-cmodio.c linux-2.6.37/drivers/mfd/janz-cmodio.c
+--- linux-2.6.37/drivers/mfd/janz-cmodio.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/mfd/janz-cmodio.c     2011-01-17 02:41:01.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -26222,9 +25925,9 @@ diff -urNp linux-2.6.36/drivers/mfd/janz-cmodio.c linux-2.6.36/drivers/mfd/janz-
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-2.6.36/drivers/misc/kgdbts.c linux-2.6.36/drivers/misc/kgdbts.c
---- linux-2.6.36/drivers/misc/kgdbts.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/misc/kgdbts.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/misc/kgdbts.c linux-2.6.37/drivers/misc/kgdbts.c
+--- linux-2.6.37/drivers/misc/kgdbts.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/misc/kgdbts.c 2011-01-17 02:41:01.000000000 -0500
 @@ -118,7 +118,7 @@
        } while (0)
  #define MAX_CONFIG_LEN                40
@@ -26234,7 +25937,7 @@ diff -urNp linux-2.6.36/drivers/misc/kgdbts.c linux-2.6.36/drivers/misc/kgdbts.c
  static char get_buf[BUFMAX];
  static int get_buf_cnt;
  static char put_buf[BUFMAX];
-@@ -1114,7 +1114,7 @@ static void kgdbts_post_exp_handler(void
+@@ -1103,7 +1103,7 @@ static void kgdbts_post_exp_handler(void
                module_put(THIS_MODULE);
  }
  
@@ -26243,9 +25946,9 @@ diff -urNp linux-2.6.36/drivers/misc/kgdbts.c linux-2.6.36/drivers/misc/kgdbts.c
        .name                   = "kgdbts",
        .read_char              = kgdbts_get_char,
        .write_char             = kgdbts_put_char,
-diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/misc/sgi-gru/gruhandles.c     2011-01-17 02:41:01.000000000 -0500
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
        unsigned long nsec;
  
@@ -26257,9 +25960,9 @@ diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruhandles.c linux-2.6.36/drivers/m
        if (mcs_op_statistics[op].max < nsec)
                mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/misc/sgi-gru/gruprocfs.c      2011-01-17 02:41:01.000000000 -0500
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)               printstat_val(s, &gru_stats.f, #f)
@@ -26283,9 +25986,9 @@ diff -urNp linux-2.6.36/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.36/drivers/mi
                max = mcs_op_statistics[op].max;
                seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
                           count ? total / count : 0, max);
-diff -urNp linux-2.6.36/drivers/misc/sgi-gru/grutables.h linux-2.6.36/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.36/drivers/misc/sgi-gru/grutables.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/misc/sgi-gru/grutables.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/misc/sgi-gru/grutables.h linux-2.6.37/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.37/drivers/misc/sgi-gru/grutables.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/misc/sgi-gru/grutables.h      2011-01-17 02:41:01.000000000 -0500
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -26465,9 +26168,9 @@ diff -urNp linux-2.6.36/drivers/misc/sgi-gru/grutables.h linux-2.6.36/drivers/mi
                        } while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.36/drivers/mtd/devices/doc2000.c linux-2.6.36/drivers/mtd/devices/doc2000.c
---- linux-2.6.36/drivers/mtd/devices/doc2000.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/mtd/devices/doc2000.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/mtd/devices/doc2000.c linux-2.6.37/drivers/mtd/devices/doc2000.c
+--- linux-2.6.37/drivers/mtd/devices/doc2000.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/mtd/devices/doc2000.c 2011-01-17 02:41:01.000000000 -0500
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
                /* The ECC will not be calculated correctly if less than 512 is written */
@@ -26477,9 +26180,9 @@ diff -urNp linux-2.6.36/drivers/mtd/devices/doc2000.c linux-2.6.36/drivers/mtd/d
                        printk(KERN_WARNING
                               "ECC needs a full sector write (adr: %lx size %lx)\n",
                               (long) to, (long) len);
-diff -urNp linux-2.6.36/drivers/mtd/devices/doc2001.c linux-2.6.36/drivers/mtd/devices/doc2001.c
---- linux-2.6.36/drivers/mtd/devices/doc2001.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/mtd/devices/doc2001.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/mtd/devices/doc2001.c linux-2.6.37/drivers/mtd/devices/doc2001.c
+--- linux-2.6.37/drivers/mtd/devices/doc2001.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/mtd/devices/doc2001.c 2011-01-17 02:41:01.000000000 -0500
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
        struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -26489,9 +26192,9 @@ diff -urNp linux-2.6.36/drivers/mtd/devices/doc2001.c linux-2.6.36/drivers/mtd/d
                return -EINVAL;
  
        /* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.36/drivers/mtd/nand/denali.c linux-2.6.36/drivers/mtd/nand/denali.c
---- linux-2.6.36/drivers/mtd/nand/denali.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/mtd/nand/denali.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/mtd/nand/denali.c linux-2.6.37/drivers/mtd/nand/denali.c
+--- linux-2.6.37/drivers/mtd/nand/denali.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/mtd/nand/denali.c     2011-01-17 02:41:01.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -26500,10 +26203,10 @@ diff -urNp linux-2.6.36/drivers/mtd/nand/denali.c linux-2.6.36/drivers/mtd/nand/
  
  #include "denali.h"
  
-diff -urNp linux-2.6.36/drivers/mtd/ubi/build.c linux-2.6.36/drivers/mtd/ubi/build.c
---- linux-2.6.36/drivers/mtd/ubi/build.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/mtd/ubi/build.c       2010-11-06 18:58:15.000000000 -0400
-@@ -1283,7 +1283,7 @@ module_exit(ubi_exit);
+diff -urNp linux-2.6.37/drivers/mtd/ubi/build.c linux-2.6.37/drivers/mtd/ubi/build.c
+--- linux-2.6.37/drivers/mtd/ubi/build.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/mtd/ubi/build.c       2011-01-17 02:41:01.000000000 -0500
+@@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
        char *endp;
@@ -26512,7 +26215,7 @@ diff -urNp linux-2.6.36/drivers/mtd/ubi/build.c linux-2.6.36/drivers/mtd/ubi/bui
  
        result = simple_strtoul(str, &endp, 0);
        if (str == endp || result >= INT_MAX) {
-@@ -1294,11 +1294,11 @@ static int __init bytes_str_to_int(const
+@@ -1296,11 +1296,11 @@ static int __init bytes_str_to_int(const
  
        switch (*endp) {
        case 'G':
@@ -26527,7 +26230,7 @@ diff -urNp linux-2.6.36/drivers/mtd/ubi/build.c linux-2.6.36/drivers/mtd/ubi/bui
                if (endp[1] == 'i' && endp[2] == 'B')
                        endp += 2;
        case '\0':
-@@ -1309,7 +1309,13 @@ static int __init bytes_str_to_int(const
+@@ -1311,7 +1311,13 @@ static int __init bytes_str_to_int(const
                return -EINVAL;
        }
  
@@ -26542,22 +26245,10 @@ diff -urNp linux-2.6.36/drivers/mtd/ubi/build.c linux-2.6.36/drivers/mtd/ubi/bui
  }
  
  /**
-diff -urNp linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c
---- linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/cxgb3/cxgb3_main.c        2010-11-06 18:58:50.000000000 -0400
-@@ -2296,7 +2296,7 @@ static int cxgb_extension_ioctl(struct n
-       case CHELSIO_GET_QSET_NUM:{
-               struct ch_reg edata;
- 
--              memset(&edata, 0, sizeof(struct ch_reg));
-+              memset(&edata, 0, sizeof(edata));
- 
-               edata.cmd = CHELSIO_GET_QSET_NUM;
-               edata.val = pi->nqsets;
-diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e1000e/82571.c
---- linux-2.6.36/drivers/net/e1000e/82571.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/e1000e/82571.c    2010-11-06 18:58:15.000000000 -0400
-@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_82571(s
+diff -urNp linux-2.6.37/drivers/net/e1000e/82571.c linux-2.6.37/drivers/net/e1000e/82571.c
+--- linux-2.6.37/drivers/net/e1000e/82571.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/e1000e/82571.c    2011-01-17 02:41:01.000000000 -0500
+@@ -211,6 +211,7 @@ static s32 e1000_init_mac_params_82571(s
  {
        struct e1000_hw *hw = &adapter->hw;
        struct e1000_mac_info *mac = &hw->mac;
@@ -26565,7 +26256,7 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        struct e1000_mac_operations *func = &mac->ops;
        u32 swsm = 0;
        u32 swsm2 = 0;
-@@ -1703,7 +1704,7 @@ static void e1000_clear_hw_cntrs_82571(s
+@@ -1740,7 +1741,7 @@ static void e1000_clear_hw_cntrs_82571(s
        er32(ICRXDMTC);
  }
  
@@ -26574,7 +26265,7 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        /* .check_mng_mode: mac type dependent */
        /* .check_for_link: media type dependent */
        .id_led_init            = e1000e_id_led_init,
-@@ -1725,7 +1726,7 @@ static struct e1000_mac_operations e8257
+@@ -1762,7 +1763,7 @@ static struct e1000_mac_operations e8257
        .read_mac_addr          = e1000_read_mac_addr_82571,
  };
  
@@ -26583,7 +26274,7 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_igp,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1743,7 +1744,7 @@ static struct e1000_phy_operations e82_p
+@@ -1780,7 +1781,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -26592,7 +26283,7 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_m88,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1761,7 +1762,7 @@ static struct e1000_phy_operations e82_p
+@@ -1798,7 +1799,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -26601,7 +26292,7 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_m88,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1779,7 +1780,7 @@ static struct e1000_phy_operations e82_p
+@@ -1816,7 +1817,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -26610,10 +26301,10 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/82571.c linux-2.6.36/drivers/net/e100
        .acquire                = e1000_acquire_nvm_82571,
        .read                   = e1000e_read_nvm_eerd,
        .release                = e1000_release_nvm_82571,
-diff -urNp linux-2.6.36/drivers/net/e1000e/e1000.h linux-2.6.36/drivers/net/e1000e/e1000.h
---- linux-2.6.36/drivers/net/e1000e/e1000.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/e1000e/e1000.h    2010-11-06 18:58:15.000000000 -0400
-@@ -379,9 +379,9 @@ struct e1000_info {
+diff -urNp linux-2.6.37/drivers/net/e1000e/e1000.h linux-2.6.37/drivers/net/e1000e/e1000.h
+--- linux-2.6.37/drivers/net/e1000e/e1000.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/e1000e/e1000.h    2011-01-17 02:41:01.000000000 -0500
+@@ -407,9 +407,9 @@ struct e1000_info {
        u32                     pba;
        u32                     max_hw_frame_size;
        s32                     (*get_variants)(struct e1000_adapter *);
@@ -26626,9 +26317,9 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/e1000.h linux-2.6.36/drivers/net/e100
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.36/drivers/net/e1000e/es2lan.c linux-2.6.36/drivers/net/e1000e/es2lan.c
---- linux-2.6.36/drivers/net/e1000e/es2lan.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/e1000e/es2lan.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/e1000e/es2lan.c linux-2.6.37/drivers/net/e1000e/es2lan.c
+--- linux-2.6.37/drivers/net/e1000e/es2lan.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/e1000e/es2lan.c   2011-01-17 02:41:01.000000000 -0500
 @@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -26664,10 +26355,10 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/es2lan.c linux-2.6.36/drivers/net/e10
        .acquire                = e1000_acquire_nvm_80003es2lan,
        .read                   = e1000e_read_nvm_eerd,
        .release                = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.36/drivers/net/e1000e/hw.h linux-2.6.36/drivers/net/e1000e/hw.h
---- linux-2.6.36/drivers/net/e1000e/hw.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/e1000e/hw.h       2010-11-06 18:58:15.000000000 -0400
-@@ -800,13 +800,13 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.37/drivers/net/e1000e/hw.h linux-2.6.37/drivers/net/e1000e/hw.h
+--- linux-2.6.37/drivers/net/e1000e/hw.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/e1000e/hw.h       2011-01-17 02:41:01.000000000 -0500
+@@ -800,16 +800,17 @@ struct e1000_phy_operations {
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
@@ -26688,7 +26379,19 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/hw.h linux-2.6.36/drivers/net/e1000e/
  };
  
  struct e1000_mac_info {
-@@ -886,6 +886,7 @@ struct e1000_phy_info {
++      /* cannot be const see e1000_init_mac_params_ich8lan */
+       struct e1000_mac_operations ops;
+ 
+       u8 addr[6];
+@@ -852,6 +853,7 @@ struct e1000_mac_info {
+ };
+ 
+ struct e1000_phy_info {
++      /* Cannot be const see e1000_init_phy_params_82571() */
+       struct e1000_phy_operations ops;
+ 
+       enum e1000_phy_type type;
+@@ -886,6 +888,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -26696,9 +26399,9 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/hw.h linux-2.6.36/drivers/net/e1000e/
        struct e1000_nvm_operations ops;
  
        enum e1000_nvm_type type;
-diff -urNp linux-2.6.36/drivers/net/e1000e/ich8lan.c linux-2.6.36/drivers/net/e1000e/ich8lan.c
---- linux-2.6.36/drivers/net/e1000e/ich8lan.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/e1000e/ich8lan.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/e1000e/ich8lan.c linux-2.6.37/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.37/drivers/net/e1000e/ich8lan.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/e1000e/ich8lan.c  2011-01-17 02:41:01.000000000 -0500
 @@ -3856,7 +3856,7 @@ static void e1000_clear_hw_cntrs_ich8lan
        }
  }
@@ -26726,22 +26429,10 @@ diff -urNp linux-2.6.36/drivers/net/e1000e/ich8lan.c linux-2.6.36/drivers/net/e1
        .acquire                = e1000_acquire_nvm_ich8lan,
        .read                   = e1000_read_nvm_ich8lan,
        .release                = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.36/drivers/net/eql.c linux-2.6.36/drivers/net/eql.c
---- linux-2.6.36/drivers/net/eql.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/eql.c     2010-11-06 18:58:50.000000000 -0400
-@@ -555,7 +555,7 @@ static int eql_g_master_cfg(struct net_d
-       equalizer_t *eql;
-       master_config_t mc;
- 
--      memset(&mc, 0, sizeof(master_config_t));
-+      memset(&mc, 0, sizeof(mc));
- 
-       if (eql_is_master(dev)) {
-               eql = netdev_priv(dev);
-diff -urNp linux-2.6.36/drivers/net/igb/e1000_82575.c linux-2.6.36/drivers/net/igb/e1000_82575.c
---- linux-2.6.36/drivers/net/igb/e1000_82575.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/igb/e1000_82575.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1698,7 +1698,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
+diff -urNp linux-2.6.37/drivers/net/igb/e1000_82575.c linux-2.6.37/drivers/net/igb/e1000_82575.c
+--- linux-2.6.37/drivers/net/igb/e1000_82575.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/igb/e1000_82575.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1712,7 +1712,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
        return ret_val;
  }
  
@@ -26750,7 +26441,7 @@ diff -urNp linux-2.6.36/drivers/net/igb/e1000_82575.c linux-2.6.36/drivers/net/i
        .init_hw              = igb_init_hw_82575,
        .check_for_link       = igb_check_for_link_82575,
        .rar_set              = igb_rar_set,
-@@ -1706,13 +1706,13 @@ static struct e1000_mac_operations e1000
+@@ -1720,13 +1720,13 @@ static struct e1000_mac_operations e1000
        .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
  };
  
@@ -26766,10 +26457,10 @@ diff -urNp linux-2.6.36/drivers/net/igb/e1000_82575.c linux-2.6.36/drivers/net/i
        .acquire              = igb_acquire_nvm_82575,
        .read                 = igb_read_nvm_eerd,
        .release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.36/drivers/net/igb/e1000_hw.h linux-2.6.36/drivers/net/igb/e1000_hw.h
---- linux-2.6.36/drivers/net/igb/e1000_hw.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/igb/e1000_hw.h    2010-11-06 18:58:15.000000000 -0400
-@@ -323,17 +323,17 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.37/drivers/net/igb/e1000_hw.h linux-2.6.37/drivers/net/igb/e1000_hw.h
+--- linux-2.6.37/drivers/net/igb/e1000_hw.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/igb/e1000_hw.h    2011-01-17 02:41:01.000000000 -0500
+@@ -325,22 +325,23 @@ struct e1000_phy_operations {
  };
  
  struct e1000_nvm_operations {
@@ -26794,7 +26485,21 @@ diff -urNp linux-2.6.36/drivers/net/igb/e1000_hw.h linux-2.6.36/drivers/net/igb/
  };
  
  extern const struct e1000_info e1000_82575_info;
-@@ -412,6 +412,7 @@ struct e1000_phy_info {
+ 
+ struct e1000_mac_info {
++      /* cannot be const see igb_get_invariants_82575() */
+       struct e1000_mac_operations ops;
+ 
+       u8 addr[6];
+@@ -379,6 +380,7 @@ struct e1000_mac_info {
+ };
+ 
+ struct e1000_phy_info {
++      /* cannot be const see igb_get_invariants_82575() */
+       struct e1000_phy_operations ops;
+ 
+       enum e1000_phy_type type;
+@@ -414,6 +416,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -26802,9 +26507,20 @@ diff -urNp linux-2.6.36/drivers/net/igb/e1000_hw.h linux-2.6.36/drivers/net/igb/
        struct e1000_nvm_operations ops;
  
        enum e1000_nvm_type type;
-diff -urNp linux-2.6.36/drivers/net/irda/vlsi_ir.c linux-2.6.36/drivers/net/irda/vlsi_ir.c
---- linux-2.6.36/drivers/net/irda/vlsi_ir.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/irda/vlsi_ir.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/igbvf/vf.h linux-2.6.37/drivers/net/igbvf/vf.h
+--- linux-2.6.37/drivers/net/igbvf/vf.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/igbvf/vf.h        2011-01-17 02:41:01.000000000 -0500
+@@ -189,6 +189,7 @@ struct e1000_mac_operations {
+ };
+ 
+ struct e1000_mac_info {
++      /* cannot be const see e1000_init_mac_params_vf() */
+       struct e1000_mac_operations ops;
+       u8 addr[6];
+       u8 perm_addr[6];
+diff -urNp linux-2.6.37/drivers/net/irda/vlsi_ir.c linux-2.6.37/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.37/drivers/net/irda/vlsi_ir.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/irda/vlsi_ir.c    2011-01-17 02:41:01.000000000 -0500
 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
                        /* no race - tx-ring already empty */
                        vlsi_set_baud(idev, iobase);
@@ -26821,9 +26537,23 @@ diff -urNp linux-2.6.36/drivers/net/irda/vlsi_ir.c linux-2.6.36/drivers/net/irda
                spin_unlock_irqrestore(&idev->lock, flags);
                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
-diff -urNp linux-2.6.36/drivers/net/pcnet32.c linux-2.6.36/drivers/net/pcnet32.c
---- linux-2.6.36/drivers/net/pcnet32.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/pcnet32.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/macvtap.c linux-2.6.37/drivers/net/macvtap.c
+--- linux-2.6.37/drivers/net/macvtap.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/macvtap.c 2011-01-17 02:41:01.000000000 -0500
+@@ -529,8 +529,9 @@ static ssize_t macvtap_get_user(struct m
+               vnet_hdr_len = q->vnet_hdr_sz;
+ 
+               err = -EINVAL;
+-              if ((len -= vnet_hdr_len) < 0)
++              if (len < vnet_hdr_len)
+                       goto err;
++              len -= vnet_hdr_len;
+ 
+               err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,
+                                          sizeof(vnet_hdr));
+diff -urNp linux-2.6.37/drivers/net/pcnet32.c linux-2.6.37/drivers/net/pcnet32.c
+--- linux-2.6.37/drivers/net/pcnet32.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/pcnet32.c 2011-01-17 02:41:01.000000000 -0500
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -26833,10 +26563,10 @@ diff -urNp linux-2.6.36/drivers/net/pcnet32.c linux-2.6.36/drivers/net/pcnet32.c
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug;
-diff -urNp linux-2.6.36/drivers/net/ppp_generic.c linux-2.6.36/drivers/net/ppp_generic.c
---- linux-2.6.36/drivers/net/ppp_generic.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/ppp_generic.c     2010-11-06 18:58:15.000000000 -0400
-@@ -985,7 +985,6 @@ ppp_net_ioctl(struct net_device *dev, st
+diff -urNp linux-2.6.37/drivers/net/ppp_generic.c linux-2.6.37/drivers/net/ppp_generic.c
+--- linux-2.6.37/drivers/net/ppp_generic.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/ppp_generic.c     2011-01-17 02:41:01.000000000 -0500
+@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
        void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
        struct ppp_stats stats;
        struct ppp_comp_stats cstats;
@@ -26844,7 +26574,7 @@ diff -urNp linux-2.6.36/drivers/net/ppp_generic.c linux-2.6.36/drivers/net/ppp_g
  
        switch (cmd) {
        case SIOCGPPPSTATS:
-@@ -1007,8 +1006,7 @@ ppp_net_ioctl(struct net_device *dev, st
+@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, st
                break;
  
        case SIOCGPPPVER:
@@ -26854,21 +26584,9 @@ diff -urNp linux-2.6.36/drivers/net/ppp_generic.c linux-2.6.36/drivers/net/ppp_g
                        break;
                err = 0;
                break;
-diff -urNp linux-2.6.36/drivers/net/tg3.c linux-2.6.36/drivers/net/tg3.c
---- linux-2.6.36/drivers/net/tg3.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/tg3.c     2010-11-06 18:58:15.000000000 -0400
-@@ -12433,7 +12433,7 @@ static void __devinit tg3_read_vpd(struc
-                       cnt = pci_read_vpd(tp->pdev, pos,
-                                          TG3_NVM_VPD_LEN - pos,
-                                          &vpd_data[pos]);
--                      if (cnt == -ETIMEDOUT || -EINTR)
-+                      if (cnt == -ETIMEDOUT || cnt == -EINTR)
-                               cnt = 0;
-                       else if (cnt < 0)
-                               goto out_not_found;
-diff -urNp linux-2.6.36/drivers/net/tg3.h linux-2.6.36/drivers/net/tg3.h
---- linux-2.6.36/drivers/net/tg3.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/tg3.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/tg3.h linux-2.6.37/drivers/net/tg3.h
+--- linux-2.6.37/drivers/net/tg3.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/tg3.h     2011-01-17 02:41:01.000000000 -0500
 @@ -131,6 +131,7 @@
  #define  CHIPREV_ID_5750_A0            0x4000
  #define  CHIPREV_ID_5750_A1            0x4001
@@ -26877,15 +26595,15 @@ diff -urNp linux-2.6.36/drivers/net/tg3.h linux-2.6.36/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2            0x4202
  #define  CHIPREV_ID_5752_A0_HW                 0x5000
  #define  CHIPREV_ID_5752_A0            0x6000
-diff -urNp linux-2.6.36/drivers/net/tulip/de4x5.c linux-2.6.36/drivers/net/tulip/de4x5.c
---- linux-2.6.36/drivers/net/tulip/de4x5.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/tulip/de4x5.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/tulip/de4x5.c linux-2.6.37/drivers/net/tulip/de4x5.c
+--- linux-2.6.37/drivers/net/tulip/de4x5.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/tulip/de4x5.c     2011-01-17 02:41:01.000000000 -0500
 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
        for (i=0; i<ETH_ALEN; i++) {
            tmp.addr[i] = dev->dev_addr[i];
        }
 -      if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
-+      if (ioc->len > sizeof(tmp.addr) || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
++      if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
        break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
@@ -26894,22 +26612,13 @@ diff -urNp linux-2.6.36/drivers/net/tulip/de4x5.c linux-2.6.36/drivers/net/tulip
        memcpy(&statbuf, &lp->pktStats, ioc->len);
        spin_unlock_irqrestore(&lp->lock, flags);
 -      if (copy_to_user(ioc->data, &statbuf, ioc->len))
-+      if (ioc->len > sizeof(statbuf) || copy_to_user(ioc->data, &statbuf, ioc->len))
++      if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
                return -EFAULT;
        break;
      }
-@@ -5474,7 +5474,7 @@ de4x5_ioctl(struct net_device *dev, stru
-       tmp.lval[6] = inl(DE4X5_STRR); j+=4;
-       tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
-       ioc->len = j;
--      if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
-+      if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
-       break;
- 
- #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
-diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
---- linux-2.6.36/drivers/net/usb/hso.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/usb/hso.c 2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/usb/hso.c linux-2.6.37/drivers/net/usb/hso.c
+--- linux-2.6.37/drivers/net/usb/hso.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/usb/hso.c 2011-01-17 02:41:01.000000000 -0500
 @@ -257,7 +257,7 @@ struct hso_serial {
  
        /* from usb_serial_port */
@@ -26919,7 +26628,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
        spinlock_t serial_lock;
  
        int (*write_data) (struct hso_serial *serial);
-@@ -1200,7 +1200,7 @@ static void put_rxbuf_data_and_resubmit_
+@@ -1187,7 +1187,7 @@ static void put_rxbuf_data_and_resubmit_
        struct urb *urb;
  
        urb = serial->rx_urb[0];
@@ -26928,7 +26637,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                count = put_rxbuf_data(urb, serial);
                if (count == -1)
                        return;
-@@ -1236,7 +1236,7 @@ static void hso_std_serial_read_bulk_cal
+@@ -1223,7 +1223,7 @@ static void hso_std_serial_read_bulk_cal
        DUMP1(urb->transfer_buffer, urb->actual_length);
  
        /* Anyone listening? */
@@ -26937,7 +26646,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                return;
  
        if (status == 0) {
-@@ -1331,8 +1331,7 @@ static int hso_serial_open(struct tty_st
+@@ -1318,8 +1318,7 @@ static int hso_serial_open(struct tty_st
        spin_unlock_irq(&serial->serial_lock);
  
        /* check for port already opened, if not set the termios */
@@ -26947,7 +26656,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                serial->rx_state = RX_IDLE;
                /* Force default termio settings */
                _hso_serial_set_termios(tty, NULL);
-@@ -1344,7 +1343,7 @@ static int hso_serial_open(struct tty_st
+@@ -1331,7 +1330,7 @@ static int hso_serial_open(struct tty_st
                result = hso_start_serial_device(serial->parent, GFP_KERNEL);
                if (result) {
                        hso_stop_serial_device(serial->parent);
@@ -26956,7 +26665,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                        kref_put(&serial->parent->ref, hso_serial_ref_free);
                }
        } else {
-@@ -1381,10 +1380,10 @@ static void hso_serial_close(struct tty_
+@@ -1368,10 +1367,10 @@ static void hso_serial_close(struct tty_
  
        /* reset the rts and dtr */
        /* do the actual close */
@@ -26970,7 +26679,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                spin_lock_irq(&serial->serial_lock);
                if (serial->tty == tty) {
                        serial->tty->driver_data = NULL;
-@@ -1466,7 +1465,7 @@ static void hso_serial_set_termios(struc
+@@ -1453,7 +1452,7 @@ static void hso_serial_set_termios(struc
  
        /* the actual setup */
        spin_lock_irqsave(&serial->serial_lock, flags);
@@ -26979,21 +26688,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                _hso_serial_set_termios(tty, old);
        else
                tty->termios = old;
-@@ -1652,10 +1651,11 @@ static int hso_get_count(struct hso_seri
-       struct uart_icount cnow;
-       struct hso_tiocmget  *tiocmget = serial->tiocmget;
- 
--      memset(&icount, 0, sizeof(struct serial_icounter_struct));
--
-       if (!tiocmget)
-                return -ENOENT;
-+
-+      memset(&icount, 0, sizeof(icount));
-+
-       spin_lock_irq(&serial->serial_lock);
-       memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
-       spin_unlock_irq(&serial->serial_lock);
-@@ -1930,7 +1930,7 @@ static void intr_callback(struct urb *ur
+@@ -1913,7 +1912,7 @@ static void intr_callback(struct urb *ur
                                D1("Pending read interrupt on port %d\n", i);
                                spin_lock(&serial->serial_lock);
                                if (serial->rx_state == RX_IDLE &&
@@ -27002,7 +26697,7 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                                        /* Setup and send a ctrl req read on
                                         * port i */
                                        if (!serial->rx_urb_filled[0]) {
-@@ -3120,7 +3120,7 @@ static int hso_resume(struct usb_interfa
+@@ -3105,7 +3104,7 @@ static int hso_resume(struct usb_interfa
        /* Start all serial ports */
        for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
                if (serial_table[i] && (serial_table[i]->interface == iface)) {
@@ -27011,9 +26706,9 @@ diff -urNp linux-2.6.36/drivers/net/usb/hso.c linux-2.6.36/drivers/net/usb/hso.c
                                result =
                                    hso_start_serial_device(serial_table[i], GFP_NOIO);
                                hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.36/drivers/net/wireless/b43/debugfs.c linux-2.6.36/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.36/drivers/net/wireless/b43/debugfs.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/wireless/b43/debugfs.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/wireless/b43/debugfs.c linux-2.6.37/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.37/drivers/net/wireless/b43/debugfs.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/wireless/b43/debugfs.c    2011-01-17 02:41:01.000000000 -0500
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
        ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -27023,9 +26718,9 @@ diff -urNp linux-2.6.36/drivers/net/wireless/b43/debugfs.c linux-2.6.36/drivers/
        /* Offset of struct b43_dfs_file in struct b43_dfsentry */
        size_t file_struct_offset;
  };
-diff -urNp linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/wireless/b43legacy/debugfs.c      2011-01-17 02:41:01.000000000 -0500
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
        ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -27035,9 +26730,9 @@ diff -urNp linux-2.6.36/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.36/dr
        /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
        size_t file_struct_offset;
        /* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/wireless/iwlwifi/iwl-debug.h      2011-01-17 02:41:01.000000000 -0500
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -27049,10 +26744,10 @@ diff -urNp linux-2.6.36/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.36/dr
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
                                      const void *p, u32 len)
  {}
-diff -urNp linux-2.6.36/drivers/net/wireless/libertas/debugfs.c linux-2.6.36/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.36/drivers/net/wireless/libertas/debugfs.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/wireless/libertas/debugfs.c       2010-11-06 18:58:15.000000000 -0400
-@@ -701,7 +701,7 @@ out_unlock:
+diff -urNp linux-2.6.37/drivers/net/wireless/libertas/debugfs.c linux-2.6.37/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.37/drivers/net/wireless/libertas/debugfs.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/wireless/libertas/debugfs.c       2011-01-17 02:41:01.000000000 -0500
+@@ -702,7 +702,7 @@ out_unlock:
  struct lbs_debugfs_files {
        const char *name;
        int perm;
@@ -27061,9 +26756,9 @@ diff -urNp linux-2.6.36/drivers/net/wireless/libertas/debugfs.c linux-2.6.36/dri
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.36/drivers/net/wireless/rndis_wlan.c linux-2.6.36/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.36/drivers/net/wireless/rndis_wlan.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/net/wireless/rndis_wlan.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/net/wireless/rndis_wlan.c linux-2.6.37/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.37/drivers/net/wireless/rndis_wlan.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/net/wireless/rndis_wlan.c     2011-01-17 02:41:01.000000000 -0500
 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbn
  
        netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -27073,9 +26768,9 @@ diff -urNp linux-2.6.36/drivers/net/wireless/rndis_wlan.c linux-2.6.36/drivers/n
                rts_threshold = 2347;
  
        tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.36/drivers/oprofile/buffer_sync.c linux-2.6.36/drivers/oprofile/buffer_sync.c
---- linux-2.6.36/drivers/oprofile/buffer_sync.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/buffer_sync.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/oprofile/buffer_sync.c linux-2.6.37/drivers/oprofile/buffer_sync.c
+--- linux-2.6.37/drivers/oprofile/buffer_sync.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/buffer_sync.c        2011-01-17 02:41:01.000000000 -0500
 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
                if (cookie == NO_COOKIE)
                        offset = pc;
@@ -27111,9 +26806,9 @@ diff -urNp linux-2.6.36/drivers/oprofile/buffer_sync.c linux-2.6.36/drivers/opro
                }
        }
        release_mm(mm);
-diff -urNp linux-2.6.36/drivers/oprofile/event_buffer.c linux-2.6.36/drivers/oprofile/event_buffer.c
---- linux-2.6.36/drivers/oprofile/event_buffer.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/event_buffer.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/oprofile/event_buffer.c linux-2.6.37/drivers/oprofile/event_buffer.c
+--- linux-2.6.37/drivers/oprofile/event_buffer.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/event_buffer.c       2011-01-17 02:41:01.000000000 -0500
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
        }
  
@@ -27123,9 +26818,9 @@ diff -urNp linux-2.6.36/drivers/oprofile/event_buffer.c linux-2.6.36/drivers/opr
                return;
        }
  
-diff -urNp linux-2.6.36/drivers/oprofile/oprof.c linux-2.6.36/drivers/oprofile/oprof.c
---- linux-2.6.36/drivers/oprofile/oprof.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/oprof.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/oprofile/oprof.c linux-2.6.37/drivers/oprofile/oprof.c
+--- linux-2.6.37/drivers/oprofile/oprof.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/oprof.c      2011-01-17 02:41:01.000000000 -0500
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
        if (oprofile_ops.switch_events())
                return;
@@ -27135,21 +26830,21 @@ diff -urNp linux-2.6.36/drivers/oprofile/oprof.c linux-2.6.36/drivers/oprofile/o
        start_switch_worker();
  }
  
-diff -urNp linux-2.6.36/drivers/oprofile/oprofilefs.c linux-2.6.36/drivers/oprofile/oprofilefs.c
---- linux-2.6.36/drivers/oprofile/oprofilefs.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/oprofilefs.c 2010-11-06 18:58:15.000000000 -0400
-@@ -187,7 +187,7 @@ static const struct file_operations atom
+diff -urNp linux-2.6.37/drivers/oprofile/oprofilefs.c linux-2.6.37/drivers/oprofile/oprofilefs.c
+--- linux-2.6.37/drivers/oprofile/oprofilefs.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/oprofilefs.c 2011-01-17 02:41:01.000000000 -0500
+@@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
  int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
 -      char const *name, atomic_t *val)
 +      char const *name, atomic_unchecked_t *val)
  {
-       struct dentry *d = __oprofilefs_create_file(sb, root, name,
-                                                    &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.c linux-2.6.36/drivers/oprofile/oprofile_stats.c
---- linux-2.6.36/drivers/oprofile/oprofile_stats.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/oprofile_stats.c     2010-11-06 18:58:15.000000000 -0400
+       return __oprofilefs_create_file(sb, root, name,
+                                       &atomic_ro_fops, 0444, val);
+diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.c linux-2.6.37/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.37/drivers/oprofile/oprofile_stats.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/oprofile_stats.c     2011-01-17 02:41:01.000000000 -0500
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
                cpu_buf->sample_invalid_eip = 0;
        }
@@ -27167,9 +26862,9 @@ diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.c linux-2.6.36/drivers/o
  }
  
  
-diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.h linux-2.6.36/drivers/oprofile/oprofile_stats.h
---- linux-2.6.36/drivers/oprofile/oprofile_stats.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/oprofile/oprofile_stats.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/oprofile/oprofile_stats.h linux-2.6.37/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.37/drivers/oprofile/oprofile_stats.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/oprofile/oprofile_stats.h     2011-01-17 02:41:01.000000000 -0500
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -27187,15 +26882,15 @@ diff -urNp linux-2.6.36/drivers/oprofile/oprofile_stats.h linux-2.6.36/drivers/o
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.36/drivers/parport/procfs.c linux-2.6.36/drivers/parport/procfs.c
---- linux-2.6.36/drivers/parport/procfs.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/parport/procfs.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/drivers/parport/procfs.c linux-2.6.37/drivers/parport/procfs.c
+--- linux-2.6.37/drivers/parport/procfs.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/parport/procfs.c      2011-01-17 02:41:01.000000000 -0500
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
        *ppos += len;
  
 -      return copy_to_user(result, buffer, len) ? -EFAULT : 0;
-+      return (len > sizeof(buffer) || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
++      return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
  }
  
  #ifdef CONFIG_PARPORT_1284
@@ -27204,13 +26899,13 @@ diff -urNp linux-2.6.36/drivers/parport/procfs.c linux-2.6.36/drivers/parport/pr
        *ppos += len;
  
 -      return copy_to_user (result, buffer, len) ? -EFAULT : 0;
-+      return (len > sizeof(buffer) || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
++      return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/hotplug/acpiphp_glue.c    2011-01-17 02:41:01.000000000 -0500
 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
  }
  
@@ -27220,9 +26915,9 @@ diff -urNp linux-2.6.36/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.36/drivers/
        .handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/hotplug/cpqphp_nvram.c    2011-01-17 02:41:01.000000000 -0500
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -27237,9 +26932,9 @@ diff -urNp linux-2.6.36/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.36/drivers/
        dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
        /* initialize our int15 lock */
-diff -urNp linux-2.6.36/drivers/pci/intel-iommu.c linux-2.6.36/drivers/pci/intel-iommu.c
---- linux-2.6.36/drivers/pci/intel-iommu.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/intel-iommu.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pci/intel-iommu.c linux-2.6.37/drivers/pci/intel-iommu.c
+--- linux-2.6.37/drivers/pci/intel-iommu.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/intel-iommu.c     2011-01-17 02:41:01.000000000 -0500
 @@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
        return !dma_addr;
  }
@@ -27249,9 +26944,9 @@ diff -urNp linux-2.6.36/drivers/pci/intel-iommu.c linux-2.6.36/drivers/pci/intel
        .alloc_coherent = intel_alloc_coherent,
        .free_coherent = intel_free_coherent,
        .map_sg = intel_map_sg,
-diff -urNp linux-2.6.36/drivers/pci/pcie/portdrv_pci.c linux-2.6.36/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.36/drivers/pci/pcie/portdrv_pci.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/pcie/portdrv_pci.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pci/pcie/portdrv_pci.c linux-2.6.37/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.37/drivers/pci/pcie/portdrv_pci.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/pcie/portdrv_pci.c        2011-01-17 02:41:01.000000000 -0500
 @@ -276,7 +276,7 @@ static void pcie_portdrv_err_resume(stru
  static const struct pci_device_id port_pci_ids[] = { {
        /* handle any PCI-Express port */
@@ -27261,9 +26956,9 @@ diff -urNp linux-2.6.36/drivers/pci/pcie/portdrv_pci.c linux-2.6.36/drivers/pci/
  };
  MODULE_DEVICE_TABLE(pci, port_pci_ids);
  
-diff -urNp linux-2.6.36/drivers/pci/probe.c linux-2.6.36/drivers/pci/probe.c
---- linux-2.6.36/drivers/pci/probe.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/probe.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pci/probe.c linux-2.6.37/drivers/pci/probe.c
+--- linux-2.6.37/drivers/pci/probe.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/probe.c   2011-01-17 02:41:01.000000000 -0500
 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
        return ret;
  }
@@ -27281,10 +26976,19 @@ diff -urNp linux-2.6.36/drivers/pci/probe.c linux-2.6.36/drivers/pci/probe.c
                                        struct device_attribute *attr,
                                        char *buf)
  {
-diff -urNp linux-2.6.36/drivers/pci/proc.c linux-2.6.36/drivers/pci/proc.c
---- linux-2.6.36/drivers/pci/proc.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pci/proc.c    2010-11-06 18:58:50.000000000 -0400
-@@ -479,7 +479,16 @@ static const struct file_operations proc
+@@ -165,7 +165,7 @@ int __pci_read_base(struct pci_dev *dev,
+       u32 l, sz, mask;
+       u16 orig_cmd;
+ 
+-      mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
++      mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
+ 
+       if (!dev->mmio_always_on) {
+               pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
+diff -urNp linux-2.6.37/drivers/pci/proc.c linux-2.6.37/drivers/pci/proc.c
+--- linux-2.6.37/drivers/pci/proc.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pci/proc.c    2011-01-17 02:41:01.000000000 -0500
+@@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
        struct pci_dev *dev = NULL;
@@ -27301,9 +27005,9 @@ diff -urNp linux-2.6.36/drivers/pci/proc.c linux-2.6.36/drivers/pci/proc.c
        proc_create("devices", 0, proc_bus_pci_dir,
                    &proc_bus_pci_dev_operations);
        proc_initialized = 1;
-diff -urNp linux-2.6.36/drivers/pcmcia/ti113x.h linux-2.6.36/drivers/pcmcia/ti113x.h
---- linux-2.6.36/drivers/pcmcia/ti113x.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pcmcia/ti113x.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pcmcia/ti113x.h linux-2.6.37/drivers/pcmcia/ti113x.h
+--- linux-2.6.37/drivers/pcmcia/ti113x.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pcmcia/ti113x.h       2011-01-17 02:41:01.000000000 -0500
 @@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
        DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
                ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -27313,10 +27017,10 @@ diff -urNp linux-2.6.36/drivers/pcmcia/ti113x.h linux-2.6.36/drivers/pcmcia/ti11
  };
  
  static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.36/drivers/pcmcia/yenta_socket.c linux-2.6.36/drivers/pcmcia/yenta_socket.c
---- linux-2.6.36/drivers/pcmcia/yenta_socket.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pcmcia/yenta_socket.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1427,7 +1427,7 @@ static struct pci_device_id yenta_table[
+diff -urNp linux-2.6.37/drivers/pcmcia/yenta_socket.c linux-2.6.37/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.37/drivers/pcmcia/yenta_socket.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pcmcia/yenta_socket.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1426,7 +1426,7 @@ static struct pci_device_id yenta_table[
  
        /* match any cardbus bridge */
        CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT),
@@ -27325,9 +27029,9 @@ diff -urNp linux-2.6.36/drivers/pcmcia/yenta_socket.c linux-2.6.36/drivers/pcmci
  };
  MODULE_DEVICE_TABLE(pci, yenta_table);
  
-diff -urNp linux-2.6.36/drivers/platform/x86/acer-wmi.c linux-2.6.36/drivers/platform/x86/acer-wmi.c
---- linux-2.6.36/drivers/platform/x86/acer-wmi.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/acer-wmi.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/platform/x86/acer-wmi.c linux-2.6.37/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.37/drivers/platform/x86/acer-wmi.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/acer-wmi.c       2011-01-17 02:41:01.000000000 -0500
 @@ -915,7 +915,7 @@ static int update_bl_status(struct backl
        return 0;
  }
@@ -27337,9 +27041,9 @@ diff -urNp linux-2.6.36/drivers/platform/x86/acer-wmi.c linux-2.6.36/drivers/pla
        .get_brightness = read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/asus_acpi.c linux-2.6.36/drivers/platform/x86/asus_acpi.c
---- linux-2.6.36/drivers/platform/x86/asus_acpi.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/asus_acpi.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/platform/x86/asus_acpi.c linux-2.6.37/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.37/drivers/platform/x86/asus_acpi.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/asus_acpi.c      2011-01-17 02:41:01.000000000 -0500
 @@ -1467,7 +1467,7 @@ static int asus_hotk_remove(struct acpi_
        return 0;
  }
@@ -27349,10 +27053,10 @@ diff -urNp linux-2.6.36/drivers/platform/x86/asus_acpi.c linux-2.6.36/drivers/pl
        .get_brightness = read_brightness,
        .update_status  = set_brightness_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/asus-laptop.c linux-2.6.36/drivers/platform/x86/asus-laptop.c
---- linux-2.6.36/drivers/platform/x86/asus-laptop.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/asus-laptop.c    2010-11-06 18:58:15.000000000 -0400
-@@ -224,7 +224,6 @@ struct asus_laptop {
+diff -urNp linux-2.6.37/drivers/platform/x86/asus-laptop.c linux-2.6.37/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.37/drivers/platform/x86/asus-laptop.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/asus-laptop.c    2011-01-17 02:41:01.000000000 -0500
+@@ -243,7 +243,6 @@ struct asus_laptop {
        struct asus_led gled;
        struct asus_led kled;
        struct workqueue_struct *led_workqueue;
@@ -27360,7 +27064,7 @@ diff -urNp linux-2.6.36/drivers/platform/x86/asus-laptop.c linux-2.6.36/drivers/
        int wireless_status;
        bool have_rsts;
        int lcd_state;
-@@ -621,7 +620,7 @@ static int update_bl_status(struct backl
+@@ -640,7 +639,7 @@ static int update_bl_status(struct backl
        return asus_lcd_set(asus, value);
  }
  
@@ -27369,10 +27073,10 @@ diff -urNp linux-2.6.36/drivers/platform/x86/asus-laptop.c linux-2.6.36/drivers/
        .get_brightness = asus_read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/dell-laptop.c linux-2.6.36/drivers/platform/x86/dell-laptop.c
---- linux-2.6.36/drivers/platform/x86/dell-laptop.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/dell-laptop.c    2010-11-06 18:58:15.000000000 -0400
-@@ -475,7 +475,7 @@ out:
+diff -urNp linux-2.6.37/drivers/platform/x86/dell-laptop.c linux-2.6.37/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.37/drivers/platform/x86/dell-laptop.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/dell-laptop.c    2011-01-17 02:41:01.000000000 -0500
+@@ -546,7 +546,7 @@ out:
        return buffer->output[1];
  }
  
@@ -27381,10 +27085,10 @@ diff -urNp linux-2.6.36/drivers/platform/x86/dell-laptop.c linux-2.6.36/drivers/
        .get_brightness = dell_get_intensity,
        .update_status  = dell_send_intensity,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/eeepc-laptop.c linux-2.6.36/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.36/drivers/platform/x86/eeepc-laptop.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/eeepc-laptop.c   2010-11-06 18:58:15.000000000 -0400
-@@ -1114,7 +1114,7 @@ static int update_bl_status(struct backl
+diff -urNp linux-2.6.37/drivers/platform/x86/eeepc-laptop.c linux-2.6.37/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.37/drivers/platform/x86/eeepc-laptop.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/eeepc-laptop.c   2011-01-17 02:41:01.000000000 -0500
+@@ -1115,7 +1115,7 @@ static int update_bl_status(struct backl
        return set_brightness(bd, bd->props.brightness);
  }
  
@@ -27393,9 +27097,9 @@ diff -urNp linux-2.6.36/drivers/platform/x86/eeepc-laptop.c linux-2.6.36/drivers
        .get_brightness = read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/fujitsu-laptop.c 2011-01-17 02:41:01.000000000 -0500
 @@ -437,7 +437,7 @@ static int bl_update_status(struct backl
        return ret;
  }
@@ -27405,9 +27109,9 @@ diff -urNp linux-2.6.36/drivers/platform/x86/fujitsu-laptop.c linux-2.6.36/drive
        .get_brightness = bl_get_brightness,
        .update_status = bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/sony-laptop.c linux-2.6.36/drivers/platform/x86/sony-laptop.c
---- linux-2.6.36/drivers/platform/x86/sony-laptop.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/sony-laptop.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/platform/x86/sony-laptop.c linux-2.6.37/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.37/drivers/platform/x86/sony-laptop.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/sony-laptop.c    2011-01-17 02:41:01.000000000 -0500
 @@ -856,7 +856,7 @@ static int sony_backlight_get_brightness
  }
  
@@ -27417,9 +27121,9 @@ diff -urNp linux-2.6.36/drivers/platform/x86/sony-laptop.c linux-2.6.36/drivers/
        .update_status = sony_backlight_update_status,
        .get_brightness = sony_backlight_get_brightness,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/thinkpad_acpi.c  2011-01-17 02:41:01.000000000 -0500
 @@ -6109,7 +6109,7 @@ static void tpacpi_brightness_notify_cha
                               BACKLIGHT_UPDATE_HOTKEY);
  }
@@ -27429,10 +27133,10 @@ diff -urNp linux-2.6.36/drivers/platform/x86/thinkpad_acpi.c linux-2.6.36/driver
        .get_brightness = brightness_get,
        .update_status  = brightness_update_status,
  };
-diff -urNp linux-2.6.36/drivers/platform/x86/toshiba_acpi.c linux-2.6.36/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.36/drivers/platform/x86/toshiba_acpi.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/platform/x86/toshiba_acpi.c   2010-11-06 18:58:15.000000000 -0400
-@@ -847,7 +847,7 @@ static void remove_toshiba_proc_entries(
+diff -urNp linux-2.6.37/drivers/platform/x86/toshiba_acpi.c linux-2.6.37/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.37/drivers/platform/x86/toshiba_acpi.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/platform/x86/toshiba_acpi.c   2011-01-17 02:41:01.000000000 -0500
+@@ -841,7 +841,7 @@ static void remove_toshiba_proc_entries(
        remove_proc_entry("version", toshiba_proc_dir);
  }
  
@@ -27441,9 +27145,9 @@ diff -urNp linux-2.6.36/drivers/platform/x86/toshiba_acpi.c linux-2.6.36/drivers
          .get_brightness = get_lcd,
          .update_status  = set_lcd_status,
  };
-diff -urNp linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pnp/pnpbios/bioscalls.c       2011-01-17 02:41:01.000000000 -0500
 @@ -59,7 +59,7 @@ do { \
        set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -27500,9 +27204,9 @@ diff -urNp linux-2.6.36/drivers/pnp/pnpbios/bioscalls.c linux-2.6.36/drivers/pnp
 +
 +      pax_close_kernel();
  }
-diff -urNp linux-2.6.36/drivers/pnp/quirks.c linux-2.6.36/drivers/pnp/quirks.c
---- linux-2.6.36/drivers/pnp/quirks.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pnp/quirks.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pnp/quirks.c linux-2.6.37/drivers/pnp/quirks.c
+--- linux-2.6.37/drivers/pnp/quirks.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pnp/quirks.c  2011-01-17 02:41:01.000000000 -0500
 @@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
        /* PnP resources that might overlap PCI BARs */
        {"PNP0c01", quirk_system_pci_resources},
@@ -27512,9 +27216,9 @@ diff -urNp linux-2.6.36/drivers/pnp/quirks.c linux-2.6.36/drivers/pnp/quirks.c
  };
  
  void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.36/drivers/pnp/resource.c linux-2.6.36/drivers/pnp/resource.c
---- linux-2.6.36/drivers/pnp/resource.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/pnp/resource.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/pnp/resource.c linux-2.6.37/drivers/pnp/resource.c
+--- linux-2.6.37/drivers/pnp/resource.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/pnp/resource.c        2011-01-17 02:41:01.000000000 -0500
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
                return 1;
  
@@ -27533,10 +27237,30 @@ diff -urNp linux-2.6.36/drivers/pnp/resource.c linux-2.6.36/drivers/pnp/resource
                return 0;
  
        /* check if the resource is reserved */
-diff -urNp linux-2.6.36/drivers/s390/cio/qdio_debug.c linux-2.6.36/drivers/s390/cio/qdio_debug.c
---- linux-2.6.36/drivers/s390/cio/qdio_debug.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/s390/cio/qdio_debug.c 2010-11-06 18:58:15.000000000 -0400
-@@ -233,7 +233,7 @@ static int qperf_seq_open(struct inode *
+diff -urNp linux-2.6.37/drivers/rtc/rtc-dev.c linux-2.6.37/drivers/rtc/rtc-dev.c
+--- linux-2.6.37/drivers/rtc/rtc-dev.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/rtc/rtc-dev.c 2011-01-17 02:41:01.000000000 -0500
+@@ -14,6 +14,7 @@
+ #include <linux/module.h>
+ #include <linux/rtc.h>
+ #include <linux/sched.h>
++#include <linux/grsecurity.h>
+ #include "rtc-core.h"
+ 
+ static dev_t rtc_devt;
+@@ -357,6 +358,8 @@ static long rtc_dev_ioctl(struct file *f
+               if (copy_from_user(&tm, uarg, sizeof(tm)))
+                       return -EFAULT;
+ 
++              gr_log_timechange();
++
+               return rtc_set_time(rtc, &tm);
+ 
+       case RTC_PIE_ON:
+diff -urNp linux-2.6.37/drivers/s390/cio/qdio_debug.c linux-2.6.37/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.37/drivers/s390/cio/qdio_debug.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/s390/cio/qdio_debug.c 2011-01-17 02:41:01.000000000 -0500
+@@ -224,7 +224,7 @@ static int qperf_seq_open(struct inode *
                           filp->f_path.dentry->d_inode->i_private);
  }
  
@@ -27545,10 +27269,22 @@ diff -urNp linux-2.6.36/drivers/s390/cio/qdio_debug.c linux-2.6.36/drivers/s390/
        .owner   = THIS_MODULE,
        .open    = qperf_seq_open,
        .read    = seq_read,
-diff -urNp linux-2.6.36/drivers/scsi/ipr.c linux-2.6.36/drivers/scsi/ipr.c
---- linux-2.6.36/drivers/scsi/ipr.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/ipr.c    2010-11-06 18:58:15.000000000 -0400
-@@ -6156,7 +6156,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
+diff -urNp linux-2.6.37/drivers/scsi/hpsa.c linux-2.6.37/drivers/scsi/hpsa.c
+--- linux-2.6.37/drivers/scsi/hpsa.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/hpsa.c   2011-01-17 02:41:01.000000000 -0500
+@@ -2292,6 +2292,8 @@ static int hpsa_ioctl32_passthru(struct 
+       int err;
+       u32 cp;
+ 
++      memset(&arg64, 0, sizeof(arg64));
++
+       err = 0;
+       err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
+                          sizeof(arg64.LUN_info));
+diff -urNp linux-2.6.37/drivers/scsi/ipr.c linux-2.6.37/drivers/scsi/ipr.c
+--- linux-2.6.37/drivers/scsi/ipr.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/ipr.c    2011-01-17 02:41:01.000000000 -0500
+@@ -6202,7 +6202,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
        return true;
  }
  
@@ -27557,9 +27293,9 @@ diff -urNp linux-2.6.36/drivers/scsi/ipr.c linux-2.6.36/drivers/scsi/ipr.c
        .phy_reset = ipr_ata_phy_reset,
        .hardreset = ipr_sata_reset,
        .post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.36/drivers/scsi/libfc/fc_exch.c linux-2.6.36/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.36/drivers/scsi/libfc/fc_exch.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/libfc/fc_exch.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/scsi/libfc/fc_exch.c linux-2.6.37/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.37/drivers/scsi/libfc/fc_exch.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/libfc/fc_exch.c  2011-01-17 02:41:01.000000000 -0500
 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
         * all together if not used XXX
         */
@@ -27681,10 +27417,10 @@ diff -urNp linux-2.6.36/drivers/scsi/libfc/fc_exch.c linux-2.6.36/drivers/scsi/l
  
        fc_frame_free(fp);
  }
-diff -urNp linux-2.6.36/drivers/scsi/libsas/sas_ata.c linux-2.6.36/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.36/drivers/scsi/libsas/sas_ata.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/libsas/sas_ata.c 2010-11-06 18:58:15.000000000 -0400
-@@ -344,7 +344,7 @@ static int sas_ata_scr_read(struct ata_l
+diff -urNp linux-2.6.37/drivers/scsi/libsas/sas_ata.c linux-2.6.37/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.37/drivers/scsi/libsas/sas_ata.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/libsas/sas_ata.c 2011-01-17 02:41:01.000000000 -0500
+@@ -348,10 +348,10 @@ static int sas_ata_scr_read(struct ata_l
        }
  }
  
@@ -27692,10 +27428,14 @@ diff -urNp linux-2.6.36/drivers/scsi/libsas/sas_ata.c linux-2.6.36/drivers/scsi/
 +static const struct ata_port_operations sas_sata_ops = {
        .phy_reset              = sas_ata_phy_reset,
        .post_internal_cmd      = sas_ata_post_internal,
+-      .qc_defer               = ata_std_qc_defer,
++      .qc_defer               = ata_std_qc_defer,
        .qc_prep                = ata_noop_qc_prep,
-diff -urNp linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h  2010-11-06 18:58:15.000000000 -0400
+       .qc_issue               = sas_ata_qc_issue,
+       .qc_fill_rtf            = sas_ata_qc_fill_rtf,
+diff -urNp linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/mpt2sas/mpt2sas_debug.h  2011-01-17 02:41:01.000000000 -0500
 @@ -79,7 +79,7 @@
                CMD;                                            \
  }
@@ -27705,21 +27445,21 @@ diff -urNp linux-2.6.36/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.36/driver
  #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
  
  
-diff -urNp linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/qla2xxx/qla_os.c 2010-11-06 18:58:15.000000000 -0400
-@@ -3946,7 +3946,7 @@ static struct pci_driver qla2xxx_pci_dri
+diff -urNp linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/qla2xxx/qla_os.c 2011-01-17 02:41:01.000000000 -0500
+@@ -4083,7 +4083,7 @@ static struct pci_driver qla2xxx_pci_dri
        .err_handler    = &qla2xxx_err_handler,
  };
  
 -static struct file_operations apidev_fops = {
 +static const struct file_operations apidev_fops = {
        .owner = THIS_MODULE,
+       .llseek = noop_llseek,
  };
- 
-diff -urNp linux-2.6.36/drivers/scsi/scsi_logging.h linux-2.6.36/drivers/scsi/scsi_logging.h
---- linux-2.6.36/drivers/scsi/scsi_logging.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/scsi_logging.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/scsi/scsi_logging.h linux-2.6.37/drivers/scsi/scsi_logging.h
+--- linux-2.6.37/drivers/scsi/scsi_logging.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/scsi_logging.h   2011-01-17 02:41:01.000000000 -0500
 @@ -51,7 +51,7 @@ do {                                                         \
                } while (0);                                    \
  } while (0)
@@ -27729,10 +27469,10 @@ diff -urNp linux-2.6.36/drivers/scsi/scsi_logging.h linux-2.6.36/drivers/scsi/sc
  #endif /* CONFIG_SCSI_LOGGING */
  
  /*
-diff -urNp linux-2.6.36/drivers/scsi/sg.c linux-2.6.36/drivers/scsi/sg.c
---- linux-2.6.36/drivers/scsi/sg.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/scsi/sg.c     2010-11-06 18:58:15.000000000 -0400
-@@ -2307,7 +2307,7 @@ struct sg_proc_leaf {
+diff -urNp linux-2.6.37/drivers/scsi/sg.c linux-2.6.37/drivers/scsi/sg.c
+--- linux-2.6.37/drivers/scsi/sg.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/scsi/sg.c     2011-01-17 02:41:01.000000000 -0500
+@@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
        const struct file_operations * fops;
  };
  
@@ -27741,7 +27481,7 @@ diff -urNp linux-2.6.36/drivers/scsi/sg.c linux-2.6.36/drivers/scsi/sg.c
        {"allow_dio", &adio_fops},
        {"debug", &debug_fops},
        {"def_reserved_size", &dressz_fops},
-@@ -2322,7 +2322,7 @@ sg_proc_init(void)
+@@ -2325,7 +2325,7 @@ sg_proc_init(void)
  {
        int k, mask;
        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
@@ -27750,10 +27490,10 @@ diff -urNp linux-2.6.36/drivers/scsi/sg.c linux-2.6.36/drivers/scsi/sg.c
  
        sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
        if (!sg_proc_sgp)
-diff -urNp linux-2.6.36/drivers/serial/8250_pci.c linux-2.6.36/drivers/serial/8250_pci.c
---- linux-2.6.36/drivers/serial/8250_pci.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/serial/8250_pci.c     2010-11-06 18:58:15.000000000 -0400
-@@ -3777,7 +3777,7 @@ static struct pci_device_id serial_pci_t
+diff -urNp linux-2.6.37/drivers/serial/8250_pci.c linux-2.6.37/drivers/serial/8250_pci.c
+--- linux-2.6.37/drivers/serial/8250_pci.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/serial/8250_pci.c     2011-01-17 02:41:01.000000000 -0500
+@@ -3782,7 +3782,7 @@ static struct pci_device_id serial_pci_t
                PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
                0xffff00, pbn_default },
@@ -27762,10 +27502,10 @@ diff -urNp linux-2.6.36/drivers/serial/8250_pci.c linux-2.6.36/drivers/serial/82
  };
  
  static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.36/drivers/serial/kgdboc.c linux-2.6.36/drivers/serial/kgdboc.c
---- linux-2.6.36/drivers/serial/kgdboc.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/serial/kgdboc.c       2010-11-06 18:58:15.000000000 -0400
-@@ -21,7 +21,8 @@
+diff -urNp linux-2.6.37/drivers/serial/kgdboc.c linux-2.6.37/drivers/serial/kgdboc.c
+--- linux-2.6.37/drivers/serial/kgdboc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/serial/kgdboc.c       2011-01-17 02:41:01.000000000 -0500
+@@ -22,7 +22,8 @@
  
  #define MAX_CONFIG_LEN                40
  
@@ -27775,18 +27515,42 @@ diff -urNp linux-2.6.36/drivers/serial/kgdboc.c linux-2.6.36/drivers/serial/kgdb
  
  /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
  static int configured         = -1;
-@@ -233,6 +234,7 @@ static void kgdboc_post_exp_handler(void
-       }
+@@ -293,6 +294,7 @@ static void kgdboc_post_exp_handler(void
+       kgdboc_restore_input();
  }
  
 +/* cannot be const, see configure_kgdboc() */
  static struct kgdb_io kgdboc_io_ops = {
        .name                   = "kgdboc",
        .read_char              = kgdboc_get_char,
-diff -urNp linux-2.6.36/drivers/staging/comedi/comedi_fops.c linux-2.6.36/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.36/drivers/staging/comedi/comedi_fops.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/comedi/comedi_fops.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1425,7 +1425,7 @@ static void comedi_unmap(struct vm_area_
+diff -urNp linux-2.6.37/drivers/staging/bcm/Bcmchar.c linux-2.6.37/drivers/staging/bcm/Bcmchar.c
+--- linux-2.6.37/drivers/staging/bcm/Bcmchar.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/bcm/Bcmchar.c 2011-01-17 02:41:01.000000000 -0500
+@@ -2386,7 +2386,7 @@ static long bcm_char_ioctl(struct file *
+ }
+ 
+ 
+-static struct file_operations bcm_fops = {
++static const struct file_operations bcm_fops = {
+       .owner    = THIS_MODULE,
+       .open     = bcm_char_open,
+       .release  = bcm_char_release,
+diff -urNp linux-2.6.37/drivers/staging/bcm/InterfaceInit.c linux-2.6.37/drivers/staging/bcm/InterfaceInit.c
+--- linux-2.6.37/drivers/staging/bcm/InterfaceInit.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/bcm/InterfaceInit.c   2011-01-17 02:41:01.000000000 -0500
+@@ -157,7 +157,7 @@ VOID ConfigureEndPointTypesThroughEEPROM
+ 
+ }
+ 
+-static struct file_operations usbbcm_fops = {
++static const struct file_operations usbbcm_fops = {
+     .open    =  usbbcm_open,
+     .release =  usbbcm_release,
+     .read    =  usbbcm_read,
+diff -urNp linux-2.6.37/drivers/staging/comedi/comedi_fops.c linux-2.6.37/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.37/drivers/staging/comedi/comedi_fops.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/comedi/comedi_fops.c  2011-01-17 02:41:01.000000000 -0500
+@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
        mutex_unlock(&dev->mutex);
  }
  
@@ -27795,148 +27559,22 @@ diff -urNp linux-2.6.36/drivers/staging/comedi/comedi_fops.c linux-2.6.36/driver
        .close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.36/drivers/staging/dream/pmem.c linux-2.6.36/drivers/staging/dream/pmem.c
---- linux-2.6.36/drivers/staging/dream/pmem.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/pmem.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1201,7 +1201,7 @@ static ssize_t debug_read(struct file *f
-       return simple_read_from_buffer(buf, count, ppos, buffer, n);
- }
- 
--static struct file_operations debug_fops = {
-+static const struct file_operations debug_fops = {
-       .read = debug_read,
-       .open = debug_open,
- };
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/adsp_driver.c     2010-11-06 18:58:15.000000000 -0400
-@@ -577,7 +577,7 @@ static struct adsp_device *inode_to_devi
- static dev_t adsp_devno;
- static struct class *adsp_class;
- 
--static struct file_operations adsp_fops = {
-+static const struct file_operations adsp_fops = {
-       .owner = THIS_MODULE,
-       .open = adsp_open,
-       .unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_aac.c       2010-11-06 18:58:15.000000000 -0400
-@@ -1023,7 +1023,7 @@ done:
-       return rc;
- }
- 
--static struct file_operations audio_aac_fops = {
-+static const struct file_operations audio_aac_fops = {
-       .owner = THIS_MODULE,
-       .open = audio_open,
-       .release = audio_release,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_amrnb.c     2010-11-06 18:58:15.000000000 -0400
-@@ -834,7 +834,7 @@ done:
-       return rc;
- }
- 
--static struct file_operations audio_amrnb_fops = {
-+static const struct file_operations audio_amrnb_fops = {
-       .owner = THIS_MODULE,
-       .open = audamrnb_open,
-       .release = audamrnb_release,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_evrc.c      2010-11-06 18:58:15.000000000 -0400
-@@ -806,7 +806,7 @@ dma_fail:
-       return rc;
- }
- 
--static struct file_operations audio_evrc_fops = {
-+static const struct file_operations audio_evrc_fops = {
-       .owner = THIS_MODULE,
-       .open = audevrc_open,
-       .release = audevrc_release,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_in.c        2010-11-06 18:58:15.000000000 -0400
-@@ -914,7 +914,7 @@ static int audpre_open(struct inode *ino
-       return 0;
- }
- 
--static struct file_operations audio_fops = {
-+static const struct file_operations audio_fops = {
-       .owner          = THIS_MODULE,
-       .open           = audio_in_open,
-       .release        = audio_in_release,
-@@ -923,7 +923,7 @@ static struct file_operations audio_fops
-       .unlocked_ioctl = audio_in_ioctl,
- };
- 
--static struct file_operations audpre_fops = {
-+static const struct file_operations audpre_fops = {
-       .owner          = THIS_MODULE,
-       .open           = audpre_open,
-       .unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_mp3.c       2010-11-06 18:58:15.000000000 -0400
-@@ -941,7 +941,7 @@ done:
-       return rc;
- }
- 
--static struct file_operations audio_mp3_fops = {
-+static const struct file_operations audio_mp3_fops = {
-       .owner          = THIS_MODULE,
-       .open           = audio_open,
-       .release        = audio_release,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_out.c       2010-11-06 18:58:15.000000000 -0400
-@@ -800,7 +800,7 @@ static int audpp_open(struct inode *inod
-       return 0;
- }
- 
--static struct file_operations audio_fops = {
-+static const struct file_operations audio_fops = {
-       .owner          = THIS_MODULE,
-       .open           = audio_open,
-       .release        = audio_release,
-@@ -809,7 +809,7 @@ static struct file_operations audio_fops
-       .unlocked_ioctl = audio_ioctl,
- };
- 
--static struct file_operations audpp_fops = {
-+static const struct file_operations audpp_fops = {
-       .owner          = THIS_MODULE,
-       .open           = audpp_open,
-       .unlocked_ioctl = audpp_ioctl,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/audio_qcelp.c     2010-11-06 18:58:15.000000000 -0400
-@@ -817,7 +817,7 @@ err:
-       return rc;
- }
- 
--static struct file_operations audio_qcelp_fops = {
-+static const struct file_operations audio_qcelp_fops = {
-       .owner = THIS_MODULE,
-       .open = audqcelp_open,
-       .release = audqcelp_release,
-diff -urNp linux-2.6.36/drivers/staging/dream/qdsp5/snd.c linux-2.6.36/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.36/drivers/staging/dream/qdsp5/snd.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/dream/qdsp5/snd.c     2010-11-06 18:58:15.000000000 -0400
-@@ -242,7 +242,7 @@ err:
-       return rc;
- }
- 
--static struct file_operations snd_fops = {
-+static const struct file_operations snd_fops = {
-       .owner          = THIS_MODULE,
-       .open           = snd_open,
-       .release        = snd_release,
-diff -urNp linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c  2010-11-06 18:58:15.000000000 -0400
-@@ -1673,7 +1673,7 @@ static int go7007_vm_fault(struct vm_are
+diff -urNp linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
+--- linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c      2011-01-17 02:41:01.000000000 -0500
+@@ -69,7 +69,7 @@ int numofmsgbuf = 0;
+ //
+ // Table of entry-point routines for char device
+ //
+-static struct file_operations ft1000fops =
++static const struct file_operations ft1000fops =
+ {
+       .unlocked_ioctl = ft1000_ChIoctl,
+       .poll           = ft1000_ChPoll,
+diff -urNp linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/go7007/go7007-v4l2.c  2011-01-17 02:41:01.000000000 -0500
+@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are
        return 0;
  }
  
@@ -27945,9 +27583,9 @@ diff -urNp linux-2.6.36/drivers/staging/go7007/go7007-v4l2.c linux-2.6.36/driver
        .open   = go7007_vm_open,
        .close  = go7007_vm_close,
        .fault  = go7007_vm_fault,
-diff -urNp linux-2.6.36/drivers/staging/hv/hv.c linux-2.6.36/drivers/staging/hv/hv.c
---- linux-2.6.36/drivers/staging/hv/hv.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/hv/hv.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/hv/hv.c linux-2.6.37/drivers/staging/hv/hv.c
+--- linux-2.6.37/drivers/staging/hv/hv.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/hv/hv.c       2011-01-17 02:41:01.000000000 -0500
 @@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
        u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
        u32 outputAddressHi = outputAddress >> 32;
@@ -27957,9 +27595,9 @@ diff -urNp linux-2.6.36/drivers/staging/hv/hv.c linux-2.6.36/drivers/staging/hv/
  
        DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
                   Control, Input, Output);
-diff -urNp linux-2.6.36/drivers/staging/msm/msm_fb_bl.c linux-2.6.36/drivers/staging/msm/msm_fb_bl.c
---- linux-2.6.36/drivers/staging/msm/msm_fb_bl.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/msm/msm_fb_bl.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/msm/msm_fb_bl.c linux-2.6.37/drivers/staging/msm/msm_fb_bl.c
+--- linux-2.6.37/drivers/staging/msm/msm_fb_bl.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/msm/msm_fb_bl.c       2011-01-17 02:41:01.000000000 -0500
 @@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struc
        return 0;
  }
@@ -27969,9 +27607,21 @@ diff -urNp linux-2.6.36/drivers/staging/msm/msm_fb_bl.c linux-2.6.36/drivers/sta
        .get_brightness = msm_fb_bl_get_brightness,
        .update_status = msm_fb_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/staging/phison/phison.c linux-2.6.36/drivers/staging/phison/phison.c
---- linux-2.6.36/drivers/staging/phison/phison.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/phison/phison.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c
+--- linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/olpc_dcon/olpc_dcon.c 2011-01-17 02:41:01.000000000 -0500
+@@ -615,7 +615,7 @@ static struct device_attribute dcon_devi
+       __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store),
+ };
+ 
+-static struct backlight_ops dcon_bl_ops = {
++static const struct backlight_ops dcon_bl_ops = {
+       .get_brightness = dconbl_get,
+       .update_status = dconbl_set
+ };
+diff -urNp linux-2.6.37/drivers/staging/phison/phison.c linux-2.6.37/drivers/staging/phison/phison.c
+--- linux-2.6.37/drivers/staging/phison/phison.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/phison/phison.c       2011-01-17 02:41:01.000000000 -0500
 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -27981,10 +27631,10 @@ diff -urNp linux-2.6.36/drivers/staging/phison/phison.c linux-2.6.36/drivers/sta
        .inherits               = &ata_bmdma_port_ops,
        .prereset               = phison_pre_reset,
  };
-diff -urNp linux-2.6.36/drivers/staging/pohmelfs/inode.c linux-2.6.36/drivers/staging/pohmelfs/inode.c
---- linux-2.6.36/drivers/staging/pohmelfs/inode.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/pohmelfs/inode.c      2010-11-06 18:58:15.000000000 -0400
-@@ -1852,7 +1852,7 @@ static int pohmelfs_fill_super(struct su
+diff -urNp linux-2.6.37/drivers/staging/pohmelfs/inode.c linux-2.6.37/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.37/drivers/staging/pohmelfs/inode.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/pohmelfs/inode.c      2011-01-17 02:41:01.000000000 -0500
+@@ -1848,7 +1848,7 @@ static int pohmelfs_fill_super(struct su
        mutex_init(&psb->mcache_lock);
        psb->mcache_root = RB_ROOT;
        psb->mcache_timeout = msecs_to_jiffies(5000);
@@ -27993,9 +27643,9 @@ diff -urNp linux-2.6.36/drivers/staging/pohmelfs/inode.c linux-2.6.36/drivers/st
  
        psb->trans_max_pages = 100;
  
-diff -urNp linux-2.6.36/drivers/staging/pohmelfs/mcache.c linux-2.6.36/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.36/drivers/staging/pohmelfs/mcache.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/pohmelfs/mcache.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/pohmelfs/mcache.c linux-2.6.37/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.37/drivers/staging/pohmelfs/mcache.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/pohmelfs/mcache.c     2011-01-17 02:41:01.000000000 -0500
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
        m->data = data;
        m->start = start;
@@ -28005,9 +27655,9 @@ diff -urNp linux-2.6.36/drivers/staging/pohmelfs/mcache.c linux-2.6.36/drivers/s
  
        mutex_lock(&psb->mcache_lock);
        err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.36/drivers/staging/pohmelfs/netfs.h linux-2.6.36/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.36/drivers/staging/pohmelfs/netfs.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/pohmelfs/netfs.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/pohmelfs/netfs.h linux-2.6.37/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.37/drivers/staging/pohmelfs/netfs.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/pohmelfs/netfs.h      2011-01-17 02:41:01.000000000 -0500
 @@ -571,7 +571,7 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
        struct rb_root          mcache_root;
@@ -28017,9 +27667,9 @@ diff -urNp linux-2.6.36/drivers/staging/pohmelfs/netfs.h linux-2.6.36/drivers/st
        unsigned long           mcache_timeout;
  
        unsigned int            idx;
-diff -urNp linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/rtl8192u/ieee80211/proc.c     2011-01-17 02:41:01.000000000 -0500
 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
        return seq_open(file, &crypto_seq_ops);
  }
@@ -28029,9 +27679,9 @@ diff -urNp linux-2.6.36/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.36/d
        .open           = crypto_info_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-diff -urNp linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c
---- linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c
+--- linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/samsung-laptop/samsung-laptop.c       2011-01-17 02:41:01.000000000 -0500
 @@ -269,7 +269,7 @@ static int update_status(struct backligh
        return 0;
  }
@@ -28041,10 +27691,10 @@ diff -urNp linux-2.6.36/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.
        .get_brightness = get_brightness,
        .update_status  = update_status,
  };
-diff -urNp linux-2.6.36/drivers/staging/spectra/ffsport.c linux-2.6.36/drivers/staging/spectra/ffsport.c
---- linux-2.6.36/drivers/staging/spectra/ffsport.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/spectra/ffsport.c     2010-11-06 18:58:15.000000000 -0400
-@@ -602,7 +602,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
+diff -urNp linux-2.6.37/drivers/staging/spectra/ffsport.c linux-2.6.37/drivers/staging/spectra/ffsport.c
+--- linux-2.6.37/drivers/staging/spectra/ffsport.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/spectra/ffsport.c     2011-01-17 02:41:01.000000000 -0500
+@@ -603,7 +603,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
        return ret;
  }
  
@@ -28053,9 +27703,9 @@ diff -urNp linux-2.6.36/drivers/staging/spectra/ffsport.c linux-2.6.36/drivers/s
        .owner = THIS_MODULE,
        .open = GLOB_SBD_open,
        .release = GLOB_SBD_release,
-diff -urNp linux-2.6.36/drivers/staging/vme/devices/vme_user.c linux-2.6.36/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.36/drivers/staging/vme/devices/vme_user.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/staging/vme/devices/vme_user.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/vme/devices/vme_user.c linux-2.6.37/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.37/drivers/staging/vme/devices/vme_user.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/vme/devices/vme_user.c        2011-01-17 02:41:01.000000000 -0500
 @@ -137,7 +137,7 @@ static long vme_user_unlocked_ioctl(stru
  static int __init vme_user_probe(struct device *, int, int);
  static int __exit vme_user_remove(struct device *, int, int);
@@ -28065,9 +27715,339 @@ diff -urNp linux-2.6.36/drivers/staging/vme/devices/vme_user.c linux-2.6.36/driv
        .open = vme_user_open,
        .release = vme_user_release,
        .read = vme_user_read,
-diff -urNp linux-2.6.36/drivers/usb/atm/cxacru.c linux-2.6.36/drivers/usb/atm/cxacru.c
---- linux-2.6.36/drivers/usb/atm/cxacru.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/atm/cxacru.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
+--- linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c   2011-01-17 02:41:01.000000000 -0500
+@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
+ 
+ 
+ /*standard block device driver interface */
+-static struct block_device_operations cyasblkdev_bdops = {
++static const struct block_device_operations cyasblkdev_bdops = {
+       .open                   = cyasblkdev_blk_open,
+       .release                = cyasblkdev_blk_release,
+       .ioctl                  = cyasblkdev_blk_ioctl,
+diff -urNp linux-2.6.37/drivers/tty/n_gsm.c linux-2.6.37/drivers/tty/n_gsm.c
+--- linux-2.6.37/drivers/tty/n_gsm.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/n_gsm.c   2011-01-17 02:41:01.000000000 -0500
+@@ -1579,7 +1579,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
+               return NULL;
+       spin_lock_init(&dlci->lock);
+       dlci->fifo = &dlci->_fifo;
+-      if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
++      if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
+               kfree(dlci);
+               return NULL;
+       }
+diff -urNp linux-2.6.37/drivers/tty/n_tty.c linux-2.6.37/drivers/tty/n_tty.c
+--- linux-2.6.37/drivers/tty/n_tty.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/n_tty.c   2011-01-17 02:41:01.000000000 -0500
+@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
+ {
+       *ops = tty_ldisc_N_TTY;
+       ops->owner = NULL;
+-      ops->refcount = ops->flags = 0;
++      atomic_set(&ops->refcount, 0);
++      ops->flags = 0;
+ }
+ EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
+diff -urNp linux-2.6.37/drivers/tty/pty.c linux-2.6.37/drivers/tty/pty.c
+--- linux-2.6.37/drivers/tty/pty.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/pty.c     2011-01-17 02:41:01.000000000 -0500
+@@ -700,7 +700,18 @@ out:
+       return retval;
+ }
+ 
+-static struct file_operations ptmx_fops;
++static const struct file_operations ptmx_fops = {
++      .llseek         = no_llseek,
++      .read           = tty_read,
++      .write          = tty_write,
++      .poll           = tty_poll,
++      .unlocked_ioctl = tty_ioctl,
++      .compat_ioctl   = tty_compat_ioctl,
++      .open           = ptmx_open,
++      .release        = tty_release,
++      .fasync         = tty_fasync,
++};
++
+ 
+ static void __init unix98_pty_init(void)
+ {
+@@ -753,10 +764,6 @@ static void __init unix98_pty_init(void)
+ 
+       register_sysctl_table(pty_root_table);
+ 
+-      /* Now create the /dev/ptmx special device */
+-      tty_default_fops(&ptmx_fops);
+-      ptmx_fops.open = ptmx_open;
+-
+       cdev_init(&ptmx_cdev, &ptmx_fops);
+       if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
+           register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
+diff -urNp linux-2.6.37/drivers/tty/tty_io.c linux-2.6.37/drivers/tty/tty_io.c
+--- linux-2.6.37/drivers/tty/tty_io.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/tty_io.c  2011-01-17 02:41:01.000000000 -0500
+@@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
+ /* Spinlock to protect the tty->tty_files list */
+ DEFINE_SPINLOCK(tty_files_lock);
+ 
+-static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
+-static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
+ ssize_t redirected_tty_write(struct file *, const char __user *,
+                                                       size_t, loff_t *);
+-static unsigned int tty_poll(struct file *, poll_table *);
+ static int tty_open(struct inode *, struct file *);
+ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+-#ifdef CONFIG_COMPAT
+-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
+-                              unsigned long arg);
+-#else
+-#define tty_compat_ioctl NULL
+-#endif
+ static int __tty_fasync(int fd, struct file *filp, int on);
+-static int tty_fasync(int fd, struct file *filp, int on);
+ static void release_tty(struct tty_struct *tty, int idx);
+ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+ static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+@@ -938,7 +928,7 @@ EXPORT_SYMBOL(start_tty);
+  *    read calls may be outstanding in parallel.
+  */
+ 
+-static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
++ssize_t tty_read(struct file *file, char __user *buf, size_t count,
+                       loff_t *ppos)
+ {
+       int i;
+@@ -964,6 +954,8 @@ static ssize_t tty_read(struct file *fil
+       return i;
+ }
+ 
++EXPORT_SYMBOL(tty_read);
++
+ void tty_write_unlock(struct tty_struct *tty)
+ {
+       mutex_unlock(&tty->atomic_write_lock);
+@@ -1113,7 +1105,7 @@ void tty_write_message(struct tty_struct
+  *    write method will not be invoked in parallel for each device.
+  */
+ 
+-static ssize_t tty_write(struct file *file, const char __user *buf,
++ssize_t tty_write(struct file *file, const char __user *buf,
+                                               size_t count, loff_t *ppos)
+ {
+       struct inode *inode = file->f_path.dentry->d_inode;
+@@ -1139,6 +1131,8 @@ static ssize_t tty_write(struct file *fi
+       return ret;
+ }
+ 
++EXPORT_SYMBOL(tty_write);
++
+ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
+                                               size_t count, loff_t *ppos)
+ {
+@@ -1778,6 +1772,8 @@ int tty_release(struct inode *inode, str
+       return 0;
+ }
+ 
++EXPORT_SYMBOL(tty_release);
++
+ /**
+  *    tty_open                -       open a tty device
+  *    @inode: inode of device file
+@@ -1969,7 +1965,7 @@ got_driver:
+  *    may be re-entered freely by other callers.
+  */
+ 
+-static unsigned int tty_poll(struct file *filp, poll_table *wait)
++unsigned int tty_poll(struct file *filp, poll_table *wait)
+ {
+       struct tty_struct *tty = file_tty(filp);
+       struct tty_ldisc *ld;
+@@ -1985,6 +1981,8 @@ static unsigned int tty_poll(struct file
+       return ret;
+ }
+ 
++EXPORT_SYMBOL(tty_poll);
++
+ static int __tty_fasync(int fd, struct file *filp, int on)
+ {
+       struct tty_struct *tty = file_tty(filp);
+@@ -2026,7 +2024,7 @@ out:
+       return retval;
+ }
+ 
+-static int tty_fasync(int fd, struct file *filp, int on)
++int tty_fasync(int fd, struct file *filp, int on)
+ {
+       int retval;
+       tty_lock();
+@@ -2035,6 +2033,8 @@ static int tty_fasync(int fd, struct fil
+       return retval;
+ }
+ 
++EXPORT_SYMBOL(tty_fasync);
++
+ /**
+  *    tiocsti                 -       fake input character
+  *    @tty: tty to fake input into
+@@ -2687,8 +2687,10 @@ long tty_ioctl(struct file *file, unsign
+       return retval;
+ }
+ 
++EXPORT_SYMBOL(tty_ioctl);
++
+ #ifdef CONFIG_COMPAT
+-static long tty_compat_ioctl(struct file *file, unsigned int cmd,
++long tty_compat_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+ {
+       struct inode *inode = file->f_dentry->d_inode;
+@@ -2712,6 +2714,9 @@ static long tty_compat_ioctl(struct file
+ 
+       return retval;
+ }
++
++EXPORT_SYMBOL(tty_compat_ioctl);
++
+ #endif
+ 
+ /*
+@@ -3190,11 +3195,6 @@ struct tty_struct *get_current_tty(void)
+ }
+ EXPORT_SYMBOL_GPL(get_current_tty);
+ 
+-void tty_default_fops(struct file_operations *fops)
+-{
+-      *fops = tty_fops;
+-}
+-
+ /*
+  * Initialize the console device. This is called *early*, so
+  * we can't necessarily depend on lots of kernel help here.
+diff -urNp linux-2.6.37/drivers/tty/tty_ldisc.c linux-2.6.37/drivers/tty/tty_ldisc.c
+--- linux-2.6.37/drivers/tty/tty_ldisc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/tty_ldisc.c       2011-01-17 02:41:01.000000000 -0500
+@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *
+       if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
+               struct tty_ldisc_ops *ldo = ld->ops;
+ 
+-              ldo->refcount--;
++              atomic_dec(&ldo->refcount);
+               module_put(ldo->owner);
+               spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+ 
+@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct 
+       spin_lock_irqsave(&tty_ldisc_lock, flags);
+       tty_ldiscs[disc] = new_ldisc;
+       new_ldisc->num = disc;
+-      new_ldisc->refcount = 0;
++      atomic_set(&new_ldisc->refcount, 0);
+       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+ 
+       return ret;
+@@ -139,7 +139,7 @@ int tty_unregister_ldisc(int disc)
+               return -EINVAL;
+ 
+       spin_lock_irqsave(&tty_ldisc_lock, flags);
+-      if (tty_ldiscs[disc]->refcount)
++      if (atomic_read(&tty_ldiscs[disc]->refcount))
+               ret = -EBUSY;
+       else
+               tty_ldiscs[disc] = NULL;
+@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(i
+       if (ldops) {
+               ret = ERR_PTR(-EAGAIN);
+               if (try_module_get(ldops->owner)) {
+-                      ldops->refcount++;
++                      atomic_inc(&ldops->refcount);
+                       ret = ldops;
+               }
+       }
+@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_o
+       unsigned long flags;
+ 
+       spin_lock_irqsave(&tty_ldisc_lock, flags);
+-      ldops->refcount--;
++      atomic_dec(&ldops->refcount);
+       module_put(ldops->owner);
+       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+ }
+diff -urNp linux-2.6.37/drivers/tty/vt/keyboard.c linux-2.6.37/drivers/tty/vt/keyboard.c
+--- linux-2.6.37/drivers/tty/vt/keyboard.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/vt/keyboard.c     2011-01-17 02:41:01.000000000 -0500
+@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
+            kbd->kbdmode == VC_MEDIUMRAW) &&
+            value != KVAL(K_SAK))
+               return;         /* SAK is allowed even in raw mode */
++
++#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
++      {
++              void *func = fn_handler[value];
++              if (func == fn_show_state || func == fn_show_ptregs ||
++                  func == fn_show_mem)
++                      return;
++      }
++#endif
++
+       fn_handler[value](vc);
+ }
+ 
+@@ -1413,7 +1423,7 @@ static const struct input_device_id kbd_
+                 .evbit = { BIT_MASK(EV_SND) },
+         },
+ 
+-      { },    /* Terminating entry */
++      { 0 },    /* Terminating entry */
+ };
+ 
+ MODULE_DEVICE_TABLE(input, kbd_ids);
+diff -urNp linux-2.6.37/drivers/tty/vt/vt_ioctl.c linux-2.6.37/drivers/tty/vt/vt_ioctl.c
+--- linux-2.6.37/drivers/tty/vt/vt_ioctl.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/tty/vt/vt_ioctl.c     2011-01-17 02:41:01.000000000 -0500
+@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+       if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
+               return -EFAULT;
+ 
+-      if (!capable(CAP_SYS_TTY_CONFIG))
+-              perm = 0;
+-
+       switch (cmd) {
+       case KDGKBENT:
+               key_map = key_maps[s];
+@@ -224,6 +221,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+                   val = (i ? K_HOLE : K_NOSUCHMAP);
+               return put_user(val, &user_kbe->kb_value);
+       case KDSKBENT:
++              if (!capable(CAP_SYS_TTY_CONFIG))
++                      perm = 0;
++
+               if (!perm)
+                       return -EPERM;
+               if (!i && v == K_NOSUCHMAP) {
+@@ -325,9 +325,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
+       int i, j, k;
+       int ret;
+ 
+-      if (!capable(CAP_SYS_TTY_CONFIG))
+-              perm = 0;
+-
+       kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
+       if (!kbs) {
+               ret = -ENOMEM;
+@@ -361,6 +358,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
+               kfree(kbs);
+               return ((p && *p) ? -EOVERFLOW : 0);
+       case KDSKBSENT:
++              if (!capable(CAP_SYS_TTY_CONFIG))
++                      perm = 0;
++
+               if (!perm) {
+                       ret = -EPERM;
+                       goto reterr;
+diff -urNp linux-2.6.37/drivers/usb/atm/cxacru.c linux-2.6.37/drivers/usb/atm/cxacru.c
+--- linux-2.6.37/drivers/usb/atm/cxacru.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/atm/cxacru.c      2011-01-17 02:41:01.000000000 -0500
 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
                ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
                if (ret < 2)
@@ -28077,9 +28057,9 @@ diff -urNp linux-2.6.36/drivers/usb/atm/cxacru.c linux-2.6.36/drivers/usb/atm/cx
                        return -EINVAL;
                pos += tmp;
  
-diff -urNp linux-2.6.36/drivers/usb/atm/usbatm.c linux-2.6.36/drivers/usb/atm/usbatm.c
---- linux-2.6.36/drivers/usb/atm/usbatm.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/atm/usbatm.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/atm/usbatm.c linux-2.6.37/drivers/usb/atm/usbatm.c
+--- linux-2.6.37/drivers/usb/atm/usbatm.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/atm/usbatm.c      2011-01-17 02:41:01.000000000 -0500
 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
                if (printk_ratelimit())
                        atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -28159,9 +28139,9 @@ diff -urNp linux-2.6.36/drivers/usb/atm/usbatm.c linux-2.6.36/drivers/usb/atm/us
  
        if (!left--) {
                if (instance->disconnected)
-diff -urNp linux-2.6.36/drivers/usb/class/cdc-acm.c linux-2.6.36/drivers/usb/class/cdc-acm.c
---- linux-2.6.36/drivers/usb/class/cdc-acm.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/class/cdc-acm.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/class/cdc-acm.c linux-2.6.37/drivers/usb/class/cdc-acm.c
+--- linux-2.6.37/drivers/usb/class/cdc-acm.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/class/cdc-acm.c   2011-01-17 02:41:01.000000000 -0500
 @@ -1634,7 +1634,7 @@ static const struct usb_device_id acm_id
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
                USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -28171,9 +28151,9 @@ diff -urNp linux-2.6.36/drivers/usb/class/cdc-acm.c linux-2.6.36/drivers/usb/cla
  };
  
  MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.36/drivers/usb/class/cdc-wdm.c linux-2.6.36/drivers/usb/class/cdc-wdm.c
---- linux-2.6.36/drivers/usb/class/cdc-wdm.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/class/cdc-wdm.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/class/cdc-wdm.c linux-2.6.37/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.37/drivers/usb/class/cdc-wdm.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/class/cdc-wdm.c   2011-01-17 02:41:01.000000000 -0500
 @@ -342,7 +342,7 @@ static ssize_t wdm_write
                goto outnp;
        }
@@ -28183,9 +28163,9 @@ diff -urNp linux-2.6.36/drivers/usb/class/cdc-wdm.c linux-2.6.36/drivers/usb/cla
                r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
                                                                &desc->flags));
        else
-diff -urNp linux-2.6.36/drivers/usb/class/usblp.c linux-2.6.36/drivers/usb/class/usblp.c
---- linux-2.6.36/drivers/usb/class/usblp.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/class/usblp.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/class/usblp.c linux-2.6.37/drivers/usb/class/usblp.c
+--- linux-2.6.37/drivers/usb/class/usblp.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/class/usblp.c     2011-01-17 02:41:01.000000000 -0500
 @@ -227,7 +227,7 @@ static const struct quirk_printer_struct
        { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
        { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -28195,7 +28175,7 @@ diff -urNp linux-2.6.36/drivers/usb/class/usblp.c linux-2.6.36/drivers/usb/class
  };
  
  static int usblp_wwait(struct usblp *usblp, int nonblock);
-@@ -1397,7 +1397,7 @@ static const struct usb_device_id usblp_
+@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_
        { USB_INTERFACE_INFO(7, 1, 2) },
        { USB_INTERFACE_INFO(7, 1, 3) },
        { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */
@@ -28204,10 +28184,10 @@ diff -urNp linux-2.6.36/drivers/usb/class/usblp.c linux-2.6.36/drivers/usb/class
  };
  
  MODULE_DEVICE_TABLE(usb, usblp_ids);
-diff -urNp linux-2.6.36/drivers/usb/core/hcd.c linux-2.6.36/drivers/usb/core/hcd.c
---- linux-2.6.36/drivers/usb/core/hcd.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/core/hcd.c        2010-11-06 18:58:15.000000000 -0400
-@@ -2420,7 +2420,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff -urNp linux-2.6.37/drivers/usb/core/hcd.c linux-2.6.37/drivers/usb/core/hcd.c
+--- linux-2.6.37/drivers/usb/core/hcd.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/core/hcd.c        2011-01-17 02:41:01.000000000 -0500
+@@ -2431,7 +2431,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
@@ -28216,7 +28196,7 @@ diff -urNp linux-2.6.36/drivers/usb/core/hcd.c linux-2.6.36/drivers/usb/core/hcd
  
  /*
   * The registration is unlocked.
-@@ -2430,7 +2430,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2441,7 +2441,7 @@ struct usb_mon_operations *mon_ops;
   * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
   */
   
@@ -28225,10 +28205,10 @@ diff -urNp linux-2.6.36/drivers/usb/core/hcd.c linux-2.6.36/drivers/usb/core/hcd
  {
  
        if (mon_ops)
-diff -urNp linux-2.6.36/drivers/usb/core/hub.c linux-2.6.36/drivers/usb/core/hub.c
---- linux-2.6.36/drivers/usb/core/hub.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/core/hub.c        2010-11-06 18:58:15.000000000 -0400
-@@ -3456,7 +3456,7 @@ static const struct usb_device_id hub_id
+diff -urNp linux-2.6.37/drivers/usb/core/hub.c linux-2.6.37/drivers/usb/core/hub.c
+--- linux-2.6.37/drivers/usb/core/hub.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/core/hub.c        2011-01-17 02:41:01.000000000 -0500
+@@ -3461,7 +3461,7 @@ static const struct usb_device_id hub_id
        .bDeviceClass = USB_CLASS_HUB},
      { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
        .bInterfaceClass = USB_CLASS_HUB},
@@ -28237,9 +28217,9 @@ diff -urNp linux-2.6.36/drivers/usb/core/hub.c linux-2.6.36/drivers/usb/core/hub
  };
  
  MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.36/drivers/usb/core/message.c linux-2.6.36/drivers/usb/core/message.c
---- linux-2.6.36/drivers/usb/core/message.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/core/message.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/core/message.c linux-2.6.37/drivers/usb/core/message.c
+--- linux-2.6.37/drivers/usb/core/message.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/core/message.c    2011-01-17 02:41:01.000000000 -0500
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
        if (buf) {
@@ -28251,9 +28231,9 @@ diff -urNp linux-2.6.36/drivers/usb/core/message.c linux-2.6.36/drivers/usb/core
                        if (!smallbuf)
                                return buf;
                        memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.36/drivers/usb/early/ehci-dbgp.c linux-2.6.36/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.36/drivers/usb/early/ehci-dbgp.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/early/ehci-dbgp.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/early/ehci-dbgp.c linux-2.6.37/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.37/drivers/usb/early/ehci-dbgp.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/early/ehci-dbgp.c 2011-01-17 02:41:01.000000000 -0500
 @@ -96,6 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
  }
  
@@ -28270,10 +28250,10 @@ diff -urNp linux-2.6.36/drivers/usb/early/ehci-dbgp.c linux-2.6.36/drivers/usb/e
  static struct kgdb_io kgdbdbgp_io_ops = {
        .name = "kgdbdbgp",
        .read_char = kgdbdbgp_read_char,
-diff -urNp linux-2.6.36/drivers/usb/host/ehci-pci.c linux-2.6.36/drivers/usb/host/ehci-pci.c
---- linux-2.6.36/drivers/usb/host/ehci-pci.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/host/ehci-pci.c   2010-11-06 18:58:15.000000000 -0400
-@@ -445,7 +445,7 @@ static const struct pci_device_id pci_id
+diff -urNp linux-2.6.37/drivers/usb/host/ehci-pci.c linux-2.6.37/drivers/usb/host/ehci-pci.c
+--- linux-2.6.37/drivers/usb/host/ehci-pci.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/host/ehci-pci.c   2011-01-17 02:41:01.000000000 -0500
+@@ -470,7 +470,7 @@ static const struct pci_device_id pci_id
        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
        .driver_data =  (unsigned long) &ehci_pci_hc_driver,
        },
@@ -28282,9 +28262,9 @@ diff -urNp linux-2.6.36/drivers/usb/host/ehci-pci.c linux-2.6.36/drivers/usb/hos
  };
  MODULE_DEVICE_TABLE(pci, pci_ids);
  
-diff -urNp linux-2.6.36/drivers/usb/host/uhci-hcd.c linux-2.6.36/drivers/usb/host/uhci-hcd.c
---- linux-2.6.36/drivers/usb/host/uhci-hcd.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/host/uhci-hcd.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/host/uhci-hcd.c linux-2.6.37/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.37/drivers/usb/host/uhci-hcd.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/host/uhci-hcd.c   2011-01-17 02:41:01.000000000 -0500
 @@ -948,7 +948,7 @@ static const struct pci_device_id uhci_p
        /* handle any USB UHCI controller */
        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28294,10 +28274,10 @@ diff -urNp linux-2.6.36/drivers/usb/host/uhci-hcd.c linux-2.6.36/drivers/usb/hos
  };
  
  MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.36/drivers/usb/mon/mon_main.c linux-2.6.36/drivers/usb/mon/mon_main.c
---- linux-2.6.36/drivers/usb/mon/mon_main.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/mon/mon_main.c    2010-11-06 18:58:15.000000000 -0400
-@@ -240,7 +240,7 @@ static struct notifier_block mon_nb = {
+diff -urNp linux-2.6.37/drivers/usb/mon/mon_main.c linux-2.6.37/drivers/usb/mon/mon_main.c
+--- linux-2.6.37/drivers/usb/mon/mon_main.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/mon/mon_main.c    2011-01-17 02:41:01.000000000 -0500
+@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
   */
@@ -28306,9 +28286,9 @@ diff -urNp linux-2.6.36/drivers/usb/mon/mon_main.c linux-2.6.36/drivers/usb/mon/
        .urb_submit =   mon_submit,
        .urb_submit_error = mon_submit_error,
        .urb_complete = mon_complete,
-diff -urNp linux-2.6.36/drivers/usb/storage/debug.h linux-2.6.36/drivers/usb/storage/debug.h
---- linux-2.6.36/drivers/usb/storage/debug.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/storage/debug.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/storage/debug.h linux-2.6.37/drivers/usb/storage/debug.h
+--- linux-2.6.37/drivers/usb/storage/debug.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/storage/debug.h   2011-01-17 02:41:01.000000000 -0500
 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 
  #define US_DEBUGPX(x...) printk( x )
  #define US_DEBUG(x) x 
@@ -28322,9 +28302,9 @@ diff -urNp linux-2.6.36/drivers/usb/storage/debug.h linux-2.6.36/drivers/usb/sto
  #endif
  
  #endif
-diff -urNp linux-2.6.36/drivers/usb/storage/usb.c linux-2.6.36/drivers/usb/storage/usb.c
---- linux-2.6.36/drivers/usb/storage/usb.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/storage/usb.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/storage/usb.c linux-2.6.37/drivers/usb/storage/usb.c
+--- linux-2.6.37/drivers/usb/storage/usb.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/storage/usb.c     2011-01-17 02:41:01.000000000 -0500
 @@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
  
  static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28334,9 +28314,9 @@ diff -urNp linux-2.6.36/drivers/usb/storage/usb.c linux-2.6.36/drivers/usb/stora
  };
  
  #undef UNUSUAL_DEV
-diff -urNp linux-2.6.36/drivers/usb/storage/usual-tables.c linux-2.6.36/drivers/usb/storage/usual-tables.c
---- linux-2.6.36/drivers/usb/storage/usual-tables.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/usb/storage/usual-tables.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/usb/storage/usual-tables.c linux-2.6.37/drivers/usb/storage/usual-tables.c
+--- linux-2.6.37/drivers/usb/storage/usual-tables.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/usb/storage/usual-tables.c    2011-01-17 02:41:01.000000000 -0500
 @@ -48,7 +48,7 @@
  
  struct usb_device_id usb_storage_usb_ids[] = {
@@ -28346,22 +28326,10 @@ diff -urNp linux-2.6.36/drivers/usb/storage/usual-tables.c linux-2.6.36/drivers/
  };
  EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
  
-diff -urNp linux-2.6.36/drivers/uwb/wlp/messages.c linux-2.6.36/drivers/uwb/wlp/messages.c
---- linux-2.6.36/drivers/uwb/wlp/messages.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/uwb/wlp/messages.c    2010-11-06 18:58:15.000000000 -0400
-@@ -920,7 +920,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
-       size_t len = skb->len;
-       size_t used;
-       ssize_t result;
--      struct wlp_nonce enonce, rnonce;
-+      struct wlp_nonce enonce = {{0}}, rnonce = {{0}};
-       enum wlp_assc_error assc_err;
-       char enonce_buf[WLP_WSS_NONCE_STRSIZE];
-       char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.36/drivers/vhost/vhost.c linux-2.6.36/drivers/vhost/vhost.c
---- linux-2.6.36/drivers/vhost/vhost.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/vhost/vhost.c 2010-11-06 18:58:15.000000000 -0400
-@@ -503,7 +503,7 @@ static int init_used(struct vhost_virtqu
+diff -urNp linux-2.6.37/drivers/vhost/vhost.c linux-2.6.37/drivers/vhost/vhost.c
+--- linux-2.6.37/drivers/vhost/vhost.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/vhost/vhost.c 2011-01-17 02:41:01.000000000 -0500
+@@ -560,7 +560,7 @@ static int init_used(struct vhost_virtqu
        return get_user(vq->last_used_idx, &used->idx);
  }
  
@@ -28370,9 +28338,9 @@ diff -urNp linux-2.6.36/drivers/vhost/vhost.c linux-2.6.36/drivers/vhost/vhost.c
  {
        struct file *eventfp, *filep = NULL,
                    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.36/drivers/video/atmel_lcdfb.c linux-2.6.36/drivers/video/atmel_lcdfb.c
---- linux-2.6.36/drivers/video/atmel_lcdfb.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/atmel_lcdfb.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/atmel_lcdfb.c linux-2.6.37/drivers/video/atmel_lcdfb.c
+--- linux-2.6.37/drivers/video/atmel_lcdfb.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/atmel_lcdfb.c   2011-01-17 02:41:01.000000000 -0500
 @@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
        return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
  }
@@ -28382,9 +28350,9 @@ diff -urNp linux-2.6.36/drivers/video/atmel_lcdfb.c linux-2.6.36/drivers/video/a
        .update_status = atmel_bl_update_status,
        .get_brightness = atmel_bl_get_brightness,
  };
-diff -urNp linux-2.6.36/drivers/video/aty/aty128fb.c linux-2.6.36/drivers/video/aty/aty128fb.c
---- linux-2.6.36/drivers/video/aty/aty128fb.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/aty/aty128fb.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/aty/aty128fb.c linux-2.6.37/drivers/video/aty/aty128fb.c
+--- linux-2.6.37/drivers/video/aty/aty128fb.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/aty/aty128fb.c  2011-01-17 02:41:01.000000000 -0500
 @@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
        return bd->props.brightness;
  }
@@ -28394,9 +28362,9 @@ diff -urNp linux-2.6.36/drivers/video/aty/aty128fb.c linux-2.6.36/drivers/video/
        .get_brightness = aty128_bl_get_brightness,
        .update_status  = aty128_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/aty/atyfb_base.c linux-2.6.36/drivers/video/aty/atyfb_base.c
---- linux-2.6.36/drivers/video/aty/atyfb_base.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/aty/atyfb_base.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/aty/atyfb_base.c linux-2.6.37/drivers/video/aty/atyfb_base.c
+--- linux-2.6.37/drivers/video/aty/atyfb_base.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/aty/atyfb_base.c        2011-01-17 02:41:01.000000000 -0500
 @@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct 
        return bd->props.brightness;
  }
@@ -28406,9 +28374,9 @@ diff -urNp linux-2.6.36/drivers/video/aty/atyfb_base.c linux-2.6.36/drivers/vide
        .get_brightness = aty_bl_get_brightness,
        .update_status  = aty_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/aty/radeon_backlight.c linux-2.6.36/drivers/video/aty/radeon_backlight.c
---- linux-2.6.36/drivers/video/aty/radeon_backlight.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/aty/radeon_backlight.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/aty/radeon_backlight.c linux-2.6.37/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.37/drivers/video/aty/radeon_backlight.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/aty/radeon_backlight.c  2011-01-17 02:41:01.000000000 -0500
 @@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
        return bd->props.brightness;
  }
@@ -28418,9 +28386,9 @@ diff -urNp linux-2.6.36/drivers/video/aty/radeon_backlight.c linux-2.6.36/driver
        .get_brightness = radeon_bl_get_brightness,
        .update_status  = radeon_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/backlight/88pm860x_bl.c linux-2.6.36/drivers/video/backlight/88pm860x_bl.c
---- linux-2.6.36/drivers/video/backlight/88pm860x_bl.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/backlight/88pm860x_bl.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/backlight/88pm860x_bl.c linux-2.6.37/drivers/video/backlight/88pm860x_bl.c
+--- linux-2.6.37/drivers/video/backlight/88pm860x_bl.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/backlight/88pm860x_bl.c 2011-01-17 02:41:01.000000000 -0500
 @@ -155,7 +155,7 @@ out:
        return -EINVAL;
  }
@@ -28430,9 +28398,9 @@ diff -urNp linux-2.6.36/drivers/video/backlight/88pm860x_bl.c linux-2.6.36/drive
        .options        = BL_CORE_SUSPENDRESUME,
        .update_status  = pm860x_backlight_update_status,
        .get_brightness = pm860x_backlight_get_brightness,
-diff -urNp linux-2.6.36/drivers/video/backlight/max8925_bl.c linux-2.6.36/drivers/video/backlight/max8925_bl.c
---- linux-2.6.36/drivers/video/backlight/max8925_bl.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/backlight/max8925_bl.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/backlight/max8925_bl.c linux-2.6.37/drivers/video/backlight/max8925_bl.c
+--- linux-2.6.37/drivers/video/backlight/max8925_bl.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/backlight/max8925_bl.c  2011-01-17 02:41:01.000000000 -0500
 @@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
        return ret;
  }
@@ -28442,10 +28410,10 @@ diff -urNp linux-2.6.36/drivers/video/backlight/max8925_bl.c linux-2.6.36/driver
        .options        = BL_CORE_SUSPENDRESUME,
        .update_status  = max8925_backlight_update_status,
        .get_brightness = max8925_backlight_get_brightness,
-diff -urNp linux-2.6.36/drivers/video/fbcmap.c linux-2.6.36/drivers/video/fbcmap.c
---- linux-2.6.36/drivers/video/fbcmap.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/fbcmap.c        2010-11-06 18:58:15.000000000 -0400
-@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
+diff -urNp linux-2.6.37/drivers/video/fbcmap.c linux-2.6.37/drivers/video/fbcmap.c
+--- linux-2.6.37/drivers/video/fbcmap.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/fbcmap.c        2011-01-17 02:41:01.000000000 -0500
+@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
                rc = -ENODEV;
                goto out;
        }
@@ -28455,9 +28423,9 @@ diff -urNp linux-2.6.36/drivers/video/fbcmap.c linux-2.6.36/drivers/video/fbcmap
                rc = -EINVAL;
                goto out1;
        }
-diff -urNp linux-2.6.36/drivers/video/fbmem.c linux-2.6.36/drivers/video/fbmem.c
---- linux-2.6.36/drivers/video/fbmem.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/fbmem.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/fbmem.c linux-2.6.37/drivers/video/fbmem.c
+--- linux-2.6.37/drivers/video/fbmem.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/fbmem.c 2011-01-17 02:41:01.000000000 -0500
 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
                        image->dx += image->width + 8;
                }
@@ -28476,7 +28444,7 @@ diff -urNp linux-2.6.36/drivers/video/fbmem.c linux-2.6.36/drivers/video/fbmem.c
                        info->fbops->fb_imageblit(info, image);
                        image->dy -= image->height + 8;
                }
-@@ -1119,7 +1119,7 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1101,7 +1101,7 @@ static long do_fb_ioctl(struct fb_info *
                        return -EFAULT;
                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
                        return -EINVAL;
@@ -28485,9 +28453,9 @@ diff -urNp linux-2.6.36/drivers/video/fbmem.c linux-2.6.36/drivers/video/fbmem.c
                        return -EINVAL;
                if (!registered_fb[con2fb.framebuffer])
                        request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.36/drivers/video/fbmon.c linux-2.6.36/drivers/video/fbmon.c
---- linux-2.6.36/drivers/video/fbmon.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/fbmon.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/fbmon.c linux-2.6.37/drivers/video/fbmon.c
+--- linux-2.6.37/drivers/video/fbmon.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/fbmon.c 2011-01-17 02:41:01.000000000 -0500
 @@ -46,7 +46,7 @@
  #ifdef DEBUG
  #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28497,9 +28465,9 @@ diff -urNp linux-2.6.36/drivers/video/fbmon.c linux-2.6.36/drivers/video/fbmon.c
  #endif
  
  #define FBMON_FIX_HEADER  1
-diff -urNp linux-2.6.36/drivers/video/i810/i810_accel.c linux-2.6.36/drivers/video/i810/i810_accel.c
---- linux-2.6.36/drivers/video/i810/i810_accel.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/i810/i810_accel.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/i810/i810_accel.c linux-2.6.37/drivers/video/i810/i810_accel.c
+--- linux-2.6.37/drivers/video/i810/i810_accel.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/i810/i810_accel.c       2011-01-17 02:41:01.000000000 -0500
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
                }
        }
@@ -28508,9 +28476,9 @@ diff -urNp linux-2.6.36/drivers/video/i810/i810_accel.c linux-2.6.36/drivers/vid
        i810_report_error(mmio); 
        par->dev_flags |= LOCKUP;
        info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.36/drivers/video/i810/i810_main.c linux-2.6.36/drivers/video/i810/i810_main.c
---- linux-2.6.36/drivers/video/i810/i810_main.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/i810/i810_main.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/i810/i810_main.c linux-2.6.37/drivers/video/i810/i810_main.c
+--- linux-2.6.37/drivers/video/i810/i810_main.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/i810/i810_main.c        2011-01-17 02:41:01.000000000 -0500
 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28520,9 +28488,9 @@ diff -urNp linux-2.6.36/drivers/video/i810/i810_main.c linux-2.6.36/drivers/vide
  };
  
  static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.36/drivers/video/modedb.c linux-2.6.36/drivers/video/modedb.c
---- linux-2.6.36/drivers/video/modedb.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/modedb.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/modedb.c linux-2.6.37/drivers/video/modedb.c
+--- linux-2.6.37/drivers/video/modedb.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/modedb.c        2011-01-17 02:41:01.000000000 -0500
 @@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
      {
        /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28823,9 +28791,9 @@ diff -urNp linux-2.6.36/drivers/video/modedb.c linux-2.6.36/drivers/video/modedb
      },
  };
  
-diff -urNp linux-2.6.36/drivers/video/nvidia/nv_backlight.c linux-2.6.36/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.36/drivers/video/nvidia/nv_backlight.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/nvidia/nv_backlight.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/nvidia/nv_backlight.c linux-2.6.37/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.37/drivers/video/nvidia/nv_backlight.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/nvidia/nv_backlight.c   2011-01-17 02:41:01.000000000 -0500
 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
        return bd->props.brightness;
  }
@@ -28835,9 +28803,9 @@ diff -urNp linux-2.6.36/drivers/video/nvidia/nv_backlight.c linux-2.6.36/drivers
        .get_brightness = nvidia_bl_get_brightness,
        .update_status  = nvidia_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/omap2/displays/panel-taal.c linux-2.6.36/drivers/video/omap2/displays/panel-taal.c
---- linux-2.6.36/drivers/video/omap2/displays/panel-taal.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/omap2/displays/panel-taal.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/omap2/displays/panel-taal.c linux-2.6.37/drivers/video/omap2/displays/panel-taal.c
+--- linux-2.6.37/drivers/video/omap2/displays/panel-taal.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/omap2/displays/panel-taal.c     2011-01-17 02:41:01.000000000 -0500
 @@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct 
        return 0;
  }
@@ -28847,9 +28815,9 @@ diff -urNp linux-2.6.36/drivers/video/omap2/displays/panel-taal.c linux-2.6.36/d
        .get_brightness = taal_bl_get_intensity,
        .update_status  = taal_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/riva/fbdev.c linux-2.6.36/drivers/video/riva/fbdev.c
---- linux-2.6.36/drivers/video/riva/fbdev.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/riva/fbdev.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/riva/fbdev.c linux-2.6.37/drivers/video/riva/fbdev.c
+--- linux-2.6.37/drivers/video/riva/fbdev.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/riva/fbdev.c    2011-01-17 02:41:01.000000000 -0500
 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
        return bd->props.brightness;
  }
@@ -28859,9 +28827,9 @@ diff -urNp linux-2.6.36/drivers/video/riva/fbdev.c linux-2.6.36/drivers/video/ri
        .get_brightness = riva_bl_get_brightness,
        .update_status  = riva_bl_update_status,
  };
-diff -urNp linux-2.6.36/drivers/video/uvesafb.c linux-2.6.36/drivers/video/uvesafb.c
---- linux-2.6.36/drivers/video/uvesafb.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/uvesafb.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/uvesafb.c linux-2.6.37/drivers/video/uvesafb.c
+--- linux-2.6.37/drivers/video/uvesafb.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/uvesafb.c       2011-01-17 02:41:01.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -28937,9 +28905,9 @@ diff -urNp linux-2.6.36/drivers/video/uvesafb.c linux-2.6.36/drivers/video/uvesa
                }
  
                framebuffer_release(info);
-diff -urNp linux-2.6.36/drivers/video/vesafb.c linux-2.6.36/drivers/video/vesafb.c
---- linux-2.6.36/drivers/video/vesafb.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/drivers/video/vesafb.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/drivers/video/vesafb.c linux-2.6.37/drivers/video/vesafb.c
+--- linux-2.6.37/drivers/video/vesafb.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/drivers/video/vesafb.c        2011-01-17 02:41:01.000000000 -0500
 @@ -9,6 +9,7 @@
   */
  
@@ -29043,10 +29011,10 @@ diff -urNp linux-2.6.36/drivers/video/vesafb.c linux-2.6.36/drivers/video/vesafb
        if (info->screen_base)
                iounmap(info->screen_base);
        framebuffer_release(info);
-diff -urNp linux-2.6.36/fs/9p/vfs_inode.c linux-2.6.36/fs/9p/vfs_inode.c
---- linux-2.6.36/fs/9p/vfs_inode.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/9p/vfs_inode.c     2010-11-06 18:58:15.000000000 -0400
-@@ -1539,7 +1539,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-2.6.37/fs/9p/vfs_inode.c linux-2.6.37/fs/9p/vfs_inode.c
+--- linux-2.6.37/fs/9p/vfs_inode.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/9p/vfs_inode.c     2011-01-17 02:41:01.000000000 -0500
+@@ -1598,7 +1598,7 @@ static void *v9fs_vfs_follow_link(struct
  static void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -29055,9 +29023,9 @@ diff -urNp linux-2.6.36/fs/9p/vfs_inode.c linux-2.6.36/fs/9p/vfs_inode.c
  
        P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
                IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.36/fs/aio.c linux-2.6.36/fs/aio.c
---- linux-2.6.36/fs/aio.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/aio.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/aio.c linux-2.6.37/fs/aio.c
+--- linux-2.6.37/fs/aio.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/aio.c      2011-01-17 02:41:01.000000000 -0500
 @@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx 
        size += sizeof(struct io_event) * nr_events;
        nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29067,9 +29035,9 @@ diff -urNp linux-2.6.36/fs/aio.c linux-2.6.36/fs/aio.c
                return -EINVAL;
  
        nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.36/fs/attr.c linux-2.6.36/fs/attr.c
---- linux-2.6.36/fs/attr.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/attr.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/attr.c linux-2.6.37/fs/attr.c
+--- linux-2.6.37/fs/attr.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/attr.c     2011-01-17 02:41:01.000000000 -0500
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
                unsigned long limit;
  
@@ -29078,45 +29046,9 @@ diff -urNp linux-2.6.36/fs/attr.c linux-2.6.36/fs/attr.c
                if (limit != RLIM_INFINITY && offset > limit)
                        goto out_sig;
                if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.36/fs/autofs/root.c linux-2.6.36/fs/autofs/root.c
---- linux-2.6.36/fs/autofs/root.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/autofs/root.c      2010-11-06 19:50:37.000000000 -0400
-@@ -27,7 +27,9 @@ static int autofs_root_unlink(struct ino
- static int autofs_root_rmdir(struct inode *,struct dentry *);
- static int autofs_root_mkdir(struct inode *,struct dentry *,int);
- static long autofs_root_ioctl(struct file *,unsigned int,unsigned long);
-+#ifdef CONFIG_COMPAT
- static long autofs_root_compat_ioctl(struct file *,unsigned int,unsigned long);
-+#endif
- 
- const struct file_operations autofs_root_operations = {
-       .llseek         = generic_file_llseek,
-@@ -306,7 +308,8 @@ static int autofs_root_symlink(struct in
-       set_bit(n,sbi->symlink_bitmap);
-       sl = &sbi->symlink[n];
-       sl->len = strlen(symname);
--      sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
-+      slsize = sl->len+1;
-+      sl->data = kmalloc(slsize, GFP_KERNEL);
-       if (!sl->data) {
-               clear_bit(n,sbi->symlink_bitmap);
-               unlock_kernel();
-diff -urNp linux-2.6.36/fs/autofs4/root.c linux-2.6.36/fs/autofs4/root.c
---- linux-2.6.36/fs/autofs4/root.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/autofs4/root.c     2010-11-06 19:50:56.000000000 -0400
-@@ -28,7 +28,9 @@ static int autofs4_dir_unlink(struct ino
- static int autofs4_dir_rmdir(struct inode *,struct dentry *);
- static int autofs4_dir_mkdir(struct inode *,struct dentry *,int);
- static long autofs4_root_ioctl(struct file *,unsigned int,unsigned long);
-+#ifdef CONFIG_COMPAT
- static long autofs4_root_compat_ioctl(struct file *,unsigned int,unsigned long);
-+#endif
- static int autofs4_dir_open(struct inode *inode, struct file *file);
- static struct dentry *autofs4_lookup(struct inode *,struct dentry *, struct nameidata *);
- static void *autofs4_follow_link(struct dentry *, struct nameidata *);
-diff -urNp linux-2.6.36/fs/autofs4/symlink.c linux-2.6.36/fs/autofs4/symlink.c
---- linux-2.6.36/fs/autofs4/symlink.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/autofs4/symlink.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/autofs4/symlink.c linux-2.6.37/fs/autofs4/symlink.c
+--- linux-2.6.37/fs/autofs4/symlink.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/autofs4/symlink.c  2011-01-17 02:41:01.000000000 -0500
 @@ -15,7 +15,7 @@
  static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
@@ -29126,9 +29058,9 @@ diff -urNp linux-2.6.36/fs/autofs4/symlink.c linux-2.6.36/fs/autofs4/symlink.c
        return NULL;
  }
  
-diff -urNp linux-2.6.36/fs/befs/linuxvfs.c linux-2.6.36/fs/befs/linuxvfs.c
---- linux-2.6.36/fs/befs/linuxvfs.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/befs/linuxvfs.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/befs/linuxvfs.c linux-2.6.37/fs/befs/linuxvfs.c
+--- linux-2.6.37/fs/befs/linuxvfs.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/befs/linuxvfs.c    2011-01-17 02:41:01.000000000 -0500
 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 
  {
        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29138,9 +29070,9 @@ diff -urNp linux-2.6.36/fs/befs/linuxvfs.c linux-2.6.36/fs/befs/linuxvfs.c
                if (!IS_ERR(link))
                        kfree(link);
        }
-diff -urNp linux-2.6.36/fs/binfmt_aout.c linux-2.6.36/fs/binfmt_aout.c
---- linux-2.6.36/fs/binfmt_aout.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/binfmt_aout.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/binfmt_aout.c linux-2.6.37/fs/binfmt_aout.c
+--- linux-2.6.37/fs/binfmt_aout.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/binfmt_aout.c      2011-01-17 02:41:01.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -29217,9 +29149,9 @@ diff -urNp linux-2.6.36/fs/binfmt_aout.c linux-2.6.36/fs/binfmt_aout.c
                                MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
                                fd_offset + ex.a_text);
                up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.36/fs/binfmt_elf.c linux-2.6.36/fs/binfmt_elf.c
---- linux-2.6.36/fs/binfmt_elf.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/binfmt_elf.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/binfmt_elf.c linux-2.6.37/fs/binfmt_elf.c
+--- linux-2.6.37/fs/binfmt_elf.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/binfmt_elf.c       2011-01-17 02:41:01.000000000 -0500
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump NULL
  #endif
@@ -29885,9 +29817,9 @@ diff -urNp linux-2.6.36/fs/binfmt_elf.c linux-2.6.36/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
        return register_binfmt(&elf_format);
-diff -urNp linux-2.6.36/fs/binfmt_flat.c linux-2.6.36/fs/binfmt_flat.c
---- linux-2.6.36/fs/binfmt_flat.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/binfmt_flat.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/binfmt_flat.c linux-2.6.37/fs/binfmt_flat.c
+--- linux-2.6.37/fs/binfmt_flat.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/binfmt_flat.c      2011-01-17 02:41:01.000000000 -0500
 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
                                realdatastart = (unsigned long) -ENOMEM;
                        printk("Unable to allocate RAM for process data, errno %d\n",
@@ -29920,10 +29852,10 @@ diff -urNp linux-2.6.36/fs/binfmt_flat.c linux-2.6.36/fs/binfmt_flat.c
                        ret = result;
                        goto err;
                }
-diff -urNp linux-2.6.36/fs/binfmt_misc.c linux-2.6.36/fs/binfmt_misc.c
---- linux-2.6.36/fs/binfmt_misc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/binfmt_misc.c      2010-11-06 18:58:15.000000000 -0400
-@@ -694,7 +694,7 @@ static int bm_fill_super(struct super_bl
+diff -urNp linux-2.6.37/fs/binfmt_misc.c linux-2.6.37/fs/binfmt_misc.c
+--- linux-2.6.37/fs/binfmt_misc.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/binfmt_misc.c      2011-01-17 02:41:01.000000000 -0500
+@@ -698,7 +698,7 @@ static int bm_fill_super(struct super_bl
        static struct tree_descr bm_files[] = {
                [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
                [3] = {"register", &bm_register_operations, S_IWUSR},
@@ -29932,10 +29864,10 @@ diff -urNp linux-2.6.36/fs/binfmt_misc.c linux-2.6.36/fs/binfmt_misc.c
        };
        int err = simple_fill_super(sb, 0x42494e4d, bm_files);
        if (!err)
-diff -urNp linux-2.6.36/fs/bio.c linux-2.6.36/fs/bio.c
---- linux-2.6.36/fs/bio.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/bio.c      2010-11-06 18:58:15.000000000 -0400
-@@ -1214,7 +1214,7 @@ static void bio_copy_kern_endio(struct b
+diff -urNp linux-2.6.37/fs/bio.c linux-2.6.37/fs/bio.c
+--- linux-2.6.37/fs/bio.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/bio.c      2011-01-17 02:41:01.000000000 -0500
+@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
        const int read = bio_data_dir(bio) == READ;
        struct bio_map_data *bmd = bio->bi_private;
        int i;
@@ -29944,10 +29876,10 @@ diff -urNp linux-2.6.36/fs/bio.c linux-2.6.36/fs/bio.c
  
        __bio_for_each_segment(bvec, bio, i, 0) {
                char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.36/fs/block_dev.c linux-2.6.36/fs/block_dev.c
---- linux-2.6.36/fs/block_dev.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/block_dev.c        2010-11-06 18:58:15.000000000 -0400
-@@ -648,7 +648,7 @@ static bool bd_may_claim(struct block_de
+diff -urNp linux-2.6.37/fs/block_dev.c linux-2.6.37/fs/block_dev.c
+--- linux-2.6.37/fs/block_dev.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/block_dev.c        2011-01-17 02:41:01.000000000 -0500
+@@ -662,7 +662,7 @@ static bool bd_may_claim(struct block_de
        else if (bdev->bd_contains == bdev)
                return true;     /* is a whole device which isn't held */
  
@@ -29956,10 +29888,10 @@ diff -urNp linux-2.6.36/fs/block_dev.c linux-2.6.36/fs/block_dev.c
                return true;     /* is a partition of a device that is being partitioned */
        else if (whole->bd_holder != NULL)
                return false;    /* is a partition of a held device */
-diff -urNp linux-2.6.36/fs/btrfs/ctree.c linux-2.6.36/fs/btrfs/ctree.c
---- linux-2.6.36/fs/btrfs/ctree.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/ctree.c      2010-11-06 18:58:15.000000000 -0400
-@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
+diff -urNp linux-2.6.37/fs/btrfs/ctree.c linux-2.6.37/fs/btrfs/ctree.c
+--- linux-2.6.37/fs/btrfs/ctree.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/ctree.c      2011-01-17 02:41:01.000000000 -0500
+@@ -466,9 +466,12 @@ static noinline int __btrfs_cow_block(st
                free_extent_buffer(buf);
                add_root_to_dirty_list(root);
        } else {
@@ -29975,7 +29907,7 @@ diff -urNp linux-2.6.36/fs/btrfs/ctree.c linux-2.6.36/fs/btrfs/ctree.c
                        parent_start = 0;
  
                WARN_ON(trans->transid != btrfs_header_generation(parent));
-@@ -3763,7 +3766,6 @@ setup_items_for_insert(struct btrfs_tran
+@@ -3768,7 +3771,6 @@ setup_items_for_insert(struct btrfs_tran
  
        ret = 0;
        if (slot == 0) {
@@ -29983,10 +29915,10 @@ diff -urNp linux-2.6.36/fs/btrfs/ctree.c linux-2.6.36/fs/btrfs/ctree.c
                btrfs_cpu_key_to_disk(&disk_key, cpu_key);
                ret = fixup_low_keys(trans, root, path, &disk_key, 1);
        }
-diff -urNp linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36/fs/btrfs/disk-io.c
---- linux-2.6.36/fs/btrfs/disk-io.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/disk-io.c    2010-11-06 18:58:15.000000000 -0400
-@@ -40,7 +40,7 @@
+diff -urNp linux-2.6.37/fs/btrfs/disk-io.c linux-2.6.37/fs/btrfs/disk-io.c
+--- linux-2.6.37/fs/btrfs/disk-io.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/disk-io.c    2011-01-17 02:41:01.000000000 -0500
+@@ -41,7 +41,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
  
@@ -29995,7 +29927,7 @@ diff -urNp linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36/fs/btrfs/disk-io.c
  static void end_workqueue_fn(struct btrfs_work *work);
  static void free_fs_root(struct btrfs_root *root);
  
-@@ -2597,7 +2597,7 @@ out:
+@@ -2619,7 +2619,7 @@ out:
        return 0;
  }
  
@@ -30004,9 +29936,9 @@ diff -urNp linux-2.6.36/fs/btrfs/disk-io.c linux-2.6.36/fs/btrfs/disk-io.c
        .write_cache_pages_lock_hook = btree_lock_page_hook,
        .readpage_end_io_hook = btree_readpage_end_io_hook,
        .submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.36/fs/btrfs/extent_io.h linux-2.6.36/fs/btrfs/extent_io.h
---- linux-2.6.36/fs/btrfs/extent_io.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/extent_io.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/btrfs/extent_io.h linux-2.6.37/fs/btrfs/extent_io.h
+--- linux-2.6.37/fs/btrfs/extent_io.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/extent_io.h  2011-01-17 02:41:01.000000000 -0500
 @@ -51,36 +51,36 @@ typedef    int (extent_submit_bio_hook_t)(s
                                       struct bio *bio, int mirror_num,
                                       unsigned long bio_flags, u64 bio_offset);
@@ -30067,10 +29999,10 @@ diff -urNp linux-2.6.36/fs/btrfs/extent_io.h linux-2.6.36/fs/btrfs/extent_io.h
  };
  
  struct extent_state {
-diff -urNp linux-2.6.36/fs/btrfs/free-space-cache.c linux-2.6.36/fs/btrfs/free-space-cache.c
---- linux-2.6.36/fs/btrfs/free-space-cache.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/free-space-cache.c   2010-11-06 18:58:15.000000000 -0400
-@@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
+diff -urNp linux-2.6.37/fs/btrfs/free-space-cache.c linux-2.6.37/fs/btrfs/free-space-cache.c
+--- linux-2.6.37/fs/btrfs/free-space-cache.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/free-space-cache.c   2011-01-17 02:41:01.000000000 -0500
+@@ -1828,8 +1828,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  
        while(1) {
                if (entry->bytes < bytes || entry->offset < min_start) {
@@ -30079,7 +30011,7 @@ diff -urNp linux-2.6.36/fs/btrfs/free-space-cache.c linux-2.6.36/fs/btrfs/free-s
                        node = rb_next(&entry->offset_index);
                        if (!node)
                                break;
-@@ -1227,7 +1225,7 @@ again:
+@@ -1980,7 +1978,7 @@ again:
         */
        while (entry->bitmap || found_bitmap ||
               (!entry->bitmap && entry->bytes < min_bytes)) {
@@ -30088,9 +30020,9 @@ diff -urNp linux-2.6.36/fs/btrfs/free-space-cache.c linux-2.6.36/fs/btrfs/free-s
  
                if (entry->bitmap && entry->bytes > bytes + empty_size) {
                        ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.36/fs/btrfs/inode.c linux-2.6.36/fs/btrfs/inode.c
---- linux-2.6.36/fs/btrfs/inode.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/inode.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/btrfs/inode.c linux-2.6.37/fs/btrfs/inode.c
+--- linux-2.6.37/fs/btrfs/inode.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/inode.c      2011-01-17 02:41:01.000000000 -0500
 @@ -64,7 +64,7 @@ static const struct inode_operations btr
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
@@ -30100,7 +30032,7 @@ diff -urNp linux-2.6.36/fs/btrfs/inode.c linux-2.6.36/fs/btrfs/inode.c
  
  static struct kmem_cache *btrfs_inode_cachep;
  struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -6964,7 +6964,7 @@ static const struct file_operations btrf
+@@ -7246,7 +7246,7 @@ static const struct file_operations btrf
        .fsync          = btrfs_sync_file,
  };
  
@@ -30109,10 +30041,10 @@ diff -urNp linux-2.6.36/fs/btrfs/inode.c linux-2.6.36/fs/btrfs/inode.c
        .fill_delalloc = run_delalloc_range,
        .submit_bio_hook = btrfs_submit_bio_hook,
        .merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.36/fs/btrfs/relocation.c linux-2.6.36/fs/btrfs/relocation.c
---- linux-2.6.36/fs/btrfs/relocation.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/btrfs/relocation.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
+diff -urNp linux-2.6.37/fs/btrfs/relocation.c linux-2.6.37/fs/btrfs/relocation.c
+--- linux-2.6.37/fs/btrfs/relocation.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/btrfs/relocation.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1238,7 +1238,7 @@ static int __update_reloc_root(struct bt
        }
        spin_unlock(&rc->reloc_root_tree.lock);
  
@@ -30121,9 +30053,9 @@ diff -urNp linux-2.6.36/fs/btrfs/relocation.c linux-2.6.36/fs/btrfs/relocation.c
  
        if (!del) {
                spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.36/fs/cachefiles/bind.c linux-2.6.36/fs/cachefiles/bind.c
---- linux-2.6.36/fs/cachefiles/bind.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/cachefiles/bind.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/cachefiles/bind.c linux-2.6.37/fs/cachefiles/bind.c
+--- linux-2.6.37/fs/cachefiles/bind.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/cachefiles/bind.c  2011-01-17 02:41:01.000000000 -0500
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
               args);
  
@@ -30140,10 +30072,10 @@ diff -urNp linux-2.6.36/fs/cachefiles/bind.c linux-2.6.36/fs/cachefiles/bind.c
               cache->bcull_percent < cache->brun_percent &&
               cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon.c
---- linux-2.6.36/fs/cachefiles/daemon.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/cachefiles/daemon.c        2010-11-06 18:58:15.000000000 -0400
-@@ -195,7 +195,7 @@ static ssize_t cachefiles_daemon_read(st
+diff -urNp linux-2.6.37/fs/cachefiles/daemon.c linux-2.6.37/fs/cachefiles/daemon.c
+--- linux-2.6.37/fs/cachefiles/daemon.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/cachefiles/daemon.c        2011-01-17 02:41:01.000000000 -0500
+@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
        if (n > buflen)
                return -EMSGSIZE;
  
@@ -30152,7 +30084,7 @@ diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon
                return -EFAULT;
  
        return n;
-@@ -221,7 +221,7 @@ static ssize_t cachefiles_daemon_write(s
+@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(s
        if (test_bit(CACHEFILES_DEAD, &cache->flags))
                return -EIO;
  
@@ -30161,7 +30093,7 @@ diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon
                return -EOPNOTSUPP;
  
        /* drag the command string into the kernel so we can parse it */
-@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
+@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struc
        if (args[0] != '%' || args[1] != '\0')
                return -EINVAL;
  
@@ -30170,7 +30102,7 @@ diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon
                return cachefiles_daemon_range_error(cache, args);
  
        cache->fstop_percent = fstop;
-@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
+@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struc
        if (args[0] != '%' || args[1] != '\0')
                return -EINVAL;
  
@@ -30179,9 +30111,9 @@ diff -urNp linux-2.6.36/fs/cachefiles/daemon.c linux-2.6.36/fs/cachefiles/daemon
                return cachefiles_daemon_range_error(cache, args);
  
        cache->bstop_percent = bstop;
-diff -urNp linux-2.6.36/fs/cachefiles/rdwr.c linux-2.6.36/fs/cachefiles/rdwr.c
---- linux-2.6.36/fs/cachefiles/rdwr.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/cachefiles/rdwr.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/cachefiles/rdwr.c linux-2.6.37/fs/cachefiles/rdwr.c
+--- linux-2.6.37/fs/cachefiles/rdwr.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/cachefiles/rdwr.c  2011-01-17 02:41:01.000000000 -0500
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
                        old_fs = get_fs();
                        set_fs(KERNEL_DS);
@@ -30191,19 +30123,19 @@ diff -urNp linux-2.6.36/fs/cachefiles/rdwr.c linux-2.6.36/fs/cachefiles/rdwr.c
                        set_fs(old_fs);
                        kunmap(page);
                        if (ret != len)
-diff -urNp linux-2.6.36/fs/ceph/dir.c linux-2.6.36/fs/ceph/dir.c
---- linux-2.6.36/fs/ceph/dir.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ceph/dir.c 2010-11-06 18:58:15.000000000 -0400
-@@ -230,7 +230,7 @@ static int ceph_readdir(struct file *fil
-       struct ceph_client *client = ceph_inode_to_client(inode);
-       struct ceph_mds_client *mdsc = &client->mdsc;
+diff -urNp linux-2.6.37/fs/ceph/dir.c linux-2.6.37/fs/ceph/dir.c
+--- linux-2.6.37/fs/ceph/dir.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ceph/dir.c 2011-01-17 02:41:01.000000000 -0500
+@@ -223,7 +223,7 @@ static int ceph_readdir(struct file *fil
+       struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
+       struct ceph_mds_client *mdsc = fsc->mdsc;
        unsigned frag = fpos_frag(filp->f_pos);
 -      int off = fpos_off(filp->f_pos);
 +      unsigned int off = fpos_off(filp->f_pos);
        int err;
        u32 ftype;
        struct ceph_mds_reply_info_parsed *rinfo;
-@@ -359,7 +359,7 @@ more:
+@@ -355,7 +355,7 @@ more:
        rinfo = &fi->last_readdir->r_reply_info;
        dout("readdir frag %x num %d off %d chunkoff %d\n", frag,
             rinfo->dir_nr, off, fi->offset);
@@ -30212,9 +30144,9 @@ diff -urNp linux-2.6.36/fs/ceph/dir.c linux-2.6.36/fs/ceph/dir.c
                u64 pos = ceph_make_fpos(frag, off);
                struct ceph_mds_reply_inode *in =
                        rinfo->dir_in[off - fi->offset].in;
-diff -urNp linux-2.6.36/fs/cifs/cifs_uniupr.h linux-2.6.36/fs/cifs/cifs_uniupr.h
---- linux-2.6.36/fs/cifs/cifs_uniupr.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/cifs/cifs_uniupr.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/cifs/cifs_uniupr.h linux-2.6.37/fs/cifs/cifs_uniupr.h
+--- linux-2.6.37/fs/cifs/cifs_uniupr.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/cifs/cifs_uniupr.h 2011-01-17 02:41:01.000000000 -0500
 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
        {0x0490, 0x04cc, UniCaseRangeU0490},
        {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30224,10 +30156,10 @@ diff -urNp linux-2.6.36/fs/cifs/cifs_uniupr.h linux-2.6.36/fs/cifs/cifs_uniupr.h
  };
  #endif
  
-diff -urNp linux-2.6.36/fs/cifs/link.c linux-2.6.36/fs/cifs/link.c
---- linux-2.6.36/fs/cifs/link.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/cifs/link.c        2010-11-06 18:58:15.000000000 -0400
-@@ -216,7 +216,7 @@ cifs_symlink(struct inode *inode, struct
+diff -urNp linux-2.6.37/fs/cifs/link.c linux-2.6.37/fs/cifs/link.c
+--- linux-2.6.37/fs/cifs/link.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/cifs/link.c        2011-01-17 02:41:01.000000000 -0500
+@@ -540,7 +540,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -30236,9 +30168,9 @@ diff -urNp linux-2.6.36/fs/cifs/link.c linux-2.6.36/fs/cifs/link.c
        if (!IS_ERR(p))
                kfree(p);
  }
-diff -urNp linux-2.6.36/fs/compat_binfmt_elf.c linux-2.6.36/fs/compat_binfmt_elf.c
---- linux-2.6.36/fs/compat_binfmt_elf.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/compat_binfmt_elf.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/compat_binfmt_elf.c linux-2.6.37/fs/compat_binfmt_elf.c
+--- linux-2.6.37/fs/compat_binfmt_elf.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/compat_binfmt_elf.c        2011-01-17 02:41:01.000000000 -0500
 @@ -30,11 +30,13 @@
  #undef        elf_phdr
  #undef        elf_shdr
@@ -30253,10 +30185,10 @@ diff -urNp linux-2.6.36/fs/compat_binfmt_elf.c linux-2.6.36/fs/compat_binfmt_elf
  #define elf_addr_t    Elf32_Addr
  
  /*
-diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
---- linux-2.6.36/fs/compat.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/compat.c   2010-11-06 18:58:50.000000000 -0400
-@@ -593,7 +593,7 @@ ssize_t compat_rw_copy_check_uvector(int
+diff -urNp linux-2.6.37/fs/compat.c linux-2.6.37/fs/compat.c
+--- linux-2.6.37/fs/compat.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/compat.c   2011-01-17 02:41:01.000000000 -0500
+@@ -592,7 +592,7 @@ ssize_t compat_rw_copy_check_uvector(int
                goto out;
  
        ret = -EINVAL;
@@ -30265,22 +30197,96 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
                goto out;
        if (nr_segs > fast_segs) {
                ret = -ENOMEM;
-@@ -1435,14 +1435,12 @@ static int compat_copy_strings(int argc,
-                       if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
-                               struct page *page;
+@@ -876,6 +876,7 @@ struct compat_old_linux_dirent {
  
--#ifdef CONFIG_STACK_GROWSUP
-                               ret = expand_stack_downwards(bprm->vma, pos);
-                               if (ret < 0) {
-                                       /* We've exceed the stack rlimit. */
+ struct compat_readdir_callback {
+       struct compat_old_linux_dirent __user *dirent;
++      struct file * file;
+       int result;
+ };
+ 
+@@ -893,6 +894,10 @@ static int compat_fillonedir(void *__buf
+               buf->result = -EOVERFLOW;
+               return -EOVERFLOW;
+       }
++
++      if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++              return 0;
++
+       buf->result++;
+       dirent = buf->dirent;
+       if (!access_ok(VERIFY_WRITE, dirent,
+@@ -925,6 +930,7 @@ asmlinkage long compat_sys_old_readdir(u
+ 
+       buf.result = 0;
+       buf.dirent = dirent;
++      buf.file = file;
+ 
+       error = vfs_readdir(file, compat_fillonedir, &buf);
+       if (buf.result)
+@@ -945,6 +951,7 @@ struct compat_linux_dirent {
+ struct compat_getdents_callback {
+       struct compat_linux_dirent __user *current_dir;
+       struct compat_linux_dirent __user *previous;
++      struct file * file;
+       int count;
+       int error;
+ };
+@@ -966,6 +973,10 @@ static int compat_filldir(void *__buf, c
+               buf->error = -EOVERFLOW;
+               return -EOVERFLOW;
+       }
++
++      if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++              return 0;
++
+       dirent = buf->previous;
+       if (dirent) {
+               if (__put_user(offset, &dirent->d_off))
+@@ -1013,6 +1024,7 @@ asmlinkage long compat_sys_getdents(unsi
+       buf.previous = NULL;
+       buf.count = count;
+       buf.error = 0;
++      buf.file = file;
+ 
+       error = vfs_readdir(file, compat_filldir, &buf);
+       if (error >= 0)
+@@ -1034,6 +1046,7 @@ out:
+ struct compat_getdents_callback64 {
+       struct linux_dirent64 __user *current_dir;
+       struct linux_dirent64 __user *previous;
++      struct file * file;
+       int count;
+       int error;
+ };
+@@ -1050,6 +1063,10 @@ static int compat_filldir64(void * __buf
+       buf->error = -EINVAL;   /* only used if we fail.. */
+       if (reclen > buf->count)
+               return -EINVAL;
++
++      if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
++              return 0;
++
+       dirent = buf->previous;
+ 
+       if (dirent) {
+@@ -1101,6 +1118,7 @@ asmlinkage long compat_sys_getdents64(un
+       buf.previous = NULL;
+       buf.count = count;
+       buf.error = 0;
++      buf.file = file;
+ 
+       error = vfs_readdir(file, compat_filldir64, &buf);
+       if (error >= 0)
+@@ -1419,6 +1437,7 @@ static int compat_copy_strings(int argc,
+ 
+                               page = get_arg_page(bprm, pos, 1);
+                               if (!page) {
++                                      /* We've exceed the stack rlimit. */
                                        ret = -E2BIG;
                                        goto out;
                                }
--#endif
-                               ret = get_user_pages(current, bprm->mm, pos,
-                                                    1, 1, 1, &page, NULL);
-                               if (ret <= 0) {
-@@ -1488,6 +1486,11 @@ int compat_do_execve(char * filename,
+@@ -1460,6 +1479,11 @@ int compat_do_execve(char * filename,
        compat_uptr_t __user *envp,
        struct pt_regs * regs)
  {
@@ -30292,7 +30298,7 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-@@ -1524,6 +1527,14 @@ int compat_do_execve(char * filename,
+@@ -1496,6 +1520,14 @@ int compat_do_execve(char * filename,
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -30307,7 +30313,7 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1553,9 +1564,40 @@ int compat_do_execve(char * filename,
+@@ -1525,9 +1557,40 @@ int compat_do_execve(char * filename,
        if (retval < 0)
                goto out;
  
@@ -30323,7 +30329,7 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
 +
 +      gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
 +
-+      gr_handle_exec_args(bprm, (char __user * __user *)argv);
++      gr_handle_exec_args_compat(bprm, argv);
 +
 +#ifdef CONFIG_GRKERNSEC
 +      old_acl = current->acl;
@@ -30349,7 +30355,7 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
  
        /* execve succeeded */
        current->fs->in_exec = 0;
-@@ -1566,6 +1608,14 @@ int compat_do_execve(char * filename,
+@@ -1538,6 +1601,14 @@ int compat_do_execve(char * filename,
                put_files_struct(displaced);
        return retval;
  
@@ -30362,12 +30368,12 @@ diff -urNp linux-2.6.36/fs/compat.c linux-2.6.36/fs/compat.c
 +#endif
 +
  out:
-       if (bprm->mm)
-               mmput(bprm->mm);
-diff -urNp linux-2.6.36/fs/compat_ioctl.c linux-2.6.36/fs/compat_ioctl.c
---- linux-2.6.36/fs/compat_ioctl.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/compat_ioctl.c     2010-11-06 18:58:15.000000000 -0400
-@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
+       if (bprm->mm) {
+               acct_arg_size(bprm, 0);
+diff -urNp linux-2.6.37/fs/compat_ioctl.c linux-2.6.37/fs/compat_ioctl.c
+--- linux-2.6.37/fs/compat_ioctl.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/compat_ioctl.c     2011-01-17 02:41:01.000000000 -0500
+@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
        err  = get_user(palp, &up->palette);
        err |= get_user(length, &up->length);
@@ -30376,10 +30382,21 @@ diff -urNp linux-2.6.36/fs/compat_ioctl.c linux-2.6.36/fs/compat_ioctl.c
  
        up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
        err  = put_user(compat_ptr(palp), &up_native->palette);
-diff -urNp linux-2.6.36/fs/debugfs/inode.c linux-2.6.36/fs/debugfs/inode.c
---- linux-2.6.36/fs/debugfs/inode.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/debugfs/inode.c    2010-11-06 18:58:15.000000000 -0400
-@@ -129,7 +129,7 @@ static inline int debugfs_positive(struc
+@@ -1637,8 +1639,8 @@ asmlinkage long compat_sys_ioctl(unsigne
+ static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
+ {
+       unsigned int a, b;
+-      a = *(unsigned int *)p;
+-      b = *(unsigned int *)q;
++      a = *(const unsigned int *)p;
++      b = *(const unsigned int *)q;
+       if (a > b)
+               return 1;
+       if (a < b)
+diff -urNp linux-2.6.37/fs/debugfs/inode.c linux-2.6.37/fs/debugfs/inode.c
+--- linux-2.6.37/fs/debugfs/inode.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/debugfs/inode.c    2011-01-17 02:41:01.000000000 -0500
+@@ -130,7 +130,7 @@ static inline int debugfs_positive(struc
  
  static int debug_fill_super(struct super_block *sb, void *data, int silent)
  {
@@ -30388,9 +30405,9 @@ diff -urNp linux-2.6.36/fs/debugfs/inode.c linux-2.6.36/fs/debugfs/inode.c
  
        return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
  }
-diff -urNp linux-2.6.36/fs/dlm/lockspace.c linux-2.6.36/fs/dlm/lockspace.c
---- linux-2.6.36/fs/dlm/lockspace.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/dlm/lockspace.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/dlm/lockspace.c linux-2.6.37/fs/dlm/lockspace.c
+--- linux-2.6.37/fs/dlm/lockspace.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/dlm/lockspace.c    2011-01-17 02:41:01.000000000 -0500
 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
        return 0;
  }
@@ -30400,10 +30417,10 @@ diff -urNp linux-2.6.36/fs/dlm/lockspace.c linux-2.6.36/fs/dlm/lockspace.c
        .uevent = dlm_uevent,
  };
  
-diff -urNp linux-2.6.36/fs/ecryptfs/inode.c linux-2.6.36/fs/ecryptfs/inode.c
---- linux-2.6.36/fs/ecryptfs/inode.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ecryptfs/inode.c   2010-11-06 18:58:15.000000000 -0400
-@@ -740,7 +740,7 @@ static int ecryptfs_readlink_lower(struc
+diff -urNp linux-2.6.37/fs/ecryptfs/inode.c linux-2.6.37/fs/ecryptfs/inode.c
+--- linux-2.6.37/fs/ecryptfs/inode.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ecryptfs/inode.c   2011-01-17 02:41:01.000000000 -0500
+@@ -745,7 +745,7 @@ static int ecryptfs_readlink_lower(struc
        old_fs = get_fs();
        set_fs(get_ds());
        rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -30412,7 +30429,7 @@ diff -urNp linux-2.6.36/fs/ecryptfs/inode.c linux-2.6.36/fs/ecryptfs/inode.c
                                                   lower_bufsiz);
        set_fs(old_fs);
        if (rc < 0)
-@@ -786,7 +786,7 @@ static void *ecryptfs_follow_link(struct
+@@ -791,7 +791,7 @@ static void *ecryptfs_follow_link(struct
        }
        old_fs = get_fs();
        set_fs(get_ds());
@@ -30421,7 +30438,7 @@ diff -urNp linux-2.6.36/fs/ecryptfs/inode.c linux-2.6.36/fs/ecryptfs/inode.c
        set_fs(old_fs);
        if (rc < 0) {
                kfree(buf);
-@@ -801,7 +801,7 @@ out:
+@@ -806,7 +806,7 @@ out:
  static void
  ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
  {
@@ -30430,9 +30447,9 @@ diff -urNp linux-2.6.36/fs/ecryptfs/inode.c linux-2.6.36/fs/ecryptfs/inode.c
        if (!IS_ERR(buf)) {
                /* Free the char* */
                kfree(buf);
-diff -urNp linux-2.6.36/fs/ecryptfs/miscdev.c linux-2.6.36/fs/ecryptfs/miscdev.c
---- linux-2.6.36/fs/ecryptfs/miscdev.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ecryptfs/miscdev.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ecryptfs/miscdev.c linux-2.6.37/fs/ecryptfs/miscdev.c
+--- linux-2.6.37/fs/ecryptfs/miscdev.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ecryptfs/miscdev.c 2011-01-17 02:41:01.000000000 -0500
 @@ -328,7 +328,7 @@ check_list:
                goto out_unlock_msg_ctx;
        i = 5;
@@ -30442,13 +30459,13 @@ diff -urNp linux-2.6.36/fs/ecryptfs/miscdev.c linux-2.6.36/fs/ecryptfs/miscdev.c
                        goto out_unlock_msg_ctx;
                i += packet_length_size;
                if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
---- linux-2.6.36/fs/exec.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/exec.c     2010-11-06 19:14:10.000000000 -0400
-@@ -54,12 +54,24 @@
- #include <linux/fsnotify.h>
+diff -urNp linux-2.6.37/fs/exec.c linux-2.6.37/fs/exec.c
+--- linux-2.6.37/fs/exec.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/exec.c     2011-01-17 02:41:01.000000000 -0500
+@@ -55,12 +55,24 @@
  #include <linux/fs_struct.h>
  #include <linux/pipe_fs_i.h>
+ #include <linux/oom.h>
 +#include <linux/random.h>
 +#include <linux/seq_file.h>
 +
@@ -30470,7 +30487,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
  int core_uses_pid;
  char core_pattern[CORENAME_MAX_SIZE] = "core";
  unsigned int core_pipe_limit;
-@@ -113,7 +125,7 @@ SYSCALL_DEFINE1(uselib, const char __use
+@@ -120,7 +132,7 @@ SYSCALL_DEFINE1(uselib, const char __use
                goto out;
  
        file = do_filp_open(AT_FDCWD, tmp,
@@ -30479,7 +30496,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
                                MAY_READ | MAY_EXEC | MAY_OPEN);
        putname(tmp);
        error = PTR_ERR(file);
-@@ -161,18 +173,10 @@ static struct page *get_arg_page(struct 
+@@ -187,18 +199,10 @@ struct page *get_arg_page(struct linux_b
                int write)
  {
        struct page *page;
@@ -30501,7 +30518,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
                return NULL;
  
        if (write) {
-@@ -245,6 +249,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -273,6 +277,11 @@ static int __bprm_mm_init(struct linux_b
        vma->vm_end = STACK_TOP_MAX;
        vma->vm_start = vma->vm_end - PAGE_SIZE;
        vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
@@ -30512,8 +30529,8 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
 +
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        INIT_LIST_HEAD(&vma->anon_vma_chain);
-       err = insert_vm_struct(mm, vma);
-@@ -254,6 +263,12 @@ static int __bprm_mm_init(struct linux_b
+ 
+@@ -287,6 +296,12 @@ static int __bprm_mm_init(struct linux_b
        mm->stack_vm = mm->total_vm = 1;
        up_write(&mm->mmap_sem);
        bprm->p = vma->vm_end - sizeof(void *);
@@ -30526,7 +30543,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        return 0;
  err:
        up_write(&mm->mmap_sem);
-@@ -485,7 +500,7 @@ int copy_strings_kernel(int argc, const 
+@@ -522,7 +537,7 @@ int copy_strings_kernel(int argc, const 
        int r;
        mm_segment_t oldfs = get_fs();
        set_fs(KERNEL_DS);
@@ -30535,17 +30552,17 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        set_fs(oldfs);
        return r;
  }
-@@ -515,7 +530,8 @@ static int shift_arg_pages(struct vm_are
+@@ -552,7 +567,8 @@ static int shift_arg_pages(struct vm_are
        unsigned long new_end = old_end - shift;
        struct mmu_gather *tlb;
  
 -      BUG_ON(new_start > new_end);
 +      if (new_start >= new_end || new_start < mmap_min_addr)
-+              return -EFAULT;
++              return -ENOMEM;
  
        /*
         * ensure there are no vmas between where we want to go
-@@ -524,6 +540,10 @@ static int shift_arg_pages(struct vm_are
+@@ -561,6 +577,10 @@ static int shift_arg_pages(struct vm_are
        if (vma != find_vma(mm, new_start))
                return -EFAULT;
  
@@ -30556,7 +30573,18 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        /*
         * cover the whole range: [new_start, old_end)
         */
-@@ -619,8 +639,28 @@ int setup_arg_pages(struct linux_binprm 
+@@ -641,10 +661,6 @@ int setup_arg_pages(struct linux_binprm 
+       stack_top = arch_align_stack(stack_top);
+       stack_top = PAGE_ALIGN(stack_top);
+ 
+-      if (unlikely(stack_top < mmap_min_addr) ||
+-          unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
+-              return -ENOMEM;
+-
+       stack_shift = vma->vm_end - stack_top;
+ 
+       bprm->p -= stack_shift;
+@@ -656,8 +672,28 @@ int setup_arg_pages(struct linux_binprm 
        bprm->exec -= stack_shift;
  
        down_write(&mm->mmap_sem);
@@ -30585,7 +30613,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        /*
         * Adjust stack execute permissions; explicitly enable for
         * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -639,13 +679,6 @@ int setup_arg_pages(struct linux_binprm 
+@@ -676,13 +712,6 @@ int setup_arg_pages(struct linux_binprm 
                goto out_unlock;
        BUG_ON(prev != vma);
  
@@ -30599,7 +30627,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        /* mprotect_fixup is overkill to remove the temporary stack flags */
        vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
  
-@@ -686,7 +719,7 @@ struct file *open_exec(const char *name)
+@@ -723,7 +752,7 @@ struct file *open_exec(const char *name)
        int err;
  
        file = do_filp_open(AT_FDCWD, name,
@@ -30608,7 +30636,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
                                MAY_EXEC | MAY_OPEN);
        if (IS_ERR(file))
                goto out;
-@@ -723,7 +756,7 @@ int kernel_read(struct file *file, loff_
+@@ -760,7 +789,7 @@ int kernel_read(struct file *file, loff_
        old_fs = get_fs();
        set_fs(get_ds());
        /* The cast to a user pointer is valid due to the set_fs() */
@@ -30617,7 +30645,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        set_fs(old_fs);
        return result;
  }
-@@ -1140,7 +1173,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1182,7 +1211,7 @@ int check_unsafe_exec(struct linux_binpr
        }
        rcu_read_unlock();
  
@@ -30626,7 +30654,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
                bprm->unsafe |= LSM_UNSAFE_SHARE;
        } else {
                res = -EAGAIN;
-@@ -1336,6 +1369,11 @@ int do_execve(const char * filename,
+@@ -1378,6 +1407,11 @@ int do_execve(const char * filename,
        const char __user *const __user *envp,
        struct pt_regs * regs)
  {
@@ -30638,7 +30666,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-@@ -1372,6 +1410,18 @@ int do_execve(const char * filename,
+@@ -1414,6 +1448,18 @@ int do_execve(const char * filename,
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -30657,7 +30685,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1401,10 +1451,41 @@ int do_execve(const char * filename,
+@@ -1443,9 +1489,40 @@ int do_execve(const char * filename,
        if (retval < 0)
                goto out;
  
@@ -30684,11 +30712,10 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
 +#endif
 +
 +      retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
-+                                 bprm->unsafe & LSM_UNSAFE_SHARE);
++                                      bprm->unsafe & LSM_UNSAFE_SHARE);
 +      if (retval < 0)
 +              goto out_fail;
 +
-       current->flags &= ~PF_KTHREAD;
        retval = search_binary_handler(bprm,regs);
        if (retval < 0)
 -              goto out;
@@ -30700,7 +30727,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
  
        /* execve succeeded */
        current->fs->in_exec = 0;
-@@ -1415,6 +1496,14 @@ int do_execve(const char * filename,
+@@ -1456,6 +1533,14 @@ int do_execve(const char * filename,
                put_files_struct(displaced);
        return retval;
  
@@ -30713,9 +30740,9 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
 +#endif
 +
  out:
-       if (bprm->mm)
-               mmput (bprm->mm);
-@@ -1578,6 +1667,217 @@ out:
+       if (bprm->mm) {
+               acct_arg_size(bprm, 0);
+@@ -1642,6 +1727,217 @@ out:
        return ispipe;
  }
  
@@ -30933,7 +30960,7 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
  static int zap_process(struct task_struct *start, int exit_code)
  {
        struct task_struct *t;
-@@ -1788,17 +2088,17 @@ static void wait_for_dump_helpers(struct
+@@ -1852,17 +2148,17 @@ static void wait_for_dump_helpers(struct
        pipe = file->f_path.dentry->d_inode->i_pipe;
  
        pipe_lock(pipe);
@@ -30956,21 +30983,21 @@ diff -urNp linux-2.6.36/fs/exec.c linux-2.6.36/fs/exec.c
        pipe_unlock(pipe);
  
  }
-@@ -1906,6 +2206,10 @@ void do_coredump(long signr, int exit_co
-        */
-       clear_thread_flag(TIF_SIGPENDING);
+@@ -1978,6 +2274,10 @@ void do_coredump(long signr, int exit_co
+               goto fail_corename;
+       }
  
 +      if (signr == SIGKILL || signr == SIGILL)
 +              gr_handle_brute_attach(current);
 +      gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
 +
-       ispipe = format_corename(corename, signr);
- 
        if (ispipe) {
-diff -urNp linux-2.6.36/fs/ext2/balloc.c linux-2.6.36/fs/ext2/balloc.c
---- linux-2.6.36/fs/ext2/balloc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext2/balloc.c      2010-11-06 18:58:50.000000000 -0400
-@@ -1193,7 +1193,7 @@ static int ext2_has_free_blocks(struct e
+               int dump_count;
+               char **helper_argv;
+diff -urNp linux-2.6.37/fs/ext2/balloc.c linux-2.6.37/fs/ext2/balloc.c
+--- linux-2.6.37/fs/ext2/balloc.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext2/balloc.c      2011-01-17 02:41:01.000000000 -0500
+@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
        root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -30979,9 +31006,9 @@ diff -urNp linux-2.6.36/fs/ext2/balloc.c linux-2.6.36/fs/ext2/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-2.6.36/fs/ext2/xattr.c linux-2.6.36/fs/ext2/xattr.c
---- linux-2.6.36/fs/ext2/xattr.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext2/xattr.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ext2/xattr.c linux-2.6.37/fs/ext2/xattr.c
+--- linux-2.6.37/fs/ext2/xattr.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext2/xattr.c       2011-01-17 02:41:01.000000000 -0500
 @@ -86,8 +86,8 @@
                printk("\n"); \
        } while (0)
@@ -30993,10 +31020,10 @@ diff -urNp linux-2.6.36/fs/ext2/xattr.c linux-2.6.36/fs/ext2/xattr.c
  #endif
  
  static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.36/fs/ext3/balloc.c linux-2.6.36/fs/ext3/balloc.c
---- linux-2.6.36/fs/ext3/balloc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext3/balloc.c      2010-11-06 18:58:50.000000000 -0400
-@@ -1422,7 +1422,7 @@ static int ext3_has_free_blocks(struct e
+diff -urNp linux-2.6.37/fs/ext3/balloc.c linux-2.6.37/fs/ext3/balloc.c
+--- linux-2.6.37/fs/ext3/balloc.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext3/balloc.c      2011-01-17 02:41:01.000000000 -0500
+@@ -1425,7 +1425,7 @@ static int ext3_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
        root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -31005,9 +31032,9 @@ diff -urNp linux-2.6.36/fs/ext3/balloc.c linux-2.6.36/fs/ext3/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-2.6.36/fs/ext3/namei.c linux-2.6.36/fs/ext3/namei.c
---- linux-2.6.36/fs/ext3/namei.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext3/namei.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ext3/namei.c linux-2.6.37/fs/ext3/namei.c
+--- linux-2.6.37/fs/ext3/namei.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext3/namei.c       2011-01-17 02:41:01.000000000 -0500
 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
        char *data1 = (*bh)->b_data, *data2;
        unsigned split, move, size;
@@ -31017,9 +31044,9 @@ diff -urNp linux-2.6.36/fs/ext3/namei.c linux-2.6.36/fs/ext3/namei.c
  
        bh2 = ext3_append (handle, dir, &newblock, &err);
        if (!(bh2)) {
-diff -urNp linux-2.6.36/fs/ext3/xattr.c linux-2.6.36/fs/ext3/xattr.c
---- linux-2.6.36/fs/ext3/xattr.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext3/xattr.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ext3/xattr.c linux-2.6.37/fs/ext3/xattr.c
+--- linux-2.6.37/fs/ext3/xattr.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext3/xattr.c       2011-01-17 02:41:01.000000000 -0500
 @@ -89,8 +89,8 @@
                printk("\n"); \
        } while (0)
@@ -31031,10 +31058,10 @@ diff -urNp linux-2.6.36/fs/ext3/xattr.c linux-2.6.36/fs/ext3/xattr.c
  #endif
  
  static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.36/fs/ext4/balloc.c linux-2.6.36/fs/ext4/balloc.c
---- linux-2.6.36/fs/ext4/balloc.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext4/balloc.c      2010-11-06 18:58:50.000000000 -0400
-@@ -518,7 +518,7 @@ int ext4_has_free_blocks(struct ext4_sb_
+diff -urNp linux-2.6.37/fs/ext4/balloc.c linux-2.6.37/fs/ext4/balloc.c
+--- linux-2.6.37/fs/ext4/balloc.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext4/balloc.c      2011-01-17 02:41:01.000000000 -0500
+@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
        /* Hm, nope.  Are (enough) root reserved blocks available? */
        if (sbi->s_resuid == current_fsuid() ||
            ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
@@ -31043,10 +31070,159 @@ diff -urNp linux-2.6.36/fs/ext4/balloc.c linux-2.6.36/fs/ext4/balloc.c
                if (free_blocks >= (nblocks + dirty_blocks))
                        return 1;
        }
-diff -urNp linux-2.6.36/fs/ext4/namei.c linux-2.6.36/fs/ext4/namei.c
---- linux-2.6.36/fs/ext4/namei.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext4/namei.c       2010-11-06 18:58:15.000000000 -0400
-@@ -1170,7 +1170,7 @@ static struct ext4_dir_entry_2 *do_split
+diff -urNp linux-2.6.37/fs/ext4/ext4.h linux-2.6.37/fs/ext4/ext4.h
+--- linux-2.6.37/fs/ext4/ext4.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext4/ext4.h        2011-01-17 02:41:01.000000000 -0500
+@@ -1164,19 +1164,19 @@ struct ext4_sb_info {
+       unsigned long s_mb_last_start;
+ 
+       /* stats for buddy allocator */
+-      atomic_t s_bal_reqs;    /* number of reqs with len > 1 */
+-      atomic_t s_bal_success; /* we found long enough chunks */
+-      atomic_t s_bal_allocated;       /* in blocks */
+-      atomic_t s_bal_ex_scanned;      /* total extents scanned */
+-      atomic_t s_bal_goals;   /* goal hits */
+-      atomic_t s_bal_breaks;  /* too long searches */
+-      atomic_t s_bal_2orders; /* 2^order hits */
++      atomic_unchecked_t s_bal_reqs;  /* number of reqs with len > 1 */
++      atomic_unchecked_t s_bal_success;       /* we found long enough chunks */
++      atomic_unchecked_t s_bal_allocated;     /* in blocks */
++      atomic_unchecked_t s_bal_ex_scanned;    /* total extents scanned */
++      atomic_unchecked_t s_bal_goals; /* goal hits */
++      atomic_unchecked_t s_bal_breaks;        /* too long searches */
++      atomic_unchecked_t s_bal_2orders;       /* 2^order hits */
+       spinlock_t s_bal_lock;
+       unsigned long s_mb_buddies_generated;
+       unsigned long long s_mb_generation_time;
+-      atomic_t s_mb_lost_chunks;
+-      atomic_t s_mb_preallocated;
+-      atomic_t s_mb_discarded;
++      atomic_unchecked_t s_mb_lost_chunks;
++      atomic_unchecked_t s_mb_preallocated;
++      atomic_unchecked_t s_mb_discarded;
+       atomic_t s_lock_busy;
+ 
+       /* locality groups */
+diff -urNp linux-2.6.37/fs/ext4/mballoc.c linux-2.6.37/fs/ext4/mballoc.c
+--- linux-2.6.37/fs/ext4/mballoc.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext4/mballoc.c     2011-01-17 02:41:01.000000000 -0500
+@@ -1841,7 +1841,7 @@ void ext4_mb_simple_scan_group(struct ex
+               BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
+ 
+               if (EXT4_SB(sb)->s_mb_stats)
+-                      atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
++                      atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
+ 
+               break;
+       }
+@@ -2135,7 +2135,7 @@ repeat:
+                       ac->ac_status = AC_STATUS_CONTINUE;
+                       ac->ac_flags |= EXT4_MB_HINT_FIRST;
+                       cr = 3;
+-                      atomic_inc(&sbi->s_mb_lost_chunks);
++                      atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
+                       goto repeat;
+               }
+       }
+@@ -2577,25 +2577,25 @@ int ext4_mb_release(struct super_block *
+       if (sbi->s_mb_stats) {
+               printk(KERN_INFO
+                      "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
+-                              atomic_read(&sbi->s_bal_allocated),
+-                              atomic_read(&sbi->s_bal_reqs),
+-                              atomic_read(&sbi->s_bal_success));
++                              atomic_read_unchecked(&sbi->s_bal_allocated),
++                              atomic_read_unchecked(&sbi->s_bal_reqs),
++                              atomic_read_unchecked(&sbi->s_bal_success));
+               printk(KERN_INFO
+                     "EXT4-fs: mballoc: %u extents scanned, %u goal hits, "
+                               "%u 2^N hits, %u breaks, %u lost\n",
+-                              atomic_read(&sbi->s_bal_ex_scanned),
+-                              atomic_read(&sbi->s_bal_goals),
+-                              atomic_read(&sbi->s_bal_2orders),
+-                              atomic_read(&sbi->s_bal_breaks),
+-                              atomic_read(&sbi->s_mb_lost_chunks));
++                              atomic_read_unchecked(&sbi->s_bal_ex_scanned),
++                              atomic_read_unchecked(&sbi->s_bal_goals),
++                              atomic_read_unchecked(&sbi->s_bal_2orders),
++                              atomic_read_unchecked(&sbi->s_bal_breaks),
++                              atomic_read_unchecked(&sbi->s_mb_lost_chunks));
+               printk(KERN_INFO
+                      "EXT4-fs: mballoc: %lu generated and it took %Lu\n",
+                               sbi->s_mb_buddies_generated++,
+                               sbi->s_mb_generation_time);
+               printk(KERN_INFO
+                      "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
+-                              atomic_read(&sbi->s_mb_preallocated),
+-                              atomic_read(&sbi->s_mb_discarded));
++                              atomic_read_unchecked(&sbi->s_mb_preallocated),
++                              atomic_read_unchecked(&sbi->s_mb_discarded));
+       }
+ 
+       free_percpu(sbi->s_locality_groups);
+@@ -3080,16 +3080,16 @@ static void ext4_mb_collect_stats(struct
+       struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
+ 
+       if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
+-              atomic_inc(&sbi->s_bal_reqs);
+-              atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
++              atomic_inc_unchecked(&sbi->s_bal_reqs);
++              atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
+               if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
+-                      atomic_inc(&sbi->s_bal_success);
+-              atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
++                      atomic_inc_unchecked(&sbi->s_bal_success);
++              atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
+               if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
+                               ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
+-                      atomic_inc(&sbi->s_bal_goals);
++                      atomic_inc_unchecked(&sbi->s_bal_goals);
+               if (ac->ac_found > sbi->s_mb_max_to_scan)
+-                      atomic_inc(&sbi->s_bal_breaks);
++                      atomic_inc_unchecked(&sbi->s_bal_breaks);
+       }
+ 
+       if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
+@@ -3487,7 +3487,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
+       trace_ext4_mb_new_inode_pa(ac, pa);
+ 
+       ext4_mb_use_inode_pa(ac, pa);
+-      atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
++      atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
+ 
+       ei = EXT4_I(ac->ac_inode);
+       grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
+@@ -3547,7 +3547,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
+       trace_ext4_mb_new_group_pa(ac, pa);
+ 
+       ext4_mb_use_group_pa(ac, pa);
+-      atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
++      atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
+ 
+       grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
+       lg = ac->ac_lg;
+@@ -3634,7 +3634,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
+                * from the bitmap and continue.
+                */
+       }
+-      atomic_add(free, &sbi->s_mb_discarded);
++      atomic_add_unchecked(free, &sbi->s_mb_discarded);
+ 
+       return err;
+ }
+@@ -3652,7 +3652,7 @@ ext4_mb_release_group_pa(struct ext4_bud
+       ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
+       BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
+       mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
+-      atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
++      atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
+       trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
+ 
+       return 0;
+diff -urNp linux-2.6.37/fs/ext4/namei.c linux-2.6.37/fs/ext4/namei.c
+--- linux-2.6.37/fs/ext4/namei.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext4/namei.c       2011-01-17 02:41:01.000000000 -0500
+@@ -1161,7 +1161,7 @@ static struct ext4_dir_entry_2 *do_split
        char *data1 = (*bh)->b_data, *data2;
        unsigned split, move, size;
        struct ext4_dir_entry_2 *de = NULL, *de2;
@@ -31055,9 +31231,9 @@ diff -urNp linux-2.6.36/fs/ext4/namei.c linux-2.6.36/fs/ext4/namei.c
  
        bh2 = ext4_append (handle, dir, &newblock, &err);
        if (!(bh2)) {
-diff -urNp linux-2.6.36/fs/ext4/xattr.c linux-2.6.36/fs/ext4/xattr.c
---- linux-2.6.36/fs/ext4/xattr.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ext4/xattr.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ext4/xattr.c linux-2.6.37/fs/ext4/xattr.c
+--- linux-2.6.37/fs/ext4/xattr.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ext4/xattr.c       2011-01-17 02:41:01.000000000 -0500
 @@ -82,8 +82,8 @@
                printk("\n"); \
        } while (0)
@@ -31069,9 +31245,9 @@ diff -urNp linux-2.6.36/fs/ext4/xattr.c linux-2.6.36/fs/ext4/xattr.c
  #endif
  
  static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.36/fs/fcntl.c linux-2.6.36/fs/fcntl.c
---- linux-2.6.36/fs/fcntl.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fcntl.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/fcntl.c linux-2.6.37/fs/fcntl.c
+--- linux-2.6.37/fs/fcntl.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fcntl.c    2011-01-17 02:53:49.000000000 -0500
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
        if (err)
                return err;
@@ -31092,9 +31268,26 @@ diff -urNp linux-2.6.36/fs/fcntl.c linux-2.6.36/fs/fcntl.c
                if (arg >= rlimit(RLIMIT_NOFILE))
                        break;
                err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-2.6.36/fs/fifo.c linux-2.6.36/fs/fifo.c
---- linux-2.6.36/fs/fifo.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fifo.c     2010-11-06 18:58:15.000000000 -0400
+@@ -808,14 +814,14 @@ static int __init fcntl_init(void)
+        * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
+        * is defined as O_NONBLOCK on some platforms and not on others.
+        */
+-      BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
++      BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
+               O_RDONLY        | O_WRONLY      | O_RDWR        |
+               O_CREAT         | O_EXCL        | O_NOCTTY      |
+               O_TRUNC         | O_APPEND      | /* O_NONBLOCK | */
+               __O_SYNC        | O_DSYNC       | FASYNC        |
+               O_DIRECT        | O_LARGEFILE   | O_DIRECTORY   |
+               O_NOFOLLOW      | O_NOATIME     | O_CLOEXEC     |
+-              FMODE_EXEC
++              FMODE_EXEC      | FMODE_GREXEC
+               ));
+ 
+       fasync_cache = kmem_cache_create("fasync_cache",
+diff -urNp linux-2.6.37/fs/fifo.c linux-2.6.37/fs/fifo.c
+--- linux-2.6.37/fs/fifo.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fifo.c     2011-01-17 02:41:01.000000000 -0500
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &read_pipefifo_fops;
@@ -31165,9 +31358,9 @@ diff -urNp linux-2.6.36/fs/fifo.c linux-2.6.36/fs/fifo.c
                free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.36/fs/file.c linux-2.6.36/fs/file.c
---- linux-2.6.36/fs/file.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/file.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/file.c linux-2.6.37/fs/file.c
+--- linux-2.6.37/fs/file.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/file.c     2011-01-17 02:41:01.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -31184,9 +31377,9 @@ diff -urNp linux-2.6.36/fs/file.c linux-2.6.36/fs/file.c
        if (nr >= rlimit(RLIMIT_NOFILE))
                return -EMFILE;
  
-diff -urNp linux-2.6.36/fs/fs_struct.c linux-2.6.36/fs/fs_struct.c
---- linux-2.6.36/fs/fs_struct.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fs_struct.c        2010-11-06 19:16:06.000000000 -0400
+diff -urNp linux-2.6.37/fs/fs_struct.c linux-2.6.37/fs/fs_struct.c
+--- linux-2.6.37/fs/fs_struct.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fs_struct.c        2011-01-17 02:41:01.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -31266,10 +31459,10 @@ diff -urNp linux-2.6.36/fs/fs_struct.c linux-2.6.36/fs/fs_struct.c
                spin_unlock(&fs->lock);
  
                task_unlock(current);
-diff -urNp linux-2.6.36/fs/fuse/control.c linux-2.6.36/fs/fuse/control.c
---- linux-2.6.36/fs/fuse/control.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fuse/control.c     2010-11-06 18:58:15.000000000 -0400
-@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
+diff -urNp linux-2.6.37/fs/fuse/control.c linux-2.6.37/fs/fuse/control.c
+--- linux-2.6.37/fs/fuse/control.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fuse/control.c     2011-01-17 02:41:01.000000000 -0500
+@@ -298,7 +298,7 @@ void fuse_ctl_remove_conn(struct fuse_co
  
  static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
  {
@@ -31278,10 +31471,10 @@ diff -urNp linux-2.6.36/fs/fuse/control.c linux-2.6.36/fs/fuse/control.c
        struct fuse_conn *fc;
        int err;
  
-diff -urNp linux-2.6.36/fs/fuse/cuse.c linux-2.6.36/fs/fuse/cuse.c
---- linux-2.6.36/fs/fuse/cuse.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fuse/cuse.c        2010-11-06 18:58:15.000000000 -0400
-@@ -529,8 +529,18 @@ static int cuse_channel_release(struct i
+diff -urNp linux-2.6.37/fs/fuse/cuse.c linux-2.6.37/fs/fuse/cuse.c
+--- linux-2.6.37/fs/fuse/cuse.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fuse/cuse.c        2011-01-17 02:41:01.000000000 -0500
+@@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
        return rc;
  }
  
@@ -31302,7 +31495,7 @@ diff -urNp linux-2.6.36/fs/fuse/cuse.c linux-2.6.36/fs/fuse/cuse.c
  
  /**************************************************************************
   * Misc stuff and module initializatiion
-@@ -576,12 +586,6 @@ static int __init cuse_init(void)
+@@ -577,12 +587,6 @@ static int __init cuse_init(void)
        for (i = 0; i < CUSE_CONNTBL_LEN; i++)
                INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -31315,10 +31508,10 @@ diff -urNp linux-2.6.36/fs/fuse/cuse.c linux-2.6.36/fs/fuse/cuse.c
        cuse_class = class_create(THIS_MODULE, "cuse");
        if (IS_ERR(cuse_class))
                return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
---- linux-2.6.36/fs/fuse/dev.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fuse/dev.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1049,7 +1049,7 @@ static ssize_t fuse_dev_do_read(struct f
+diff -urNp linux-2.6.37/fs/fuse/dev.c linux-2.6.37/fs/fuse/dev.c
+--- linux-2.6.37/fs/fuse/dev.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fuse/dev.c 2011-01-17 02:41:01.000000000 -0500
+@@ -1047,7 +1047,7 @@ static ssize_t fuse_dev_do_read(struct f
        return err;
  }
  
@@ -31327,7 +31520,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
                              unsigned long nr_segs, loff_t pos)
  {
        struct fuse_copy_state cs;
-@@ -1063,6 +1063,8 @@ static ssize_t fuse_dev_read(struct kioc
+@@ -1061,6 +1061,8 @@ static ssize_t fuse_dev_read(struct kioc
        return fuse_dev_do_read(fc, file, &cs, iov_length(iov, nr_segs));
  }
  
@@ -31336,7 +31529,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe,
                                   struct pipe_buffer *buf)
  {
-@@ -1106,7 +1108,7 @@ static ssize_t fuse_dev_splice_read(stru
+@@ -1104,7 +1106,7 @@ static ssize_t fuse_dev_splice_read(stru
        ret = 0;
        pipe_lock(pipe);
  
@@ -31345,7 +31538,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
                send_sig(SIGPIPE, current, 0);
                if (!ret)
                        ret = -EPIPE;
-@@ -1604,7 +1606,7 @@ static ssize_t fuse_dev_do_write(struct 
+@@ -1597,7 +1599,7 @@ static ssize_t fuse_dev_do_write(struct 
        return err;
  }
  
@@ -31354,7 +31547,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
                              unsigned long nr_segs, loff_t pos)
  {
        struct fuse_copy_state cs;
-@@ -1617,6 +1619,8 @@ static ssize_t fuse_dev_write(struct kio
+@@ -1610,6 +1612,8 @@ static ssize_t fuse_dev_write(struct kio
        return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs));
  }
  
@@ -31363,7 +31556,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
                                     struct file *out, loff_t *ppos,
                                     size_t len, unsigned int flags)
-@@ -1695,7 +1699,7 @@ out:
+@@ -1688,7 +1692,7 @@ out:
        return ret;
  }
  
@@ -31372,7 +31565,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  {
        unsigned mask = POLLOUT | POLLWRNORM;
        struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1714,6 +1718,8 @@ static unsigned fuse_dev_poll(struct fil
+@@ -1707,6 +1711,8 @@ static unsigned fuse_dev_poll(struct fil
        return mask;
  }
  
@@ -31381,7 +31574,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  /*
   * Abort all requests on the given list (pending or processing)
   *
-@@ -1831,7 +1837,7 @@ int fuse_dev_release(struct inode *inode
+@@ -1824,7 +1830,7 @@ int fuse_dev_release(struct inode *inode
  }
  EXPORT_SYMBOL_GPL(fuse_dev_release);
  
@@ -31390,7 +31583,7 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  {
        struct fuse_conn *fc = fuse_get_conn(file);
        if (!fc)
-@@ -1841,6 +1847,8 @@ static int fuse_dev_fasync(int fd, struc
+@@ -1834,6 +1840,8 @@ static int fuse_dev_fasync(int fd, struc
        return fasync_helper(fd, file, on, &fc->fasync);
  }
  
@@ -31399,9 +31592,9 @@ diff -urNp linux-2.6.36/fs/fuse/dev.c linux-2.6.36/fs/fuse/dev.c
  const struct file_operations fuse_dev_operations = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
-diff -urNp linux-2.6.36/fs/fuse/dir.c linux-2.6.36/fs/fuse/dir.c
---- linux-2.6.36/fs/fuse/dir.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fuse/dir.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/fuse/dir.c linux-2.6.37/fs/fuse/dir.c
+--- linux-2.6.37/fs/fuse/dir.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fuse/dir.c 2011-01-17 02:41:01.000000000 -0500
 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
        return link;
  }
@@ -31411,9 +31604,9 @@ diff -urNp linux-2.6.36/fs/fuse/dir.c linux-2.6.36/fs/fuse/dir.c
  {
        if (!IS_ERR(link))
                free_page((unsigned long) link);
-diff -urNp linux-2.6.36/fs/fuse/fuse_i.h linux-2.6.36/fs/fuse/fuse_i.h
---- linux-2.6.36/fs/fuse/fuse_i.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/fuse/fuse_i.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/fuse/fuse_i.h linux-2.6.37/fs/fuse/fuse_i.h
+--- linux-2.6.37/fs/fuse/fuse_i.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/fuse/fuse_i.h      2011-01-17 02:41:01.000000000 -0500
 @@ -525,6 +525,16 @@ extern const struct file_operations fuse
  
  extern const struct dentry_operations fuse_dentry_operations;
@@ -31431,9 +31624,9 @@ diff -urNp linux-2.6.36/fs/fuse/fuse_i.h linux-2.6.36/fs/fuse/fuse_i.h
  /**
   * Inode to nodeid comparison.
   */
-diff -urNp linux-2.6.36/fs/hfs/inode.c linux-2.6.36/fs/hfs/inode.c
---- linux-2.6.36/fs/hfs/inode.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/hfs/inode.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/hfs/inode.c linux-2.6.37/fs/hfs/inode.c
+--- linux-2.6.37/fs/hfs/inode.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/hfs/inode.c        2011-01-17 02:41:01.000000000 -0500
 @@ -447,7 +447,7 @@ int hfs_write_inode(struct inode *inode,
  
        if (S_ISDIR(main_inode->i_mode)) {
@@ -31452,10 +31645,10 @@ diff -urNp linux-2.6.36/fs/hfs/inode.c linux-2.6.36/fs/hfs/inode.c
                hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
                           sizeof(struct hfs_cat_file));
                if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
---- linux-2.6.36/fs/hfsplus/inode.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/hfsplus/inode.c    2010-11-06 18:58:15.000000000 -0400
-@@ -477,7 +477,7 @@ int hfsplus_cat_read_inode(struct inode 
+diff -urNp linux-2.6.37/fs/hfsplus/inode.c linux-2.6.37/fs/hfsplus/inode.c
+--- linux-2.6.37/fs/hfsplus/inode.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/hfsplus/inode.c    2011-01-17 02:41:01.000000000 -0500
+@@ -478,7 +478,7 @@ int hfsplus_cat_read_inode(struct inode 
                struct hfsplus_cat_folder *folder = &entry.folder;
  
                if (fd->entrylength < sizeof(struct hfsplus_cat_folder))
@@ -31464,7 +31657,7 @@ diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
                hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
                                        sizeof(struct hfsplus_cat_folder));
                hfsplus_get_perms(inode, &folder->permissions, 1);
-@@ -494,7 +494,7 @@ int hfsplus_cat_read_inode(struct inode 
+@@ -495,7 +495,7 @@ int hfsplus_cat_read_inode(struct inode 
                struct hfsplus_cat_file *file = &entry.file;
  
                if (fd->entrylength < sizeof(struct hfsplus_cat_file))
@@ -31473,7 +31666,7 @@ diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
                hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
                                        sizeof(struct hfsplus_cat_file));
  
-@@ -550,7 +550,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -551,7 +551,7 @@ int hfsplus_cat_write_inode(struct inode
                struct hfsplus_cat_folder *folder = &entry.folder;
  
                if (fd.entrylength < sizeof(struct hfsplus_cat_folder))
@@ -31482,7 +31675,7 @@ diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
                hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
                                        sizeof(struct hfsplus_cat_folder));
                /* simple node checks? */
-@@ -572,7 +572,7 @@ int hfsplus_cat_write_inode(struct inode
+@@ -573,7 +573,7 @@ int hfsplus_cat_write_inode(struct inode
                struct hfsplus_cat_file *file = &entry.file;
  
                if (fd.entrylength < sizeof(struct hfsplus_cat_file))
@@ -31491,10 +31684,10 @@ diff -urNp linux-2.6.36/fs/hfsplus/inode.c linux-2.6.36/fs/hfsplus/inode.c
                hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
                                        sizeof(struct hfsplus_cat_file));
                hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.36/fs/hugetlbfs/inode.c linux-2.6.36/fs/hugetlbfs/inode.c
---- linux-2.6.36/fs/hugetlbfs/inode.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/hugetlbfs/inode.c  2010-11-06 18:58:50.000000000 -0400
-@@ -891,7 +891,7 @@ static struct file_system_type hugetlbfs
+diff -urNp linux-2.6.37/fs/hugetlbfs/inode.c linux-2.6.37/fs/hugetlbfs/inode.c
+--- linux-2.6.37/fs/hugetlbfs/inode.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/hugetlbfs/inode.c  2011-01-17 02:41:01.000000000 -0500
+@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
        .kill_sb        = kill_litter_super,
  };
  
@@ -31503,10 +31696,10 @@ diff -urNp linux-2.6.36/fs/hugetlbfs/inode.c linux-2.6.36/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.36/fs/ioctl.c linux-2.6.36/fs/ioctl.c
---- linux-2.6.36/fs/ioctl.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ioctl.c    2010-11-06 18:58:15.000000000 -0400
-@@ -87,7 +87,7 @@ int fiemap_fill_next_extent(struct fiema
+diff -urNp linux-2.6.37/fs/ioctl.c linux-2.6.37/fs/ioctl.c
+--- linux-2.6.37/fs/ioctl.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ioctl.c    2011-01-17 02:41:01.000000000 -0500
+@@ -86,7 +86,7 @@ int fiemap_fill_next_extent(struct fiema
                            u64 phys, u64 len, u32 flags)
  {
        struct fiemap_extent extent;
@@ -31515,7 +31708,7 @@ diff -urNp linux-2.6.36/fs/ioctl.c linux-2.6.36/fs/ioctl.c
  
        /* only count the extents */
        if (fieinfo->fi_extents_max == 0) {
-@@ -197,7 +197,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -196,7 +196,7 @@ static int ioctl_fiemap(struct file *fil
  
        fieinfo.fi_flags = fiemap.fm_flags;
        fieinfo.fi_extents_max = fiemap.fm_extent_count;
@@ -31524,7 +31717,7 @@ diff -urNp linux-2.6.36/fs/ioctl.c linux-2.6.36/fs/ioctl.c
  
        if (fiemap.fm_extent_count != 0 &&
            !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
-@@ -210,7 +210,7 @@ static int ioctl_fiemap(struct file *fil
+@@ -209,7 +209,7 @@ static int ioctl_fiemap(struct file *fil
        error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
        fiemap.fm_flags = fieinfo.fi_flags;
        fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
@@ -31533,9 +31726,9 @@ diff -urNp linux-2.6.36/fs/ioctl.c linux-2.6.36/fs/ioctl.c
                error = -EFAULT;
  
        return error;
-diff -urNp linux-2.6.36/fs/jffs2/debug.h linux-2.6.36/fs/jffs2/debug.h
---- linux-2.6.36/fs/jffs2/debug.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/jffs2/debug.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/jffs2/debug.h linux-2.6.37/fs/jffs2/debug.h
+--- linux-2.6.37/fs/jffs2/debug.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/jffs2/debug.h      2011-01-17 02:41:01.000000000 -0500
 @@ -53,13 +53,13 @@
  #if CONFIG_JFFS2_FS_DEBUG > 0
  #define D1(x) x
@@ -31637,9 +31830,9 @@ diff -urNp linux-2.6.36/fs/jffs2/debug.h linux-2.6.36/fs/jffs2/debug.h
  #endif 
  
  /* "Sanity" checks */
-diff -urNp linux-2.6.36/fs/jffs2/erase.c linux-2.6.36/fs/jffs2/erase.c
---- linux-2.6.36/fs/jffs2/erase.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/jffs2/erase.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/jffs2/erase.c linux-2.6.37/fs/jffs2/erase.c
+--- linux-2.6.37/fs/jffs2/erase.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/jffs2/erase.c      2011-01-17 02:41:01.000000000 -0500
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
                struct jffs2_unknown_node marker = {
                        .magic =        cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31650,9 +31843,9 @@ diff -urNp linux-2.6.36/fs/jffs2/erase.c linux-2.6.36/fs/jffs2/erase.c
                };
  
                jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.36/fs/jffs2/summary.h linux-2.6.36/fs/jffs2/summary.h
---- linux-2.6.36/fs/jffs2/summary.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/jffs2/summary.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/jffs2/summary.h linux-2.6.37/fs/jffs2/summary.h
+--- linux-2.6.37/fs/jffs2/summary.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/jffs2/summary.h    2011-01-17 02:41:01.000000000 -0500
 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
  
  #define jffs2_sum_active() (0)
@@ -31681,9 +31874,9 @@ diff -urNp linux-2.6.36/fs/jffs2/summary.h linux-2.6.36/fs/jffs2/summary.h
  #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
  
  #endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.36/fs/jffs2/wbuf.c linux-2.6.36/fs/jffs2/wbuf.c
---- linux-2.6.36/fs/jffs2/wbuf.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/jffs2/wbuf.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/jffs2/wbuf.c linux-2.6.37/fs/jffs2/wbuf.c
+--- linux-2.6.37/fs/jffs2/wbuf.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/jffs2/wbuf.c       2011-01-17 02:41:01.000000000 -0500
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
        .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31694,9 +31887,9 @@ diff -urNp linux-2.6.36/fs/jffs2/wbuf.c linux-2.6.36/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.36/fs/Kconfig.binfmt linux-2.6.36/fs/Kconfig.binfmt
---- linux-2.6.36/fs/Kconfig.binfmt     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/Kconfig.binfmt     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/Kconfig.binfmt linux-2.6.37/fs/Kconfig.binfmt
+--- linux-2.6.37/fs/Kconfig.binfmt     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/Kconfig.binfmt     2011-01-17 02:41:01.000000000 -0500
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -31706,10 +31899,10 @@ diff -urNp linux-2.6.36/fs/Kconfig.binfmt linux-2.6.36/fs/Kconfig.binfmt
        ---help---
          A.out (Assembler.OUTput) is a set of formats for libraries and
          executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-2.6.36/fs/lockd/svc.c linux-2.6.36/fs/lockd/svc.c
---- linux-2.6.36/fs/lockd/svc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/lockd/svc.c        2010-11-06 18:58:15.000000000 -0400
-@@ -42,7 +42,7 @@
+diff -urNp linux-2.6.37/fs/lockd/svc.c linux-2.6.37/fs/lockd/svc.c
+--- linux-2.6.37/fs/lockd/svc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/lockd/svc.c        2011-01-17 02:41:01.000000000 -0500
+@@ -41,7 +41,7 @@
  
  static struct svc_program     nlmsvc_program;
  
@@ -31718,10 +31911,10 @@ diff -urNp linux-2.6.36/fs/lockd/svc.c linux-2.6.36/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.36/fs/locks.c linux-2.6.36/fs/locks.c
---- linux-2.6.36/fs/locks.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/locks.c    2010-11-06 18:58:15.000000000 -0400
-@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *fil
+diff -urNp linux-2.6.37/fs/locks.c linux-2.6.37/fs/locks.c
+--- linux-2.6.37/fs/locks.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/locks.c    2011-01-17 02:41:01.000000000 -0500
+@@ -2050,16 +2050,16 @@ void locks_remove_flock(struct file *fil
                return;
  
        if (filp->f_op && filp->f_op->flock) {
@@ -31741,11 +31934,51 @@ diff -urNp linux-2.6.36/fs/locks.c linux-2.6.36/fs/locks.c
 +                      flock.fl_ops->fl_release_private(&flock);
        }
  
-       lock_kernel();
-diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
---- linux-2.6.36/fs/namei.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/namei.c    2010-11-06 18:58:50.000000000 -0400
-@@ -542,7 +542,7 @@ __do_follow_link(struct path *path, stru
+       lock_flocks();
+diff -urNp linux-2.6.37/fs/namei.c linux-2.6.37/fs/namei.c
+--- linux-2.6.37/fs/namei.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/namei.c    2011-01-17 02:46:52.000000000 -0500
+@@ -221,14 +221,6 @@ int generic_permission(struct inode *ino
+               return ret;
+ 
+       /*
+-       * Read/write DACs are always overridable.
+-       * Executable DACs are overridable if at least one exec bit is set.
+-       */
+-      if (!(mask & MAY_EXEC) || execute_ok(inode))
+-              if (capable(CAP_DAC_OVERRIDE))
+-                      return 0;
+-
+-      /*
+        * Searching includes executable on directories, else just read.
+        */
+       mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
+@@ -236,6 +228,14 @@ int generic_permission(struct inode *ino
+               if (capable(CAP_DAC_READ_SEARCH))
+                       return 0;
+ 
++      /*
++       * Read/write DACs are always overridable.
++       * Executable DACs are overridable if at least one exec bit is set.
++       */
++      if (!(mask & MAY_EXEC) || execute_ok(inode))
++              if (capable(CAP_DAC_OVERRIDE))
++                      return 0;
++
+       return -EACCES;
+ }
+ 
+@@ -473,7 +473,8 @@ static int exec_permission(struct inode 
+       if (!ret)
+               goto ok;
+ 
+-      if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
++      if (capable_nolog(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH) ||
++                      capable(CAP_DAC_OVERRIDE))
+               goto ok;
+ 
+       return ret;
+@@ -542,7 +543,7 @@ __do_follow_link(struct path *path, stru
        *p = dentry->d_inode->i_op->follow_link(dentry, nd);
        error = PTR_ERR(*p);
        if (!IS_ERR(*p)) {
@@ -31754,7 +31987,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
                error = 0;
                if (s)
                        error = __vfs_follow_link(nd, s);
-@@ -575,6 +575,13 @@ static inline int do_follow_link(struct 
+@@ -575,6 +576,13 @@ static inline int do_follow_link(struct 
        err = security_inode_follow_link(path->dentry, nd);
        if (err)
                goto loop;
@@ -31768,7 +32001,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        current->link_count++;
        current->total_link_count++;
        nd->depth++;
-@@ -967,11 +974,18 @@ return_reval:
+@@ -967,11 +975,18 @@ return_reval:
                                break;
                }
  return_base:
@@ -31787,18 +32020,79 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        path_put(&nd->path);
  return_err:
        return err;
-@@ -1486,12 +1500,19 @@ static int __open_namei_create(struct na
+@@ -1397,6 +1412,30 @@ int vfs_create(struct inode *dir, struct
+       return error;
+ }
+ 
++/*
++ * Note that while the flag value (low two bits) for sys_open means:
++ *    00 - read-only
++ *    01 - write-only
++ *    10 - read-write
++ *    11 - special
++ * it is changed into
++ *    00 - no permissions needed
++ *    01 - read-permission
++ *    10 - write-permission
++ *    11 - read-write
++ * for the internal routines (ie open_namei()/follow_link() etc)
++ * This is more logical, and also allows the 00 "no perm needed"
++ * to be used for symlinks (where the permissions are checked
++ * later).
++ *
++*/
++static inline int open_to_namei_flags(int flag)
++{
++      if ((flag+1) & O_ACCMODE)
++              flag++;
++      return flag;
++}
++
+ int may_open(struct path *path, int acc_mode, int flag)
+ {
+       struct dentry *dentry = path->dentry;
+@@ -1445,7 +1484,26 @@ int may_open(struct path *path, int acc_
+       /*
+        * Ensure there are no outstanding leases on the file.
+        */
+-      return break_lease(inode, flag);
++      error = break_lease(inode, flag);
++      if (error)
++              return error;
++
++      if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode)) {
++              error = -EPERM;
++              goto exit;
++      }
++
++      if (gr_handle_rawio(inode)) {
++              error = -EPERM;
++              goto exit;
++      }
++
++      if (!gr_acl_handle_open(dentry, path->mnt, open_to_namei_flags(flag))) {
++              error = -EACCES;
++              goto exit;
++      }
++exit:
++      return error;
+ }
+ 
+ static int handle_truncate(struct path *path)
+@@ -1479,6 +1537,12 @@ static int __open_namei_create(struct na
+ {
        int error;
        struct dentry *dir = nd->path.dentry;
- 
-+      if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, open_flag, mode)) {
++      int flag = open_to_namei_flags(open_flag);
++
++      if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
 +              error = -EACCES;
 +              goto out_unlock;
 +      }
-+
+ 
        if (!IS_POSIXACL(dir->d_inode))
                mode &= ~current_umask();
-       error = security_path_mknod(&nd->path, path->dentry, mode, 0);
+@@ -1486,6 +1550,8 @@ static int __open_namei_create(struct na
        if (error)
                goto out_unlock;
        error = vfs_create(dir->d_inode, path->dentry, mode, nd);
@@ -31807,7 +32101,38 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  out_unlock:
        mutex_unlock(&dir->d_inode->i_mutex);
        dput(nd->path.dentry);
-@@ -1594,6 +1615,7 @@ static struct file *do_last(struct namei
+@@ -1496,30 +1562,6 @@ out_unlock:
+       return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
+ }
+ 
+-/*
+- * Note that while the flag value (low two bits) for sys_open means:
+- *    00 - read-only
+- *    01 - write-only
+- *    10 - read-write
+- *    11 - special
+- * it is changed into
+- *    00 - no permissions needed
+- *    01 - read-permission
+- *    10 - write-permission
+- *    11 - read-write
+- * for the internal routines (ie open_namei()/follow_link() etc)
+- * This is more logical, and also allows the 00 "no perm needed"
+- * to be used for symlinks (where the permissions are checked
+- * later).
+- *
+-*/
+-static inline int open_to_namei_flags(int flag)
+-{
+-      if ((flag+1) & O_ACCMODE)
+-              flag++;
+-      return flag;
+-}
+-
+ static int open_will_truncate(int flag, struct inode *inode)
+ {
+       /*
+@@ -1589,6 +1631,7 @@ static struct file *do_last(struct namei
                            int mode, const char *pathname)
  {
        struct dentry *dir = nd->path.dentry;
@@ -31815,47 +32140,14 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        struct file *filp;
        int error = -EISDIR;
  
-@@ -1642,6 +1664,22 @@ static struct file *do_last(struct namei
-               }
-               path_to_nameidata(path, nd);
-               audit_inode(pathname, nd->path.dentry);
-+
-+              if (gr_handle_rofs_blockwrite(nd->path.dentry, nd->path.mnt, acc_mode)) {
-+                      error = -EPERM;
-+                      goto exit;
-+              }
-+
-+              if (gr_handle_rawio(nd->path.dentry->d_inode)) {
-+                      error = -EPERM;
-+                      goto exit;
-+              }
-+
-+              if (!gr_acl_handle_open(nd->path.dentry, nd->path.mnt, flag)) {
-+                      error = -EACCES;
-+                      goto exit;
-+              }
-+
-               goto ok;
-       }
- 
-@@ -1694,6 +1732,24 @@ static struct file *do_last(struct namei
+@@ -1690,6 +1733,14 @@ static struct file *do_last(struct namei
        /*
         * It already exists.
         */
 +
-+      if (gr_handle_rofs_blockwrite(path->dentry, nd->path.mnt, acc_mode)) {
-+              error = -EPERM;
-+              goto exit_mutex_unlock;
-+      }
-+      if (gr_handle_rawio(path->dentry->d_inode)) {
-+              error = -EPERM;
-+              goto exit_mutex_unlock;
-+      }
-+      if (!gr_acl_handle_open(path->dentry, nd->path.mnt, flag)) {
-+              error = -EACCES;
-+              goto exit_mutex_unlock;
-+      }
-+      if (gr_handle_fifo(path->dentry, nd->path.mnt, dir, flag, acc_mode)) {
++      /* only check if O_CREAT is specified, all other checks need to go
++         into may_open */
++      if (gr_handle_fifo(path->dentry, path->mnt, dir, flag, acc_mode)) {
 +              error = -EACCES;
 +              goto exit_mutex_unlock;
 +      }
@@ -31863,7 +32155,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        mutex_unlock(&dir->d_inode->i_mutex);
        audit_inode(pathname, path->dentry);
  
-@@ -2014,6 +2070,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2013,6 +2064,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        error = may_mknod(mode);
        if (error)
                goto out_dput;
@@ -31881,7 +32173,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2034,6 +2101,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2033,6 +2095,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        }
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
@@ -31891,7 +32183,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  out_dput:
        dput(dentry);
  out_unlock:
-@@ -2086,6 +2156,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2085,6 +2150,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        if (IS_ERR(dentry))
                goto out_unlock;
  
@@ -31903,7 +32195,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        if (!IS_POSIXACL(nd.path.dentry->d_inode))
                mode &= ~current_umask();
        error = mnt_want_write(nd.path.mnt);
-@@ -2097,6 +2172,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2096,6 +2166,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
@@ -31914,7 +32206,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  out_dput:
        dput(dentry);
  out_unlock:
-@@ -2178,6 +2257,8 @@ static long do_rmdir(int dfd, const char
+@@ -2177,6 +2251,8 @@ static long do_rmdir(int dfd, const char
        char * name;
        struct dentry *dentry;
        struct nameidata nd;
@@ -31923,7 +32215,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2202,6 +2283,19 @@ static long do_rmdir(int dfd, const char
+@@ -2201,6 +2277,19 @@ static long do_rmdir(int dfd, const char
        error = PTR_ERR(dentry);
        if (IS_ERR(dentry))
                goto exit2;
@@ -31943,7 +32235,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto exit3;
-@@ -2209,6 +2303,8 @@ static long do_rmdir(int dfd, const char
+@@ -2208,6 +2297,8 @@ static long do_rmdir(int dfd, const char
        if (error)
                goto exit4;
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -31952,7 +32244,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  exit4:
        mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2271,6 +2367,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2270,6 +2361,8 @@ static long do_unlinkat(int dfd, const c
        struct dentry *dentry;
        struct nameidata nd;
        struct inode *inode = NULL;
@@ -31961,19 +32253,17 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2290,8 +2388,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2289,8 +2382,17 @@ static long do_unlinkat(int dfd, const c
                if (nd.last.name[nd.last.len])
                        goto slashes;
                inode = dentry->d_inode;
 -              if (inode)
 +              if (inode) {
+                       ihold(inode);
 +                      if (inode->i_nlink <= 1) {
 +                              saved_ino = inode->i_ino;
 +                              saved_dev = inode->i_sb->s_dev;
 +                      }
-+
-                       atomic_inc(&inode->i_count);
-+
 +                      if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
 +                              error = -EACCES;
 +                              goto exit2;
@@ -31982,7 +32272,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit2;
-@@ -2299,6 +2408,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2298,6 +2400,8 @@ static long do_unlinkat(int dfd, const c
                if (error)
                        goto exit3;
                error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -31991,7 +32281,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  exit3:
                mnt_drop_write(nd.path.mnt);
        exit2:
-@@ -2376,6 +2487,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2375,6 +2479,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
        if (IS_ERR(dentry))
                goto out_unlock;
  
@@ -32003,7 +32293,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2383,6 +2499,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2382,6 +2491,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
        if (error)
                goto out_drop_write;
        error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -32012,7 +32302,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2475,6 +2593,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2474,6 +2585,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        error = PTR_ERR(new_dentry);
        if (IS_ERR(new_dentry))
                goto out_unlock;
@@ -32033,7 +32323,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2482,6 +2614,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2481,6 +2606,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        if (error)
                goto out_drop_write;
        error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -32042,7 +32332,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2715,6 +2849,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2714,6 +2841,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        if (new_dentry == trap)
                goto exit5;
  
@@ -32055,7 +32345,7 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
        error = mnt_want_write(oldnd.path.mnt);
        if (error)
                goto exit5;
-@@ -2724,6 +2864,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2723,6 +2856,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
                goto exit6;
        error = vfs_rename(old_dir->d_inode, old_dentry,
                                   new_dir->d_inode, new_dentry);
@@ -32065,10 +32355,10 @@ diff -urNp linux-2.6.36/fs/namei.c linux-2.6.36/fs/namei.c
  exit6:
        mnt_drop_write(oldnd.path.mnt);
  exit5:
-diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
---- linux-2.6.36/fs/namespace.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/namespace.c        2010-11-06 19:18:03.000000000 -0400
-@@ -1142,6 +1142,9 @@ static int do_umount(struct vfsmount *mn
+diff -urNp linux-2.6.37/fs/namespace.c linux-2.6.37/fs/namespace.c
+--- linux-2.6.37/fs/namespace.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/namespace.c        2011-01-17 02:41:01.000000000 -0500
+@@ -1141,6 +1141,9 @@ static int do_umount(struct vfsmount *mn
                if (!(sb->s_flags & MS_RDONLY))
                        retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
                up_write(&sb->s_umount);
@@ -32078,7 +32368,7 @@ diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
                return retval;
        }
  
-@@ -1161,6 +1164,9 @@ static int do_umount(struct vfsmount *mn
+@@ -1160,6 +1163,9 @@ static int do_umount(struct vfsmount *mn
        br_write_unlock(vfsmount_lock);
        up_write(&namespace_sem);
        release_mounts(&umount_list);
@@ -32088,7 +32378,7 @@ diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
        return retval;
  }
  
-@@ -2056,6 +2062,16 @@ long do_mount(char *dev_name, char *dir_
+@@ -2053,6 +2059,16 @@ long do_mount(char *dev_name, char *dir_
                   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
                   MS_STRICTATIME);
  
@@ -32105,7 +32395,7 @@ diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
        if (flags & MS_REMOUNT)
                retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
                                    data_page);
-@@ -2070,6 +2086,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2067,6 +2083,9 @@ long do_mount(char *dev_name, char *dir_
                                      dev_name, data_page);
  dput_out:
        path_put(&path);
@@ -32115,7 +32405,7 @@ diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
        return retval;
  }
  
-@@ -2276,6 +2295,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2273,6 +2292,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
                goto out1;
        }
  
@@ -32128,10 +32418,10 @@ diff -urNp linux-2.6.36/fs/namespace.c linux-2.6.36/fs/namespace.c
        get_fs_root(current->fs, &root);
        down_write(&namespace_sem);
        mutex_lock(&old.dentry->d_inode->i_mutex);
-diff -urNp linux-2.6.36/fs/nfs/inode.c linux-2.6.36/fs/nfs/inode.c
---- linux-2.6.36/fs/nfs/inode.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nfs/inode.c        2010-11-06 18:58:15.000000000 -0400
-@@ -982,16 +982,16 @@ static int nfs_size_need_update(const st
+diff -urNp linux-2.6.37/fs/nfs/inode.c linux-2.6.37/fs/nfs/inode.c
+--- linux-2.6.37/fs/nfs/inode.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nfs/inode.c        2011-01-17 02:41:01.000000000 -0500
+@@ -985,16 +985,16 @@ static int nfs_size_need_update(const st
        return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -32151,9 +32441,9 @@ diff -urNp linux-2.6.36/fs/nfs/inode.c linux-2.6.36/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
---- linux-2.6.36/fs/nfs/nfs4proc.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nfs/nfs4proc.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/nfs/nfs4proc.c linux-2.6.37/fs/nfs/nfs4proc.c
+--- linux-2.6.37/fs/nfs/nfs4proc.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nfs/nfs4proc.c     2011-01-17 02:41:01.000000000 -0500
 @@ -1184,7 +1184,7 @@ static int _nfs4_do_open_reclaim(struct 
  static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
@@ -32172,7 +32462,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        struct nfs_server *server = NFS_SERVER(state->inode);
        int err;
        do {
-@@ -1595,7 +1595,7 @@ static int _nfs4_open_expired(struct nfs
+@@ -1602,7 +1602,7 @@ static int _nfs4_open_expired(struct nfs
  static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32181,7 +32471,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -1711,7 +1711,7 @@ out_err:
+@@ -1717,7 +1717,7 @@ out_err:
  
  static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
  {
@@ -32190,7 +32480,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        struct nfs4_state *res;
        int status;
  
-@@ -1802,7 +1802,7 @@ static int nfs4_do_setattr(struct inode 
+@@ -1808,7 +1808,7 @@ static int nfs4_do_setattr(struct inode 
                           struct nfs4_state *state)
  {
        struct nfs_server *server = NFS_SERVER(inode);
@@ -32199,7 +32489,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2179,7 +2179,7 @@ static int _nfs4_server_capabilities(str
+@@ -2081,7 +2081,7 @@ static int _nfs4_server_capabilities(str
  
  int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
  {
@@ -32208,7 +32498,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2213,7 +2213,7 @@ static int _nfs4_lookup_root(struct nfs_
+@@ -2115,7 +2115,7 @@ static int _nfs4_lookup_root(struct nfs_
  static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
                struct nfs_fsinfo *info)
  {
@@ -32217,7 +32507,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2301,7 +2301,7 @@ static int _nfs4_proc_getattr(struct nfs
+@@ -2203,7 +2203,7 @@ static int _nfs4_proc_getattr(struct nfs
  
  static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -32226,7 +32516,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2389,7 +2389,7 @@ static int nfs4_proc_lookupfh(struct nfs
+@@ -2291,7 +2291,7 @@ static int nfs4_proc_lookupfh(struct nfs
                              struct qstr *name, struct nfs_fh *fhandle,
                              struct nfs_fattr *fattr)
  {
@@ -32235,7 +32525,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
-@@ -2418,7 +2418,7 @@ static int _nfs4_proc_lookup(struct inod
+@@ -2320,7 +2320,7 @@ static int _nfs4_proc_lookup(struct inod
  
  static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -32244,7 +32534,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2485,7 +2485,7 @@ static int _nfs4_proc_access(struct inod
+@@ -2387,7 +2387,7 @@ static int _nfs4_proc_access(struct inod
  
  static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
  {
@@ -32253,7 +32543,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2541,7 +2541,7 @@ static int _nfs4_proc_readlink(struct in
+@@ -2443,7 +2443,7 @@ static int _nfs4_proc_readlink(struct in
  static int nfs4_proc_readlink(struct inode *inode, struct page *page,
                unsigned int pgbase, unsigned int pglen)
  {
@@ -32262,7 +32552,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2637,7 +2637,7 @@ out:
+@@ -2537,7 +2537,7 @@ out:
  
  static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
  {
@@ -32271,7 +32561,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2713,7 +2713,7 @@ out:
+@@ -2642,7 +2642,7 @@ out:
  static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
                struct inode *new_dir, struct qstr *new_name)
  {
@@ -32280,7 +32570,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(old_dir),
-@@ -2762,7 +2762,7 @@ out:
+@@ -2691,7 +2691,7 @@ out:
  
  static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
  {
@@ -32289,7 +32579,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2854,7 +2854,7 @@ out:
+@@ -2783,7 +2783,7 @@ out:
  static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
                struct page *page, unsigned int len, struct iattr *sattr)
  {
@@ -32298,7 +32588,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2885,7 +2885,7 @@ out:
+@@ -2814,7 +2814,7 @@ out:
  static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
                struct iattr *sattr)
  {
@@ -32307,16 +32597,16 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2934,7 +2934,7 @@ static int _nfs4_proc_readdir(struct den
+@@ -2866,7 +2866,7 @@ static int _nfs4_proc_readdir(struct den
  static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
-                   u64 cookie, struct page *page, unsigned int count, int plus)
+               u64 cookie, struct page **pages, unsigned int count, int plus)
  {
 -      struct nfs4_exception exception = { };
 +      struct nfs4_exception exception = {0, 0};
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
-@@ -2982,7 +2982,7 @@ out:
+@@ -2914,7 +2914,7 @@ out:
  static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
                struct iattr *sattr, dev_t rdev)
  {
@@ -32325,7 +32615,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -3014,7 +3014,7 @@ static int _nfs4_proc_statfs(struct nfs_
+@@ -2946,7 +2946,7 @@ static int _nfs4_proc_statfs(struct nfs_
  
  static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
  {
@@ -32334,7 +32624,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -3045,7 +3045,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
+@@ -2977,7 +2977,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
  
  static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
  {
@@ -32343,7 +32633,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -3091,7 +3091,7 @@ static int _nfs4_proc_pathconf(struct nf
+@@ -3023,7 +3023,7 @@ static int _nfs4_proc_pathconf(struct nf
  static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
                struct nfs_pathconf *pathconf)
  {
@@ -32352,7 +32642,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -3408,7 +3408,7 @@ out_free:
+@@ -3340,7 +3340,7 @@ out_free:
  
  static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
  {
@@ -32361,7 +32651,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        ssize_t ret;
        do {
                ret = __nfs4_get_acl_uncached(inode, buf, buflen);
-@@ -3464,7 +3464,7 @@ static int __nfs4_proc_set_acl(struct in
+@@ -3405,7 +3405,7 @@ static int __nfs4_proc_set_acl(struct in
  
  static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
  {
@@ -32370,7 +32660,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -3749,7 +3749,7 @@ out:
+@@ -3685,7 +3685,7 @@ out:
  int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
  {
        struct nfs_server *server = NFS_SERVER(inode);
@@ -32379,7 +32669,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
        do {
                err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
-@@ -3822,7 +3822,7 @@ out:
+@@ -3758,7 +3758,7 @@ out:
  
  static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -32388,7 +32678,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4233,7 +4233,7 @@ static int _nfs4_do_setlk(struct nfs4_st
+@@ -4167,7 +4167,7 @@ static int _nfs4_do_setlk(struct nfs4_st
  static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32397,7 +32687,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4251,7 +4251,7 @@ static int nfs4_lock_reclaim(struct nfs4
+@@ -4185,7 +4185,7 @@ static int nfs4_lock_reclaim(struct nfs4
  static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32406,7 +32696,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        err = nfs4_set_lock_state(state, request);
-@@ -4316,7 +4316,7 @@ out:
+@@ -4249,7 +4249,7 @@ out:
  
  static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -32415,7 +32705,7 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4376,7 +4376,7 @@ nfs4_proc_lock(struct file *filp, int cm
+@@ -4309,7 +4309,7 @@ nfs4_proc_lock(struct file *filp, int cm
  int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -32424,9 +32714,9 @@ diff -urNp linux-2.6.36/fs/nfs/nfs4proc.c linux-2.6.36/fs/nfs/nfs4proc.c
        int err;
  
        err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.36/fs/nfsd/lockd.c linux-2.6.36/fs/nfsd/lockd.c
---- linux-2.6.36/fs/nfsd/lockd.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nfsd/lockd.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/nfsd/lockd.c linux-2.6.37/fs/nfsd/lockd.c
+--- linux-2.6.37/fs/nfsd/lockd.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nfsd/lockd.c       2011-01-17 02:41:01.000000000 -0500
 @@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
        fput(filp);
  }
@@ -32436,10 +32726,10 @@ diff -urNp linux-2.6.36/fs/nfsd/lockd.c linux-2.6.36/fs/nfsd/lockd.c
        .fopen          = nlm_fopen,            /* open file for locking */
        .fclose         = nlm_fclose,           /* close file */
  };
-diff -urNp linux-2.6.36/fs/nfsd/nfsctl.c linux-2.6.36/fs/nfsd/nfsctl.c
---- linux-2.6.36/fs/nfsd/nfsctl.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nfsd/nfsctl.c      2010-11-06 18:58:15.000000000 -0400
-@@ -163,7 +163,7 @@ static int export_features_open(struct i
+diff -urNp linux-2.6.37/fs/nfsd/nfsctl.c linux-2.6.37/fs/nfsd/nfsctl.c
+--- linux-2.6.37/fs/nfsd/nfsctl.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nfsd/nfsctl.c      2011-01-17 02:41:01.000000000 -0500
+@@ -178,7 +178,7 @@ static int export_features_open(struct i
        return single_open(file, export_features_show, NULL);
  }
  
@@ -32448,10 +32738,10 @@ diff -urNp linux-2.6.36/fs/nfsd/nfsctl.c linux-2.6.36/fs/nfsd/nfsctl.c
        .open           = export_features_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-diff -urNp linux-2.6.36/fs/nfsd/vfs.c linux-2.6.36/fs/nfsd/vfs.c
---- linux-2.6.36/fs/nfsd/vfs.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nfsd/vfs.c 2010-11-06 18:58:15.000000000 -0400
-@@ -926,7 +926,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
+diff -urNp linux-2.6.37/fs/nfsd/vfs.c linux-2.6.37/fs/nfsd/vfs.c
+--- linux-2.6.37/fs/nfsd/vfs.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nfsd/vfs.c 2011-01-17 02:41:01.000000000 -0500
+@@ -916,7 +916,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
        } else {
                oldfs = get_fs();
                set_fs(KERNEL_DS);
@@ -32460,7 +32750,7 @@ diff -urNp linux-2.6.36/fs/nfsd/vfs.c linux-2.6.36/fs/nfsd/vfs.c
                set_fs(oldfs);
        }
  
-@@ -1039,7 +1039,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
+@@ -1029,7 +1029,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
  
        /* Write the data. */
        oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -32469,7 +32759,7 @@ diff -urNp linux-2.6.36/fs/nfsd/vfs.c linux-2.6.36/fs/nfsd/vfs.c
        set_fs(oldfs);
        if (host_err < 0)
                goto out_nfserr;
-@@ -1556,7 +1556,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1546,7 +1546,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
         */
  
        oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -32478,9 +32768,9 @@ diff -urNp linux-2.6.36/fs/nfsd/vfs.c linux-2.6.36/fs/nfsd/vfs.c
        set_fs(oldfs);
  
        if (host_err < 0)
-diff -urNp linux-2.6.36/fs/nls/nls_base.c linux-2.6.36/fs/nls/nls_base.c
---- linux-2.6.36/fs/nls/nls_base.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/nls/nls_base.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/nls/nls_base.c linux-2.6.37/fs/nls/nls_base.c
+--- linux-2.6.37/fs/nls/nls_base.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/nls/nls_base.c     2011-01-17 02:41:01.000000000 -0500
 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
      {0xF8,  0xF0,   3*6,    0x1FFFFF,       0x10000,   /* 4 byte sequence */},
      {0xFC,  0xF8,   4*6,    0x3FFFFFF,      0x200000,  /* 5 byte sequence */},
@@ -32490,9 +32780,9 @@ diff -urNp linux-2.6.36/fs/nls/nls_base.c linux-2.6.36/fs/nls/nls_base.c
  };
  
  #define UNICODE_MAX   0x0010ffff
-diff -urNp linux-2.6.36/fs/ntfs/dir.c linux-2.6.36/fs/ntfs/dir.c
---- linux-2.6.36/fs/ntfs/dir.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ntfs/dir.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ntfs/dir.c linux-2.6.37/fs/ntfs/dir.c
+--- linux-2.6.37/fs/ntfs/dir.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ntfs/dir.c 2011-01-17 02:41:01.000000000 -0500
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
        ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
                        ~(s64)(ndir->itype.index.block_size - 1)));
@@ -32502,9 +32792,9 @@ diff -urNp linux-2.6.36/fs/ntfs/dir.c linux-2.6.36/fs/ntfs/dir.c
                ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
                                "inode 0x%lx or driver bug.", vdir->i_ino);
                goto err_out;
-diff -urNp linux-2.6.36/fs/ntfs/file.c linux-2.6.36/fs/ntfs/file.c
---- linux-2.6.36/fs/ntfs/file.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ntfs/file.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ntfs/file.c linux-2.6.37/fs/ntfs/file.c
+--- linux-2.6.37/fs/ntfs/file.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ntfs/file.c        2011-01-17 02:41:01.000000000 -0500
 @@ -2223,6 +2223,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -32514,9 +32804,9 @@ diff -urNp linux-2.6.36/fs/ntfs/file.c linux-2.6.36/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.36/fs/ocfs2/localalloc.c linux-2.6.36/fs/ocfs2/localalloc.c
---- linux-2.6.36/fs/ocfs2/localalloc.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ocfs2/localalloc.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ocfs2/localalloc.c linux-2.6.37/fs/ocfs2/localalloc.c
+--- linux-2.6.37/fs/ocfs2/localalloc.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ocfs2/localalloc.c 2011-01-17 02:41:01.000000000 -0500
 @@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
                goto bail;
        }
@@ -32526,10 +32816,10 @@ diff -urNp linux-2.6.36/fs/ocfs2/localalloc.c linux-2.6.36/fs/ocfs2/localalloc.c
  
  bail:
        if (handle)
-diff -urNp linux-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36/fs/ocfs2/ocfs2.h
---- linux-2.6.36/fs/ocfs2/ocfs2.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ocfs2/ocfs2.h      2010-11-06 18:58:15.000000000 -0400
-@@ -223,11 +223,11 @@ enum ocfs2_vol_state
+diff -urNp linux-2.6.37/fs/ocfs2/ocfs2.h linux-2.6.37/fs/ocfs2/ocfs2.h
+--- linux-2.6.37/fs/ocfs2/ocfs2.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ocfs2/ocfs2.h      2011-01-17 02:41:01.000000000 -0500
+@@ -230,11 +230,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
  {
@@ -32546,9 +32836,9 @@ diff -urNp linux-2.6.36/fs/ocfs2/ocfs2.h linux-2.6.36/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
---- linux-2.6.36/fs/ocfs2/suballoc.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ocfs2/suballoc.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ocfs2/suballoc.c linux-2.6.37/fs/ocfs2/suballoc.c
+--- linux-2.6.37/fs/ocfs2/suballoc.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ocfs2/suballoc.c   2011-01-17 02:41:01.000000000 -0500
 @@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
                                mlog_errno(status);
                        goto bail;
@@ -32558,7 +32848,7 @@ diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
  
                /* You should never ask for this much metadata */
                BUG_ON(bits_wanted >
-@@ -2004,7 +2004,7 @@ int ocfs2_claim_metadata(handle_t *handl
+@@ -2012,7 +2012,7 @@ int ocfs2_claim_metadata(handle_t *handl
                mlog_errno(status);
                goto bail;
        }
@@ -32567,7 +32857,7 @@ diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
  
        *suballoc_loc = res.sr_bg_blkno;
        *suballoc_bit_start = res.sr_bit_offset;
-@@ -2211,7 +2211,7 @@ int ocfs2_claim_new_inode(handle_t *hand
+@@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *hand
                mlog_errno(status);
                goto bail;
        }
@@ -32576,7 +32866,7 @@ diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
  
        BUG_ON(res.sr_bits != 1);
  
-@@ -2316,7 +2316,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2324,7 +2324,7 @@ int __ocfs2_claim_clusters(handle_t *han
                                                      cluster_start,
                                                      num_clusters);
                if (!status)
@@ -32585,7 +32875,7 @@ diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
        } else {
                if (min_clusters > (osb->bitmap_cpg - 1)) {
                        /* The only paths asking for contiguousness
-@@ -2342,7 +2342,7 @@ int __ocfs2_claim_clusters(handle_t *han
+@@ -2350,7 +2350,7 @@ int __ocfs2_claim_clusters(handle_t *han
                                ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
                                                                 res.sr_bg_blkno,
                                                                 res.sr_bit_offset);
@@ -32594,10 +32884,10 @@ diff -urNp linux-2.6.36/fs/ocfs2/suballoc.c linux-2.6.36/fs/ocfs2/suballoc.c
                        *num_clusters = res.sr_bits;
                }
        }
-diff -urNp linux-2.6.36/fs/ocfs2/super.c linux-2.6.36/fs/ocfs2/super.c
---- linux-2.6.36/fs/ocfs2/super.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ocfs2/super.c      2010-11-06 18:58:15.000000000 -0400
-@@ -292,11 +292,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
+diff -urNp linux-2.6.37/fs/ocfs2/super.c linux-2.6.37/fs/ocfs2/super.c
+--- linux-2.6.37/fs/ocfs2/super.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ocfs2/super.c      2011-01-17 02:41:01.000000000 -0500
+@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
                        "%10s => GlobalAllocs: %d  LocalAllocs: %d  "
                        "SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
                        "Stats",
@@ -32614,7 +32904,7 @@ diff -urNp linux-2.6.36/fs/ocfs2/super.c linux-2.6.36/fs/ocfs2/super.c
  
        out += snprintf(buf + out, len - out,
                        "%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -2046,11 +2046,11 @@ static int ocfs2_initialize_super(struct
+@@ -2122,11 +2122,11 @@ static int ocfs2_initialize_super(struct
        spin_lock_init(&osb->osb_xattr_lock);
        ocfs2_init_steal_slots(osb);
  
@@ -32631,9 +32921,9 @@ diff -urNp linux-2.6.36/fs/ocfs2/super.c linux-2.6.36/fs/ocfs2/super.c
  
        /* Copy the blockcheck stats from the superblock probe */
        osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.36/fs/ocfs2/symlink.c linux-2.6.36/fs/ocfs2/symlink.c
---- linux-2.6.36/fs/ocfs2/symlink.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/ocfs2/symlink.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/ocfs2/symlink.c linux-2.6.37/fs/ocfs2/symlink.c
+--- linux-2.6.37/fs/ocfs2/symlink.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/ocfs2/symlink.c    2011-01-17 02:41:01.000000000 -0500
 @@ -148,7 +148,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -32643,20 +32933,21 @@ diff -urNp linux-2.6.36/fs/ocfs2/symlink.c linux-2.6.36/fs/ocfs2/symlink.c
        if (!IS_ERR(link))
                kfree(link);
  }
-diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
---- linux-2.6.36/fs/open.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/open.c     2010-11-06 20:36:14.000000000 -0400
-@@ -43,6 +43,9 @@ int do_truncate(struct dentry *dentry, l
-       if (length < 0)
-               return -EINVAL;
- 
-+      if (filp && !gr_acl_handle_truncate(dentry, filp->f_path.mnt))
-+              return -EACCES;
+diff -urNp linux-2.6.37/fs/open.c linux-2.6.37/fs/open.c
+--- linux-2.6.37/fs/open.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/open.c     2011-01-17 02:49:14.000000000 -0500
+@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
+       error = locks_verify_truncate(inode, NULL, length);
+       if (!error)
+               error = security_path_truncate(&path);
 +
-       newattrs.ia_size = length;
-       newattrs.ia_valid = ATTR_SIZE | time_attrs;
-       if (filp) {
-@@ -345,6 +348,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
++      if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
++              error = -EACCES;
++
+       if (!error)
+               error = do_truncate(path.dentry, length, 0, NULL);
+ 
+@@ -345,6 +349,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
        if (__mnt_is_readonly(path.mnt))
                res = -EROFS;
  
@@ -32666,7 +32957,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
  out_path_release:
        path_put(&path);
  out:
-@@ -371,6 +377,8 @@ SYSCALL_DEFINE1(chdir, const char __user
+@@ -371,6 +378,8 @@ SYSCALL_DEFINE1(chdir, const char __user
        if (error)
                goto dput_and_out;
  
@@ -32675,7 +32966,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        set_fs_pwd(current->fs, &path);
  
  dput_and_out:
-@@ -397,6 +405,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
+@@ -397,6 +406,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
                goto out_putf;
  
        error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
@@ -32689,7 +32980,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        if (!error)
                set_fs_pwd(current->fs, &file->f_path);
  out_putf:
-@@ -425,7 +440,18 @@ SYSCALL_DEFINE1(chroot, const char __use
+@@ -425,7 +441,18 @@ SYSCALL_DEFINE1(chroot, const char __use
        if (error)
                goto dput_and_out;
  
@@ -32708,7 +32999,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        error = 0;
  dput_and_out:
        path_put(&path);
-@@ -453,12 +479,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -453,12 +480,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
        err = mnt_want_write_file(file);
        if (err)
                goto out_putf;
@@ -32734,7 +33025,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
        newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
        err = notify_change(dentry, &newattrs);
-@@ -486,12 +525,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -486,12 +526,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
        error = mnt_want_write(path.mnt);
        if (error)
                goto dput_and_out;
@@ -32760,7 +33051,7 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
        newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
        error = notify_change(path.dentry, &newattrs);
-@@ -515,6 +567,9 @@ static int chown_common(struct path *pat
+@@ -515,6 +568,9 @@ static int chown_common(struct path *pat
        int error;
        struct iattr newattrs;
  
@@ -32770,18 +33061,21 @@ diff -urNp linux-2.6.36/fs/open.c linux-2.6.36/fs/open.c
        newattrs.ia_valid =  ATTR_CTIME;
        if (user != (uid_t) -1) {
                newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-2.6.36/fs/pipe.c linux-2.6.36/fs/pipe.c
---- linux-2.6.36/fs/pipe.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/pipe.c     2010-11-06 18:58:50.000000000 -0400
-@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const stru
-                       error = ops->confirm(pipe, buf);
-                       if (error) {
-                               if (!ret)
--                                      error = ret;
-+                                      ret = error;
-                               break;
-                       }
- 
+@@ -883,7 +939,10 @@ long do_sys_open(int dfd, const char __u
+       if (!IS_ERR(tmp)) {
+               fd = get_unused_fd_flags(flags);
+               if (fd >= 0) {
+-                      struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
++                      struct file *f;
++                      /* don't allow to be set by userland */
++                      flags &= ~FMODE_GREXEC;
++                      f = do_filp_open(dfd, tmp, flags, mode, 0);
+                       if (IS_ERR(f)) {
+                               put_unused_fd(fd);
+                               fd = PTR_ERR(f);
+diff -urNp linux-2.6.37/fs/pipe.c linux-2.6.37/fs/pipe.c
+--- linux-2.6.37/fs/pipe.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/pipe.c     2011-01-17 02:41:01.000000000 -0500
 @@ -420,9 +420,9 @@ redo:
                }
                if (bufs)       /* More to do? */
@@ -32895,7 +33189,7 @@ diff -urNp linux-2.6.36/fs/pipe.c linux-2.6.36/fs/pipe.c
  
  /*
   * pipefs_dname() is called from d_path().
-@@ -959,7 +959,8 @@ static struct inode * get_pipe_inode(voi
+@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(voi
                goto fail_iput;
        inode->i_pipe = pipe;
  
@@ -32905,9 +33199,9 @@ diff -urNp linux-2.6.36/fs/pipe.c linux-2.6.36/fs/pipe.c
        inode->i_fop = &rdwr_pipefifo_fops;
  
        /*
-diff -urNp linux-2.6.36/fs/proc/array.c linux-2.6.36/fs/proc/array.c
---- linux-2.6.36/fs/proc/array.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/array.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/array.c linux-2.6.37/fs/proc/array.c
+--- linux-2.6.37/fs/proc/array.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/array.c       2011-01-17 02:41:01.000000000 -0500
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -33010,9 +33304,9 @@ diff -urNp linux-2.6.36/fs/proc/array.c linux-2.6.36/fs/proc/array.c
 +      return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
---- linux-2.6.36/fs/proc/base.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/base.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/base.c linux-2.6.37/fs/proc/base.c
+--- linux-2.6.37/fs/proc/base.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/base.c        2011-01-17 02:41:01.000000000 -0500
 @@ -104,6 +104,22 @@ struct pid_entry {
        union proc_op op;
  };
@@ -33112,7 +33406,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
  static int proc_pid_syscall(struct task_struct *task, char *buffer)
  {
        long nr;
-@@ -928,6 +966,9 @@ static ssize_t environ_read(struct file 
+@@ -930,6 +968,9 @@ static ssize_t environ_read(struct file 
        if (!task)
                goto out_no_task;
  
@@ -33122,7 +33416,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        if (!ptrace_may_access(task, PTRACE_MODE_READ))
                goto out;
  
-@@ -1614,7 +1655,11 @@ static struct inode *proc_pid_make_inode
+@@ -1663,7 +1704,11 @@ static struct inode *proc_pid_make_inode
                rcu_read_lock();
                cred = __task_cred(task);
                inode->i_uid = cred->euid;
@@ -33134,7 +33428,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
                rcu_read_unlock();
        }
        security_task_to_inode(task, inode);
-@@ -1632,6 +1677,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1681,6 +1726,9 @@ static int pid_getattr(struct vfsmount *
        struct inode *inode = dentry->d_inode;
        struct task_struct *task;
        const struct cred *cred;
@@ -33144,7 +33438,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
  
        generic_fillattr(inode, stat);
  
-@@ -1639,12 +1687,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1688,12 +1736,34 @@ static int pid_getattr(struct vfsmount *
        stat->uid = 0;
        stat->gid = 0;
        task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -33180,7 +33474,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
                }
        }
        rcu_read_unlock();
-@@ -1676,11 +1746,20 @@ static int pid_revalidate(struct dentry 
+@@ -1725,11 +1795,20 @@ static int pid_revalidate(struct dentry 
  
        if (task) {
                if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -33201,7 +33495,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
                        rcu_read_unlock();
                } else {
                        inode->i_uid = 0;
-@@ -1801,7 +1880,8 @@ static int proc_fd_info(struct inode *in
+@@ -1850,7 +1929,8 @@ static int proc_fd_info(struct inode *in
        int fd = proc_fd(inode);
  
        if (task) {
@@ -33211,7 +33505,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
                put_task_struct(task);
        }
        if (files) {
-@@ -2053,12 +2133,22 @@ static const struct file_operations proc
+@@ -2104,12 +2184,22 @@ static const struct file_operations proc
  static int proc_fd_permission(struct inode *inode, int mask)
  {
        int rv;
@@ -33236,7 +33530,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        return rv;
  }
  
-@@ -2167,6 +2257,9 @@ static struct dentry *proc_pident_lookup
+@@ -2219,6 +2309,9 @@ static struct dentry *proc_pident_lookup
        if (!task)
                goto out_no_task;
  
@@ -33246,7 +33540,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        /*
         * Yes, it does not scale. And it should not. Don't add
         * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2211,6 +2304,9 @@ static int proc_pident_readdir(struct fi
+@@ -2263,6 +2356,9 @@ static int proc_pident_readdir(struct fi
        if (!task)
                goto out_no_task;
  
@@ -33256,7 +33550,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        ret = 0;
        i = filp->f_pos;
        switch (i) {
-@@ -2480,7 +2576,7 @@ static void *proc_self_follow_link(struc
+@@ -2533,7 +2629,7 @@ static void *proc_self_follow_link(struc
  static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
                                void *cookie)
  {
@@ -33265,7 +33559,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        if (!IS_ERR(s))
                __putname(s);
  }
-@@ -2680,7 +2776,7 @@ static const struct pid_entry tgid_base_
+@@ -2734,7 +2830,7 @@ static const struct pid_entry tgid_base_
        REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
        REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -33274,7 +33568,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        INF("syscall",    S_IRUSR, proc_pid_syscall),
  #endif
        INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2705,10 +2801,10 @@ static const struct pid_entry tgid_base_
+@@ -2759,10 +2855,10 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_SECURITY
        DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -33287,7 +33581,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2739,6 +2835,9 @@ static const struct pid_entry tgid_base_
+@@ -2793,6 +2889,9 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_TASK_IO_ACCOUNTING
        INF("io",       S_IRUGO, proc_tgid_io_accounting),
  #endif
@@ -33297,7 +33591,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2863,7 +2962,14 @@ static struct dentry *proc_pid_instantia
+@@ -2918,7 +3017,14 @@ static struct dentry *proc_pid_instantia
        if (!inode)
                goto out;
  
@@ -33312,7 +33606,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        inode->i_op = &proc_tgid_base_inode_operations;
        inode->i_fop = &proc_tgid_base_operations;
        inode->i_flags|=S_IMMUTABLE;
-@@ -2905,7 +3011,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2960,7 +3066,11 @@ struct dentry *proc_pid_lookup(struct in
        if (!task)
                goto out;
  
@@ -33324,7 +33618,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        put_task_struct(task);
  out:
        return result;
-@@ -2970,6 +3080,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3025,6 +3135,11 @@ int proc_pid_readdir(struct file * filp,
  {
        unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
        struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -33336,7 +33630,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        struct tgid_iter iter;
        struct pid_namespace *ns;
  
-@@ -2988,8 +3103,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3043,8 +3158,27 @@ int proc_pid_readdir(struct file * filp,
        for (iter = next_tgid(ns, iter);
             iter.task;
             iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -33365,7 +33659,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
                        put_task_struct(iter.task);
                        goto out;
                }
-@@ -3016,7 +3150,7 @@ static const struct pid_entry tid_base_s
+@@ -3071,7 +3205,7 @@ static const struct pid_entry tid_base_s
        REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
        REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -33374,7 +33668,7 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        INF("syscall",   S_IRUSR, proc_pid_syscall),
  #endif
        INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3040,10 +3174,10 @@ static const struct pid_entry tid_base_s
+@@ -3095,10 +3229,10 @@ static const struct pid_entry tid_base_s
  #ifdef CONFIG_SECURITY
        DIR("attr",      S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -33387,9 +33681,9 @@ diff -urNp linux-2.6.36/fs/proc/base.c linux-2.6.36/fs/proc/base.c
        ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.36/fs/proc/cmdline.c linux-2.6.36/fs/proc/cmdline.c
---- linux-2.6.36/fs/proc/cmdline.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/cmdline.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/cmdline.c linux-2.6.37/fs/proc/cmdline.c
+--- linux-2.6.37/fs/proc/cmdline.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/cmdline.c     2011-01-17 02:41:01.000000000 -0500
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -33402,9 +33696,9 @@ diff -urNp linux-2.6.36/fs/proc/cmdline.c linux-2.6.36/fs/proc/cmdline.c
        return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.36/fs/proc/devices.c linux-2.6.36/fs/proc/devices.c
---- linux-2.6.36/fs/proc/devices.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/devices.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/devices.c linux-2.6.37/fs/proc/devices.c
+--- linux-2.6.37/fs/proc/devices.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/devices.c     2011-01-17 02:41:01.000000000 -0500
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -33417,10 +33711,10 @@ diff -urNp linux-2.6.36/fs/proc/devices.c linux-2.6.36/fs/proc/devices.c
        return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.36/fs/proc/inode.c linux-2.6.36/fs/proc/inode.c
---- linux-2.6.36/fs/proc/inode.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/inode.c       2010-11-06 18:58:50.000000000 -0400
-@@ -426,7 +426,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-2.6.37/fs/proc/inode.c linux-2.6.37/fs/proc/inode.c
+--- linux-2.6.37/fs/proc/inode.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/inode.c       2011-01-17 02:41:01.000000000 -0500
+@@ -425,7 +425,11 @@ struct inode *proc_get_inode(struct supe
                if (de->mode) {
                        inode->i_mode = de->mode;
                        inode->i_uid = de->uid;
@@ -33432,9 +33726,9 @@ diff -urNp linux-2.6.36/fs/proc/inode.c linux-2.6.36/fs/proc/inode.c
                }
                if (de->size)
                        inode->i_size = de->size;
-diff -urNp linux-2.6.36/fs/proc/internal.h linux-2.6.36/fs/proc/internal.h
---- linux-2.6.36/fs/proc/internal.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/internal.h    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/internal.h linux-2.6.37/fs/proc/internal.h
+--- linux-2.6.37/fs/proc/internal.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/internal.h    2011-01-17 02:41:01.000000000 -0500
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
                                struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33445,9 +33739,9 @@ diff -urNp linux-2.6.36/fs/proc/internal.h linux-2.6.36/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.36/fs/proc/Kconfig linux-2.6.36/fs/proc/Kconfig
---- linux-2.6.36/fs/proc/Kconfig       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/Kconfig       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/Kconfig linux-2.6.37/fs/proc/Kconfig
+--- linux-2.6.37/fs/proc/Kconfig       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/Kconfig       2011-01-17 02:41:01.000000000 -0500
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -33456,10 +33750,10 @@ diff -urNp linux-2.6.36/fs/proc/Kconfig linux-2.6.36/fs/proc/Kconfig
 +      depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
  
  config PROC_VMCORE
-         bool "/proc/vmcore support (EXPERIMENTAL)"
--        depends on PROC_FS && CRASH_DUMP
+       bool "/proc/vmcore support"
+-      depends on PROC_FS && CRASH_DUMP
 -      default y
-+        depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++      depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
 +      default n
          help
          Exports the dump image of crashed kernel in ELF format.
@@ -33475,9 +33769,9 @@ diff -urNp linux-2.6.36/fs/proc/Kconfig linux-2.6.36/fs/proc/Kconfig
        bool "Enable /proc page monitoring" if EMBEDDED
        help
          Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.36/fs/proc/kcore.c linux-2.6.36/fs/proc/kcore.c
---- linux-2.6.36/fs/proc/kcore.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/kcore.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/kcore.c linux-2.6.37/fs/proc/kcore.c
+--- linux-2.6.37/fs/proc/kcore.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/kcore.c       2011-01-17 02:41:01.000000000 -0500
 @@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
         * the addresses in the elf_phdr on our list.
         */
@@ -33491,12 +33785,13 @@ diff -urNp linux-2.6.36/fs/proc/kcore.c linux-2.6.36/fs/proc/kcore.c
        while (buflen) {
                struct kcore_list *m;
  
-@@ -509,20 +510,18 @@ read_kcore(struct file *file, char __use
+@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __use
                        kfree(elf_buf);
                } else {
                        if (kern_addr_valid(start)) {
 -                              unsigned long n;
 +                              char *elf_buf;
++                              mm_segment_t oldfs;
  
 -                              n = copy_to_user(buffer, (char *)start, tsz);
 -                              /*
@@ -33511,17 +33806,21 @@ diff -urNp linux-2.6.36/fs/proc/kcore.c linux-2.6.36/fs/proc/kcore.c
 +                              elf_buf = kmalloc(tsz, GFP_KERNEL);
 +                              if (!elf_buf)
 +                                      return -ENOMEM;
++                              oldfs = get_fs();
++                              set_fs(KERNEL_DS);
 +                              if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
++                                      set_fs(oldfs);
 +                                      if (copy_to_user(buffer, elf_buf, tsz)) {
 +                                              kfree(elf_buf);
                                                return -EFAULT;
 +                                      }
                                }
++                              set_fs(oldfs);
 +                              kfree(elf_buf);
                        } else {
                                if (clear_user(buffer, tsz))
                                        return -EFAULT;
-@@ -542,6 +541,9 @@ read_kcore(struct file *file, char __use
+@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __use
  
  static int open_kcore(struct inode *inode, struct file *filp)
  {
@@ -33531,9 +33830,9 @@ diff -urNp linux-2.6.36/fs/proc/kcore.c linux-2.6.36/fs/proc/kcore.c
        if (!capable(CAP_SYS_RAWIO))
                return -EPERM;
        if (kcore_need_update)
-diff -urNp linux-2.6.36/fs/proc/meminfo.c linux-2.6.36/fs/proc/meminfo.c
---- linux-2.6.36/fs/proc/meminfo.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/meminfo.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/meminfo.c linux-2.6.37/fs/proc/meminfo.c
+--- linux-2.6.37/fs/proc/meminfo.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/meminfo.c     2011-01-17 02:41:01.000000000 -0500
 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
                vmi.used >> 10,
                vmi.largest_chunk >> 10
@@ -33543,9 +33842,9 @@ diff -urNp linux-2.6.36/fs/proc/meminfo.c linux-2.6.36/fs/proc/meminfo.c
  #endif
                );
  
-diff -urNp linux-2.6.36/fs/proc/nommu.c linux-2.6.36/fs/proc/nommu.c
---- linux-2.6.36/fs/proc/nommu.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/nommu.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/nommu.c linux-2.6.37/fs/proc/nommu.c
+--- linux-2.6.37/fs/proc/nommu.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/nommu.c       2011-01-17 02:41:01.000000000 -0500
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
                if (len < 1)
                        len = 1;
@@ -33555,9 +33854,9 @@ diff -urNp linux-2.6.36/fs/proc/nommu.c linux-2.6.36/fs/proc/nommu.c
        }
  
        seq_putc(m, '\n');
-diff -urNp linux-2.6.36/fs/proc/proc_net.c linux-2.6.36/fs/proc/proc_net.c
---- linux-2.6.36/fs/proc/proc_net.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/proc_net.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/proc_net.c linux-2.6.37/fs/proc/proc_net.c
+--- linux-2.6.37/fs/proc/proc_net.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/proc_net.c    2011-01-17 02:41:01.000000000 -0500
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
        struct task_struct *task;
        struct nsproxy *ns;
@@ -33576,9 +33875,9 @@ diff -urNp linux-2.6.36/fs/proc/proc_net.c linux-2.6.36/fs/proc/proc_net.c
  
        rcu_read_lock();
        task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
---- linux-2.6.36/fs/proc/proc_sysctl.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/proc_sysctl.c 2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/proc_sysctl.c linux-2.6.37/fs/proc/proc_sysctl.c
+--- linux-2.6.37/fs/proc/proc_sysctl.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/proc_sysctl.c 2011-01-17 02:41:01.000000000 -0500
 @@ -7,6 +7,8 @@
  #include <linux/security.h>
  #include "internal.h"
@@ -33588,7 +33887,7 @@ diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
  static const struct dentry_operations proc_sys_dentry_operations;
  static const struct file_operations proc_sys_file_operations;
  static const struct inode_operations proc_sys_inode_operations;
-@@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(st
+@@ -111,6 +113,9 @@ static struct dentry *proc_sys_lookup(st
        if (!p)
                goto out;
  
@@ -33598,7 +33897,7 @@ diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
        err = ERR_PTR(-ENOMEM);
        inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
        if (h)
-@@ -228,6 +233,9 @@ static int scan(struct ctl_table_header 
+@@ -230,6 +235,9 @@ static int scan(struct ctl_table_header 
                if (*pos < file->f_pos)
                        continue;
  
@@ -33608,7 +33907,7 @@ diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
                res = proc_sys_fill_cache(file, dirent, filldir, head, table);
                if (res)
                        return res;
-@@ -353,6 +361,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -355,6 +363,9 @@ static int proc_sys_getattr(struct vfsmo
        if (IS_ERR(head))
                return PTR_ERR(head);
  
@@ -33618,10 +33917,10 @@ diff -urNp linux-2.6.36/fs/proc/proc_sysctl.c linux-2.6.36/fs/proc/proc_sysctl.c
        generic_fillattr(inode, stat);
        if (table)
                stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.36/fs/proc/root.c linux-2.6.36/fs/proc/root.c
---- linux-2.6.36/fs/proc/root.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/root.c        2010-11-06 18:58:50.000000000 -0400
-@@ -133,7 +133,15 @@ void __init proc_root_init(void)
+diff -urNp linux-2.6.37/fs/proc/root.c linux-2.6.37/fs/proc/root.c
+--- linux-2.6.37/fs/proc/root.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/root.c        2011-01-17 02:41:01.000000000 -0500
+@@ -132,7 +132,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
        proc_device_tree_init();
  #endif
@@ -33637,9 +33936,9 @@ diff -urNp linux-2.6.36/fs/proc/root.c linux-2.6.36/fs/proc/root.c
        proc_sys_init();
  }
  
-diff -urNp linux-2.6.36/fs/proc/task_mmu.c linux-2.6.36/fs/proc/task_mmu.c
---- linux-2.6.36/fs/proc/task_mmu.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/task_mmu.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/task_mmu.c linux-2.6.37/fs/proc/task_mmu.c
+--- linux-2.6.37/fs/proc/task_mmu.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/task_mmu.c    2011-01-17 02:41:01.000000000 -0500
 @@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
                "VmExe:\t%8lu kB\n"
                "VmLib:\t%8lu kB\n"
@@ -33745,7 +34044,7 @@ diff -urNp linux-2.6.36/fs/proc/task_mmu.c linux-2.6.36/fs/proc/task_mmu.c
                                        name = "[stack]";
                                }
                        } else {
-@@ -394,11 +414,16 @@ static int show_smap(struct seq_file *m,
+@@ -398,11 +418,16 @@ static int show_smap(struct seq_file *m,
        };
  
        memset(&mss, 0, sizeof mss);
@@ -33767,7 +34066,7 @@ diff -urNp linux-2.6.36/fs/proc/task_mmu.c linux-2.6.36/fs/proc/task_mmu.c
        show_map_vma(m, vma);
  
        seq_printf(m,
-@@ -413,7 +438,11 @@ static int show_smap(struct seq_file *m,
+@@ -418,7 +443,11 @@ static int show_smap(struct seq_file *m,
                   "Swap:           %8lu kB\n"
                   "KernelPageSize: %8lu kB\n"
                   "MMUPageSize:    %8lu kB\n",
@@ -33779,9 +34078,9 @@ diff -urNp linux-2.6.36/fs/proc/task_mmu.c linux-2.6.36/fs/proc/task_mmu.c
                   mss.resident >> 10,
                   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
                   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.36/fs/proc/task_nommu.c linux-2.6.36/fs/proc/task_nommu.c
---- linux-2.6.36/fs/proc/task_nommu.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/proc/task_nommu.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/proc/task_nommu.c linux-2.6.37/fs/proc/task_nommu.c
+--- linux-2.6.37/fs/proc/task_nommu.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/proc/task_nommu.c  2011-01-17 02:41:01.000000000 -0500
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
        else
                bytes += kobjsize(mm);
@@ -33800,9 +34099,9 @@ diff -urNp linux-2.6.36/fs/proc/task_nommu.c linux-2.6.36/fs/proc/task_nommu.c
        } else if (mm) {
                if (vma->vm_start <= mm->start_stack &&
                        vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.36/fs/readdir.c linux-2.6.36/fs/readdir.c
---- linux-2.6.36/fs/readdir.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/readdir.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/readdir.c linux-2.6.37/fs/readdir.c
+--- linux-2.6.37/fs/readdir.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/readdir.c  2011-01-17 02:41:01.000000000 -0500
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -33892,9 +34191,9 @@ diff -urNp linux-2.6.36/fs/readdir.c linux-2.6.36/fs/readdir.c
        buf.count = count;
        buf.error = 0;
  
-diff -urNp linux-2.6.36/fs/reiserfs/do_balan.c linux-2.6.36/fs/reiserfs/do_balan.c
---- linux-2.6.36/fs/reiserfs/do_balan.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/reiserfs/do_balan.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/reiserfs/do_balan.c linux-2.6.37/fs/reiserfs/do_balan.c
+--- linux-2.6.37/fs/reiserfs/do_balan.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/reiserfs/do_balan.c        2011-01-17 02:41:02.000000000 -0500
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
                return;
        }
@@ -33904,9 +34203,9 @@ diff -urNp linux-2.6.36/fs/reiserfs/do_balan.c linux-2.6.36/fs/reiserfs/do_balan
        do_balance_starts(tb);
  
        /* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.36/fs/reiserfs/item_ops.c linux-2.6.36/fs/reiserfs/item_ops.c
---- linux-2.6.36/fs/reiserfs/item_ops.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/reiserfs/item_ops.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/reiserfs/item_ops.c linux-2.6.37/fs/reiserfs/item_ops.c
+--- linux-2.6.37/fs/reiserfs/item_ops.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/reiserfs/item_ops.c        2011-01-17 02:41:02.000000000 -0500
 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
                         vi->vi_index, vi->vi_type, vi->vi_ih);
  }
@@ -33961,9 +34260,9 @@ diff -urNp linux-2.6.36/fs/reiserfs/item_ops.c linux-2.6.36/fs/reiserfs/item_ops
        &stat_data_ops,
        &indirect_ops,
        &direct_ops,
-diff -urNp linux-2.6.36/fs/reiserfs/procfs.c linux-2.6.36/fs/reiserfs/procfs.c
---- linux-2.6.36/fs/reiserfs/procfs.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/reiserfs/procfs.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/reiserfs/procfs.c linux-2.6.37/fs/reiserfs/procfs.c
+--- linux-2.6.37/fs/reiserfs/procfs.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/reiserfs/procfs.c  2011-01-17 02:41:02.000000000 -0500
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
                   "SMALL_TAILS " : "NO_TAILS ",
                   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -33973,9 +34272,9 @@ diff -urNp linux-2.6.36/fs/reiserfs/procfs.c linux-2.6.36/fs/reiserfs/procfs.c
                   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
                   SF(s_do_balance), SF(s_unneeded_left_neighbor),
                   SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.36/fs/select.c linux-2.6.36/fs/select.c
---- linux-2.6.36/fs/select.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/select.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/select.c linux-2.6.37/fs/select.c
+--- linux-2.6.37/fs/select.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/select.c   2011-01-17 02:41:02.000000000 -0500
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -33992,9 +34291,9 @@ diff -urNp linux-2.6.36/fs/select.c linux-2.6.36/fs/select.c
        if (nfds > rlimit(RLIMIT_NOFILE))
                return -EINVAL;
  
-diff -urNp linux-2.6.36/fs/seq_file.c linux-2.6.36/fs/seq_file.c
---- linux-2.6.36/fs/seq_file.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/seq_file.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/seq_file.c linux-2.6.37/fs/seq_file.c
+--- linux-2.6.37/fs/seq_file.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/seq_file.c 2011-01-17 02:41:02.000000000 -0500
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
                return 0;
        }
@@ -34035,21 +34334,9 @@ diff -urNp linux-2.6.36/fs/seq_file.c linux-2.6.36/fs/seq_file.c
                if (!m->buf)
                        goto Enomem;
                m->count = 0;
-diff -urNp linux-2.6.36/fs/smbfs/symlink.c linux-2.6.36/fs/smbfs/symlink.c
---- linux-2.6.36/fs/smbfs/symlink.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/smbfs/symlink.c    2010-11-06 18:58:15.000000000 -0400
-@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
- 
- static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
- {
--      char *s = nd_get_link(nd);
-+      const char *s = nd_get_link(nd);
-       if (!IS_ERR(s))
-               __putname(s);
- }
-diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
---- linux-2.6.36/fs/splice.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/splice.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/splice.c linux-2.6.37/fs/splice.c
+--- linux-2.6.37/fs/splice.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/splice.c   2011-01-17 02:41:02.000000000 -0500
 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
        pipe_lock(pipe);
  
@@ -34120,7 +34407,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
  
                current->splice_pipe = pipe;
        }
-@@ -1757,9 +1757,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1745,9 +1745,9 @@ static int ipipe_prep(struct pipe_inode_
                        ret = -ERESTARTSYS;
                        break;
                }
@@ -34132,7 +34419,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
                        if (flags & SPLICE_F_NONBLOCK) {
                                ret = -EAGAIN;
                                break;
-@@ -1791,7 +1791,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1779,7 +1779,7 @@ static int opipe_prep(struct pipe_inode_
        pipe_lock(pipe);
  
        while (pipe->nrbufs >= pipe->buffers) {
@@ -34141,7 +34428,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
                        send_sig(SIGPIPE, current, 0);
                        ret = -EPIPE;
                        break;
-@@ -1804,9 +1804,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1792,9 +1792,9 @@ static int opipe_prep(struct pipe_inode_
                        ret = -ERESTARTSYS;
                        break;
                }
@@ -34153,7 +34440,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
        }
  
        pipe_unlock(pipe);
-@@ -1842,14 +1842,14 @@ retry:
+@@ -1830,14 +1830,14 @@ retry:
        pipe_double_lock(ipipe, opipe);
  
        do {
@@ -34170,7 +34457,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
                        break;
  
                /*
-@@ -1949,7 +1949,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1937,7 +1937,7 @@ static int link_pipe(struct pipe_inode_i
        pipe_double_lock(ipipe, opipe);
  
        do {
@@ -34179,7 +34466,7 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
                        send_sig(SIGPIPE, current, 0);
                        if (!ret)
                                ret = -EPIPE;
-@@ -1994,7 +1994,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1982,7 +1982,7 @@ static int link_pipe(struct pipe_inode_i
         * return EAGAIN if we have the potential of some data in the
         * future, otherwise just return 0
         */
@@ -34188,9 +34475,9 @@ diff -urNp linux-2.6.36/fs/splice.c linux-2.6.36/fs/splice.c
                ret = -EAGAIN;
  
        pipe_unlock(ipipe);
-diff -urNp linux-2.6.36/fs/sysfs/symlink.c linux-2.6.36/fs/sysfs/symlink.c
---- linux-2.6.36/fs/sysfs/symlink.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/sysfs/symlink.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/sysfs/symlink.c linux-2.6.37/fs/sysfs/symlink.c
+--- linux-2.6.37/fs/sysfs/symlink.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/sysfs/symlink.c    2011-01-17 02:41:02.000000000 -0500
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34200,9 +34487,9 @@ diff -urNp linux-2.6.36/fs/sysfs/symlink.c linux-2.6.36/fs/sysfs/symlink.c
        if (!IS_ERR(page))
                free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.36/fs/udf/misc.c linux-2.6.36/fs/udf/misc.c
---- linux-2.6.36/fs/udf/misc.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/udf/misc.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/udf/misc.c linux-2.6.37/fs/udf/misc.c
+--- linux-2.6.37/fs/udf/misc.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/udf/misc.c 2011-01-17 02:41:02.000000000 -0500
 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
                iinfo->i_lenEAttr += size;
                return (struct genericFormat *)&ea[offset];
@@ -34214,9 +34501,18 @@ diff -urNp linux-2.6.36/fs/udf/misc.c linux-2.6.36/fs/udf/misc.c
  
        return NULL;
  }
-diff -urNp linux-2.6.36/fs/udf/udfdecl.h linux-2.6.36/fs/udf/udfdecl.h
---- linux-2.6.36/fs/udf/udfdecl.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/udf/udfdecl.h      2010-11-06 18:58:15.000000000 -0400
+@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
+ 
+ u8 udf_tag_checksum(const struct tag *t)
+ {
+-      u8 *data = (u8 *)t;
++      const u8 *data = (const u8 *)t;
+       u8 checksum = 0;
+       int i;
+       for (i = 0; i < sizeof(struct tag); ++i)
+diff -urNp linux-2.6.37/fs/udf/udfdecl.h linux-2.6.37/fs/udf/udfdecl.h
+--- linux-2.6.37/fs/udf/udfdecl.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/udf/udfdecl.h      2011-01-17 02:41:02.000000000 -0500
 @@ -26,7 +26,7 @@ do { \
        printk(f, ##a); \
  } while (0)
@@ -34226,9 +34522,9 @@ diff -urNp linux-2.6.36/fs/udf/udfdecl.h linux-2.6.36/fs/udf/udfdecl.h
  #endif
  
  #define udf_info(f, a...) \
-diff -urNp linux-2.6.36/fs/utimes.c linux-2.6.36/fs/utimes.c
---- linux-2.6.36/fs/utimes.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/utimes.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/utimes.c linux-2.6.37/fs/utimes.c
+--- linux-2.6.37/fs/utimes.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/utimes.c   2011-01-17 02:41:02.000000000 -0500
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -34250,22 +34546,101 @@ diff -urNp linux-2.6.36/fs/utimes.c linux-2.6.36/fs/utimes.c
        mutex_lock(&inode->i_mutex);
        error = notify_change(path->dentry, &newattrs);
        mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/xfs/linux-2.6/xfs_ioctl.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/fs/xattr_acl.c linux-2.6.37/fs/xattr_acl.c
+--- linux-2.6.37/fs/xattr_acl.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/xattr_acl.c        2011-01-17 02:41:02.000000000 -0500
+@@ -17,8 +17,8 @@
+ struct posix_acl *
+ posix_acl_from_xattr(const void *value, size_t size)
+ {
+-      posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
+-      posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
++      const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
++      const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
+       int count;
+       struct posix_acl *acl;
+       struct posix_acl_entry *acl_e;
+diff -urNp linux-2.6.37/fs/xattr.c linux-2.6.37/fs/xattr.c
+--- linux-2.6.37/fs/xattr.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/xattr.c    2011-01-17 02:41:02.000000000 -0500
+@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
+  * Extended attribute SET operations
+  */
+ static long
+-setxattr(struct dentry *d, const char __user *name, const void __user *value,
++setxattr(struct path *path, const char __user *name, const void __user *value,
+        size_t size, int flags)
+ {
+       int error;
+@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __
+                       return PTR_ERR(kvalue);
+       }
+ 
+-      error = vfs_setxattr(d, kname, kvalue, size, flags);
++      if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
++              error = -EACCES;
++              goto out;
++      }
++
++      error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
++out:
+       kfree(kvalue);
+       return error;
+ }
+@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __u
+               return error;
+       error = mnt_want_write(path.mnt);
+       if (!error) {
+-              error = setxattr(path.dentry, name, value, size, flags);
++              error = setxattr(&path, name, value, size, flags);
+               mnt_drop_write(path.mnt);
+       }
+       path_put(&path);
+@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __
+               return error;
+       error = mnt_want_write(path.mnt);
+       if (!error) {
+-              error = setxattr(path.dentry, name, value, size, flags);
++              error = setxattr(&path, name, value, size, flags);
+               mnt_drop_write(path.mnt);
+       }
+       path_put(&path);
+@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons
+               const void __user *,value, size_t, size, int, flags)
+ {
+       struct file *f;
+-      struct dentry *dentry;
+       int error = -EBADF;
+ 
+       f = fget(fd);
+       if (!f)
+               return error;
+-      dentry = f->f_path.dentry;
+-      audit_inode(NULL, dentry);
++      audit_inode(NULL, f->f_path.dentry);
+       error = mnt_want_write_file(f);
+       if (!error) {
+-              error = setxattr(dentry, name, value, size, flags);
++              error = setxattr(&f->f_path, name, value, size, flags);
+               mnt_drop_write(f->f_path.mnt);
+       }
+       fput(f);
+diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c  2011-01-17 02:41:02.000000000 -0500
 @@ -127,7 +127,7 @@ xfs_find_handle(
        }
  
        error = -EFAULT;
 -      if (copy_to_user(hreq->ohandle, &handle, hsize) ||
-+      if (hsize > sizeof(handle) || copy_to_user(hreq->ohandle, &handle, hsize) ||
++      if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
            copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
                goto out_put;
  
-diff -urNp linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c   2010-11-06 18:58:15.000000000 -0400
-@@ -472,7 +472,7 @@ xfs_vn_put_link(
+diff -urNp linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c   2011-01-17 02:41:02.000000000 -0500
+@@ -437,7 +437,7 @@ xfs_vn_put_link(
        struct nameidata *nd,
        void            *p)
  {
@@ -34274,9 +34649,9 @@ diff -urNp linux-2.6.36/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.36/fs/xfs/linux-2.
  
        if (!IS_ERR(s))
                kfree(s);
-diff -urNp linux-2.6.36/fs/xfs/xfs_bmap.c linux-2.6.36/fs/xfs/xfs_bmap.c
---- linux-2.6.36/fs/xfs/xfs_bmap.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/fs/xfs/xfs_bmap.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/fs/xfs/xfs_bmap.c linux-2.6.37/fs/xfs/xfs_bmap.c
+--- linux-2.6.37/fs/xfs/xfs_bmap.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/fs/xfs/xfs_bmap.c     2011-01-17 02:41:02.000000000 -0500
 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
        int                     nmap,
        int                     ret_nmap);
@@ -34286,9 +34661,9 @@ diff -urNp linux-2.6.36/fs/xfs/xfs_bmap.c linux-2.6.36/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-2.6.36/grsecurity/gracl_alloc.c linux-2.6.36/grsecurity/gracl_alloc.c
---- linux-2.6.36/grsecurity/gracl_alloc.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_alloc.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_alloc.c linux-2.6.37/grsecurity/gracl_alloc.c
+--- linux-2.6.37/grsecurity/gracl_alloc.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_alloc.c      2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -34395,10 +34770,10 @@ diff -urNp linux-2.6.36/grsecurity/gracl_alloc.c linux-2.6.36/grsecurity/gracl_a
 +      else
 +              return 1;
 +}
-diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
---- linux-2.6.36/grsecurity/gracl.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl.c    2010-11-06 19:40:35.000000000 -0400
-@@ -0,0 +1,3874 @@
+diff -urNp linux-2.6.37/grsecurity/gracl.c linux-2.6.37/grsecurity/gracl.c
+--- linux-2.6.37/grsecurity/gracl.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl.c    2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,3991 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -34410,6 +34785,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +#include <linux/tty.h>
 +#include <linux/proc_fs.h>
 +#include <linux/smp_lock.h>
++#include <linux/lglock.h>
 +#include <linux/slab.h>
 +#include <linux/vmalloc.h>
 +#include <linux/types.h>
@@ -34447,7 +34823,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +static u16 acl_sp_role_value;
 +
 +extern char *gr_shared_page[4];
-+static DECLARE_MUTEX(gr_dev_sem);
++static DEFINE_MUTEX(gr_dev_mutex);
 +DEFINE_RWLOCK(gr_inode_lock);
 +
 +struct gr_arg *gr_usermode;
@@ -34487,7 +34863,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +extern void gr_remove_uid(uid_t uid);
 +extern int gr_find_uid(uid_t uid);
 +
-+extern spinlock_t vfsmount_lock;
++DECLARE_BRLOCK(vfsmount_lock);
 +
 +__inline__ int
 +gr_acl_is_enabled(void)
@@ -34550,12 +34926,82 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      return !memcmp(a, b, lena);
 +}
 +
++static int prepend(char **buffer, int *buflen, const char *str, int namelen)
++{
++      *buflen -= namelen;
++      if (*buflen < 0)
++              return -ENAMETOOLONG;
++      *buffer -= namelen;
++      memcpy(*buffer, str, namelen);
++      return 0;
++}
++
++static int prepend_name(char **buffer, int *buflen, struct qstr *name)
++{
++      return prepend(buffer, buflen, name->name, name->len);
++}
++
++static int prepend_path(const struct path *path, struct path *root,
++                      char **buffer, int *buflen)
++{
++      struct dentry *dentry = path->dentry;
++      struct vfsmount *vfsmnt = path->mnt;
++      bool slash = false;
++      int error = 0;
++
++      while (dentry != root->dentry || vfsmnt != root->mnt) {
++              struct dentry * parent;
++
++              if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
++                      /* Global root? */
++                      if (vfsmnt->mnt_parent == vfsmnt) {
++                              goto out;
++                      }
++                      dentry = vfsmnt->mnt_mountpoint;
++                      vfsmnt = vfsmnt->mnt_parent;
++                      continue;
++              }
++              parent = dentry->d_parent;
++              prefetch(parent);
++              error = prepend_name(buffer, buflen, &dentry->d_name);
++              if (!error)
++                      error = prepend(buffer, buflen, "/", 1);
++              if (error)
++                      break;
++
++              slash = true;
++              dentry = parent;
++      }
++
++out:
++      if (!error && !slash)
++              error = prepend(buffer, buflen, "/", 1);
++
++      return error;
++}
++
++/* this must be called with vfsmount_lock and dcache_lock held */
++
++static char *__our_d_path(const struct path *path, struct path *root,
++                      char *buf, int buflen)
++{
++      char *res = buf + buflen;
++      int error;
++
++      prepend(&res, &buflen, "\0", 1);
++      error = prepend_path(path, root, &res, &buflen);
++      if (error)
++              return ERR_PTR(error);
++
++      return res;
++}
++
 +static char *
 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
 +{
 +      char *retval;
 +
-+      retval = __d_path(path, root, buf, buflen);
++      retval = __our_d_path(path, root, buf, buflen);
 +      if (unlikely(IS_ERR(retval)))
 +              retval = strcpy(buf, "<path too long>");
 +      else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
@@ -34597,7 +35043,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      get_fs_root(reaper->fs, &root);
 +
 +      spin_lock(&dcache_lock);
++      br_read_lock(vfsmount_lock);
 +      res = gen_full_path(&path, &root, buf, buflen);
++      br_read_unlock(vfsmount_lock);
 +      spin_unlock(&dcache_lock);
 +
 +      path_put(&root);
@@ -34609,8 +35057,10 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +{
 +      char *ret;
 +      spin_lock(&dcache_lock);
++      br_read_lock(vfsmount_lock);
 +      ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
 +                           PAGE_SIZE);
++      br_read_unlock(vfsmount_lock);
 +      spin_unlock(&dcache_lock);
 +      return ret;
 +}
@@ -34702,6 +35152,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      struct acl_role_label *match;
 +      struct role_allowed_ip *ipp;
 +      unsigned int x;
++      u32 curr_ip = task->signal->curr_ip;
++
++      task->signal->saved_ip = curr_ip;
 +
 +      match = acl_role_set.r_hash[index];
 +
@@ -34739,7 +35192,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +              else {
 +                      for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
 +                              if (likely
-+                                  ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
++                                  ((ntohl(curr_ip) & ipp->netmask) ==
 +                                   (ntohl(ipp->addr) & ipp->netmask)))
 +                                      return match;
 +                      }
@@ -34750,7 +35203,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      } else {
 +              for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
 +                      if (likely
-+                          ((ntohl(task->signal->curr_ip) & ipp->netmask) ==
++                          ((ntohl(curr_ip) & ipp->netmask) ==
 +                           (ntohl(ipp->addr) & ipp->netmask)))
 +                              return match;
 +              }
@@ -36092,9 +36545,19 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +          const struct dentry *curr_dentry,
 +          const struct acl_subject_label *subj, char **path, const int checkglob)
 +{
++      int newglob = checkglob;
++
++      /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
++         as we don't want a / * rule to match instead of the / object
++         don't do this for create lookups that call this function though, since they're looking up
++         on the parent and thus need globbing checks on all paths
++      */
++      if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
++              newglob = GR_NO_GLOB;
++
 +      return __full_lookup(orig_dentry, orig_mnt,
 +                           curr_dentry->d_inode->i_ino, 
-+                           curr_dentry->d_inode->i_sb->s_dev, subj, path, checkglob);
++                           curr_dentry->d_inode->i_sb->s_dev, subj, path, newglob);
 +}
 +
 +static struct acl_object_label *
@@ -36106,6 +36569,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      struct acl_object_label *retval;
 +
 +      spin_lock(&dcache_lock);
++      br_read_lock(vfsmount_lock);
 +
 +      if (unlikely(mnt == shm_mnt || mnt == pipe_mnt || mnt == sock_mnt ||
 +#ifdef CONFIG_HUGETLBFS
@@ -36146,7 +36610,11 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      if (retval == NULL)
 +              retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
 +out:
++      br_read_unlock(vfsmount_lock);
 +      spin_unlock(&dcache_lock);
++
++      BUG_ON(retval == NULL);
++
 +      return retval;
 +}
 +
@@ -36155,7 +36623,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +            const struct acl_subject_label *subj)
 +{
 +      char *path = NULL;
-+      return __chk_obj_label(l_dentry, l_mnt, subj, path, 1);
++      return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
 +}
 +
 +static __inline__ struct acl_object_label *
@@ -36163,14 +36631,14 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +            const struct acl_subject_label *subj)
 +{
 +      char *path = NULL;
-+      return __chk_obj_label(l_dentry, l_mnt, subj, path, 0);
++      return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
 +}
 +
 +static __inline__ struct acl_object_label *
 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
 +                   const struct acl_subject_label *subj, char *path)
 +{
-+      return __chk_obj_label(l_dentry, l_mnt, subj, path, 1);
++      return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
 +}
 +
 +static struct acl_subject_label *
@@ -36182,6 +36650,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      struct acl_subject_label *retval;
 +
 +      spin_lock(&dcache_lock);
++      br_read_lock(vfsmount_lock);
 +
 +      for (;;) {
 +              if (dentry == real_root.dentry && mnt == real_root.mnt)
@@ -36225,8 +36694,11 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +              read_unlock(&gr_inode_lock);
 +      }
 +out:
++      br_read_unlock(vfsmount_lock);
 +      spin_unlock(&dcache_lock);
 +
++      BUG_ON(retval == NULL);
++
 +      return retval;
 +}
 +
@@ -36239,7 +36711,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
 +                     cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
 +                     task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
-+                     1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->curr_ip);
++                     1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
 +
 +      return;
 +}
@@ -36253,7 +36725,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
 +                     cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
 +                     task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
-+                     1UL, 1UL, path, (unsigned long) mode, &task->signal->curr_ip);
++                     1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
 +
 +      return;
 +}
@@ -36268,7 +36740,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
 +                     cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
 +                     task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
-+                     type, real, effective, fs, &task->signal->curr_ip);
++                     type, real, effective, fs, &task->signal->saved_ip);
 +
 +      return;
 +}
@@ -36486,12 +36958,15 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      tsk->acl = current->acl;
 +      tsk->role = current->role;
 +      tsk->signal->curr_ip = current->signal->curr_ip;
++      tsk->signal->saved_ip = current->signal->saved_ip;
 +      if (current->exec_file)
 +              get_file(current->exec_file);
 +      tsk->exec_file = current->exec_file;
 +      tsk->is_writable = current->is_writable;
-+      if (unlikely(current->signal->used_accept))
++      if (unlikely(current->signal->used_accept)) {
 +              current->signal->curr_ip = 0;
++              current->signal->saved_ip = 0;
++      }
 +
 +      return;
 +}
@@ -37042,6 +37517,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      struct role_transition *trans;
 +      unsigned int i;
 +      int found = 0;
++      u32 curr_ip = current->signal->curr_ip;
++
++      current->signal->saved_ip = curr_ip;
 +
 +      /* check transition table */
 +
@@ -37064,7 +37542,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +                      found = 0;
 +                      if (r->allowed_ips != NULL) {
 +                              for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
-+                                      if ((ntohl(current->signal->curr_ip) & ipp->netmask) ==
++                                      if ((ntohl(curr_ip) & ipp->netmask) ==
 +                                           (ntohl(ipp->addr) & ipp->netmask))
 +                                              found = 1;
 +                              }
@@ -37229,7 +37707,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +      int error = sizeof (struct gr_arg_wrapper);
 +      int error2 = 0;
 +
-+      down(&gr_dev_sem);
++      mutex_lock(&gr_dev_mutex);
 +
 +      if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
 +              error = -EPERM;
@@ -37462,7 +37940,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +              gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
 +
 +      out:
-+      up(&gr_dev_sem);
++      mutex_unlock(&gr_dev_mutex);
 +      return error;
 +}
 +
@@ -37660,7 +38138,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +              security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
 +                             task->role->roletype, cred->uid, cred->gid, acl->filename,
 +                             acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
-+                             "", (unsigned long) res, &task->signal->curr_ip);
++                             "", (unsigned long) res, &task->signal->saved_ip);
 +              rcu_read_unlock();
 +      }
 +
@@ -38193,6 +38671,20 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +}
 +#endif
 +
++/* AUXV entries are filled via a descendant of search_binary_handler
++   after we've already applied the subject for the target
++*/
++int gr_acl_enable_at_secure(void)
++{
++      if (unlikely(!(gr_status & GR_READY)))
++              return 0;
++
++      if (current->acl->mode & GR_ATSECURE)
++              return 1;
++
++      return 0;
++}
++      
 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
 +{
 +      struct task_struct *task = current;
@@ -38273,9 +38765,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl.c linux-2.6.36/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.36/grsecurity/gracl_cap.c linux-2.6.36/grsecurity/gracl_cap.c
---- linux-2.6.36/grsecurity/gracl_cap.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_cap.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_cap.c linux-2.6.37/grsecurity/gracl_cap.c
+--- linux-2.6.37/grsecurity/gracl_cap.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_cap.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,138 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -38373,7 +38865,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_cap.c linux-2.6.36/grsecurity/gracl_cap
 +                             gr_to_filename(task->exec_file->f_path.dentry,
 +                             task->exec_file->f_path.mnt) : curracl->filename,
 +                             curracl->filename, 0UL,
-+                             0UL, "", (unsigned long) cap, &task->signal->curr_ip);
++                             0UL, "", (unsigned long) cap, &task->signal->saved_ip);
 +              return 1;
 +      }
 +
@@ -38415,10 +38907,10 @@ diff -urNp linux-2.6.36/grsecurity/gracl_cap.c linux-2.6.36/grsecurity/gracl_cap
 +      return 0;
 +}
 +
-diff -urNp linux-2.6.36/grsecurity/gracl_fs.c linux-2.6.36/grsecurity/gracl_fs.c
---- linux-2.6.36/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_fs.c 2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,424 @@
+diff -urNp linux-2.6.37/grsecurity/gracl_fs.c linux-2.6.37/grsecurity/gracl_fs.c
+--- linux-2.6.37/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_fs.c 2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,430 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/types.h>
@@ -38648,6 +39140,12 @@ diff -urNp linux-2.6.36/grsecurity/gracl_fs.c linux-2.6.36/grsecurity/gracl_fs.c
 +}
 +
 +__u32
++gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++      return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
++}
++
++__u32
 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
 +      return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
@@ -38843,10 +39341,10 @@ diff -urNp linux-2.6.36/grsecurity/gracl_fs.c linux-2.6.36/grsecurity/gracl_fs.c
 +
 +      return 0;
 +}
-diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
---- linux-2.6.36/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_ip.c 2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,339 @@
+diff -urNp linux-2.6.37/grsecurity/gracl_ip.c linux-2.6.37/grsecurity/gracl_ip.c
+--- linux-2.6.37/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_ip.c 2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,382 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
 +#include <asm/errno.h>
@@ -38872,8 +39370,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +#define GR_INVERT             0x04
 +#define GR_BINDOVERRIDE               0x08
 +#define GR_CONNECTOVERRIDE    0x10
++#define GR_SOCK_FAMILY                0x20
 +
-+static const char * gr_protocols[256] = {
++static const char * gr_protocols[IPPROTO_MAX] = {
 +      "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
 +      "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
 +      "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
@@ -38908,11 +39407,18 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +      "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
 +      };
 +
-+static const char * gr_socktypes[11] = {
++static const char * gr_socktypes[SOCK_MAX] = {
 +      "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6", 
 +      "unknown:7", "unknown:8", "unknown:9", "packet"
 +      };
 +
++static const char * gr_sockfamilies[AF_MAX+1] = {
++      "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
++      "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
++      "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "tipc", "bluetooth",
++      "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
++      };
++
 +const char *
 +gr_proto_to_name(unsigned char proto)
 +{
@@ -38925,6 +39431,12 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +      return gr_socktypes[type];
 +}
 +
++const char *
++gr_sockfamily_to_name(unsigned char family)
++{
++      return gr_sockfamilies[family];
++}
++
 +int
 +gr_search_socket(const int domain, const int type, const int protocol)
 +{
@@ -38934,12 +39446,36 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +      if (unlikely(!gr_acl_is_enabled()))
 +              goto exit;
 +
-+      if ((domain < 0) || (type < 0) || (protocol < 0) || (domain != PF_INET)
-+          || (domain >= NPROTO) || (type >= SOCK_MAX) || (protocol > 255))
++      if ((domain < 0) || (type < 0) || (protocol < 0) ||
++          (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
 +              goto exit;      // let the kernel handle it
 +
 +      curr = current->acl;
 +
++      if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
++              /* the family is allowed, if this is PF_INET allow it only if
++                 the extra sock type/protocol checks pass */
++              if (domain == PF_INET)
++                      goto inet_check;
++              goto exit;
++      } else {
++              if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
++                      __u32 fakeip = 0;
++                      security_learn(GR_IP_LEARN_MSG, current->role->rolename,
++                                     current->role->roletype, cred->uid,
++                                     cred->gid, current->exec_file ?
++                                     gr_to_filename(current->exec_file->f_path.dentry,
++                                     current->exec_file->f_path.mnt) :
++                                     curr->filename, curr->filename,
++                                     &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
++                                     &current->signal->saved_ip);
++                      goto exit;
++              }
++              goto exit_fail;
++      }
++
++inet_check:
++      /* the rest of this checking is for IPv4 only */
 +      if (!curr->ips)
 +              goto exit;
 +
@@ -38960,7 +39496,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +                                     current->exec_file->f_path.mnt) :
 +                                     curr->filename, curr->filename,
 +                                     &fakeip, 0, type,
-+                                     protocol, GR_CONNECT, &current->signal->curr_ip);
++                                     protocol, GR_CONNECT, &current->signal->saved_ip);
 +              } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
 +                      __u32 fakeip = 0;
 +                      security_learn(GR_IP_LEARN_MSG, current->role->rolename,
@@ -38970,17 +39506,22 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +                                     current->exec_file->f_path.mnt) :
 +                                     curr->filename, curr->filename,
 +                                     &fakeip, 0, type,
-+                                     protocol, GR_BIND, &current->signal->curr_ip);
++                                     protocol, GR_BIND, &current->signal->saved_ip);
 +              }
 +              /* we'll log when they use connect or bind */
 +              goto exit;
 +      }
 +
-+      gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, "inet", 
-+                  gr_socktype_to_name(type), gr_proto_to_name(protocol));
++exit_fail:
++      if (domain == PF_INET)
++              gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain), 
++                          gr_socktype_to_name(type), gr_proto_to_name(protocol));
++      else
++              gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain), 
++                          gr_socktype_to_name(type), protocol);
 +
 +      return 0;
-+      exit:
++exit:
 +      return 1;
 +}
 +
@@ -39062,7 +39603,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +                             current->exec_file->f_path.mnt) :
 +                             curr->filename, curr->filename,
 +                             &ip_addr, ip_port, type,
-+                             sk->sk_protocol, mode, &current->signal->curr_ip);
++                             sk->sk_protocol, mode, &current->signal->saved_ip);
 +              return 0;
 +      }
 +
@@ -39186,9 +39727,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_ip.c linux-2.6.36/grsecurity/gracl_ip.c
 +
 +      return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_learn.c
---- linux-2.6.36/grsecurity/gracl_learn.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_learn.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_learn.c linux-2.6.37/grsecurity/gracl_learn.c
+--- linux-2.6.37/grsecurity/gracl_learn.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_learn.c      2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -39212,7 +39753,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +#define LEARN_BUFFER_SIZE (512 * 1024)
 +
 +static DEFINE_SPINLOCK(gr_learn_lock);
-+static DECLARE_MUTEX(gr_learn_user_sem);
++static DEFINE_MUTEX(gr_learn_user_mutex);
 +
 +/* we need to maintain two buffers, so that the kernel context of grlearn
 +   uses a semaphore around the userspace copying, and the other kernel contexts
@@ -39232,12 +39773,12 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +      add_wait_queue(&learn_wait, &wait);
 +      set_current_state(TASK_INTERRUPTIBLE);
 +      do {
-+              down(&gr_learn_user_sem);
++              mutex_lock(&gr_learn_user_mutex);
 +              spin_lock(&gr_learn_lock);
 +              if (learn_buffer_len)
 +                      break;
 +              spin_unlock(&gr_learn_lock);
-+              up(&gr_learn_user_sem);
++              mutex_unlock(&gr_learn_user_mutex);
 +              if (file->f_flags & O_NONBLOCK) {
 +                      retval = -EAGAIN;
 +                      goto out;
@@ -39260,7 +39801,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +      if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
 +              retval = -EFAULT;
 +
-+      up(&gr_learn_user_sem);
++      mutex_unlock(&gr_learn_user_mutex);
 +out:
 +      set_current_state(TASK_RUNNING);
 +      remove_wait_queue(&learn_wait, &wait);
@@ -39283,7 +39824,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +{
 +      char *tmp;
 +
-+      down(&gr_learn_user_sem);
++      mutex_lock(&gr_learn_user_mutex);
 +      if (learn_buffer != NULL) {
 +              spin_lock(&gr_learn_lock);
 +              tmp = learn_buffer;
@@ -39296,7 +39837,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +              learn_buffer_user = NULL;
 +      }
 +      learn_buffer_len = 0;
-+      up(&gr_learn_user_sem);
++      mutex_unlock(&gr_learn_user_mutex);
 +
 +      return;
 +}
@@ -39344,7 +39885,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +              return -EBUSY;
 +      if (file->f_mode & FMODE_READ) {
 +              int retval = 0;
-+              down(&gr_learn_user_sem);
++              mutex_lock(&gr_learn_user_mutex);
 +              if (learn_buffer == NULL)
 +                      learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
 +              if (learn_buffer_user == NULL)
@@ -39361,7 +39902,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +              learn_buffer_user_len = 0;
 +              gr_learn_attached = 1;
 +out_error:
-+              up(&gr_learn_user_sem);
++              mutex_unlock(&gr_learn_user_mutex);
 +              return retval;
 +      }
 +      return 0;
@@ -39373,7 +39914,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +      char *tmp;
 +
 +      if (file->f_mode & FMODE_READ) {
-+              down(&gr_learn_user_sem);
++              mutex_lock(&gr_learn_user_mutex);
 +              if (learn_buffer != NULL) {
 +                      spin_lock(&gr_learn_lock);
 +                      tmp = learn_buffer;
@@ -39388,7 +39929,7 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +              learn_buffer_len = 0;
 +              learn_buffer_user_len = 0;
 +              gr_learn_attached = 0;
-+              up(&gr_learn_user_sem);
++              mutex_unlock(&gr_learn_user_mutex);
 +      }
 +
 +      return 0;
@@ -39401,9 +39942,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_learn.c linux-2.6.36/grsecurity/gracl_l
 +      .release        = close_learn,
 +      .poll           = poll_learn,
 +};
-diff -urNp linux-2.6.36/grsecurity/gracl_res.c linux-2.6.36/grsecurity/gracl_res.c
---- linux-2.6.36/grsecurity/gracl_res.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_res.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_res.c linux-2.6.37/grsecurity/gracl_res.c
+--- linux-2.6.37/grsecurity/gracl_res.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_res.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39473,9 +40014,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_res.c linux-2.6.36/grsecurity/gracl_res
 +      rcu_read_unlock();
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/gracl_segv.c linux-2.6.36/grsecurity/gracl_segv.c
---- linux-2.6.36/grsecurity/gracl_segv.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_segv.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_segv.c linux-2.6.37/grsecurity/gracl_segv.c
+--- linux-2.6.37/grsecurity/gracl_segv.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_segv.c       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -39787,9 +40328,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_segv.c linux-2.6.36/grsecurity/gracl_se
 +
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/gracl_shm.c linux-2.6.36/grsecurity/gracl_shm.c
---- linux-2.6.36/grsecurity/gracl_shm.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/gracl_shm.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/gracl_shm.c linux-2.6.37/grsecurity/gracl_shm.c
+--- linux-2.6.37/grsecurity/gracl_shm.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/gracl_shm.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -39831,9 +40372,9 @@ diff -urNp linux-2.6.36/grsecurity/gracl_shm.c linux-2.6.36/grsecurity/gracl_shm
 +
 +      return 1;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_chdir.c linux-2.6.36/grsecurity/grsec_chdir.c
---- linux-2.6.36/grsecurity/grsec_chdir.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_chdir.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_chdir.c linux-2.6.37/grsecurity/grsec_chdir.c
+--- linux-2.6.37/grsecurity/grsec_chdir.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_chdir.c      2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39854,10 +40395,10 @@ diff -urNp linux-2.6.36/grsecurity/grsec_chdir.c linux-2.6.36/grsecurity/grsec_c
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_chroot.c linux-2.6.36/grsecurity/grsec_chroot.c
---- linux-2.6.36/grsecurity/grsec_chroot.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_chroot.c     2010-11-06 20:00:34.000000000 -0400
-@@ -0,0 +1,372 @@
+diff -urNp linux-2.6.37/grsecurity/grsec_chroot.c linux-2.6.37/grsecurity/grsec_chroot.c
+--- linux-2.6.37/grsecurity/grsec_chroot.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_chroot.c     2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,373 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -40217,7 +40758,8 @@ diff -urNp linux-2.6.36/grsecurity/grsec_chroot.c linux-2.6.36/grsecurity/grsec_
 +                     const struct vfsmount *mnt, const int mode)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
-+      if (grsec_enable_chroot_chmod &&
++      /* allow chmod +s on directories, but not files */
++      if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
 +          ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
 +          proc_is_chrooted(current)) {
 +              gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
@@ -40230,10 +40772,10 @@ diff -urNp linux-2.6.36/grsecurity/grsec_chroot.c linux-2.6.36/grsecurity/grsec_
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.36/grsecurity/grsec_disabled.c linux-2.6.36/grsecurity/grsec_disabled.c
---- linux-2.6.36/grsecurity/grsec_disabled.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_disabled.c   2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,431 @@
+diff -urNp linux-2.6.37/grsecurity/grsec_disabled.c linux-2.6.37/grsecurity/grsec_disabled.c
+--- linux-2.6.37/grsecurity/grsec_disabled.c   1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_disabled.c   2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,442 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -40498,6 +41040,12 @@ diff -urNp linux-2.6.36/grsecurity/grsec_disabled.c linux-2.6.36/grsecurity/grse
 +      return 1;
 +}
 +
++__u32
++gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
++{
++      return 1;
++}
++
 +void
 +grsecurity_init(void)
 +{
@@ -40657,6 +41205,11 @@ diff -urNp linux-2.6.36/grsecurity/grsec_disabled.c linux-2.6.36/grsecurity/grse
 +      return 0;
 +}
 +
++int gr_acl_enable_at_secure(void)
++{
++      return 0;
++}
++
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
 +EXPORT_SYMBOL(gr_learn_resource);
@@ -40665,10 +41218,10 @@ diff -urNp linux-2.6.36/grsecurity/grsec_disabled.c linux-2.6.36/grsecurity/grse
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.36/grsecurity/grsec_exec.c linux-2.6.36/grsecurity/grsec_exec.c
---- linux-2.6.36/grsecurity/grsec_exec.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_exec.c       2010-11-06 19:52:16.000000000 -0400
-@@ -0,0 +1,88 @@
+diff -urNp linux-2.6.37/grsecurity/grsec_exec.c linux-2.6.37/grsecurity/grsec_exec.c
+--- linux-2.6.37/grsecurity/grsec_exec.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_exec.c       2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,147 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -40679,12 +41232,13 @@ diff -urNp linux-2.6.36/grsecurity/grsec_exec.c linux-2.6.36/grsecurity/grsec_ex
 +#include <linux/grdefs.h>
 +#include <linux/grinternal.h>
 +#include <linux/capability.h>
++#include <linux/compat.h>
 +
 +#include <asm/uaccess.h>
 +
 +#ifdef CONFIG_GRKERNSEC_EXECLOG
 +static char gr_exec_arg_buf[132];
-+static DECLARE_MUTEX(gr_exec_arg_sem);
++static DEFINE_MUTEX(gr_exec_arg_mutex);
 +#endif
 +
 +int
@@ -40715,7 +41269,7 @@ diff -urNp linux-2.6.36/grsecurity/grsec_exec.c linux-2.6.36/grsecurity/grsec_ex
 +            || (grsec_enable_execlog && !grsec_enable_group)))
 +              return;
 +
-+      down(&gr_exec_arg_sem);
++      mutex_lock(&gr_exec_arg_mutex);
 +      memset(grarg, 0, sizeof(gr_exec_arg_buf));
 +
 +      if (unlikely(argv == NULL))
@@ -40753,13 +41307,71 @@ diff -urNp linux-2.6.36/grsecurity/grsec_exec.c linux-2.6.36/grsecurity/grsec_ex
 +      log:
 +      gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
 +                      bprm->file->f_path.mnt, grarg);
-+      up(&gr_exec_arg_sem);
++      mutex_unlock(&gr_exec_arg_mutex);
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_fifo.c linux-2.6.36/grsecurity/grsec_fifo.c
---- linux-2.6.36/grsecurity/grsec_fifo.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_fifo.c       2010-11-06 18:58:50.000000000 -0400
++
++#ifdef CONFIG_COMPAT
++void
++gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv)
++{
++#ifdef CONFIG_GRKERNSEC_EXECLOG
++      char *grarg = gr_exec_arg_buf;
++      unsigned int i, x, execlen = 0;
++      char c;
++
++      if (!((grsec_enable_execlog && grsec_enable_group &&
++             in_group_p(grsec_audit_gid))
++            || (grsec_enable_execlog && !grsec_enable_group)))
++              return;
++
++      mutex_lock(&gr_exec_arg_mutex);
++      memset(grarg, 0, sizeof(gr_exec_arg_buf));
++
++      if (unlikely(argv == NULL))
++              goto log;
++
++      for (i = 0; i < bprm->argc && execlen < 128; i++) {
++              compat_uptr_t p;
++              unsigned int len;
++
++              if (get_user(p, argv + i))
++                      goto log;
++              len = strnlen_user(compat_ptr(p), 128 - execlen);
++              if (len > 128 - execlen)
++                      len = 128 - execlen;
++              else if (len > 0)
++                      len--;
++              else
++                      goto log;
++              if (copy_from_user(grarg + execlen, compat_ptr(p), len))
++                      goto log;
++
++              /* rewrite unprintable characters */
++              for (x = 0; x < len; x++) {
++                      c = *(grarg + execlen + x);
++                      if (c < 32 || c > 126)
++                              *(grarg + execlen + x) = ' ';
++              }
++
++              execlen += len;
++              *(grarg + execlen) = ' ';
++              *(grarg + execlen + 1) = '\0';
++              execlen++;
++      }
++
++      log:
++      gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
++                      bprm->file->f_path.mnt, grarg);
++      mutex_unlock(&gr_exec_arg_mutex);
++#endif
++      return;
++}
++#endif
+diff -urNp linux-2.6.37/grsecurity/grsec_fifo.c linux-2.6.37/grsecurity/grsec_fifo.c
+--- linux-2.6.37/grsecurity/grsec_fifo.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_fifo.c       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40785,9 +41397,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_fifo.c linux-2.6.36/grsecurity/grsec_fi
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_fork.c linux-2.6.36/grsecurity/grsec_fork.c
---- linux-2.6.36/grsecurity/grsec_fork.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_fork.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_fork.c linux-2.6.37/grsecurity/grsec_fork.c
+--- linux-2.6.37/grsecurity/grsec_fork.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_fork.c       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40812,9 +41424,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_fork.c linux-2.6.36/grsecurity/grsec_fo
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_init.c linux-2.6.36/grsecurity/grsec_init.c
---- linux-2.6.36/grsecurity/grsec_init.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_init.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_init.c linux-2.6.37/grsecurity/grsec_init.c
+--- linux-2.6.37/grsecurity/grsec_init.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_init.c       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41086,9 +41698,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_init.c linux-2.6.36/grsecurity/grsec_in
 +
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_link.c linux-2.6.36/grsecurity/grsec_link.c
---- linux-2.6.36/grsecurity/grsec_link.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_link.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_link.c linux-2.6.37/grsecurity/grsec_link.c
+--- linux-2.6.37/grsecurity/grsec_link.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_link.c       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41133,9 +41745,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_link.c linux-2.6.36/grsecurity/grsec_li
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_log.c linux-2.6.36/grsecurity/grsec_log.c
---- linux-2.6.36/grsecurity/grsec_log.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_log.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_log.c linux-2.6.37/grsecurity/grsec_log.c
+--- linux-2.6.37/grsecurity/grsec_log.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_log.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41447,9 +42059,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_log.c linux-2.6.36/grsecurity/grsec_log
 +      gr_log_end(audit);
 +      END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_mem.c linux-2.6.36/grsecurity/grsec_mem.c
---- linux-2.6.36/grsecurity/grsec_mem.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_mem.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_mem.c linux-2.6.37/grsecurity/grsec_mem.c
+--- linux-2.6.37/grsecurity/grsec_mem.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_mem.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41536,9 +42148,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_mem.c linux-2.6.36/grsecurity/grsec_mem
 +      gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_mount.c linux-2.6.36/grsecurity/grsec_mount.c
---- linux-2.6.36/grsecurity/grsec_mount.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_mount.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_mount.c linux-2.6.37/grsecurity/grsec_mount.c
+--- linux-2.6.37/grsecurity/grsec_mount.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_mount.c      2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41602,9 +42214,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_mount.c linux-2.6.36/grsecurity/grsec_m
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_pax.c linux-2.6.36/grsecurity/grsec_pax.c
---- linux-2.6.36/grsecurity/grsec_pax.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_pax.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_pax.c linux-2.6.37/grsecurity/grsec_pax.c
+--- linux-2.6.37/grsecurity/grsec_pax.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_pax.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41642,9 +42254,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_pax.c linux-2.6.36/grsecurity/grsec_pax
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_ptrace.c linux-2.6.36/grsecurity/grsec_ptrace.c
---- linux-2.6.36/grsecurity/grsec_ptrace.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_ptrace.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_ptrace.c linux-2.6.37/grsecurity/grsec_ptrace.c
+--- linux-2.6.37/grsecurity/grsec_ptrace.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_ptrace.c     2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41660,9 +42272,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_ptrace.c linux-2.6.36/grsecurity/grsec_
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_sig.c linux-2.6.36/grsecurity/grsec_sig.c
---- linux-2.6.36/grsecurity/grsec_sig.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_sig.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_sig.c linux-2.6.37/grsecurity/grsec_sig.c
+--- linux-2.6.37/grsecurity/grsec_sig.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_sig.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,65 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41729,10 +42341,10 @@ diff -urNp linux-2.6.36/grsecurity/grsec_sig.c linux-2.6.36/grsecurity/grsec_sig
 +      return;
 +}
 +
-diff -urNp linux-2.6.36/grsecurity/grsec_sock.c linux-2.6.36/grsecurity/grsec_sock.c
---- linux-2.6.36/grsecurity/grsec_sock.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_sock.c       2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,271 @@
+diff -urNp linux-2.6.37/grsecurity/grsec_sock.c linux-2.6.37/grsecurity/grsec_sock.c
+--- linux-2.6.37/grsecurity/grsec_sock.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_sock.c       2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,275 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -41774,6 +42386,7 @@ diff -urNp linux-2.6.36/grsecurity/grsec_sock.c linux-2.6.36/grsecurity/grsec_so
 +
 +extern const char * gr_socktype_to_name(unsigned char type);
 +extern const char * gr_proto_to_name(unsigned char proto);
++extern const char * gr_sockfamily_to_name(unsigned char family);
 +
 +static __inline__ int 
 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
@@ -41925,8 +42538,11 @@ diff -urNp linux-2.6.36/grsecurity/grsec_sock.c linux-2.6.36/grsecurity/grsec_so
 +{
 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
 +      if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
-+          (family != AF_UNIX) && (family != AF_LOCAL)) {
-+              gr_log_int_str2(GR_DONT_AUDIT, GR_SOCK2_MSG, family, gr_socktype_to_name(type), gr_proto_to_name(protocol));
++          (family != AF_UNIX)) {
++              if (family == AF_INET)
++                      gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
++              else
++                      gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
 +              return -EACCES;
 +      }
 +#endif
@@ -42004,9 +42620,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_sock.c linux-2.6.36/grsecurity/grsec_so
 +      return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_sysctl.c linux-2.6.36/grsecurity/grsec_sysctl.c
---- linux-2.6.36/grsecurity/grsec_sysctl.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_sysctl.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsec_sysctl.c linux-2.6.37/grsecurity/grsec_sysctl.c
+--- linux-2.6.37/grsecurity/grsec_sysctl.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_sysctl.c     2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -42441,13 +43057,14 @@ diff -urNp linux-2.6.36/grsecurity/grsec_sysctl.c linux-2.6.36/grsecurity/grsec_
 +      { }
 +};
 +#endif
-diff -urNp linux-2.6.36/grsecurity/grsec_time.c linux-2.6.36/grsecurity/grsec_time.c
---- linux-2.6.36/grsecurity/grsec_time.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_time.c       2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,13 @@
+diff -urNp linux-2.6.37/grsecurity/grsec_time.c linux-2.6.37/grsecurity/grsec_time.c
+--- linux-2.6.37/grsecurity/grsec_time.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_time.c       2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/grinternal.h>
++#include <linux/module.h>
 +
 +void
 +gr_log_timechange(void)
@@ -42458,9 +43075,11 @@ diff -urNp linux-2.6.36/grsecurity/grsec_time.c linux-2.6.36/grsecurity/grsec_ti
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsec_tpe.c linux-2.6.36/grsecurity/grsec_tpe.c
---- linux-2.6.36/grsecurity/grsec_tpe.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsec_tpe.c        2010-11-06 18:58:50.000000000 -0400
++
++EXPORT_SYMBOL(gr_log_timechange);
+diff -urNp linux-2.6.37/grsecurity/grsec_tpe.c linux-2.6.37/grsecurity/grsec_tpe.c
+--- linux-2.6.37/grsecurity/grsec_tpe.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsec_tpe.c        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -42501,9 +43120,9 @@ diff -urNp linux-2.6.36/grsecurity/grsec_tpe.c linux-2.6.36/grsecurity/grsec_tpe
 +#endif
 +      return 1;
 +}
-diff -urNp linux-2.6.36/grsecurity/grsum.c linux-2.6.36/grsecurity/grsum.c
---- linux-2.6.36/grsecurity/grsum.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/grsum.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/grsum.c linux-2.6.37/grsecurity/grsum.c
+--- linux-2.6.37/grsecurity/grsum.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/grsum.c    2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -42566,10 +43185,10 @@ diff -urNp linux-2.6.36/grsecurity/grsum.c linux-2.6.36/grsecurity/grsum.c
 +
 +      return retval;
 +}
-diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
---- linux-2.6.36/grsecurity/Kconfig    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/Kconfig    2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,995 @@
+diff -urNp linux-2.6.37/grsecurity/Kconfig linux-2.6.37/grsecurity/Kconfig
+--- linux-2.6.37/grsecurity/Kconfig    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/Kconfig    2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,1000 @@
 +#
 +# grecurity configuration
 +#
@@ -42890,7 +43509,8 @@ diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
 +        Note that this option is only effective provided the following
 +        conditions are met:
 +        1) The kernel using grsecurity is not precompiled by some distribution
-+        2) You are using the RBAC system and hiding other files such as your
++        2) You have also enabled GRKERNSEC_DMESG
++        3) You are using the RBAC system and hiding other files such as your
 +           kernel image and System.map.  Alternatively, enabling this option
 +           causes the permissions on /boot, /lib/modules, and the kernel
 +           source directory to change at compile time to prevent 
@@ -42967,9 +43587,10 @@ diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
 +      depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
 +      help
 +        If you say Y here, you will be able to select a group that will be
-+        able to view all processes, network-related information, and
-+        kernel and symbol information.  This option is useful if you want
-+        to run identd as a non-root user.
++          able to view all processes and network-related information.  If you've
++          enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
++          remain hidden.  This option is useful if you want to run identd as
++          a non-root user.
 +
 +config GRKERNSEC_PROC_GID
 +      int "GID for special group"
@@ -43310,6 +43931,9 @@ diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
 +      help
 +        If you say Y here, non-root users will not be able to use dmesg(8)
 +        to view up to the last 4kb of messages in the kernel's log buffer.
++        The kernel's log buffer often contains kernel addresses and other
++        identifying information useful to an attacker in fingerprinting a
++        system for a targeted exploit.
 +        If the sysctl option is enabled, a sysctl option with name "dmesg" is
 +        created.
 +
@@ -43565,9 +44189,9 @@ diff -urNp linux-2.6.36/grsecurity/Kconfig linux-2.6.36/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.36/grsecurity/Makefile linux-2.6.36/grsecurity/Makefile
---- linux-2.6.36/grsecurity/Makefile   1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/grsecurity/Makefile   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/grsecurity/Makefile linux-2.6.37/grsecurity/Makefile
+--- linux-2.6.37/grsecurity/Makefile   1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/grsecurity/Makefile   2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,29 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -43598,9 +44222,9 @@ diff -urNp linux-2.6.36/grsecurity/Makefile linux-2.6.36/grsecurity/Makefile
 +      @-chmod -f 700 .
 +      @echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.36/include/acpi/acoutput.h linux-2.6.36/include/acpi/acoutput.h
---- linux-2.6.36/include/acpi/acoutput.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/acpi/acoutput.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/acpi/acoutput.h linux-2.6.37/include/acpi/acoutput.h
+--- linux-2.6.37/include/acpi/acoutput.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/acpi/acoutput.h       2011-01-17 02:41:02.000000000 -0500
 @@ -269,8 +269,8 @@
   * leaving no executable debug code!
   */
@@ -43612,10 +44236,10 @@ diff -urNp linux-2.6.36/include/acpi/acoutput.h linux-2.6.36/include/acpi/acoutp
  
  #endif                                /* ACPI_DEBUG_OUTPUT */
  
-diff -urNp linux-2.6.36/include/acpi/acpi_drivers.h linux-2.6.36/include/acpi/acpi_drivers.h
---- linux-2.6.36/include/acpi/acpi_drivers.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/acpi/acpi_drivers.h   2010-11-06 18:58:15.000000000 -0400
-@@ -121,8 +121,8 @@ int acpi_processor_set_thermal_limit(acp
+diff -urNp linux-2.6.37/include/acpi/acpi_drivers.h linux-2.6.37/include/acpi/acpi_drivers.h
+--- linux-2.6.37/include/acpi/acpi_drivers.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/acpi/acpi_drivers.h   2011-01-17 02:41:02.000000000 -0500
+@@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
                                    Dock Station
    -------------------------------------------------------------------------- */
  struct acpi_dock_ops {
@@ -43626,7 +44250,7 @@ diff -urNp linux-2.6.36/include/acpi/acpi_drivers.h linux-2.6.36/include/acpi/ac
  };
  
  #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
-@@ -130,7 +130,7 @@ extern int is_dock_device(acpi_handle ha
+@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
  extern int register_dock_notifier(struct notifier_block *nb);
  extern void unregister_dock_notifier(struct notifier_block *nb);
  extern int register_hotplug_dock_device(acpi_handle handle,
@@ -43635,7 +44259,7 @@ diff -urNp linux-2.6.36/include/acpi/acpi_drivers.h linux-2.6.36/include/acpi/ac
                                        void *context);
  extern void unregister_hotplug_dock_device(acpi_handle handle);
  #else
-@@ -146,7 +146,7 @@ static inline void unregister_dock_notif
+@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
  {
  }
  static inline int register_hotplug_dock_device(acpi_handle handle,
@@ -43644,9 +44268,9 @@ diff -urNp linux-2.6.36/include/acpi/acpi_drivers.h linux-2.6.36/include/acpi/ac
                                               void *context)
  {
        return -ENODEV;
-diff -urNp linux-2.6.36/include/asm-generic/atomic-long.h linux-2.6.36/include/asm-generic/atomic-long.h
---- linux-2.6.36/include/asm-generic/atomic-long.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/atomic-long.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/atomic-long.h linux-2.6.37/include/asm-generic/atomic-long.h
+--- linux-2.6.37/include/asm-generic/atomic-long.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/atomic-long.h     2011-01-17 02:41:02.000000000 -0500
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -43939,9 +44563,9 @@ diff -urNp linux-2.6.36/include/asm-generic/atomic-long.h linux-2.6.36/include/a
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.36/include/asm-generic/dma-mapping-common.h linux-2.6.36/include/asm-generic/dma-mapping-common.h
---- linux-2.6.36/include/asm-generic/dma-mapping-common.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/dma-mapping-common.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/dma-mapping-common.h linux-2.6.37/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.37/include/asm-generic/dma-mapping-common.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/dma-mapping-common.h      2011-01-17 02:41:02.000000000 -0500
 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
                                              enum dma_data_direction dir,
                                              struct dma_attrs *attrs)
@@ -44032,9 +44656,9 @@ diff -urNp linux-2.6.36/include/asm-generic/dma-mapping-common.h linux-2.6.36/in
  
        BUG_ON(!valid_dma_direction(dir));
        if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.36/include/asm-generic/futex.h linux-2.6.36/include/asm-generic/futex.h
---- linux-2.6.36/include/asm-generic/futex.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/futex.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/futex.h linux-2.6.37/include/asm-generic/futex.h
+--- linux-2.6.37/include/asm-generic/futex.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/futex.h   2011-01-17 02:41:02.000000000 -0500
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -44053,9 +44677,9 @@ diff -urNp linux-2.6.36/include/asm-generic/futex.h linux-2.6.36/include/asm-gen
  {
        return -ENOSYS;
  }
-diff -urNp linux-2.6.36/include/asm-generic/int-l64.h linux-2.6.36/include/asm-generic/int-l64.h
---- linux-2.6.36/include/asm-generic/int-l64.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/int-l64.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/int-l64.h linux-2.6.37/include/asm-generic/int-l64.h
+--- linux-2.6.37/include/asm-generic/int-l64.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/int-l64.h 2011-01-17 02:41:02.000000000 -0500
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -44065,9 +44689,9 @@ diff -urNp linux-2.6.36/include/asm-generic/int-l64.h linux-2.6.36/include/asm-g
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.36/include/asm-generic/int-ll64.h linux-2.6.36/include/asm-generic/int-ll64.h
---- linux-2.6.36/include/asm-generic/int-ll64.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/int-ll64.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/int-ll64.h linux-2.6.37/include/asm-generic/int-ll64.h
+--- linux-2.6.37/include/asm-generic/int-ll64.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/int-ll64.h        2011-01-17 02:41:02.000000000 -0500
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -44077,9 +44701,9 @@ diff -urNp linux-2.6.36/include/asm-generic/int-ll64.h linux-2.6.36/include/asm-
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.36/include/asm-generic/kmap_types.h linux-2.6.36/include/asm-generic/kmap_types.h
---- linux-2.6.36/include/asm-generic/kmap_types.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/kmap_types.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/kmap_types.h linux-2.6.37/include/asm-generic/kmap_types.h
+--- linux-2.6.37/include/asm-generic/kmap_types.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/kmap_types.h      2011-01-17 02:41:02.000000000 -0500
 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
  KMAP_D(17)    KM_NMI,
  KMAP_D(18)    KM_NMI_PTE,
@@ -44093,10 +44717,10 @@ diff -urNp linux-2.6.36/include/asm-generic/kmap_types.h linux-2.6.36/include/as
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.36/include/asm-generic/pgtable.h linux-2.6.36/include/asm-generic/pgtable.h
---- linux-2.6.36/include/asm-generic/pgtable.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/pgtable.h 2010-11-06 18:58:15.000000000 -0400
-@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
+diff -urNp linux-2.6.37/include/asm-generic/pgtable.h linux-2.6.37/include/asm-generic/pgtable.h
+--- linux-2.6.37/include/asm-generic/pgtable.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/pgtable.h 2011-01-17 02:41:02.000000000 -0500
+@@ -348,6 +348,14 @@ extern void untrack_pfn_vma(struct vm_ar
                                unsigned long size);
  #endif
  
@@ -44111,9 +44735,9 @@ diff -urNp linux-2.6.36/include/asm-generic/pgtable.h linux-2.6.36/include/asm-g
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopmd.h linux-2.6.36/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.36/include/asm-generic/pgtable-nopmd.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/pgtable-nopmd.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopmd.h linux-2.6.37/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.37/include/asm-generic/pgtable-nopmd.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/pgtable-nopmd.h   2011-01-17 02:41:02.000000000 -0500
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -44150,9 +44774,9 @@ diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopmd.h linux-2.6.36/include
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopud.h linux-2.6.36/include/asm-generic/pgtable-nopud.h
---- linux-2.6.36/include/asm-generic/pgtable-nopud.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/pgtable-nopud.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/asm-generic/pgtable-nopud.h linux-2.6.37/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.37/include/asm-generic/pgtable-nopud.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/pgtable-nopud.h   2011-01-17 02:41:02.000000000 -0500
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -44183,10 +44807,10 @@ diff -urNp linux-2.6.36/include/asm-generic/pgtable-nopud.h linux-2.6.36/include
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.36/include/asm-generic/vmlinux.lds.h linux-2.6.36/include/asm-generic/vmlinux.lds.h
---- linux-2.6.36/include/asm-generic/vmlinux.lds.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/asm-generic/vmlinux.lds.h     2010-11-06 18:58:15.000000000 -0400
-@@ -209,6 +209,7 @@
+diff -urNp linux-2.6.37/include/asm-generic/vmlinux.lds.h linux-2.6.37/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.37/include/asm-generic/vmlinux.lds.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/asm-generic/vmlinux.lds.h     2011-01-17 02:41:02.000000000 -0500
+@@ -210,6 +210,7 @@
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                VMLINUX_SYMBOL(__start_rodata) = .;                     \
                *(.rodata) *(.rodata.*)                                 \
@@ -44194,7 +44818,7 @@ diff -urNp linux-2.6.36/include/asm-generic/vmlinux.lds.h linux-2.6.36/include/a
                *(__vermagic)           /* Kernel version magic */      \
                *(__markers_strings)    /* Markers: strings */          \
                *(__tracepoints_strings)/* Tracepoints: strings */      \
-@@ -667,22 +668,24 @@
+@@ -679,14 +680,15 @@
   * section in the linker script will go there too.  @phdr should have
   * a leading colon.
   *
@@ -44212,10 +44836,8 @@ diff -urNp linux-2.6.36/include/asm-generic/vmlinux.lds.h linux-2.6.36/include/a
 +              VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load;      \
                VMLINUX_SYMBOL(__per_cpu_start) = .;                    \
                *(.data..percpu..first)                                 \
--              *(.data..percpu..page_aligned)                          \
-               *(.data..percpu)                                        \
-+              . = ALIGN(PAGE_SIZE);                                   \
-+              *(.data..percpu..page_aligned)                          \
+               . = ALIGN(PAGE_SIZE);                                   \
+@@ -696,7 +698,7 @@
                *(.data..percpu..shared_aligned)                        \
                VMLINUX_SYMBOL(__per_cpu_end) = .;                      \
        } phdr                                                          \
@@ -44224,9 +44846,9 @@ diff -urNp linux-2.6.36/include/asm-generic/vmlinux.lds.h linux-2.6.36/include/a
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.36/include/drm/drm_pciids.h linux-2.6.36/include/drm/drm_pciids.h
---- linux-2.6.36/include/drm/drm_pciids.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/drm/drm_pciids.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/drm/drm_pciids.h linux-2.6.37/include/drm/drm_pciids.h
+--- linux-2.6.37/include/drm/drm_pciids.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/drm/drm_pciids.h      2011-01-17 02:41:02.000000000 -0500
 @@ -419,7 +419,7 @@
        {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
        {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44330,10 +44952,10 @@ diff -urNp linux-2.6.36/include/drm/drm_pciids.h linux-2.6.36/include/drm/drm_pc
        {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 -      {0, 0, 0}
 +      {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.36/include/drm/drmP.h linux-2.6.36/include/drm/drmP.h
---- linux-2.6.36/include/drm/drmP.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/drm/drmP.h    2010-11-06 18:58:15.000000000 -0400
-@@ -813,7 +813,7 @@ struct drm_driver {
+diff -urNp linux-2.6.37/include/drm/drmP.h linux-2.6.37/include/drm/drmP.h
+--- linux-2.6.37/include/drm/drmP.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/drm/drmP.h    2011-01-17 02:41:02.000000000 -0500
+@@ -804,7 +804,7 @@ struct drm_driver {
        void (*vgaarb_irq)(struct drm_device *dev, bool state);
  
        /* Driver private ops for this object */
@@ -44342,7 +44964,16 @@ diff -urNp linux-2.6.36/include/drm/drmP.h linux-2.6.36/include/drm/drmP.h
  
        int major;
        int minor;
-@@ -923,7 +923,7 @@ struct drm_device {
+@@ -817,7 +817,7 @@ struct drm_driver {
+       int dev_priv_size;
+       struct drm_ioctl_desc *ioctls;
+       int num_ioctls;
+-      struct file_operations fops;
++      const struct file_operations fops;
+       struct pci_driver pci_driver;
+       struct platform_device *platform_device;
+       /* List of devices hanging off this driver */
+@@ -914,7 +914,7 @@ struct drm_device {
  
        /** \name Usage Counters */
        /*@{ */
@@ -44351,7 +44982,7 @@ diff -urNp linux-2.6.36/include/drm/drmP.h linux-2.6.36/include/drm/drmP.h
        atomic_t ioctl_count;           /**< Outstanding IOCTLs pending */
        atomic_t vma_count;             /**< Outstanding vma areas open */
        int buf_use;                    /**< Buffers in use -- cannot alloc */
-@@ -934,7 +934,7 @@ struct drm_device {
+@@ -925,7 +925,7 @@ struct drm_device {
        /*@{ */
        unsigned long counters;
        enum drm_stat_type types[15];
@@ -44360,9 +44991,9 @@ diff -urNp linux-2.6.36/include/drm/drmP.h linux-2.6.36/include/drm/drmP.h
        /*@} */
  
        struct list_head filelist;
-diff -urNp linux-2.6.36/include/linux/a.out.h linux-2.6.36/include/linux/a.out.h
---- linux-2.6.36/include/linux/a.out.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/a.out.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/a.out.h linux-2.6.37/include/linux/a.out.h
+--- linux-2.6.37/include/linux/a.out.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/a.out.h 2011-01-17 02:41:02.000000000 -0500
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152               /* MIPS R6000/R4000 binary */
  };
@@ -44378,9 +45009,9 @@ diff -urNp linux-2.6.36/include/linux/a.out.h linux-2.6.36/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.36/include/linux/atmdev.h linux-2.6.36/include/linux/atmdev.h
---- linux-2.6.36/include/linux/atmdev.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/atmdev.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/atmdev.h linux-2.6.37/include/linux/atmdev.h
+--- linux-2.6.37/include/linux/atmdev.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/atmdev.h        2011-01-17 02:41:02.000000000 -0500
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -44390,10 +45021,10 @@ diff -urNp linux-2.6.36/include/linux/atmdev.h linux-2.6.36/include/linux/atmdev
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.36/include/linux/binfmts.h linux-2.6.36/include/linux/binfmts.h
---- linux-2.6.36/include/linux/binfmts.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/binfmts.h       2010-11-06 18:58:15.000000000 -0400
-@@ -87,6 +87,7 @@ struct linux_binfmt {
+diff -urNp linux-2.6.37/include/linux/binfmts.h linux-2.6.37/include/linux/binfmts.h
+--- linux-2.6.37/include/linux/binfmts.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/binfmts.h       2011-01-17 02:41:02.000000000 -0500
+@@ -92,6 +92,7 @@ struct linux_binfmt {
        int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
        int (*load_shlib)(struct file *);
        int (*core_dump)(struct coredump_params *cprm);
@@ -44401,10 +45032,10 @@ diff -urNp linux-2.6.36/include/linux/binfmts.h linux-2.6.36/include/linux/binfm
        unsigned long min_coredump;     /* minimal dump size */
        int hasvdso;
  };
-diff -urNp linux-2.6.36/include/linux/blkdev.h linux-2.6.36/include/linux/blkdev.h
---- linux-2.6.36/include/linux/blkdev.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/blkdev.h        2010-11-06 18:58:15.000000000 -0400
-@@ -1249,19 +1249,19 @@ static inline int blk_integrity_rq(struc
+diff -urNp linux-2.6.37/include/linux/blkdev.h linux-2.6.37/include/linux/blkdev.h
+--- linux-2.6.37/include/linux/blkdev.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/blkdev.h        2011-01-17 02:41:02.000000000 -0500
+@@ -1250,19 +1250,19 @@ queue_max_integrity_segments(struct requ
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  
  struct block_device_operations {
@@ -44435,9 +45066,76 @@ diff -urNp linux-2.6.36/include/linux/blkdev.h linux-2.6.36/include/linux/blkdev
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.36/include/linux/cache.h linux-2.6.36/include/linux/cache.h
---- linux-2.6.36/include/linux/cache.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/cache.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/byteorder/little_endian.h linux-2.6.37/include/linux/byteorder/little_endian.h
+--- linux-2.6.37/include/linux/byteorder/little_endian.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/byteorder/little_endian.h       2011-01-17 02:41:02.000000000 -0500
+@@ -42,51 +42,51 @@
+ 
+ static inline __le64 __cpu_to_le64p(const __u64 *p)
+ {
+-      return (__force __le64)*p;
++      return (__force const __le64)*p;
+ }
+ static inline __u64 __le64_to_cpup(const __le64 *p)
+ {
+-      return (__force __u64)*p;
++      return (__force const __u64)*p;
+ }
+ static inline __le32 __cpu_to_le32p(const __u32 *p)
+ {
+-      return (__force __le32)*p;
++      return (__force const __le32)*p;
+ }
+ static inline __u32 __le32_to_cpup(const __le32 *p)
+ {
+-      return (__force __u32)*p;
++      return (__force const __u32)*p;
+ }
+ static inline __le16 __cpu_to_le16p(const __u16 *p)
+ {
+-      return (__force __le16)*p;
++      return (__force const __le16)*p;
+ }
+ static inline __u16 __le16_to_cpup(const __le16 *p)
+ {
+-      return (__force __u16)*p;
++      return (__force const __u16)*p;
+ }
+ static inline __be64 __cpu_to_be64p(const __u64 *p)
+ {
+-      return (__force __be64)__swab64p(p);
++      return (__force const __be64)__swab64p(p);
+ }
+ static inline __u64 __be64_to_cpup(const __be64 *p)
+ {
+-      return __swab64p((__u64 *)p);
++      return __swab64p((const __u64 *)p);
+ }
+ static inline __be32 __cpu_to_be32p(const __u32 *p)
+ {
+-      return (__force __be32)__swab32p(p);
++      return (__force const __be32)__swab32p(p);
+ }
+ static inline __u32 __be32_to_cpup(const __be32 *p)
+ {
+-      return __swab32p((__u32 *)p);
++      return __swab32p((const __u32 *)p);
+ }
+ static inline __be16 __cpu_to_be16p(const __u16 *p)
+ {
+-      return (__force __be16)__swab16p(p);
++      return (__force const __be16)__swab16p(p);
+ }
+ static inline __u16 __be16_to_cpup(const __be16 *p)
+ {
+-      return __swab16p((__u16 *)p);
++      return __swab16p((const __u16 *)p);
+ }
+ #define __cpu_to_le64s(x) do { (void)(x); } while (0)
+ #define __le64_to_cpus(x) do { (void)(x); } while (0)
+diff -urNp linux-2.6.37/include/linux/cache.h linux-2.6.37/include/linux/cache.h
+--- linux-2.6.37/include/linux/cache.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/cache.h 2011-01-17 02:41:02.000000000 -0500
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -44449,9 +45147,9 @@ diff -urNp linux-2.6.36/include/linux/cache.h linux-2.6.36/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.36/include/linux/capability.h linux-2.6.36/include/linux/capability.h
---- linux-2.6.36/include/linux/capability.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/capability.h    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/capability.h linux-2.6.37/include/linux/capability.h
+--- linux-2.6.37/include/linux/capability.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/capability.h    2011-01-17 02:41:02.000000000 -0500
 @@ -558,6 +558,7 @@ extern const kernel_cap_t __cap_init_eff
        (security_real_capable_noaudit((t), (cap)) == 0)
  
@@ -44460,9 +45158,9 @@ diff -urNp linux-2.6.36/include/linux/capability.h linux-2.6.36/include/linux/ca
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.36/include/linux/compiler-gcc4.h linux-2.6.36/include/linux/compiler-gcc4.h
---- linux-2.6.36/include/linux/compiler-gcc4.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/compiler-gcc4.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/compiler-gcc4.h linux-2.6.37/include/linux/compiler-gcc4.h
+--- linux-2.6.37/include/linux/compiler-gcc4.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/compiler-gcc4.h 2011-01-17 02:41:02.000000000 -0500
 @@ -54,6 +54,10 @@
  
  #endif
@@ -44474,10 +45172,10 @@ diff -urNp linux-2.6.36/include/linux/compiler-gcc4.h linux-2.6.36/include/linux
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.36/include/linux/compiler.h linux-2.6.36/include/linux/compiler.h
---- linux-2.6.36/include/linux/compiler.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/compiler.h      2010-11-06 18:58:15.000000000 -0400
-@@ -269,6 +269,22 @@ void ftrace_likely_update(struct ftrace_
+diff -urNp linux-2.6.37/include/linux/compiler.h linux-2.6.37/include/linux/compiler.h
+--- linux-2.6.37/include/linux/compiler.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/compiler.h      2011-01-17 02:41:02.000000000 -0500
+@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
@@ -44500,9 +45198,30 @@ diff -urNp linux-2.6.36/include/linux/compiler.h linux-2.6.36/include/linux/comp
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.36/include/linux/decompress/mm.h linux-2.6.36/include/linux/decompress/mm.h
---- linux-2.6.36/include/linux/decompress/mm.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/decompress/mm.h 2010-11-06 18:58:15.000000000 -0400
+@@ -306,6 +322,7 @@ void ftrace_likely_update(struct ftrace_
+  * use is to mediate communication between process-level code and irq/NMI
+  * handlers, all running on the same CPU.
+  */
+-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
++#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
++#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
+ 
+ #endif /* __LINUX_COMPILER_H */
+diff -urNp linux-2.6.37/include/linux/cpuset.h linux-2.6.37/include/linux/cpuset.h
+--- linux-2.6.37/include/linux/cpuset.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/cpuset.h        2011-01-17 02:41:02.000000000 -0500
+@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
+        * nodemask.
+        */
+       smp_mb();
+-      --ACCESS_ONCE(current->mems_allowed_change_disable);
++      --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
+ }
+ 
+ static inline void set_mems_allowed(nodemask_t nodemask)
+diff -urNp linux-2.6.37/include/linux/decompress/mm.h linux-2.6.37/include/linux/decompress/mm.h
+--- linux-2.6.37/include/linux/decompress/mm.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/decompress/mm.h 2011-01-17 02:41:02.000000000 -0500
 @@ -78,7 +78,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -44512,9 +45231,9 @@ diff -urNp linux-2.6.36/include/linux/decompress/mm.h linux-2.6.36/include/linux
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.36/include/linux/dma-mapping.h linux-2.6.36/include/linux/dma-mapping.h
---- linux-2.6.36/include/linux/dma-mapping.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/dma-mapping.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/dma-mapping.h linux-2.6.37/include/linux/dma-mapping.h
+--- linux-2.6.37/include/linux/dma-mapping.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/dma-mapping.h   2011-01-17 02:41:02.000000000 -0500
 @@ -16,40 +16,40 @@ enum dma_data_direction {
  };
  
@@ -44570,9 +45289,9 @@ diff -urNp linux-2.6.36/include/linux/dma-mapping.h linux-2.6.36/include/linux/d
  };
  
  #define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.36/include/linux/elf.h linux-2.6.36/include/linux/elf.h
---- linux-2.6.36/include/linux/elf.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/elf.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/elf.h linux-2.6.37/include/linux/elf.h
+--- linux-2.6.37/include/linux/elf.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/elf.h   2011-01-17 02:41:02.000000000 -0500
 @@ -49,6 +49,17 @@ typedef __s64       Elf64_Sxword;
  #define PT_GNU_EH_FRAME               0x6474e550
  
@@ -44645,22 +45364,22 @@ diff -urNp linux-2.6.36/include/linux/elf.h linux-2.6.36/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
---- linux-2.6.36/include/linux/fs.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/fs.h    2010-11-06 19:01:56.000000000 -0400
-@@ -92,6 +92,11 @@ struct inodes_stat_t {
- /* Expect random access pattern */
- #define FMODE_RANDOM          ((__force fmode_t)0x1000)
+diff -urNp linux-2.6.37/include/linux/fs.h linux-2.6.37/include/linux/fs.h
+--- linux-2.6.37/include/linux/fs.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/fs.h    2011-01-17 02:43:32.000000000 -0500
+@@ -105,6 +105,11 @@ struct inodes_stat_t {
+ /* File was opened by fanotify and shouldn't generate fanotify events */
+ #define FMODE_NONOTIFY                ((__force fmode_t)0x1000000)
  
 +/* Hack for grsec so as not to require read permission simply to execute
 + * a binary
 + */
-+#define FMODE_GREXEC          ((__force fmode_t)0x2000)
++#define FMODE_GREXEC          ((__force fmode_t)0x2000000)
 +
- /* File was opened by fanotify and shouldn't generate fanotify events */
- #define FMODE_NONOTIFY                ((__force fmode_t)0x1000000)
- 
-@@ -569,41 +574,41 @@ typedef int (*read_actor_t)(read_descrip
+ /*
+  * The below are the various read and write types that we support. Some of
+  * them include behavioral modifiers that send information down to the
+@@ -578,42 +583,42 @@ typedef int (*read_actor_t)(read_descrip
                unsigned long, unsigned long);
  
  struct address_space_operations {
@@ -44696,10 +45415,12 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
 -      sector_t (*bmap)(struct address_space *, sector_t);
 -      void (*invalidatepage) (struct page *, unsigned long);
 -      int (*releasepage) (struct page *, gfp_t);
+-      void (*freepage)(struct page *);
 -      ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
 +      sector_t (* const bmap)(struct address_space *, sector_t);
 +      void (* const invalidatepage) (struct page *, unsigned long);
 +      int (* const releasepage) (struct page *, gfp_t);
++      void (* const freepage)(struct page *);
 +      ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
                        loff_t offset, unsigned long nr_segs);
 -      int (*get_xip_mem)(struct address_space *, pgoff_t, int,
@@ -44719,7 +45440,7 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
  };
  
  /*
-@@ -1029,19 +1034,19 @@ static inline int file_check_writeable(s
+@@ -1049,18 +1054,18 @@ static inline int file_check_writeable(s
  typedef struct files_struct *fl_owner_t;
  
  struct file_lock_operations {
@@ -44733,7 +45454,6 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
 -      int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
 -      void (*fl_notify)(struct file_lock *);  /* unblock callback */
 -      int (*fl_grant)(struct file_lock *, struct file_lock *, int);
--      void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
 -      void (*fl_release_private)(struct file_lock *);
 -      void (*fl_break)(struct file_lock *);
 -      int (*fl_mylease)(struct file_lock *, struct file_lock *);
@@ -44741,7 +45461,6 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
 +      int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
 +      void (* const fl_notify)(struct file_lock *);   /* unblock callback */
 +      int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
-+      void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
 +      void (* const fl_release_private)(struct file_lock *);
 +      void (* const fl_break)(struct file_lock *);
 +      int (* const fl_mylease)(struct file_lock *, struct file_lock *);
@@ -44749,7 +45468,7 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
  };
  
  struct lock_manager {
-@@ -1442,7 +1447,7 @@ struct fiemap_extent_info {
+@@ -1474,7 +1479,7 @@ struct fiemap_extent_info {
        unsigned int fi_flags;          /* Flags as passed from user */
        unsigned int fi_extents_mapped; /* Number of mapped extents */
        unsigned int fi_extents_max;    /* Size of fiemap_extent array */
@@ -44758,7 +45477,7 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
                                                 * array */
  };
  int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
-@@ -1558,29 +1563,29 @@ extern ssize_t vfs_writev(struct file *,
+@@ -1590,29 +1595,29 @@ extern ssize_t vfs_writev(struct file *,
                unsigned long, loff_t *);
  
  struct super_operations {
@@ -44807,9 +45526,9 @@ diff -urNp linux-2.6.36/include/linux/fs.h linux-2.6.36/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.36/include/linux/fs_struct.h linux-2.6.36/include/linux/fs_struct.h
---- linux-2.6.36/include/linux/fs_struct.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/fs_struct.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/fs_struct.h linux-2.6.37/include/linux/fs_struct.h
+--- linux-2.6.37/include/linux/fs_struct.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/fs_struct.h     2011-01-17 02:41:02.000000000 -0500
 @@ -4,7 +4,7 @@
  #include <linux/path.h>
  
@@ -44819,10 +45538,10 @@ diff -urNp linux-2.6.36/include/linux/fs_struct.h linux-2.6.36/include/linux/fs_
        spinlock_t lock;
        int umask;
        int in_exec;
-diff -urNp linux-2.6.36/include/linux/genhd.h linux-2.6.36/include/linux/genhd.h
---- linux-2.6.36/include/linux/genhd.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/genhd.h 2010-11-06 18:58:15.000000000 -0400
-@@ -162,7 +162,7 @@ struct gendisk {
+diff -urNp linux-2.6.37/include/linux/genhd.h linux-2.6.37/include/linux/genhd.h
+--- linux-2.6.37/include/linux/genhd.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/genhd.h 2011-01-17 02:41:02.000000000 -0500
+@@ -172,7 +172,7 @@ struct gendisk {
  
        struct timer_rand_state *random;
  
@@ -44831,10 +45550,10 @@ diff -urNp linux-2.6.36/include/linux/genhd.h linux-2.6.36/include/linux/genhd.h
        struct work_struct async_notify;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
        struct blk_integrity *integrity;
-diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
---- linux-2.6.36/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/gracl.h 2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,310 @@
+diff -urNp linux-2.6.37/include/linux/gracl.h linux-2.6.37/include/linux/gracl.h
+--- linux-2.6.37/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/gracl.h 2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
 +
@@ -44846,8 +45565,8 @@ diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
 +
 +/* Major status information */
 +
-+#define GR_VERSION  "grsecurity 2.2.0"
-+#define GRSECURITY_VERSION 0x2200
++#define GR_VERSION  "grsecurity 2.2.1"
++#define GRSECURITY_VERSION 0x2201
 +
 +enum {
 +      GR_SHUTDOWN = 0,
@@ -44873,6 +45592,12 @@ diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
 +      GR_SPROLE_LEN = 64,
 +};
 +
++enum {
++      GR_NO_GLOB = 0,
++      GR_REG_GLOB,
++      GR_CREATE_GLOB
++};
++
 +#define GR_NLIMITS 32
 +
 +/* Begin Data Structures */
@@ -44950,6 +45675,7 @@ diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
 +      __u16 user_trans_num;
 +      __u16 group_trans_num;
 +
++      __u32 sock_families[2];
 +      __u32 ip_proto[8];
 +      __u32 ip_type;
 +      struct acl_ip_label **ips;
@@ -45145,9 +45871,9 @@ diff -urNp linux-2.6.36/include/linux/gracl.h linux-2.6.36/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-2.6.36/include/linux/gralloc.h linux-2.6.36/include/linux/gralloc.h
---- linux-2.6.36/include/linux/gralloc.h       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/gralloc.h       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/gralloc.h linux-2.6.37/include/linux/gralloc.h
+--- linux-2.6.37/include/linux/gralloc.h       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/gralloc.h       2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -45158,10 +45884,10 @@ diff -urNp linux-2.6.36/include/linux/gralloc.h linux-2.6.36/include/linux/grall
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/grdefs.h linux-2.6.36/include/linux/grdefs.h
---- linux-2.6.36/include/linux/grdefs.h        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/grdefs.h        2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,136 @@
+diff -urNp linux-2.6.37/include/linux/grdefs.h linux-2.6.37/include/linux/grdefs.h
+--- linux-2.6.37/include/linux/grdefs.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/grdefs.h        2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,137 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
 +
@@ -45249,6 +45975,7 @@ diff -urNp linux-2.6.36/include/linux/grdefs.h linux-2.6.36/include/linux/grdefs
 +      GR_PROCFIND     = 0x00008000,
 +      GR_POVERRIDE    = 0x00010000,
 +      GR_KERNELAUTH   = 0x00020000,
++      GR_ATSECURE     = 0x00040000
 +};
 +
 +enum {
@@ -45298,10 +46025,10 @@ diff -urNp linux-2.6.36/include/linux/grdefs.h linux-2.6.36/include/linux/grdefs
 +};
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/grinternal.h linux-2.6.36/include/linux/grinternal.h
---- linux-2.6.36/include/linux/grinternal.h    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/grinternal.h    2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,214 @@
+diff -urNp linux-2.6.37/include/linux/grinternal.h linux-2.6.37/include/linux/grinternal.h
+--- linux-2.6.37/include/linux/grinternal.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/grinternal.h    2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,216 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
 +
@@ -45455,6 +46182,7 @@ diff -urNp linux-2.6.36/include/linux/grinternal.h linux-2.6.36/include/linux/gr
 +      GR_ONE_INT_TWO_STR,
 +      GR_ONE_STR,
 +      GR_STR_INT,
++      GR_TWO_STR_INT,
 +      GR_TWO_INT,
 +      GR_THREE_INT,
 +      GR_FIVE_INT_TWO_STR,
@@ -45494,6 +46222,7 @@ diff -urNp linux-2.6.36/include/linux/grinternal.h linux-2.6.36/include/linux/gr
 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
 +#define gr_log_int5_str2(audit, msg, num1, num2, str1, str2) gr_log_varargs(audit, msg, GR_FIVE_INT_TWO_STR, num1, num2, str1, str2)
 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
++#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
@@ -45516,10 +46245,10 @@ diff -urNp linux-2.6.36/include/linux/grinternal.h linux-2.6.36/include/linux/gr
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/grmsg.h linux-2.6.36/include/linux/grmsg.h
---- linux-2.6.36/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/grmsg.h 2010-11-06 18:58:50.000000000 -0400
-@@ -0,0 +1,110 @@
+diff -urNp linux-2.6.37/include/linux/grmsg.h linux-2.6.37/include/linux/grmsg.h
+--- linux-2.6.37/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/grmsg.h 2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,111 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -45572,6 +46301,7 @@ diff -urNp linux-2.6.36/include/linux/grmsg.h linux-2.6.36/include/linux/grmsg.h
 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
++#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
 +#define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
@@ -45607,7 +46337,7 @@ diff -urNp linux-2.6.36/include/linux/grmsg.h linux-2.6.36/include/linux/grmsg.h
 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
-+#define GR_SOCK2_MSG "denied socket(%d,%.16s,%.16s) by "
++#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
 +#define GR_BIND_MSG "denied bind() by "
 +#define GR_CONNECT_MSG "denied connect() by "
 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
@@ -45630,16 +46360,17 @@ diff -urNp linux-2.6.36/include/linux/grmsg.h linux-2.6.36/include/linux/grmsg.h
 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/grsecurity.h
---- linux-2.6.36/include/linux/grsecurity.h    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/grsecurity.h    2010-11-06 20:09:12.000000000 -0400
-@@ -0,0 +1,206 @@
+diff -urNp linux-2.6.37/include/linux/grsecurity.h linux-2.6.37/include/linux/grsecurity.h
+--- linux-2.6.37/include/linux/grsecurity.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/grsecurity.h    2011-01-17 02:41:02.000000000 -0500
+@@ -0,0 +1,214 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
 +#include <linux/fs_struct.h>
 +#include <linux/binfmts.h>
 +#include <linux/gracl.h>
++#include <linux/compat.h>
 +
 +/* notify of brain-dead configs */
 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
@@ -45663,6 +46394,8 @@ diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/gr
 +
 +char gr_roletype_to_char(void);
 +
++int gr_acl_enable_at_secure(void);
++
 +int gr_check_user_change(int real, int effective, int fs);
 +int gr_check_group_change(int real, int effective, int fs);
 +
@@ -45708,6 +46441,9 @@ diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/gr
 +void gr_log_chroot_exec(const struct dentry *dentry,
 +                             const struct vfsmount *mnt);
 +void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
++#ifdef CONFIG_COMPAT
++void gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv);
++#endif
 +void gr_log_remount(const char *devname, const int retval);
 +void gr_log_unmount(const char *devname, const int retval);
 +void gr_log_mount(const char *from, const char *to, const int retval);
@@ -45755,6 +46491,8 @@ diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/gr
 +                               const struct vfsmount *mnt, mode_t mode);
 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
 +                               const struct vfsmount *mnt);
++__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
++                               const struct vfsmount *mnt);
 +int gr_handle_ptrace(struct task_struct *task, const long request);
 +int gr_handle_proc_ptrace(struct task_struct *task);
 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
@@ -45840,9 +46578,9 @@ diff -urNp linux-2.6.36/include/linux/grsecurity.h linux-2.6.36/include/linux/gr
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/grsock.h linux-2.6.36/include/linux/grsock.h
---- linux-2.6.36/include/linux/grsock.h        1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/grsock.h        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/grsock.h linux-2.6.37/include/linux/grsock.h
+--- linux-2.6.37/include/linux/grsock.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/grsock.h        2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -45863,10 +46601,10 @@ diff -urNp linux-2.6.36/include/linux/grsock.h linux-2.6.36/include/linux/grsock
 +                          const int protocol);
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/highmem.h linux-2.6.36/include/linux/highmem.h
---- linux-2.6.36/include/linux/highmem.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/highmem.h       2010-11-06 18:58:15.000000000 -0400
-@@ -155,6 +155,18 @@ static inline void clear_highpage(struct
+diff -urNp linux-2.6.37/include/linux/highmem.h linux-2.6.37/include/linux/highmem.h
+--- linux-2.6.37/include/linux/highmem.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/highmem.h       2011-01-17 02:41:02.000000000 -0500
+@@ -182,6 +182,18 @@ static inline void clear_highpage(struct
        kunmap_atomic(kaddr, KM_USER0);
  }
  
@@ -45885,10 +46623,10 @@ diff -urNp linux-2.6.36/include/linux/highmem.h linux-2.6.36/include/linux/highm
  static inline void zero_user_segments(struct page *page,
        unsigned start1, unsigned end1,
        unsigned start2, unsigned end2)
-diff -urNp linux-2.6.36/include/linux/init.h linux-2.6.36/include/linux/init.h
---- linux-2.6.36/include/linux/init.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/init.h  2010-11-06 18:58:15.000000000 -0400
-@@ -286,13 +286,13 @@ void __init parse_early_options(char *cm
+diff -urNp linux-2.6.37/include/linux/init.h linux-2.6.37/include/linux/init.h
+--- linux-2.6.37/include/linux/init.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/init.h  2011-01-17 02:41:02.000000000 -0500
+@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
  #define module_init(initfn)                                   \
@@ -45904,10 +46642,10 @@ diff -urNp linux-2.6.36/include/linux/init.h linux-2.6.36/include/linux/init.h
        { return exitfn; }                                      \
        void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-2.6.36/include/linux/interrupt.h linux-2.6.36/include/linux/interrupt.h
---- linux-2.6.36/include/linux/interrupt.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/interrupt.h     2010-11-06 18:58:15.000000000 -0400
-@@ -392,7 +392,7 @@ enum
+diff -urNp linux-2.6.37/include/linux/interrupt.h linux-2.6.37/include/linux/interrupt.h
+--- linux-2.6.37/include/linux/interrupt.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/interrupt.h     2011-01-17 02:41:02.000000000 -0500
+@@ -393,7 +393,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
   */
@@ -45916,7 +46654,7 @@ diff -urNp linux-2.6.36/include/linux/interrupt.h linux-2.6.36/include/linux/int
  
  /* softirq mask and active fields moved to irq_cpustat_t in
   * asm/hardirq.h to get better cache usage.  KAO
-@@ -400,12 +400,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
+@@ -401,12 +401,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
  
  struct softirq_action
  {
@@ -45929,11 +46667,11 @@ diff -urNp linux-2.6.36/include/linux/interrupt.h linux-2.6.36/include/linux/int
 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
 +extern void open_softirq(int nr, void (*action)(void));
  extern void softirq_init(void);
- #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
- extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.36/include/linux/jbd2.h linux-2.6.36/include/linux/jbd2.h
---- linux-2.6.36/include/linux/jbd2.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/jbd2.h  2010-11-06 18:58:15.000000000 -0400
+ static inline void __raise_softirq_irqoff(unsigned int nr)
+ {
+diff -urNp linux-2.6.37/include/linux/jbd2.h linux-2.6.37/include/linux/jbd2.h
+--- linux-2.6.37/include/linux/jbd2.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/jbd2.h  2011-01-17 02:41:02.000000000 -0500
 @@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
                }                                                       \
        } while (0)
@@ -45943,9 +46681,9 @@ diff -urNp linux-2.6.36/include/linux/jbd2.h linux-2.6.36/include/linux/jbd2.h
  #endif
  
  extern void *jbd2_alloc(size_t size, gfp_t flags);
-diff -urNp linux-2.6.36/include/linux/jbd.h linux-2.6.36/include/linux/jbd.h
---- linux-2.6.36/include/linux/jbd.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/jbd.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/jbd.h linux-2.6.37/include/linux/jbd.h
+--- linux-2.6.37/include/linux/jbd.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/jbd.h   2011-01-17 02:41:02.000000000 -0500
 @@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
                }                                                       \
        } while (0)
@@ -45955,33 +46693,39 @@ diff -urNp linux-2.6.36/include/linux/jbd.h linux-2.6.36/include/linux/jbd.h
  #endif
  
  static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.36/include/linux/kallsyms.h linux-2.6.36/include/linux/kallsyms.h
---- linux-2.6.36/include/linux/kallsyms.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/kallsyms.h      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/kallsyms.h linux-2.6.37/include/linux/kallsyms.h
+--- linux-2.6.37/include/linux/kallsyms.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/kallsyms.h      2011-01-17 02:41:02.000000000 -0500
 @@ -15,7 +15,8 @@
  
  struct module;
  
 -#ifdef CONFIG_KALLSYMS
-+#ifndef __INCLUDED_BY_HIDESYM
++#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
  /* Lookup the address for a symbol. Returns 0 if not found. */
  unsigned long kallsyms_lookup_name(const char *name);
  
-@@ -92,6 +93,9 @@ static inline int lookup_symbol_attrs(un
+@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(un
  /* Stupid that this does nothing, but I didn't create this mess. */
  #define __print_symbol(fmt, addr)
  #endif /*CONFIG_KALLSYMS*/
-+#else /* when included by kallsyms.c, with HIDESYM enabled */
++#else /* when included by kallsyms.c, vsnprintf.c, or
++       arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
 +extern void __print_symbol(const char *fmt, unsigned long address);
++extern int sprint_symbol(char *buffer, unsigned long address);
++const char *kallsyms_lookup(unsigned long addr,
++                          unsigned long *symbolsize,
++                          unsigned long *offset,
++                          char **modname, char *namebuf);
 +#endif
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.36/include/linux/kgdb.h linux-2.6.36/include/linux/kgdb.h
---- linux-2.6.36/include/linux/kgdb.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/kgdb.h  2010-11-06 18:58:15.000000000 -0400
-@@ -276,22 +276,22 @@ struct kgdb_arch {
+diff -urNp linux-2.6.37/include/linux/kgdb.h linux-2.6.37/include/linux/kgdb.h
+--- linux-2.6.37/include/linux/kgdb.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/kgdb.h  2011-01-17 02:41:02.000000000 -0500
+@@ -269,22 +269,22 @@ struct kgdb_arch {
   */
  struct kgdb_io {
        const char              *name;
@@ -46014,10 +46758,10 @@ diff -urNp linux-2.6.36/include/linux/kgdb.h linux-2.6.36/include/linux/kgdb.h
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern char *kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.36/include/linux/kvm_host.h linux-2.6.36/include/linux/kvm_host.h
---- linux-2.6.36/include/linux/kvm_host.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/kvm_host.h      2010-11-06 18:58:15.000000000 -0400
-@@ -245,7 +245,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-2.6.37/include/linux/kvm_host.h linux-2.6.37/include/linux/kvm_host.h
+--- linux-2.6.37/include/linux/kvm_host.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/kvm_host.h      2011-01-17 02:41:02.000000000 -0500
+@@ -246,7 +246,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
@@ -46026,7 +46770,7 @@ diff -urNp linux-2.6.36/include/linux/kvm_host.h linux-2.6.36/include/linux/kvm_
                  struct module *module);
  void kvm_exit(void);
  
-@@ -369,7 +369,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -375,7 +375,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
                                        struct kvm_guest_debug *dbg);
  int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
  
@@ -46035,10 +46779,10 @@ diff -urNp linux-2.6.36/include/linux/kvm_host.h linux-2.6.36/include/linux/kvm_
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata.h
---- linux-2.6.36/include/linux/libata.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/libata.h        2010-11-06 18:58:15.000000000 -0400
-@@ -64,11 +64,11 @@
+diff -urNp linux-2.6.37/include/linux/libata.h linux-2.6.37/include/linux/libata.h
+--- linux-2.6.37/include/linux/libata.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/libata.h        2011-01-17 02:41:02.000000000 -0500
+@@ -65,11 +65,11 @@
  #ifdef ATA_VERBOSE_DEBUG
  #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
  #else
@@ -46053,7 +46797,7 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
  #endif        /* ATA_DEBUG */
  
  #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
-@@ -524,11 +524,11 @@ struct ata_ioports {
+@@ -530,11 +530,11 @@ struct ata_ioports {
  
  struct ata_host {
        spinlock_t              lock;
@@ -46065,9 +46809,9 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
 -      struct ata_port_operations *ops;
 +      const struct ata_port_operations *ops;
        unsigned long           flags;
- #ifdef CONFIG_ATA_ACPI
-       acpi_handle             acpi_handle;
-@@ -710,7 +710,7 @@ struct ata_link {
+ 
+       struct mutex            eh_mutex;
+@@ -725,7 +725,7 @@ struct ata_link {
  
  struct ata_port {
        struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
@@ -46076,7 +46820,7 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
        spinlock_t              *lock;
        /* Flags owned by the EH context. Only EH should touch these once the
           port is active */
-@@ -897,7 +897,7 @@ struct ata_port_info {
+@@ -913,7 +913,7 @@ struct ata_port_info {
        unsigned long           pio_mask;
        unsigned long           mwdma_mask;
        unsigned long           udma_mask;
@@ -46085,7 +46829,7 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
        void                    *private_data;
  };
  
-@@ -921,7 +921,7 @@ extern const unsigned long sata_deb_timi
+@@ -937,7 +937,7 @@ extern const unsigned long sata_deb_timi
  extern const unsigned long sata_deb_timing_hotplug[];
  extern const unsigned long sata_deb_timing_long[];
  
@@ -46094,7 +46838,7 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
  extern const struct ata_port_info ata_dummy_port_info;
  
  static inline const unsigned long *
-@@ -965,7 +965,7 @@ extern int ata_host_activate(struct ata_
+@@ -983,7 +983,7 @@ extern int ata_host_activate(struct ata_
                             struct scsi_host_template *sht);
  extern void ata_host_detach(struct ata_host *host);
  extern void ata_host_init(struct ata_host *, struct device *,
@@ -46102,10 +46846,10 @@ diff -urNp linux-2.6.36/include/linux/libata.h linux-2.6.36/include/linux/libata
 +                        unsigned long, const struct ata_port_operations *);
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
- extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.36/include/linux/lockd/bind.h linux-2.6.36/include/linux/lockd/bind.h
---- linux-2.6.36/include/linux/lockd/bind.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/lockd/bind.h    2010-11-06 18:58:15.000000000 -0400
+ extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
+diff -urNp linux-2.6.37/include/linux/lockd/bind.h linux-2.6.37/include/linux/lockd/bind.h
+--- linux-2.6.37/include/linux/lockd/bind.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/lockd/bind.h    2011-01-17 02:41:02.000000000 -0500
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -46123,9 +46867,9 @@ diff -urNp linux-2.6.36/include/linux/lockd/bind.h linux-2.6.36/include/linux/lo
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
---- linux-2.6.36/include/linux/mm.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/mm.h    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/mm.h linux-2.6.37/include/linux/mm.h
+--- linux-2.6.37/include/linux/mm.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/mm.h    2011-01-17 02:41:02.000000000 -0500
 @@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000   /* Has ->fault & does nonlinear pages */
@@ -46141,7 +46885,20 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
  #define VM_PFN_AT_MMAP        0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
  #define VM_MERGEABLE  0x80000000      /* KSM may merge identical pages */
  
-@@ -1021,6 +1028,15 @@ struct shrinker {
+@@ -875,12 +882,6 @@ int set_page_dirty(struct page *page);
+ int set_page_dirty_lock(struct page *page);
+ int clear_page_dirty_for_io(struct page *page);
+ 
+-/* Is the vma a continuation of the stack vma above it? */
+-static inline int vma_stack_continue(struct vm_area_struct *vma, unsigned long addr)
+-{
+-      return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
+-}
+-
+ extern unsigned long move_page_tables(struct vm_area_struct *vma,
+               unsigned long old_addr, struct vm_area_struct *new_vma,
+               unsigned long new_addr, unsigned long len);
+@@ -1032,6 +1033,15 @@ struct shrinker {
  extern void register_shrinker(struct shrinker *);
  extern void unregister_shrinker(struct shrinker *);
  
@@ -46156,8 +46913,8 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
 +
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
- extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
-@@ -1297,6 +1313,7 @@ out:
+ extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
+@@ -1318,6 +1328,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -46165,7 +46922,7 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1353,6 +1370,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1374,6 +1385,10 @@ extern struct vm_area_struct * find_vma(
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
                                             struct vm_area_struct **pprev);
  
@@ -46176,7 +46933,7 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1369,15 +1390,6 @@ static inline unsigned long vma_pages(st
+@@ -1390,15 +1405,6 @@ static inline unsigned long vma_pages(st
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -46192,7 +46949,7 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
  struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
  int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
                        unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1484,7 +1496,7 @@ extern int unpoison_memory(unsigned long
+@@ -1505,7 +1511,7 @@ extern int unpoison_memory(unsigned long
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
  extern void shake_page(struct page *p, int access);
@@ -46201,7 +46958,7 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
  extern int soft_offline_page(struct page *page, int flags);
  #ifdef CONFIG_MEMORY_FAILURE
  int is_hwpoison_address(unsigned long addr);
-@@ -1497,5 +1509,11 @@ static inline int is_hwpoison_address(un
+@@ -1518,5 +1524,11 @@ static inline int is_hwpoison_address(un
  
  extern void dump_page(struct page *page);
  
@@ -46213,9 +46970,9 @@ diff -urNp linux-2.6.36/include/linux/mm.h linux-2.6.36/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.36/include/linux/mm_types.h linux-2.6.36/include/linux/mm_types.h
---- linux-2.6.36/include/linux/mm_types.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/mm_types.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/mm_types.h linux-2.6.37/include/linux/mm_types.h
+--- linux-2.6.37/include/linux/mm_types.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/mm_types.h      2011-01-17 02:41:02.000000000 -0500
 @@ -183,6 +183,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
        struct mempolicy *vm_policy;    /* NUMA policy for the VMA */
@@ -46225,10 +46982,10 @@ diff -urNp linux-2.6.36/include/linux/mm_types.h linux-2.6.36/include/linux/mm_t
  };
  
  struct core_thread {
-@@ -310,6 +312,24 @@ struct mm_struct {
- #ifdef CONFIG_MMU_NOTIFIER
-       struct mmu_notifier_mm *mmu_notifier_mm;
+@@ -312,6 +314,24 @@ struct mm_struct {
  #endif
+       /* How many tasks sharing this mm are OOM_DISABLE */
+       atomic_t oom_disable_count;
 +
 +#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
 +      unsigned long pax_flags;
@@ -46250,9 +47007,9 @@ diff -urNp linux-2.6.36/include/linux/mm_types.h linux-2.6.36/include/linux/mm_t
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.36/include/linux/mmu_notifier.h linux-2.6.36/include/linux/mmu_notifier.h
---- linux-2.6.36/include/linux/mmu_notifier.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/mmu_notifier.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/mmu_notifier.h linux-2.6.37/include/linux/mmu_notifier.h
+--- linux-2.6.37/include/linux/mmu_notifier.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/mmu_notifier.h  2011-01-17 02:41:02.000000000 -0500
 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)             \
@@ -46269,10 +47026,10 @@ diff -urNp linux-2.6.36/include/linux/mmu_notifier.h linux-2.6.36/include/linux/
  })
  
  #define ptep_clear_flush_young_notify(__vma, __address, __ptep)               \
-diff -urNp linux-2.6.36/include/linux/mmzone.h linux-2.6.36/include/linux/mmzone.h
---- linux-2.6.36/include/linux/mmzone.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/mmzone.h        2010-11-06 18:58:15.000000000 -0400
-@@ -352,7 +352,7 @@ struct zone {
+diff -urNp linux-2.6.37/include/linux/mmzone.h linux-2.6.37/include/linux/mmzone.h
+--- linux-2.6.37/include/linux/mmzone.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/mmzone.h        2011-01-17 02:41:02.000000000 -0500
+@@ -354,7 +354,7 @@ struct zone {
        unsigned long           flags;             /* zone flags, see below */
  
        /* Zone statistics */
@@ -46281,9 +47038,9 @@ diff -urNp linux-2.6.36/include/linux/mmzone.h linux-2.6.36/include/linux/mmzone
  
        /*
         * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-2.6.36/include/linux/mod_devicetable.h linux-2.6.36/include/linux/mod_devicetable.h
---- linux-2.6.36/include/linux/mod_devicetable.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/mod_devicetable.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/mod_devicetable.h linux-2.6.37/include/linux/mod_devicetable.h
+--- linux-2.6.37/include/linux/mod_devicetable.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/mod_devicetable.h       2011-01-17 02:41:02.000000000 -0500
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -46302,9 +47059,9 @@ diff -urNp linux-2.6.36/include/linux/mod_devicetable.h linux-2.6.36/include/lin
  
  struct hid_device_id {
        __u16 bus;
-diff -urNp linux-2.6.36/include/linux/module.h linux-2.6.36/include/linux/module.h
---- linux-2.6.36/include/linux/module.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/module.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/module.h linux-2.6.37/include/linux/module.h
+--- linux-2.6.37/include/linux/module.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/module.h        2011-01-17 02:41:02.000000000 -0500
 @@ -297,16 +297,16 @@ struct module
        int (*init)(void);
  
@@ -46326,7 +47083,7 @@ diff -urNp linux-2.6.36/include/linux/module.h linux-2.6.36/include/linux/module
  
        /* Arch-specific module values */
        struct mod_arch_specific arch;
-@@ -408,16 +408,46 @@ bool is_module_address(unsigned long add
+@@ -411,16 +411,46 @@ bool is_module_address(unsigned long add
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -46377,9 +47134,9 @@ diff -urNp linux-2.6.36/include/linux/module.h linux-2.6.36/include/linux/module
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.36/include/linux/moduleloader.h linux-2.6.36/include/linux/moduleloader.h
---- linux-2.6.36/include/linux/moduleloader.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/moduleloader.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/moduleloader.h linux-2.6.37/include/linux/moduleloader.h
+--- linux-2.6.37/include/linux/moduleloader.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/moduleloader.h  2011-01-17 02:41:02.000000000 -0500
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -46402,9 +47159,9 @@ diff -urNp linux-2.6.36/include/linux/moduleloader.h linux-2.6.36/include/linux/
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.36/include/linux/moduleparam.h linux-2.6.36/include/linux/moduleparam.h
---- linux-2.6.36/include/linux/moduleparam.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/moduleparam.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/moduleparam.h linux-2.6.37/include/linux/moduleparam.h
+--- linux-2.6.37/include/linux/moduleparam.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/moduleparam.h   2011-01-17 02:41:02.000000000 -0500
 @@ -253,7 +253,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -46423,9 +47180,9 @@ diff -urNp linux-2.6.36/include/linux/moduleparam.h linux-2.6.36/include/linux/m
        = { ARRAY_SIZE(array), nump, &param_ops_##type,                 \
            sizeof(array[0]), array };                                  \
        __module_param_call(MODULE_PARAM_PREFIX, name,                  \
-diff -urNp linux-2.6.36/include/linux/namei.h linux-2.6.36/include/linux/namei.h
---- linux-2.6.36/include/linux/namei.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/namei.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/namei.h linux-2.6.37/include/linux/namei.h
+--- linux-2.6.37/include/linux/namei.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/namei.h 2011-01-17 02:41:02.000000000 -0500
 @@ -22,7 +22,7 @@ struct nameidata {
        unsigned int    flags;
        int             last_type;
@@ -46450,9 +47207,9 @@ diff -urNp linux-2.6.36/include/linux/namei.h linux-2.6.36/include/linux/namei.h
  {
        return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.36/include/linux/netfilter/xt_gradm.h linux-2.6.36/include/linux/netfilter/xt_gradm.h
---- linux-2.6.36/include/linux/netfilter/xt_gradm.h    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/include/linux/netfilter/xt_gradm.h    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/netfilter/xt_gradm.h linux-2.6.37/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.37/include/linux/netfilter/xt_gradm.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/include/linux/netfilter/xt_gradm.h    2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -46463,10 +47220,10 @@ diff -urNp linux-2.6.36/include/linux/netfilter/xt_gradm.h linux-2.6.36/include/
 +};
 +
 +#endif
-diff -urNp linux-2.6.36/include/linux/oprofile.h linux-2.6.36/include/linux/oprofile.h
---- linux-2.6.36/include/linux/oprofile.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/oprofile.h      2010-11-06 18:58:15.000000000 -0400
-@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
+diff -urNp linux-2.6.37/include/linux/oprofile.h linux-2.6.37/include/linux/oprofile.h
+--- linux-2.6.37/include/linux/oprofile.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/oprofile.h      2011-01-17 02:41:02.000000000 -0500
+@@ -130,9 +130,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
        char const * name, ulong * val);
   
@@ -46478,9 +47235,9 @@ diff -urNp linux-2.6.36/include/linux/oprofile.h linux-2.6.36/include/linux/opro
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.36/include/linux/pipe_fs_i.h linux-2.6.36/include/linux/pipe_fs_i.h
---- linux-2.6.36/include/linux/pipe_fs_i.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/pipe_fs_i.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/pipe_fs_i.h linux-2.6.37/include/linux/pipe_fs_i.h
+--- linux-2.6.37/include/linux/pipe_fs_i.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/pipe_fs_i.h     2011-01-17 02:41:02.000000000 -0500
 @@ -45,9 +45,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
        wait_queue_head_t wait;
@@ -46494,9 +47251,21 @@ diff -urNp linux-2.6.36/include/linux/pipe_fs_i.h linux-2.6.36/include/linux/pip
        unsigned int r_counter;
        unsigned int w_counter;
        struct page *tmp_page;
-diff -urNp linux-2.6.36/include/linux/poison.h linux-2.6.36/include/linux/poison.h
---- linux-2.6.36/include/linux/poison.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/poison.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/pm_runtime.h linux-2.6.37/include/linux/pm_runtime.h
+--- linux-2.6.37/include/linux/pm_runtime.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/pm_runtime.h    2011-01-17 02:41:02.000000000 -0500
+@@ -83,7 +83,7 @@ static inline bool pm_runtime_suspended(
+ 
+ static inline void pm_runtime_mark_last_busy(struct device *dev)
+ {
+-      ACCESS_ONCE(dev->power.last_busy) = jiffies;
++      ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
+ }
+ 
+ #else /* !CONFIG_PM_RUNTIME */
+diff -urNp linux-2.6.37/include/linux/poison.h linux-2.6.37/include/linux/poison.h
+--- linux-2.6.37/include/linux/poison.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/poison.h        2011-01-17 02:41:02.000000000 -0500
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -46508,9 +47277,9 @@ diff -urNp linux-2.6.36/include/linux/poison.h linux-2.6.36/include/linux/poison
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.36/include/linux/proc_fs.h linux-2.6.36/include/linux/proc_fs.h
---- linux-2.6.36/include/linux/proc_fs.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/proc_fs.h       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/proc_fs.h linux-2.6.37/include/linux/proc_fs.h
+--- linux-2.6.37/include/linux/proc_fs.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/proc_fs.h       2011-01-17 02:41:02.000000000 -0500
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
        return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -46531,9 +47300,9 @@ diff -urNp linux-2.6.36/include/linux/proc_fs.h linux-2.6.36/include/linux/proc_
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
        mode_t mode, struct proc_dir_entry *base, 
        read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.36/include/linux/random.h linux-2.6.36/include/linux/random.h
---- linux-2.6.36/include/linux/random.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/random.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/random.h linux-2.6.37/include/linux/random.h
+--- linux-2.6.37/include/linux/random.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/random.h        2011-01-17 02:41:02.000000000 -0500
 @@ -80,12 +80,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -46553,10 +47322,10 @@ diff -urNp linux-2.6.36/include/linux/random.h linux-2.6.36/include/linux/random
  }
  
  /**
-diff -urNp linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36/include/linux/reiserfs_fs.h
---- linux-2.6.36/include/linux/reiserfs_fs.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/reiserfs_fs.h   2010-11-06 18:58:15.000000000 -0400
-@@ -1404,7 +1404,7 @@ static inline loff_t max_reiserfs_offset
+diff -urNp linux-2.6.37/include/linux/reiserfs_fs.h linux-2.6.37/include/linux/reiserfs_fs.h
+--- linux-2.6.37/include/linux/reiserfs_fs.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/reiserfs_fs.h   2011-01-17 02:41:02.000000000 -0500
+@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM             1       /* reiserfs user memory mode            */
  
  #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
@@ -46565,7 +47334,7 @@ diff -urNp linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36/include/linux/r
  #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)             \
-@@ -1616,24 +1616,24 @@ static inline struct super_block *sb_fro
+@@ -1615,24 +1615,24 @@ static inline struct super_block *sb_fro
  */
  
  struct item_operations {
@@ -46602,9 +47371,9 @@ diff -urNp linux-2.6.36/include/linux/reiserfs_fs.h linux-2.6.36/include/linux/r
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36/include/linux/reiserfs_fs_sb.h
---- linux-2.6.36/include/linux/reiserfs_fs_sb.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/reiserfs_fs_sb.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/reiserfs_fs_sb.h linux-2.6.37/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.37/include/linux/reiserfs_fs_sb.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/reiserfs_fs_sb.h        2011-01-17 02:41:02.000000000 -0500
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
        /* Comment? -Hans */
        wait_queue_head_t s_wait;
@@ -46614,9 +47383,9 @@ diff -urNp linux-2.6.36/include/linux/reiserfs_fs_sb.h linux-2.6.36/include/linu
        // tree gets re-balanced
        unsigned long s_properties;     /* File system properties. Currently holds
                                           on-disk FS format */
-diff -urNp linux-2.6.36/include/linux/rmap.h linux-2.6.36/include/linux/rmap.h
---- linux-2.6.36/include/linux/rmap.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/rmap.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/rmap.h linux-2.6.37/include/linux/rmap.h
+--- linux-2.6.37/include/linux/rmap.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/rmap.h  2011-01-17 02:41:02.000000000 -0500
 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
  void anon_vma_init(void);     /* create anon_vma_cachep */
  int  anon_vma_prepare(struct vm_area_struct *);
@@ -46628,9 +47397,9 @@ diff -urNp linux-2.6.36/include/linux/rmap.h linux-2.6.36/include/linux/rmap.h
  void __anon_vma_link(struct vm_area_struct *);
  void anon_vma_free(struct anon_vma *);
  
-diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
---- linux-2.6.36/include/linux/sched.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/sched.h 2010-11-06 19:00:55.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/sched.h linux-2.6.37/include/linux/sched.h
+--- linux-2.6.37/include/linux/sched.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/sched.h 2011-01-17 02:41:02.000000000 -0500
 @@ -100,6 +100,7 @@ struct robust_list_head;
  struct bio_list;
  struct fs_struct;
@@ -46639,7 +47408,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  
  /*
   * List of flags we want to share for kernel threads,
-@@ -374,10 +375,12 @@ struct user_namespace;
+@@ -377,10 +378,12 @@ struct user_namespace;
  #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
  
  extern int sysctl_max_map_count;
@@ -46652,12 +47421,13 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -621,6 +624,15 @@ struct signal_struct {
+@@ -624,6 +627,16 @@ struct signal_struct {
        struct tty_audit_buf *tty_audit_buf;
  #endif
  
 +#ifdef CONFIG_GRKERNSEC
 +      u32 curr_ip;
++      u32 saved_ip;
 +      u32 gr_saddr;
 +      u32 gr_daddr;
 +      u16 gr_sport;
@@ -46667,8 +47437,8 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
 +
        int oom_adj;            /* OOM kill score adjustment (bit shift) */
        int oom_score_adj;      /* OOM kill score adjustment */
- };
-@@ -1162,7 +1174,7 @@ struct rcu_node;
+ 
+@@ -1181,7 +1194,7 @@ enum perf_event_task_context {
  
  struct task_struct {
        volatile long state;    /* -1 unrunnable, 0 runnable, >0 stopped */
@@ -46677,7 +47447,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
        atomic_t usage;
        unsigned int flags;     /* per process flags, defined below */
        unsigned int ptrace;
-@@ -1270,8 +1282,8 @@ struct task_struct {
+@@ -1291,8 +1304,8 @@ struct task_struct {
        struct list_head thread_group;
  
        struct completion *vfork_done;          /* for vfork() */
@@ -46688,50 +47458,44 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  
        cputime_t utime, stime, utimescaled, stimescaled;
        cputime_t gtime;
-@@ -1287,16 +1299,6 @@ struct task_struct {
+@@ -1308,13 +1321,6 @@ struct task_struct {
        struct task_cputime cputime_expires;
        struct list_head cpu_timers[3];
  
 -/* process credentials */
--      const struct cred *real_cred;   /* objective and real subjective task
+-      const struct cred __rcu *real_cred; /* objective and real subjective task
 -                                       * credentials (COW) */
--      const struct cred *cred;        /* effective (overridable) subjective task
+-      const struct cred __rcu *cred;  /* effective (overridable) subjective task
 -                                       * credentials (COW) */
--      struct mutex cred_guard_mutex;  /* guard against foreign influences on
--                                       * credential calculations
--                                       * (notably. ptrace) */
 -      struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
 -
        char comm[TASK_COMM_LEN]; /* executable name excluding path
                                     - access with [gs]et_task_comm (which lock
                                       it with task_lock())
-@@ -1380,6 +1382,15 @@ struct task_struct {
-       int softirqs_enabled;
-       int softirq_context;
- #endif
+@@ -1333,6 +1339,10 @@ struct task_struct {
+       struct thread_struct thread;
+ /* filesystem information */
+       struct fs_struct *fs;
 +
-+/* process credentials */
-+      const struct cred *real_cred;   /* objective and real subjective task
++      const struct cred __rcu *cred;  /* effective (overridable) subjective task
 +                                       * credentials (COW) */
-+      struct mutex cred_guard_mutex;  /* guard against foreign influences on
-+                                       * credential calculations
-+                                       * (notably. ptrace) */
-+      struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
 +
- #ifdef CONFIG_LOCKDEP
- # define MAX_LOCK_DEPTH 48UL
-       u64 curr_chain_key;
-@@ -1400,6 +1411,9 @@ struct task_struct {
- 
-       struct backing_dev_info *backing_dev_info;
+ /* open file information */
+       struct files_struct *files;
+ /* namespaces */
+@@ -1379,6 +1389,11 @@ struct task_struct {
+       struct rt_mutex_waiter *pi_blocked_on;
+ #endif
  
-+      const struct cred *cred;        /* effective (overridable) subjective task
++/* process credentials */
++      const struct cred __rcu *real_cred; /* objective and real subjective task
 +                                       * credentials (COW) */
++      struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
 +
-       struct io_context *io_context;
- 
-       unsigned long ptrace_message;
-@@ -1465,6 +1479,20 @@ struct task_struct {
+ #ifdef CONFIG_DEBUG_MUTEXES
+       /* mutex deadlock detection */
+       struct mutex_waiter *blocked_on;
+@@ -1483,6 +1498,20 @@ struct task_struct {
        unsigned long default_timer_slack_ns;
  
        struct list_head        *scm_work_list;
@@ -46752,7 +47516,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /* Index of current stored address in ret_stack */
        int curr_ret_stack;
-@@ -1496,6 +1524,52 @@ struct task_struct {
+@@ -1514,6 +1543,52 @@ struct task_struct {
  #endif
  };
  
@@ -46805,7 +47569,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2103,7 +2177,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2134,7 +2209,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -46814,7 +47578,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2221,8 +2295,8 @@ static inline void unlock_task_sighand(s
+@@ -2259,8 +2334,8 @@ static inline void unlock_task_sighand(s
  
  #ifndef __HAVE_THREAD_FUNCTIONS
  
@@ -46825,7 +47589,7 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  
  static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
  {
-@@ -2237,13 +2311,17 @@ static inline unsigned long *end_of_stac
+@@ -2275,13 +2350,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -46845,9 +47609,9 @@ diff -urNp linux-2.6.36/include/linux/sched.h linux-2.6.36/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.36/include/linux/screen_info.h linux-2.6.36/include/linux/screen_info.h
---- linux-2.6.36/include/linux/screen_info.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/screen_info.h   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/screen_info.h linux-2.6.37/include/linux/screen_info.h
+--- linux-2.6.37/include/linux/screen_info.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/screen_info.h   2011-01-17 02:41:02.000000000 -0500
 @@ -43,7 +43,8 @@ struct screen_info {
        __u16 pages;            /* 0x32 */
        __u16 vesa_attributes;  /* 0x34 */
@@ -46858,9 +47622,9 @@ diff -urNp linux-2.6.36/include/linux/screen_info.h linux-2.6.36/include/linux/s
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA                0x10    /* Monochrome Text Display      */
-diff -urNp linux-2.6.36/include/linux/security.h linux-2.6.36/include/linux/security.h
---- linux-2.6.36/include/linux/security.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/security.h      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/security.h linux-2.6.37/include/linux/security.h
+--- linux-2.6.37/include/linux/security.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/security.h      2011-01-17 02:41:02.000000000 -0500
 @@ -35,6 +35,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -46869,9 +47633,9 @@ diff -urNp linux-2.6.36/include/linux/security.h linux-2.6.36/include/linux/secu
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.36/include/linux/shm.h linux-2.6.36/include/linux/shm.h
---- linux-2.6.36/include/linux/shm.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/shm.h   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/shm.h linux-2.6.37/include/linux/shm.h
+--- linux-2.6.37/include/linux/shm.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/shm.h   2011-01-17 02:41:02.000000000 -0500
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
        pid_t                   shm_cprid;
        pid_t                   shm_lprid;
@@ -46883,9 +47647,39 @@ diff -urNp linux-2.6.36/include/linux/shm.h linux-2.6.36/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.36/include/linux/slab.h linux-2.6.36/include/linux/slab.h
---- linux-2.6.36/include/linux/slab.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/slab.h  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/skbuff.h linux-2.6.37/include/linux/skbuff.h
+--- linux-2.6.37/include/linux/skbuff.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/skbuff.h        2011-01-17 02:41:02.000000000 -0500
+@@ -581,7 +581,7 @@ static inline struct skb_shared_hwtstamp
+  */
+ static inline int skb_queue_empty(const struct sk_buff_head *list)
+ {
+-      return list->next == (struct sk_buff *)list;
++      return list->next == (const struct sk_buff *)list;
+ }
+ 
+ /**
+@@ -594,7 +594,7 @@ static inline int skb_queue_empty(const 
+ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
+                                    const struct sk_buff *skb)
+ {
+-      return skb->next == (struct sk_buff *)list;
++      return skb->next == (const struct sk_buff *)list;
+ }
+ 
+ /**
+@@ -607,7 +607,7 @@ static inline bool skb_queue_is_last(con
+ static inline bool skb_queue_is_first(const struct sk_buff_head *list,
+                                     const struct sk_buff *skb)
+ {
+-      return skb->prev == (struct sk_buff *)list;
++      return skb->prev == (const struct sk_buff *)list;
+ }
+ 
+ /**
+diff -urNp linux-2.6.37/include/linux/slab.h linux-2.6.37/include/linux/slab.h
+--- linux-2.6.37/include/linux/slab.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/slab.h  2011-01-17 02:41:02.000000000 -0500
 @@ -11,6 +11,7 @@
  
  #include <linux/gfp.h>
@@ -46957,9 +47751,9 @@ diff -urNp linux-2.6.36/include/linux/slab.h linux-2.6.36/include/linux/slab.h
 +})
 +
  #endif        /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.36/include/linux/slub_def.h linux-2.6.36/include/linux/slub_def.h
---- linux-2.6.36/include/linux/slub_def.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/slub_def.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/slub_def.h linux-2.6.37/include/linux/slub_def.h
+--- linux-2.6.37/include/linux/slub_def.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/slub_def.h      2011-01-17 02:41:02.000000000 -0500
 @@ -80,7 +80,7 @@ struct kmem_cache {
        struct kmem_cache_order_objects max;
        struct kmem_cache_order_objects min;
@@ -46969,9 +47763,9 @@ diff -urNp linux-2.6.36/include/linux/slub_def.h linux-2.6.36/include/linux/slub
        void (*ctor)(void *);
        int inuse;              /* Offset to metadata */
        int align;              /* Alignment */
-diff -urNp linux-2.6.36/include/linux/sonet.h linux-2.6.36/include/linux/sonet.h
---- linux-2.6.36/include/linux/sonet.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/sonet.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/sonet.h linux-2.6.37/include/linux/sonet.h
+--- linux-2.6.37/include/linux/sonet.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/sonet.h 2011-01-17 02:41:02.000000000 -0500
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -46981,9 +47775,42 @@ diff -urNp linux-2.6.36/include/linux/sonet.h linux-2.6.36/include/linux/sonet.h
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.36/include/linux/suspend.h linux-2.6.36/include/linux/suspend.h
---- linux-2.6.36/include/linux/suspend.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/suspend.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/sunrpc/clnt.h linux-2.6.37/include/linux/sunrpc/clnt.h
+--- linux-2.6.37/include/linux/sunrpc/clnt.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/sunrpc/clnt.h   2011-01-17 02:41:02.000000000 -0500
+@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
+ {
+       switch (sap->sa_family) {
+       case AF_INET:
+-              return ntohs(((struct sockaddr_in *)sap)->sin_port);
++              return ntohs(((const struct sockaddr_in *)sap)->sin_port);
+       case AF_INET6:
+-              return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
++              return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
+       }
+       return 0;
+ }
+@@ -203,7 +203,7 @@ static inline bool __rpc_cmp_addr4(const
+ static inline bool __rpc_copy_addr4(struct sockaddr *dst,
+                                   const struct sockaddr *src)
+ {
+-      const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
++      const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
+       struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+ 
+       dsin->sin_family = ssin->sin_family;
+@@ -300,7 +300,7 @@ static inline u32 rpc_get_scope_id(const
+       if (sa->sa_family != AF_INET6)
+               return 0;
+ 
+-      return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
++      return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
+ }
+ 
+ #endif /* __KERNEL__ */
+diff -urNp linux-2.6.37/include/linux/suspend.h linux-2.6.37/include/linux/suspend.h
+--- linux-2.6.37/include/linux/suspend.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/suspend.h       2011-01-17 02:41:02.000000000 -0500
 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
   *    which require special recovery actions in that situation.
   */
@@ -47072,9 +47899,9 @@ diff -urNp linux-2.6.36/include/linux/suspend.h linux-2.6.36/include/linux/suspe
  static inline int hibernate(void) { return -ENOSYS; }
  static inline bool system_entering_hibernation(void) { return false; }
  #endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.36/include/linux/sysctl.h linux-2.6.36/include/linux/sysctl.h
---- linux-2.6.36/include/linux/sysctl.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/sysctl.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/sysctl.h linux-2.6.37/include/linux/sysctl.h
+--- linux-2.6.37/include/linux/sysctl.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/sysctl.h        2011-01-17 02:41:02.000000000 -0500
 @@ -155,7 +155,11 @@ enum
        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -47088,9 +47915,18 @@ diff -urNp linux-2.6.36/include/linux/sysctl.h linux-2.6.36/include/linux/sysctl
  
  /* CTL_VM names: */
  enum
-diff -urNp linux-2.6.36/include/linux/sysfs.h linux-2.6.36/include/linux/sysfs.h
---- linux-2.6.36/include/linux/sysfs.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/sysfs.h 2010-11-06 18:58:15.000000000 -0400
+@@ -966,6 +970,8 @@ typedef int proc_handler (struct ctl_tab
+ 
+ extern int proc_dostring(struct ctl_table *, int,
+                        void __user *, size_t *, loff_t *);
++extern int proc_dostring_modpriv(struct ctl_table *, int,
++                       void __user *, size_t *, loff_t *);
+ extern int proc_dointvec(struct ctl_table *, int,
+                        void __user *, size_t *, loff_t *);
+ extern int proc_dointvec_minmax(struct ctl_table *, int,
+diff -urNp linux-2.6.37/include/linux/sysfs.h linux-2.6.37/include/linux/sysfs.h
+--- linux-2.6.37/include/linux/sysfs.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/sysfs.h 2011-01-17 02:41:02.000000000 -0500
 @@ -110,8 +110,8 @@ struct bin_attribute {
  #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
  
@@ -47102,38 +47938,27 @@ diff -urNp linux-2.6.36/include/linux/sysfs.h linux-2.6.36/include/linux/sysfs.h
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.36/include/linux/thread_info.h linux-2.6.36/include/linux/thread_info.h
---- linux-2.6.36/include/linux/thread_info.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/thread_info.h   2010-11-06 18:58:15.000000000 -0400
-@@ -23,7 +23,7 @@ struct restart_block {
-               };
-               /* For futex_wait and futex_wait_requeue_pi */
-               struct {
--                      u32 *uaddr;
-+                      u32 __user *uaddr;
-                       u32 val;
-                       u32 flags;
-                       u32 bitset;
-diff -urNp linux-2.6.36/include/linux/tty.h linux-2.6.36/include/linux/tty.h
---- linux-2.6.36/include/linux/tty.h   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/tty.h   2010-11-06 18:58:15.000000000 -0400
-@@ -13,6 +13,7 @@
+diff -urNp linux-2.6.37/include/linux/tty.h linux-2.6.37/include/linux/tty.h
+--- linux-2.6.37/include/linux/tty.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/tty.h   2011-01-17 02:41:02.000000000 -0500
+@@ -13,6 +13,8 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_ldisc.h>
  #include <linux/mutex.h>
 +#include <linux/poll.h>
- #include <linux/smp_lock.h>
++#include <linux/smp_lock.h>
  
  #include <asm/system.h>
-@@ -463,7 +464,6 @@ extern int tty_perform_flush(struct tty_
+ 
+@@ -465,7 +467,6 @@ extern int tty_perform_flush(struct tty_
  extern dev_t tty_devnum(struct tty_struct *tty);
  extern void proc_clear_tty(struct task_struct *p);
  extern struct tty_struct *get_current_tty(void);
 -extern void tty_default_fops(struct file_operations *fops);
  extern struct tty_struct *alloc_tty_struct(void);
- extern void tty_add_file(struct tty_struct *tty, struct file *file);
+ extern int tty_add_file(struct tty_struct *tty, struct file *file);
  extern void free_tty_struct(struct tty_struct *tty);
-@@ -526,6 +526,18 @@ extern void tty_ldisc_begin(void);
+@@ -528,6 +529,18 @@ extern void tty_ldisc_begin(void);
  /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
  extern void tty_ldisc_enable(struct tty_struct *tty);
  
@@ -47152,9 +47977,9 @@ diff -urNp linux-2.6.36/include/linux/tty.h linux-2.6.36/include/linux/tty.h
  
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.36/include/linux/tty_ldisc.h linux-2.6.36/include/linux/tty_ldisc.h
---- linux-2.6.36/include/linux/tty_ldisc.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/tty_ldisc.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/tty_ldisc.h linux-2.6.37/include/linux/tty_ldisc.h
+--- linux-2.6.37/include/linux/tty_ldisc.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/tty_ldisc.h     2011-01-17 02:41:02.000000000 -0500
 @@ -147,7 +147,7 @@ struct tty_ldisc_ops {
  
        struct  module *owner;
@@ -47164,9 +47989,9 @@ diff -urNp linux-2.6.36/include/linux/tty_ldisc.h linux-2.6.36/include/linux/tty
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.36/include/linux/types.h linux-2.6.36/include/linux/types.h
---- linux-2.6.36/include/linux/types.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/types.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/types.h linux-2.6.37/include/linux/types.h
+--- linux-2.6.37/include/linux/types.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/types.h 2011-01-17 02:41:02.000000000 -0500
 @@ -207,10 +207,26 @@ typedef struct {
        int counter;
  } atomic_t;
@@ -47194,9 +48019,64 @@ diff -urNp linux-2.6.36/include/linux/types.h linux-2.6.36/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-2.6.36/include/linux/uaccess.h linux-2.6.36/include/linux/uaccess.h
---- linux-2.6.36/include/linux/uaccess.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/uaccess.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/u64_stats_sync.h linux-2.6.37/include/linux/u64_stats_sync.h
+--- linux-2.6.37/include/linux/u64_stats_sync.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/u64_stats_sync.h        2011-01-17 02:41:02.000000000 -0500
+@@ -67,21 +67,21 @@ struct u64_stats_sync {
+ #endif
+ };
+ 
+-static void inline u64_stats_update_begin(struct u64_stats_sync *syncp)
++static inline void u64_stats_update_begin(struct u64_stats_sync *syncp)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+       write_seqcount_begin(&syncp->seq);
+ #endif
+ }
+ 
+-static void inline u64_stats_update_end(struct u64_stats_sync *syncp)
++static inline void u64_stats_update_end(struct u64_stats_sync *syncp)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+       write_seqcount_end(&syncp->seq);
+ #endif
+ }
+ 
+-static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *syncp)
++static inline unsigned int u64_stats_fetch_begin(const struct u64_stats_sync *syncp)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+       return read_seqcount_begin(&syncp->seq);
+@@ -93,7 +93,7 @@ static unsigned int inline u64_stats_fet
+ #endif
+ }
+ 
+-static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
++static inline bool u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
+                                        unsigned int start)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+@@ -112,7 +112,7 @@ static bool inline u64_stats_fetch_retry
+  * - UP 32bit must disable BH.
+  * - 64bit have no problem atomically reading u64 values, irq safe.
+  */
+-static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
++static inline unsigned int u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+       return read_seqcount_begin(&syncp->seq);
+@@ -124,7 +124,7 @@ static unsigned int inline u64_stats_fet
+ #endif
+ }
+ 
+-static bool inline u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
++static inline bool u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
+                                        unsigned int start)
+ {
+ #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
+diff -urNp linux-2.6.37/include/linux/uaccess.h linux-2.6.37/include/linux/uaccess.h
+--- linux-2.6.37/include/linux/uaccess.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/uaccess.h       2011-01-17 02:41:02.000000000 -0500
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
                long ret;                               \
                mm_segment_t old_fs = get_fs();         \
@@ -47232,10 +48112,52 @@ diff -urNp linux-2.6.36/include/linux/uaccess.h linux-2.6.36/include/linux/uacce
 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif                /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.36/include/linux/usb/hcd.h linux-2.6.36/include/linux/usb/hcd.h
---- linux-2.6.36/include/linux/usb/hcd.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/usb/hcd.h       2010-11-06 18:58:15.000000000 -0400
-@@ -578,7 +578,7 @@ struct usb_mon_operations {
+diff -urNp linux-2.6.37/include/linux/unaligned/access_ok.h linux-2.6.37/include/linux/unaligned/access_ok.h
+--- linux-2.6.37/include/linux/unaligned/access_ok.h   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/unaligned/access_ok.h   2011-01-17 02:41:02.000000000 -0500
+@@ -6,32 +6,32 @@
+ 
+ static inline u16 get_unaligned_le16(const void *p)
+ {
+-      return le16_to_cpup((__le16 *)p);
++      return le16_to_cpup((const __le16 *)p);
+ }
+ 
+ static inline u32 get_unaligned_le32(const void *p)
+ {
+-      return le32_to_cpup((__le32 *)p);
++      return le32_to_cpup((const __le32 *)p);
+ }
+ 
+ static inline u64 get_unaligned_le64(const void *p)
+ {
+-      return le64_to_cpup((__le64 *)p);
++      return le64_to_cpup((const __le64 *)p);
+ }
+ 
+ static inline u16 get_unaligned_be16(const void *p)
+ {
+-      return be16_to_cpup((__be16 *)p);
++      return be16_to_cpup((const __be16 *)p);
+ }
+ 
+ static inline u32 get_unaligned_be32(const void *p)
+ {
+-      return be32_to_cpup((__be32 *)p);
++      return be32_to_cpup((const __be32 *)p);
+ }
+ 
+ static inline u64 get_unaligned_be64(const void *p)
+ {
+-      return be64_to_cpup((__be64 *)p);
++      return be64_to_cpup((const __be64 *)p);
+ }
+ 
+ static inline void put_unaligned_le16(u16 val, void *p)
+diff -urNp linux-2.6.37/include/linux/usb/hcd.h linux-2.6.37/include/linux/usb/hcd.h
+--- linux-2.6.37/include/linux/usb/hcd.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/usb/hcd.h       2011-01-17 02:41:02.000000000 -0500
+@@ -580,7 +580,7 @@ struct usb_mon_operations {
        /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
  };
  
@@ -47244,7 +48166,7 @@ diff -urNp linux-2.6.36/include/linux/usb/hcd.h linux-2.6.36/include/linux/usb/h
  
  static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
  {
-@@ -600,7 +600,7 @@ static inline void usbmon_urb_complete(s
+@@ -602,7 +602,7 @@ static inline void usbmon_urb_complete(s
                (*mon_ops->urb_complete)(bus, urb, status);
  }
  
@@ -47253,10 +48175,10 @@ diff -urNp linux-2.6.36/include/linux/usb/hcd.h linux-2.6.36/include/linux/usb/h
  void usb_mon_deregister(void);
  
  #else
-diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmalloc.h
---- linux-2.6.36/include/linux/vmalloc.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/vmalloc.h       2010-11-06 18:58:15.000000000 -0400
-@@ -15,6 +15,11 @@ extern bool vmap_lazy_unmap;
+diff -urNp linux-2.6.37/include/linux/vmalloc.h linux-2.6.37/include/linux/vmalloc.h
+--- linux-2.6.37/include/linux/vmalloc.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/vmalloc.h       2011-01-17 02:41:02.000000000 -0500
+@@ -13,6 +13,11 @@ struct vm_area_struct;              /* vma defining 
  #define VM_MAP                0x00000004      /* vmap()ed pages */
  #define VM_USERMAP    0x00000008      /* suitable for remap_vmalloc_range */
  #define VM_VPAGES     0x00000010      /* buffer for pages was vmalloc'ed */
@@ -47268,9 +48190,9 @@ diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmall
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -123,4 +128,81 @@ struct vm_struct **pcpu_get_vm_areas(con
- 
+@@ -125,4 +130,103 @@ struct vm_struct **pcpu_get_vm_areas(con
  void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
+ #endif
  
 +#define vmalloc(x)                                            \
 +({                                                            \
@@ -47283,6 +48205,17 @@ diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmall
 +      ___retval;                                              \
 +})
 +
++#define vzalloc(x)                                            \
++({                                                            \
++      void *___retval;                                        \
++      intoverflow_t ___x = (intoverflow_t)x;                  \
++      if (WARN(___x > ULONG_MAX, "vzalloc size overflow\n"))  \
++              ___retval = NULL;                               \
++      else                                                    \
++              ___retval = vzalloc((unsigned long)___x);       \
++      ___retval;                                              \
++})
++
 +#define __vmalloc(x, y, z)                                    \
 +({                                                            \
 +      void *___retval;                                        \
@@ -47327,6 +48260,17 @@ diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmall
 +      ___retval;                                              \
 +})
 +
++#define vzalloc_node(x, y)                                    \
++({                                                            \
++      void *___retval;                                        \
++      intoverflow_t ___x = (intoverflow_t)x;                  \
++      if (WARN(___x > ULONG_MAX, "vzalloc_node size overflow\n"))\
++              ___retval = NULL;                               \
++      else                                                    \
++              ___retval = vzalloc_node((unsigned long)___x, (y));\
++      ___retval;                                              \
++})
++
 +#define vmalloc_32(x)                                         \
 +({                                                            \
 +      void *___retval;                                        \
@@ -47340,7 +48284,7 @@ diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmall
 +
 +#define vmalloc_32_user(x)                                    \
 +({                                                            \
-+      void *___retval;                                        \
++void *___retval;                                      \
 +      intoverflow_t ___x = (intoverflow_t)x;                  \
 +      if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
 +              ___retval = NULL;                               \
@@ -47350,9 +48294,9 @@ diff -urNp linux-2.6.36/include/linux/vmalloc.h linux-2.6.36/include/linux/vmall
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.36/include/linux/vmstat.h linux-2.6.36/include/linux/vmstat.h
---- linux-2.6.36/include/linux/vmstat.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/linux/vmstat.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/linux/vmstat.h linux-2.6.37/include/linux/vmstat.h
+--- linux-2.6.37/include/linux/vmstat.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/linux/vmstat.h        2011-01-17 02:41:02.000000000 -0500
 @@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -47416,9 +48360,9 @@ diff -urNp linux-2.6.36/include/linux/vmstat.h linux-2.6.36/include/linux/vmstat
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.36/include/net/inetpeer.h linux-2.6.36/include/net/inetpeer.h
---- linux-2.6.36/include/net/inetpeer.h        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/inetpeer.h        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/net/inetpeer.h linux-2.6.37/include/net/inetpeer.h
+--- linux-2.6.37/include/net/inetpeer.h        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/inetpeer.h        2011-01-17 02:41:02.000000000 -0500
 @@ -30,8 +30,8 @@ struct inet_peer {
         */
        union {
@@ -47439,9 +48383,9 @@ diff -urNp linux-2.6.36/include/net/inetpeer.h linux-2.6.36/include/net/inetpeer
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-2.6.36/include/net/irda/ircomm_tty.h linux-2.6.36/include/net/irda/ircomm_tty.h
---- linux-2.6.36/include/net/irda/ircomm_tty.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/irda/ircomm_tty.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/net/irda/ircomm_tty.h linux-2.6.37/include/net/irda/ircomm_tty.h
+--- linux-2.6.37/include/net/irda/ircomm_tty.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/irda/ircomm_tty.h 2011-01-17 02:41:02.000000000 -0500
 @@ -105,8 +105,8 @@ struct ircomm_tty_cb {
          unsigned short    close_delay;
          unsigned short    closing_wait; /* time to wait before closing */
@@ -47453,10 +48397,10 @@ diff -urNp linux-2.6.36/include/net/irda/ircomm_tty.h linux-2.6.36/include/net/i
  
        /* Protect concurent access to :
         *      o self->open_count
-diff -urNp linux-2.6.36/include/net/neighbour.h linux-2.6.36/include/net/neighbour.h
---- linux-2.6.36/include/net/neighbour.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/neighbour.h       2010-11-06 18:58:15.000000000 -0400
-@@ -116,12 +116,12 @@ struct neighbour {
+diff -urNp linux-2.6.37/include/net/neighbour.h linux-2.6.37/include/net/neighbour.h
+--- linux-2.6.37/include/net/neighbour.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/neighbour.h       2011-01-17 02:41:02.000000000 -0500
+@@ -118,12 +118,12 @@ struct neighbour {
  
  struct neigh_ops {
        int                     family;
@@ -47475,24 +48419,38 @@ diff -urNp linux-2.6.36/include/net/neighbour.h linux-2.6.36/include/net/neighbo
  };
  
  struct pneigh_entry {
-diff -urNp linux-2.6.36/include/net/sctp/sctp.h linux-2.6.36/include/net/sctp/sctp.h
---- linux-2.6.36/include/net/sctp/sctp.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/sctp/sctp.h       2010-11-06 18:58:15.000000000 -0400
-@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
+diff -urNp linux-2.6.37/include/net/netlink.h linux-2.6.37/include/net/netlink.h
+--- linux-2.6.37/include/net/netlink.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/netlink.h 2011-01-17 02:41:02.000000000 -0500
+@@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
+ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
+ {
+       if (mark)
+-              skb_trim(skb, (unsigned char *) mark - skb->data);
++              skb_trim(skb, (const unsigned char *) mark - skb->data);
+ }
+ 
+ /**
+diff -urNp linux-2.6.37/include/net/sctp/sctp.h linux-2.6.37/include/net/sctp/sctp.h
+--- linux-2.6.37/include/net/sctp/sctp.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/sctp/sctp.h       2011-01-17 02:41:02.000000000 -0500
+@@ -316,9 +316,9 @@ do {                                                                       \
  
  #else /* SCTP_DEBUG */
  
 -#define SCTP_DEBUG_PRINTK(whatever...)
+-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
 -#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
 +#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
++#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
 +#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.36/include/net/tcp.h linux-2.6.36/include/net/tcp.h
---- linux-2.6.36/include/net/tcp.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/tcp.h     2010-11-06 18:58:15.000000000 -0400
-@@ -1373,6 +1373,7 @@ enum tcp_seq_states {
+diff -urNp linux-2.6.37/include/net/tcp.h linux-2.6.37/include/net/tcp.h
+--- linux-2.6.37/include/net/tcp.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/tcp.h     2011-01-17 02:41:02.000000000 -0500
+@@ -1380,6 +1380,7 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -47500,10 +48458,10 @@ diff -urNp linux-2.6.36/include/net/tcp.h linux-2.6.36/include/net/tcp.h
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
  };
-diff -urNp linux-2.6.36/include/net/udp.h linux-2.6.36/include/net/udp.h
---- linux-2.6.36/include/net/udp.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/net/udp.h     2010-11-06 18:58:15.000000000 -0400
-@@ -220,6 +220,7 @@ struct udp_seq_afinfo {
+diff -urNp linux-2.6.37/include/net/udp.h linux-2.6.37/include/net/udp.h
+--- linux-2.6.37/include/net/udp.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/net/udp.h     2011-01-17 02:41:02.000000000 -0500
+@@ -223,6 +223,7 @@ struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
        struct udp_table        *udp_table;
@@ -47511,9 +48469,9 @@ diff -urNp linux-2.6.36/include/net/udp.h linux-2.6.36/include/net/udp.h
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
  };
-diff -urNp linux-2.6.36/include/sound/ac97_codec.h linux-2.6.36/include/sound/ac97_codec.h
---- linux-2.6.36/include/sound/ac97_codec.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/sound/ac97_codec.h    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/sound/ac97_codec.h linux-2.6.37/include/sound/ac97_codec.h
+--- linux-2.6.37/include/sound/ac97_codec.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/sound/ac97_codec.h    2011-01-17 02:41:02.000000000 -0500
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -47546,10 +48504,10 @@ diff -urNp linux-2.6.36/include/sound/ac97_codec.h linux-2.6.36/include/sound/ac
        void *private_data;
        void (*private_free) (struct snd_ac97 *ac97);
        /* --- */
-diff -urNp linux-2.6.36/include/trace/events/irq.h linux-2.6.36/include/trace/events/irq.h
---- linux-2.6.36/include/trace/events/irq.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/trace/events/irq.h    2010-11-06 18:58:15.000000000 -0400
-@@ -34,7 +34,7 @@
+diff -urNp linux-2.6.37/include/trace/events/irq.h linux-2.6.37/include/trace/events/irq.h
+--- linux-2.6.37/include/trace/events/irq.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/trace/events/irq.h    2011-01-17 02:41:02.000000000 -0500
+@@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
  
@@ -47558,7 +48516,7 @@ diff -urNp linux-2.6.36/include/trace/events/irq.h linux-2.6.36/include/trace/ev
  
        TP_ARGS(irq, action),
  
-@@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry,
+@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
   */
  TRACE_EVENT(irq_handler_exit,
  
@@ -47567,36 +48525,9 @@ diff -urNp linux-2.6.36/include/trace/events/irq.h linux-2.6.36/include/trace/ev
  
        TP_ARGS(irq, action, ret),
  
-@@ -84,7 +84,7 @@ TRACE_EVENT(irq_handler_exit,
- 
- DECLARE_EVENT_CLASS(softirq,
- 
--      TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-+      TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
- 
-       TP_ARGS(h, vec),
- 
-@@ -113,7 +113,7 @@ DECLARE_EVENT_CLASS(softirq,
-  */
- DEFINE_EVENT(softirq, softirq_entry,
- 
--      TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-+      TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
- 
-       TP_ARGS(h, vec)
- );
-@@ -131,7 +131,7 @@ DEFINE_EVENT(softirq, softirq_entry,
-  */
- DEFINE_EVENT(softirq, softirq_exit,
- 
--      TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
-+      TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
- 
-       TP_ARGS(h, vec)
- );
-diff -urNp linux-2.6.36/include/video/uvesafb.h linux-2.6.36/include/video/uvesafb.h
---- linux-2.6.36/include/video/uvesafb.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/include/video/uvesafb.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/include/video/uvesafb.h linux-2.6.37/include/video/uvesafb.h
+--- linux-2.6.37/include/video/uvesafb.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/include/video/uvesafb.h       2011-01-17 02:41:02.000000000 -0500
 @@ -177,6 +177,7 @@ struct uvesafb_par {
        u8 ypan;                        /* 0 - nothing, 1 - ypan, 2 - ywrap */
        u8 pmi_setpal;                  /* PMI for palette changes */
@@ -47605,10 +48536,10 @@ diff -urNp linux-2.6.36/include/video/uvesafb.h linux-2.6.36/include/video/uvesa
        void *pmi_start;
        void *pmi_pal;
        u8 *vbe_state_orig;             /*
-diff -urNp linux-2.6.36/init/do_mounts.c linux-2.6.36/init/do_mounts.c
---- linux-2.6.36/init/do_mounts.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/do_mounts.c      2010-11-06 18:58:15.000000000 -0400
-@@ -217,11 +217,11 @@ static void __init get_fs_names(char *pa
+diff -urNp linux-2.6.37/init/do_mounts.c linux-2.6.37/init/do_mounts.c
+--- linux-2.6.37/init/do_mounts.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/do_mounts.c      2011-01-17 02:41:02.000000000 -0500
+@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
@@ -47617,12 +48548,7 @@ diff -urNp linux-2.6.36/init/do_mounts.c linux-2.6.36/init/do_mounts.c
        if (err)
                return err;
  
--      sys_chdir("/root");
-+      sys_chdir((__force char __user *)"/root");
-       ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
-       printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
-              current->fs->pwd.mnt->mnt_sb->s_type->name,
-@@ -312,18 +312,18 @@ void __init change_floppy(char *fmt, ...
+@@ -382,18 +382,18 @@ void __init change_floppy(char *fmt, ...
        va_start(args, fmt);
        vsprintf(buf, fmt, args);
        va_end(args);
@@ -47644,18 +48570,17 @@ diff -urNp linux-2.6.36/init/do_mounts.c linux-2.6.36/init/do_mounts.c
                termios.c_lflag |= ICANON;
                sys_ioctl(fd, TCSETSF, (long)&termios);
                sys_close(fd);
-@@ -417,6 +417,6 @@ void __init prepare_namespace(void)
+@@ -487,6 +487,6 @@ void __init prepare_namespace(void)
        mount_root();
  out:
        devtmpfs_mount("dev");
 -      sys_mount(".", "/", NULL, MS_MOVE, NULL);
--      sys_chroot(".");
 +      sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
-+      sys_chroot((__force char __user *)".");
+       sys_chroot((const char __user __force *)".");
  }
-diff -urNp linux-2.6.36/init/do_mounts.h linux-2.6.36/init/do_mounts.h
---- linux-2.6.36/init/do_mounts.h      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/do_mounts.h      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/init/do_mounts.h linux-2.6.37/init/do_mounts.h
+--- linux-2.6.37/init/do_mounts.h      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/do_mounts.h      2011-01-17 02:41:02.000000000 -0500
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -47675,9 +48600,9 @@ diff -urNp linux-2.6.36/init/do_mounts.h linux-2.6.36/init/do_mounts.h
                return 0;
        if (!S_ISBLK(stat.st_mode))
                return 0;
-diff -urNp linux-2.6.36/init/do_mounts_initrd.c linux-2.6.36/init/do_mounts_initrd.c
---- linux-2.6.36/init/do_mounts_initrd.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/do_mounts_initrd.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/init/do_mounts_initrd.c linux-2.6.37/init/do_mounts_initrd.c
+--- linux-2.6.37/init/do_mounts_initrd.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/do_mounts_initrd.c       2011-01-17 02:41:02.000000000 -0500
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
        create_dev("/dev/root.old", Root_RAM0);
        /* mount initrd on rootfs' /root */
@@ -47752,9 +48677,9 @@ diff -urNp linux-2.6.36/init/do_mounts_initrd.c linux-2.6.36/init/do_mounts_init
 +      sys_unlink((__force const char __user *)"/initrd.image");
        return 0;
  }
-diff -urNp linux-2.6.36/init/do_mounts_md.c linux-2.6.36/init/do_mounts_md.c
---- linux-2.6.36/init/do_mounts_md.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/do_mounts_md.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/init/do_mounts_md.c linux-2.6.37/init/do_mounts_md.c
+--- linux-2.6.37/init/do_mounts_md.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/do_mounts_md.c   2011-01-17 02:41:02.000000000 -0500
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
                        partitioned ? "_d" : "", minor,
                        md_setup_args[ent].device_names);
@@ -47773,18 +48698,9 @@ diff -urNp linux-2.6.36/init/do_mounts_md.c linux-2.6.36/init/do_mounts_md.c
                        sys_ioctl(fd, BLKRRPART, 0);
                }
                sys_close(fd);
-@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
- 
-       wait_for_device_probe();
- 
--      fd = sys_open("/dev/md0", 0, 0);
-+      fd = sys_open((__force char __user *)"/dev/md0", 0, 0);
-       if (fd >= 0) {
-               sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
-               sys_close(fd);
-diff -urNp linux-2.6.36/init/initramfs.c linux-2.6.36/init/initramfs.c
---- linux-2.6.36/init/initramfs.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/initramfs.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/init/initramfs.c linux-2.6.37/init/initramfs.c
+--- linux-2.6.37/init/initramfs.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/initramfs.c      2011-01-17 02:41:02.000000000 -0500
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
        }
  }
@@ -47893,10 +48809,10 @@ diff -urNp linux-2.6.36/init/initramfs.c linux-2.6.36/init/initramfs.c
        state = SkipIt;
        next_state = Reset;
        return 0;
-diff -urNp linux-2.6.36/init/Kconfig linux-2.6.36/init/Kconfig
---- linux-2.6.36/init/Kconfig  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/Kconfig  2010-11-06 18:58:15.000000000 -0400
-@@ -1067,7 +1067,7 @@ config SLUB_DEBUG
+diff -urNp linux-2.6.37/init/Kconfig linux-2.6.37/init/Kconfig
+--- linux-2.6.37/init/Kconfig  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/Kconfig  2011-01-17 02:41:02.000000000 -0500
+@@ -1108,7 +1108,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
        bool "Disable heap randomization"
@@ -47905,10 +48821,10 @@ diff -urNp linux-2.6.36/init/Kconfig linux-2.6.36/init/Kconfig
        help
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
---- linux-2.6.36/init/main.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/main.c   2010-11-06 18:58:50.000000000 -0400
-@@ -95,6 +95,7 @@ static inline void mark_rodata_ro(void) 
+diff -urNp linux-2.6.37/init/main.c linux-2.6.37/init/main.c
+--- linux-2.6.37/init/main.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/init/main.c   2011-01-17 02:41:02.000000000 -0500
+@@ -94,6 +94,7 @@ static inline void mark_rodata_ro(void) 
  #ifdef CONFIG_TC
  extern void tc_init(void);
  #endif
@@ -47916,13 +48832,13 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
  
  enum system_states system_state __read_mostly;
  EXPORT_SYMBOL(system_state);
-@@ -197,6 +198,47 @@ static int __init set_reset_devices(char
+@@ -196,6 +197,47 @@ static int __init set_reset_devices(char
  
  __setup("reset_devices", set_reset_devices);
  
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+extern void pax_enter_kernel_user(void);
-+extern void pax_exit_kernel_user(void);
++extern char pax_enter_kernel_user[];
++extern char pax_exit_kernel_user[];
 +extern pgdval_t clone_pgd_mask;
 +#endif
 +
@@ -47935,10 +48851,10 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
 +      for (cpu = 0; cpu < NR_CPUS; cpu++) {
 +              get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].type = 3;
 +              get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_DS].limit = 0xf;
++              get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
++              get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
 +      }
-+      asm("mov %0, %%ds" : : "r" (__KERNEL_DS) : "memory");
-+      asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory");
-+      asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
++      asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
 +#else
 +      memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
 +      memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
@@ -47964,7 +48880,7 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
  static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -743,6 +785,7 @@ int __init_or_module do_one_initcall(ini
+@@ -740,6 +782,7 @@ int __init_or_module do_one_initcall(ini
  {
        int count = preempt_count();
        int ret;
@@ -47972,7 +48888,7 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
  
        if (initcall_debug)
                ret = do_one_initcall_debug(fn);
-@@ -755,15 +798,15 @@ int __init_or_module do_one_initcall(ini
+@@ -752,15 +795,15 @@ int __init_or_module do_one_initcall(ini
                sprintf(msgbuf, "error code %d ", ret);
  
        if (preempt_count() != count) {
@@ -47992,7 +48908,7 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
        }
  
        return ret;
-@@ -893,7 +936,7 @@ static int __init kernel_init(void * unu
+@@ -889,7 +932,7 @@ static int __init kernel_init(void * unu
        do_basic_setup();
  
        /* Open the /dev/console on the rootfs, this should never fail */
@@ -48001,7 +48917,7 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
  
        (void) sys_dup(0);
-@@ -906,11 +949,13 @@ static int __init kernel_init(void * unu
+@@ -902,11 +945,13 @@ static int __init kernel_init(void * unu
        if (!ramdisk_execute_command)
                ramdisk_execute_command = "/init";
  
@@ -48016,86 +48932,10 @@ diff -urNp linux-2.6.36/init/main.c linux-2.6.36/init/main.c
        /*
         * Ok, we have completed the initial bootup, and
         * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.36/init/noinitramfs.c linux-2.6.36/init/noinitramfs.c
---- linux-2.6.36/init/noinitramfs.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/init/noinitramfs.c    2010-11-06 18:58:15.000000000 -0400
-@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
- {
-       int err;
- 
--      err = sys_mkdir("/dev", 0755);
-+      err = sys_mkdir((const char __user *)"/dev", 0755);
-       if (err < 0)
-               goto out;
- 
--      err = sys_mknod((const char __user *) "/dev/console",
-+      err = sys_mknod((__force const char __user *) "/dev/console",
-                       S_IFCHR | S_IRUSR | S_IWUSR,
-                       new_encode_dev(MKDEV(5, 1)));
-       if (err < 0)
-               goto out;
- 
--      err = sys_mkdir("/root", 0700);
-+      err = sys_mkdir((const char __user *)"/root", 0700);
-       if (err < 0)
-               goto out;
- 
-diff -urNp linux-2.6.36/ipc/compat.c linux-2.6.36/ipc/compat.c
---- linux-2.6.36/ipc/compat.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/ipc/compat.c  2010-11-06 18:58:50.000000000 -0400
-@@ -241,6 +241,8 @@ long compat_sys_semctl(int first, int se
-       struct semid64_ds __user *up64;
-       int version = compat_ipc_parse_version(&third);
- 
-+      memset(&s64, 0, sizeof(s64));
-+
-       if (!uptr)
-               return -EINVAL;
-       if (get_user(pad, (u32 __user *) uptr))
-@@ -421,6 +423,8 @@ long compat_sys_msgctl(int first, int se
-       int version = compat_ipc_parse_version(&second);
-       void __user *p;
- 
-+      memset(&m64, 0, sizeof(m64));
-+
-       switch (second & (~IPC_64)) {
-       case IPC_INFO:
-       case IPC_RMID:
-@@ -594,6 +598,8 @@ long compat_sys_shmctl(int first, int se
-       int err, err2;
-       int version = compat_ipc_parse_version(&second);
- 
-+      memset(&s64, 0, sizeof(s64));
-+
-       switch (second & (~IPC_64)) {
-       case IPC_RMID:
-       case SHM_LOCK:
-diff -urNp linux-2.6.36/ipc/compat_mq.c linux-2.6.36/ipc/compat_mq.c
---- linux-2.6.36/ipc/compat_mq.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/ipc/compat_mq.c       2010-11-06 18:58:50.000000000 -0400
-@@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const
-       void __user *p = NULL;
-       if (u_attr && oflag & O_CREAT) {
-               struct mq_attr attr;
-+
-+              memset(&attr, 0, sizeof(attr));
-+
-               p = compat_alloc_user_space(sizeof(attr));
-               if (get_compat_mq_attr(&attr, u_attr) ||
-                   copy_to_user(p, &attr, sizeof(attr)))
-@@ -127,6 +130,8 @@ asmlinkage long compat_sys_mq_getsetattr
-       struct mq_attr __user *p = compat_alloc_user_space(2 * sizeof(*p));
-       long ret;
- 
-+      memset(&mqstat, 0, sizeof(mqstat));
-+
-       if (u_mqstat) {
-               if (get_compat_mq_attr(&mqstat, u_mqstat) ||
-                   copy_to_user(p, &mqstat, sizeof(mqstat)))
-diff -urNp linux-2.6.36/ipc/mqueue.c linux-2.6.36/ipc/mqueue.c
---- linux-2.6.36/ipc/mqueue.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/ipc/mqueue.c  2010-11-06 18:58:50.000000000 -0400
-@@ -153,6 +153,7 @@ static struct inode *mqueue_get_inode(st
+diff -urNp linux-2.6.37/ipc/mqueue.c linux-2.6.37/ipc/mqueue.c
+--- linux-2.6.37/ipc/mqueue.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/ipc/mqueue.c  2011-01-17 02:41:02.000000000 -0500
+@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
                        mq_bytes = (mq_msg_tblsz +
                                (info->attr.mq_maxmsg * info->attr.mq_msgsize));
  
@@ -48103,9 +48943,9 @@ diff -urNp linux-2.6.36/ipc/mqueue.c linux-2.6.36/ipc/mqueue.c
                        spin_lock(&mq_lock);
                        if (u->mq_bytes + mq_bytes < u->mq_bytes ||
                            u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.36/ipc/shm.c linux-2.6.36/ipc/shm.c
---- linux-2.6.36/ipc/shm.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/ipc/shm.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/ipc/shm.c linux-2.6.37/ipc/shm.c
+--- linux-2.6.37/ipc/shm.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/ipc/shm.c     2011-01-17 02:41:02.000000000 -0500
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -48121,7 +48961,7 @@ diff -urNp linux-2.6.36/ipc/shm.c linux-2.6.36/ipc/shm.c
  void shm_init_ns(struct ipc_namespace *ns)
  {
        ns->shm_ctlmax = SHMMAX;
-@@ -395,6 +403,14 @@ static int newseg(struct ipc_namespace *
+@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *
        shp->shm_lprid = 0;
        shp->shm_atim = shp->shm_dtim = 0;
        shp->shm_ctim = get_seconds();
@@ -48136,16 +48976,7 @@ diff -urNp linux-2.6.36/ipc/shm.c linux-2.6.36/ipc/shm.c
        shp->shm_segsz = size;
        shp->shm_nattch = 0;
        shp->shm_file = file;
-@@ -473,6 +489,8 @@ static inline unsigned long copy_shmid_t
-           {
-               struct shmid_ds out;
- 
-+              memset(&out, 0, sizeof(out));
-+
-               ipc64_perm_to_ipc_perm(&in->shm_perm, &out.shm_perm);
-               out.shm_segsz   = in->shm_segsz;
-               out.shm_atime   = in->shm_atime;
-@@ -877,9 +895,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -895,9 +911,21 @@ long do_shmat(int shmid, char __user *sh
        if (err)
                goto out_unlock;
  
@@ -48167,9 +48998,9 @@ diff -urNp linux-2.6.36/ipc/shm.c linux-2.6.36/ipc/shm.c
        size = i_size_read(path.dentry->d_inode);
        shm_unlock(shp);
  
-diff -urNp linux-2.6.36/kernel/acct.c linux-2.6.36/kernel/acct.c
---- linux-2.6.36/kernel/acct.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/acct.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/acct.c linux-2.6.37/kernel/acct.c
+--- linux-2.6.37/kernel/acct.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/acct.c 2011-01-17 02:41:02.000000000 -0500
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
         */
        flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -48179,9 +49010,9 @@ diff -urNp linux-2.6.36/kernel/acct.c linux-2.6.36/kernel/acct.c
                               sizeof(acct_t), &file->f_pos);
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
        set_fs(fs);
-diff -urNp linux-2.6.36/kernel/capability.c linux-2.6.36/kernel/capability.c
---- linux-2.6.36/kernel/capability.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/capability.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/capability.c linux-2.6.37/kernel/capability.c
+--- linux-2.6.37/kernel/capability.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/capability.c   2011-01-17 02:41:02.000000000 -0500
 @@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
                 * before modification is attempted and the application
                 * fails.
@@ -48192,32 +49023,37 @@ diff -urNp linux-2.6.36/kernel/capability.c linux-2.6.36/kernel/capability.c
                if (copy_to_user(dataptr, kdata, tocopy
                                 * sizeof(struct __user_cap_data_struct))) {
                        return -EFAULT;
-@@ -306,10 +309,21 @@ int capable(int cap)
+@@ -306,10 +309,26 @@ int capable(int cap)
                BUG();
        }
  
 -      if (security_capable(cap) == 0) {
 +      if (security_capable(cap) == 0 && gr_is_capable(cap)) {
-+              current->flags |= PF_SUPERPRIV;
-+              return 1;
-+      }
-+      return 0;
-+}
-+
-+int capable_nolog(int cap)
-+{
-+      if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
                current->flags |= PF_SUPERPRIV;
                return 1;
        }
        return 0;
  }
++
++int capable_nolog(int cap)
++{
++      if (unlikely(!cap_valid(cap))) {
++              printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
++              BUG();
++      }
++
++      if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
++              current->flags |= PF_SUPERPRIV;
++              return 1;
++      }
++      return 0;
++}
 +
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.36/kernel/compat.c linux-2.6.36/kernel/compat.c
---- linux-2.6.36/kernel/compat.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/compat.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/compat.c linux-2.6.37/kernel/compat.c
+--- linux-2.6.37/kernel/compat.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/compat.c       2011-01-17 02:41:02.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -48226,10 +49062,10 @@ diff -urNp linux-2.6.36/kernel/compat.c linux-2.6.36/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-2.6.36/kernel/configs.c linux-2.6.36/kernel/configs.c
---- linux-2.6.36/kernel/configs.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/configs.c      2010-11-06 18:58:50.000000000 -0400
-@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
+diff -urNp linux-2.6.37/kernel/configs.c linux-2.6.37/kernel/configs.c
+--- linux-2.6.37/kernel/configs.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/configs.c      2011-01-17 02:41:02.000000000 -0500
+@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
        struct proc_dir_entry *entry;
  
        /* create the current config file */
@@ -48249,10 +49085,10 @@ diff -urNp linux-2.6.36/kernel/configs.c linux-2.6.36/kernel/configs.c
        if (!entry)
                return -ENOMEM;
  
-diff -urNp linux-2.6.36/kernel/cred.c linux-2.6.36/kernel/cred.c
---- linux-2.6.36/kernel/cred.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/cred.c 2010-11-06 18:58:50.000000000 -0400
-@@ -485,6 +485,8 @@ int commit_creds(struct cred *new)
+diff -urNp linux-2.6.37/kernel/cred.c linux-2.6.37/kernel/cred.c
+--- linux-2.6.37/kernel/cred.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/cred.c 2011-01-17 02:41:02.000000000 -0500
+@@ -483,6 +483,8 @@ int commit_creds(struct cred *new)
  
        get_cred(new); /* we will require a ref for the subj creds too */
  
@@ -48261,10 +49097,10 @@ diff -urNp linux-2.6.36/kernel/cred.c linux-2.6.36/kernel/cred.c
        /* dumpability changes */
        if (old->euid != new->euid ||
            old->egid != new->egid ||
-diff -urNp linux-2.6.36/kernel/debug/debug_core.c linux-2.6.36/kernel/debug/debug_core.c
---- linux-2.6.36/kernel/debug/debug_core.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/debug/debug_core.c     2010-11-06 18:58:15.000000000 -0400
-@@ -71,7 +71,7 @@ int                  kgdb_io_module_registered;
+diff -urNp linux-2.6.37/kernel/debug/debug_core.c linux-2.6.37/kernel/debug/debug_core.c
+--- linux-2.6.37/kernel/debug/debug_core.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/debug/debug_core.c     2011-01-17 02:41:02.000000000 -0500
+@@ -72,7 +72,7 @@ int                  kgdb_io_module_registered;
  /* Guard for recursive entry */
  static int                    exception_level;
  
@@ -48273,7 +49109,7 @@ diff -urNp linux-2.6.36/kernel/debug/debug_core.c linux-2.6.36/kernel/debug/debu
  static DEFINE_SPINLOCK(kgdb_registration_lock);
  
  /* kgdb console driver is loaded */
-@@ -873,7 +873,7 @@ static void kgdb_initial_breakpoint(void
+@@ -864,7 +864,7 @@ static void kgdb_initial_breakpoint(void
   *
   *    Register it with the KGDB core.
   */
@@ -48282,7 +49118,7 @@ diff -urNp linux-2.6.36/kernel/debug/debug_core.c linux-2.6.36/kernel/debug/debu
  {
        int err;
  
-@@ -918,7 +918,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
+@@ -909,7 +909,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
   *
   *    Unregister it with the KGDB core.
   */
@@ -48291,9 +49127,9 @@ diff -urNp linux-2.6.36/kernel/debug/debug_core.c linux-2.6.36/kernel/debug/debu
  {
        BUG_ON(kgdb_connected);
  
-diff -urNp linux-2.6.36/kernel/debug/kdb/kdb_main.c linux-2.6.36/kernel/debug/kdb/kdb_main.c
---- linux-2.6.36/kernel/debug/kdb/kdb_main.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/debug/kdb/kdb_main.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/debug/kdb/kdb_main.c linux-2.6.37/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.37/kernel/debug/kdb/kdb_main.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/debug/kdb/kdb_main.c   2011-01-17 02:41:02.000000000 -0500
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
        list_for_each_entry(mod, kdb_modules, list) {
  
@@ -48312,10 +49148,10 @@ diff -urNp linux-2.6.36/kernel/debug/kdb/kdb_main.c linux-2.6.36/kernel/debug/kd
  
  #ifdef CONFIG_MODULE_UNLOAD
                {
-diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
---- linux-2.6.36/kernel/exit.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/exit.c 2010-11-06 18:58:50.000000000 -0400
-@@ -56,6 +56,10 @@
+diff -urNp linux-2.6.37/kernel/exit.c linux-2.6.37/kernel/exit.c
+--- linux-2.6.37/kernel/exit.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/exit.c 2011-01-17 02:41:02.000000000 -0500
+@@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
  
@@ -48326,7 +49162,7 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
  static void exit_mm(struct task_struct * tsk);
  
  static void __unhash_process(struct task_struct *p, bool group_dead)
-@@ -162,6 +166,8 @@ void release_task(struct task_struct * p
+@@ -169,6 +173,8 @@ void release_task(struct task_struct * p
        struct task_struct *leader;
        int zap_leader;
  repeat:
@@ -48335,7 +49171,7 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
        tracehook_prepare_release_task(p);
        /* don't need to get the RCU readlock here - the process is dead and
         * can't be modifying its own credentials. But shut RCU-lockdep up */
-@@ -331,11 +337,22 @@ static void reparent_to_kthreadd(void)
+@@ -338,11 +344,22 @@ static void reparent_to_kthreadd(void)
  {
        write_lock_irq(&tasklist_lock);
  
@@ -48358,7 +49194,7 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
        /* Set the exit signal to SIGCHLD so we signal init on exit */
        current->exit_signal = SIGCHLD;
  
-@@ -387,7 +404,7 @@ int allow_signal(int sig)
+@@ -394,7 +411,7 @@ int allow_signal(int sig)
         * know it'll be handled, so that they don't get converted to
         * SIGKILL or just silently dropped.
         */
@@ -48367,7 +49203,7 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
        return 0;
-@@ -423,6 +440,17 @@ void daemonize(const char *name, ...)
+@@ -430,6 +447,17 @@ void daemonize(const char *name, ...)
        vsnprintf(current->comm, sizeof(current->comm), name, args);
        va_end(args);
  
@@ -48385,7 +49221,46 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
        /*
         * If we were started as result of loading a module, close all of the
         * user space pages.  We don't need them, and if we didn't close them
-@@ -963,6 +991,9 @@ NORET_TYPE void do_exit(long code)
+@@ -905,17 +933,17 @@ NORET_TYPE void do_exit(long code)
+       struct task_struct *tsk = current;
+       int group_dead;
+ 
+-      profile_task_exit(tsk);
+-
+-      WARN_ON(atomic_read(&tsk->fs_excl));
+-
++      /*
++       * Check this first since set_fs() below depends on
++       * current_thread_info(), which we better not access when we're in
++       * interrupt context.  Other than that, we want to do the set_fs()
++       * as early as possible.
++       */
+       if (unlikely(in_interrupt()))
+               panic("Aiee, killing interrupt handler!");
+-      if (unlikely(!tsk->pid))
+-              panic("Attempted to kill the idle task!");
+ 
+       /*
+-       * If do_exit is called because this processes oopsed, it's possible
++       * If do_exit is called because this processes Oops'ed, it's possible
+        * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
+        * continuing. Amongst other possible reasons, this is to prevent
+        * mm_release()->clear_child_tid() from writing to a user-controlled
+@@ -923,6 +951,13 @@ NORET_TYPE void do_exit(long code)
+        */
+       set_fs(USER_DS);
+ 
++      profile_task_exit(tsk);
++
++      WARN_ON(atomic_read(&tsk->fs_excl));
++
++      if (unlikely(!tsk->pid))
++              panic("Attempted to kill the idle task!");
++
+       tracehook_report_exit(&code);
+ 
+       validate_creds_for_do_exit(tsk);
+@@ -983,6 +1018,9 @@ NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        taskstats_exit(tsk, group_dead);
  
@@ -48395,10 +49270,10 @@ diff -urNp linux-2.6.36/kernel/exit.c linux-2.6.36/kernel/exit.c
        exit_mm(tsk);
  
        if (group_dead)
-diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
---- linux-2.6.36/kernel/fork.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/fork.c 2010-11-06 19:20:52.000000000 -0400
-@@ -276,7 +276,7 @@ static struct task_struct *dup_task_stru
+diff -urNp linux-2.6.37/kernel/fork.c linux-2.6.37/kernel/fork.c
+--- linux-2.6.37/kernel/fork.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/fork.c 2011-01-17 02:41:02.000000000 -0500
+@@ -278,7 +278,7 @@ static struct task_struct *dup_task_stru
        *stackend = STACK_END_MAGIC;    /* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -48407,7 +49282,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
  #endif
  
        /* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -298,13 +298,78 @@ out:
+@@ -300,13 +300,78 @@ out:
  }
  
  #ifdef CONFIG_MMU
@@ -48488,7 +49363,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
  
        down_write(&oldmm->mmap_sem);
        flush_cache_dup_mm(oldmm);
-@@ -316,8 +381,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -318,8 +383,8 @@ static int dup_mmap(struct mm_struct *mm
        mm->locked_vm = 0;
        mm->mmap = NULL;
        mm->mmap_cache = NULL;
@@ -48499,7 +49374,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
        mm->map_count = 0;
        cpumask_clear(mm_cpumask(mm));
        mm->mm_rb = RB_ROOT;
-@@ -330,8 +395,6 @@ static int dup_mmap(struct mm_struct *mm
+@@ -332,8 +397,6 @@ static int dup_mmap(struct mm_struct *mm
  
        prev = NULL;
        for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -48508,7 +49383,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                if (mpnt->vm_flags & VM_DONTCOPY) {
                        long pages = vma_pages(mpnt);
                        mm->total_vm -= pages;
-@@ -339,56 +402,13 @@ static int dup_mmap(struct mm_struct *mm
+@@ -341,56 +404,13 @@ static int dup_mmap(struct mm_struct *mm
                                                                -pages);
                        continue;
                }
@@ -48569,7 +49444,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                 * Link in the new vma and copy the page table entries.
                 */
                *pprev = tmp;
-@@ -409,6 +429,31 @@ static int dup_mmap(struct mm_struct *mm
+@@ -411,6 +431,31 @@ static int dup_mmap(struct mm_struct *mm
                if (retval)
                        goto out;
        }
@@ -48601,7 +49476,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
        /* a new mm has just been created */
        arch_dup_mmap(oldmm, mm);
        retval = 0;
-@@ -417,14 +462,6 @@ out:
+@@ -419,14 +464,6 @@ out:
        flush_tlb_mm(oldmm);
        up_write(&oldmm->mmap_sem);
        return retval;
@@ -48616,7 +49491,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
  }
  
  static inline int mm_alloc_pgd(struct mm_struct * mm)
-@@ -760,13 +797,14 @@ static int copy_fs(unsigned long clone_f
+@@ -765,13 +802,14 @@ static int copy_fs(unsigned long clone_f
                        spin_unlock(&fs->lock);
                        return -EAGAIN;
                }
@@ -48632,7 +49507,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
        return 0;
  }
  
-@@ -1020,10 +1058,13 @@ static struct task_struct *copy_process(
+@@ -1027,10 +1065,13 @@ static struct task_struct *copy_process(
        DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
        retval = -EAGAIN;
@@ -48648,7 +49523,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                        goto bad_fork_free;
        }
  
-@@ -1177,6 +1218,8 @@ static struct task_struct *copy_process(
+@@ -1184,6 +1225,8 @@ static struct task_struct *copy_process(
                        goto bad_fork_free_pid;
        }
  
@@ -48657,7 +49532,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
        p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
        /*
         * Clear TID on mm_release()?
-@@ -1329,6 +1372,8 @@ bad_fork_cleanup_count:
+@@ -1341,6 +1384,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
        free_task(p);
  fork_out:
@@ -48666,7 +49541,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
        return ERR_PTR(retval);
  }
  
-@@ -1434,6 +1479,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1446,6 +1491,8 @@ long do_fork(unsigned long clone_flags,
                if (clone_flags & CLONE_PARENT_SETTID)
                        put_user(nr, parent_tidptr);
  
@@ -48675,7 +49550,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                if (clone_flags & CLONE_VFORK) {
                        p->vfork_done = &vfork;
                        init_completion(&vfork);
-@@ -1558,7 +1605,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1570,7 +1617,7 @@ static int unshare_fs(unsigned long unsh
                return 0;
  
        /* don't need lock here; in the worst case we'll do useless copy */
@@ -48684,7 +49559,7 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                return 0;
  
        *new_fsp = copy_fs_struct(fs);
-@@ -1681,7 +1728,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
+@@ -1693,7 +1740,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
                        fs = current->fs;
                        spin_lock(&fs->lock);
                        current->fs = new_fs;
@@ -48694,9 +49569,9 @@ diff -urNp linux-2.6.36/kernel/fork.c linux-2.6.36/kernel/fork.c
                                new_fs = NULL;
                        else
                                new_fs = fs;
-diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
---- linux-2.6.36/kernel/futex.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/futex.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/futex.c linux-2.6.37/kernel/futex.c
+--- linux-2.6.37/kernel/futex.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/futex.c        2011-01-17 02:41:02.000000000 -0500
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -48705,7 +49580,7 @@ diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
  #include <linux/signal.h>
  #include <linux/module.h>
  #include <linux/magic.h>
-@@ -221,6 +222,11 @@ get_futex_key(u32 __user *uaddr, int fsh
+@@ -222,6 +223,11 @@ get_futex_key(u32 __user *uaddr, int fsh
        struct page *page;
        int err;
  
@@ -48717,16 +49592,7 @@ diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
        /*
         * The futex address must be "naturally" aligned.
         */
-@@ -1843,7 +1849,7 @@ retry:
- 
-       restart = &current_thread_info()->restart_block;
-       restart->fn = futex_wait_restart;
--      restart->futex.uaddr = (u32 *)uaddr;
-+      restart->futex.uaddr = uaddr;
-       restart->futex.val = val;
-       restart->futex.time = abs_time->tv64;
-       restart->futex.bitset = bitset;
-@@ -2376,7 +2382,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2384,7 +2390,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  {
        struct robust_list_head __user *head;
        unsigned long ret;
@@ -48736,7 +49602,7 @@ diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
  
        if (!futex_cmpxchg_enabled)
                return -ENOSYS;
-@@ -2392,11 +2400,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2400,11 +2408,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
                if (!p)
                        goto err_unlock;
                ret = -EPERM;
@@ -48753,18 +49619,28 @@ diff -urNp linux-2.6.36/kernel/futex.c linux-2.6.36/kernel/futex.c
                head = p->robust_list;
                rcu_read_unlock();
        }
-@@ -2458,7 +2471,7 @@ retry:
-  */
- static inline int fetch_robust_entry(struct robust_list __user **entry,
-                                    struct robust_list __user * __user *head,
--                                   int *pi)
-+                                   unsigned int *pi)
+@@ -2648,6 +2661,7 @@ static int __init futex_init(void)
  {
-       unsigned long uentry;
+       u32 curval;
+       int i;
++      mm_segment_t oldfs;
  
-diff -urNp linux-2.6.36/kernel/futex_compat.c linux-2.6.36/kernel/futex_compat.c
---- linux-2.6.36/kernel/futex_compat.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/futex_compat.c 2010-11-06 18:58:50.000000000 -0400
+       /*
+        * This will fail and we want it. Some arch implementations do
+@@ -2659,7 +2673,10 @@ static int __init futex_init(void)
+        * implementation, the non-functional ones will return
+        * -ENOSYS.
+        */
++      oldfs = get_fs();
++      set_fs(USER_DS);
+       curval = cmpxchg_futex_value_locked(NULL, 0, 0);
++      set_fs(oldfs);
+       if (curval == -EFAULT)
+               futex_cmpxchg_enabled = 1;
+ 
+diff -urNp linux-2.6.37/kernel/futex_compat.c linux-2.6.37/kernel/futex_compat.c
+--- linux-2.6.37/kernel/futex_compat.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/futex_compat.c 2011-01-17 02:41:02.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -48773,7 +49649,7 @@ diff -urNp linux-2.6.36/kernel/futex_compat.c linux-2.6.36/kernel/futex_compat.c
  
  #include <asm/uaccess.h>
  
-@@ -135,7 +136,10 @@ compat_sys_get_robust_list(int pid, comp
+@@ -136,7 +137,10 @@ compat_sys_get_robust_list(int pid, comp
  {
        struct compat_robust_list_head __user *head;
        unsigned long ret;
@@ -48785,7 +49661,7 @@ diff -urNp linux-2.6.36/kernel/futex_compat.c linux-2.6.36/kernel/futex_compat.c
  
        if (!futex_cmpxchg_enabled)
                return -ENOSYS;
-@@ -151,11 +155,16 @@ compat_sys_get_robust_list(int pid, comp
+@@ -152,11 +156,16 @@ compat_sys_get_robust_list(int pid, comp
                if (!p)
                        goto err_unlock;
                ret = -EPERM;
@@ -48802,9 +49678,9 @@ diff -urNp linux-2.6.36/kernel/futex_compat.c linux-2.6.36/kernel/futex_compat.c
                head = p->compat_robust_list;
                rcu_read_unlock();
        }
-diff -urNp linux-2.6.36/kernel/gcov/base.c linux-2.6.36/kernel/gcov/base.c
---- linux-2.6.36/kernel/gcov/base.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/gcov/base.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/gcov/base.c linux-2.6.37/kernel/gcov/base.c
+--- linux-2.6.37/kernel/gcov/base.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/gcov/base.c    2011-01-17 02:41:02.000000000 -0500
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -48826,9 +49702,9 @@ diff -urNp linux-2.6.36/kernel/gcov/base.c linux-2.6.36/kernel/gcov/base.c
                        if (prev)
                                prev->next = info->next;
                        else
-diff -urNp linux-2.6.36/kernel/hrtimer.c linux-2.6.36/kernel/hrtimer.c
---- linux-2.6.36/kernel/hrtimer.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/hrtimer.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/hrtimer.c linux-2.6.37/kernel/hrtimer.c
+--- linux-2.6.37/kernel/hrtimer.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/hrtimer.c      2011-01-17 02:41:02.000000000 -0500
 @@ -1401,7 +1401,7 @@ void hrtimer_peek_ahead_timers(void)
        local_irq_restore(flags);
  }
@@ -48838,9 +49714,52 @@ diff -urNp linux-2.6.36/kernel/hrtimer.c linux-2.6.36/kernel/hrtimer.c
  {
        hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.36/kernel/kallsyms.c linux-2.6.36/kernel/kallsyms.c
---- linux-2.6.36/kernel/kallsyms.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/kallsyms.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/jump_label.c linux-2.6.37/kernel/jump_label.c
+--- linux-2.6.37/kernel/jump_label.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/jump_label.c   2011-01-17 02:41:02.000000000 -0500
+@@ -49,6 +49,17 @@ void jump_label_unlock(void)
+       mutex_unlock(&jump_label_mutex);
+ }
+ 
++static void jump_label_swap(void *a, void *b, int size)
++{
++      struct jump_entry t;
++
++      t = *(struct jump_entry *)a;
++      pax_open_kernel();
++      *(struct jump_entry *)a = *(struct jump_entry *)b;
++      *(struct jump_entry *)b = t;
++      pax_close_kernel();
++}
++
+ static int jump_label_cmp(const void *a, const void *b)
+ {
+       const struct jump_entry *jea = a;
+@@ -70,7 +81,7 @@ sort_jump_label_entries(struct jump_entr
+ 
+       size = (((unsigned long)stop - (unsigned long)start)
+                                       / sizeof(struct jump_entry));
+-      sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
++      sort(start, size, sizeof(struct jump_entry), jump_label_cmp, jump_label_swap);
+ }
+ 
+ static struct jump_label_entry *get_jump_label_entry(jump_label_t key)
+@@ -407,8 +418,11 @@ static void remove_jump_label_module_ini
+                               count = e_module->nr_entries;
+                               iter = e_module->table;
+                               while (count--) {
+-                                      if (within_module_init(iter->code, mod))
++                                      if (within_module_init(iter->code, mod)) {
++                                              pax_open_kernel();
+                                               iter->key = 0;
++                                              pax_close_kernel();
++                                      }
+                                       iter++;
+                               }
+                       }
+diff -urNp linux-2.6.37/kernel/kallsyms.c linux-2.6.37/kernel/kallsyms.c
+--- linux-2.6.37/kernel/kallsyms.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/kallsyms.c     2011-01-17 02:41:02.000000000 -0500
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -48943,9 +49862,9 @@ diff -urNp linux-2.6.36/kernel/kallsyms.c linux-2.6.36/kernel/kallsyms.c
        if (!iter)
                return -ENOMEM;
        reset_iter(iter, 0);
-diff -urNp linux-2.6.36/kernel/kmod.c linux-2.6.36/kernel/kmod.c
---- linux-2.6.36/kernel/kmod.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/kmod.c 2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/kmod.c linux-2.6.37/kernel/kmod.c
+--- linux-2.6.37/kernel/kmod.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/kmod.c 2011-01-17 02:41:02.000000000 -0500
 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
        if (ret)
                return ret;
@@ -48965,10 +49884,10 @@ diff -urNp linux-2.6.36/kernel/kmod.c linux-2.6.36/kernel/kmod.c
        /* If modprobe needs a service that is in a module, we get a recursive
         * loop.  Limit the number of running kmod threads to max_threads/2 or
         * MAX_KMOD_CONCURRENT, whichever is the smaller.  A cleaner method
-diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
---- linux-2.6.36/kernel/kprobes.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/kprobes.c      2010-11-06 18:58:15.000000000 -0400
-@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
+diff -urNp linux-2.6.37/kernel/kprobes.c linux-2.6.37/kernel/kprobes.c
+--- linux-2.6.37/kernel/kprobes.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/kprobes.c      2011-01-17 02:41:02.000000000 -0500
+@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
         * kernel image and loaded module images reside. This is required
         * so x86_64 can correctly handle the %rip-relative fixups.
         */
@@ -48977,7 +49896,7 @@ diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
        if (!kip->insns) {
                kfree(kip);
                return NULL;
-@@ -223,7 +223,7 @@ static int __kprobes collect_one_slot(st
+@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(st
                 */
                if (!list_is_singular(&kip->list)) {
                        list_del(&kip->list);
@@ -48986,7 +49905,7 @@ diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
                        kfree(kip);
                }
                return 1;
-@@ -1709,7 +1709,7 @@ static int __init init_kprobes(void)
+@@ -1724,7 +1724,7 @@ static int __init init_kprobes(void)
  {
        int i, err = 0;
        unsigned long offset = 0, size = 0;
@@ -48995,7 +49914,7 @@ diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
        const char *symbol_name;
        void *addr;
        struct kprobe_blackpoint *kb;
-@@ -1835,7 +1835,7 @@ static int __kprobes show_kprobe_addr(st
+@@ -1850,7 +1850,7 @@ static int __kprobes show_kprobe_addr(st
        const char *sym = NULL;
        unsigned int i = *(loff_t *) v;
        unsigned long offset = 0;
@@ -49004,9 +49923,9 @@ diff -urNp linux-2.6.36/kernel/kprobes.c linux-2.6.36/kernel/kprobes.c
  
        head = &kprobe_table[i];
        preempt_disable();
-diff -urNp linux-2.6.36/kernel/lockdep.c linux-2.6.36/kernel/lockdep.c
---- linux-2.6.36/kernel/lockdep.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/lockdep.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/lockdep.c linux-2.6.37/kernel/lockdep.c
+--- linux-2.6.37/kernel/lockdep.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/lockdep.c      2011-01-17 02:41:02.000000000 -0500
 @@ -571,6 +571,10 @@ static int static_obj(void *obj)
                      end   = (unsigned long) &_end,
                      addr  = (unsigned long) obj;
@@ -49018,7 +49937,7 @@ diff -urNp linux-2.6.36/kernel/lockdep.c linux-2.6.36/kernel/lockdep.c
        /*
         * static variable?
         */
-@@ -696,6 +700,7 @@ register_lock_class(struct lockdep_map *
+@@ -706,6 +710,7 @@ register_lock_class(struct lockdep_map *
        if (!static_obj(lock->key)) {
                debug_locks_off();
                printk("INFO: trying to register non-static key.\n");
@@ -49026,9 +49945,18 @@ diff -urNp linux-2.6.36/kernel/lockdep.c linux-2.6.36/kernel/lockdep.c
                printk("the code is fine but needs lockdep annotation.\n");
                printk("turning off the locking correctness validator.\n");
                dump_stack();
-diff -urNp linux-2.6.36/kernel/lockdep_proc.c linux-2.6.36/kernel/lockdep_proc.c
---- linux-2.6.36/kernel/lockdep_proc.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/lockdep_proc.c 2010-11-06 18:58:15.000000000 -0400
+@@ -2768,7 +2773,7 @@ static int __lock_acquire(struct lockdep
+               if (!class)
+                       return 0;
+       }
+-      atomic_inc((atomic_t *)&class->ops);
++      atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
+       if (very_verbose(class)) {
+               printk("\nacquire class [%p] %s", class->key, class->name);
+               if (class->name_version > 1)
+diff -urNp linux-2.6.37/kernel/lockdep_proc.c linux-2.6.37/kernel/lockdep_proc.c
+--- linux-2.6.37/kernel/lockdep_proc.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/lockdep_proc.c 2011-01-17 02:41:02.000000000 -0500
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -49038,10 +49966,10 @@ diff -urNp linux-2.6.36/kernel/lockdep_proc.c linux-2.6.36/kernel/lockdep_proc.c
        const char *name = class->name;
  
        if (!name) {
-diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
---- linux-2.6.36/kernel/module.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/module.c       2010-11-06 18:58:50.000000000 -0400
-@@ -96,7 +96,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
+diff -urNp linux-2.6.37/kernel/module.c linux-2.6.37/kernel/module.c
+--- linux-2.6.37/kernel/module.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/module.c       2011-01-17 02:41:02.000000000 -0500
+@@ -97,7 +97,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
  
  /* Bounds of module allocation, for speeding __module_address.
   * Protected by module_mutex. */
@@ -49051,7 +49979,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
  int register_module_notifier(struct notifier_block * nb)
  {
-@@ -260,7 +261,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -261,7 +262,7 @@ bool each_symbol(bool (*fn)(const struct
                return true;
  
        list_for_each_entry_rcu(mod, &modules, list) {
@@ -49060,7 +49988,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                        { mod->syms, mod->syms + mod->num_syms, mod->crcs,
                          NOT_GPL_ONLY, false },
                        { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -282,7 +283,7 @@ bool each_symbol(bool (*fn)(const struct
+@@ -283,7 +284,7 @@ bool each_symbol(bool (*fn)(const struct
  #endif
                };
  
@@ -49069,7 +49997,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                        return true;
        }
        return false;
-@@ -393,7 +394,7 @@ static inline void __percpu *mod_percpu(
+@@ -394,7 +395,7 @@ static inline void __percpu *mod_percpu(
  static int percpu_modalloc(struct module *mod,
                           unsigned long size, unsigned long align)
  {
@@ -49078,7 +50006,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
                       mod->name, align, PAGE_SIZE);
                align = PAGE_SIZE;
-@@ -1565,15 +1566,18 @@ static void free_module(struct module *m
+@@ -1566,15 +1567,18 @@ static void free_module(struct module *m
        destroy_params(mod->kp, mod->num_kp);
  
        /* This may be NULL, but that's OK */
@@ -49100,7 +50028,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
  #ifdef CONFIG_MPU
        update_protections(current->mm);
-@@ -1666,7 +1670,9 @@ static int simplify_symbols(struct modul
+@@ -1667,7 +1671,9 @@ static int simplify_symbols(struct modul
                        ksym = resolve_symbol_wait(mod, info, name);
                        /* Ok if resolved.  */
                        if (ksym && !IS_ERR(ksym)) {
@@ -49110,7 +50038,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                                break;
                        }
  
-@@ -1685,7 +1691,9 @@ static int simplify_symbols(struct modul
+@@ -1686,7 +1692,9 @@ static int simplify_symbols(struct modul
                                secbase = (unsigned long)mod_percpu(mod);
                        else
                                secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -49120,7 +50048,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                        break;
                }
        }
-@@ -1773,11 +1781,12 @@ static void layout_sections(struct modul
+@@ -1774,11 +1782,12 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || strstarts(sname, ".init"))
                                continue;
@@ -49136,7 +50064,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        }
  
        DEBUGP("Init section allocation order:\n");
-@@ -1791,12 +1800,13 @@ static void layout_sections(struct modul
+@@ -1792,12 +1801,13 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || !strstarts(sname, ".init"))
                                continue;
@@ -49154,7 +50082,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        }
  }
  
-@@ -1964,7 +1974,7 @@ static void layout_symtab(struct module 
+@@ -1965,7 +1975,7 @@ static void layout_symtab(struct module 
  
        /* Put symbol section at end of init part of module. */
        symsect->sh_flags |= SHF_ALLOC;
@@ -49163,7 +50091,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                                         info->index.sym) | INIT_OFFSET_MASK;
        DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -1981,19 +1991,19 @@ static void layout_symtab(struct module 
+@@ -1982,19 +1992,19 @@ static void layout_symtab(struct module 
                }
  
        /* Append room for core symbols at end of core part. */
@@ -49188,7 +50116,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  }
  
  static void add_kallsyms(struct module *mod, const struct load_info *info)
-@@ -2009,11 +2019,13 @@ static void add_kallsyms(struct module *
+@@ -2010,11 +2020,13 @@ static void add_kallsyms(struct module *
        /* Make sure we get permanent strtab: don't use info->strtab. */
        mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
  
@@ -49203,7 +50131,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        src = mod->symtab;
        *dst = *src;
        for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2026,10 +2038,12 @@ static void add_kallsyms(struct module *
+@@ -2027,10 +2039,12 @@ static void add_kallsyms(struct module *
        }
        mod->core_num_syms = ndst;
  
@@ -49217,7 +50145,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2058,17 +2072,33 @@ static void dynamic_debug_remove(struct 
+@@ -2059,17 +2073,33 @@ static void dynamic_debug_remove(struct 
                ddebug_remove_module(debug->modname);
  }
  
@@ -49256,7 +50184,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                mutex_unlock(&module_mutex);
        }
        return ret;
-@@ -2344,7 +2374,7 @@ static int move_module(struct module *mo
+@@ -2362,7 +2392,7 @@ static int move_module(struct module *mo
        void *ptr;
  
        /* Do the allocs. */
@@ -49265,7 +50193,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        /*
         * The pointer to this block is stored in the module structure
         * which is inside the block. Just mark it as not being a
-@@ -2354,23 +2384,50 @@ static int move_module(struct module *mo
+@@ -2372,23 +2402,50 @@ static int move_module(struct module *mo
        if (!ptr)
                return -ENOMEM;
  
@@ -49324,7 +50252,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
        /* Transfer each section which specifies SHF_ALLOC */
        DEBUGP("final section addresses:\n");
-@@ -2381,16 +2438,41 @@ static int move_module(struct module *mo
+@@ -2399,16 +2456,45 @@ static int move_module(struct module *mo
                if (!(shdr->sh_flags & SHF_ALLOC))
                        continue;
  
@@ -49350,6 +50278,10 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
 +              if (shdr->sh_type != SHT_NOBITS) {
 +
 +#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_X86_64
++                      if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
++                              set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
++#endif
 +                      if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
 +                              pax_open_kernel();
 +                              memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
@@ -49373,7 +50305,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                DEBUGP("\t0x%lx %s\n",
                       shdr->sh_addr, info->secstrings + shdr->sh_name);
        }
-@@ -2441,12 +2523,12 @@ static void flush_module_icache(const st
+@@ -2459,12 +2545,12 @@ static void flush_module_icache(const st
         * Do it before processing of module parameters, so the module
         * can provide parameter accessor functions of its own.
         */
@@ -49392,7 +50324,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
        set_fs(old_fs);
  }
-@@ -2518,8 +2600,10 @@ static void module_deallocate(struct mod
+@@ -2536,8 +2622,10 @@ static void module_deallocate(struct mod
  {
        kfree(info->strmap);
        percpu_modfree(mod);
@@ -49405,7 +50337,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  }
  
  static int post_relocation(struct module *mod, const struct load_info *info)
-@@ -2747,10 +2831,12 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -2765,10 +2853,12 @@ SYSCALL_DEFINE3(init_module, void __user
        mod->symtab = mod->core_symtab;
        mod->strtab = mod->core_strtab;
  #endif
@@ -49422,7 +50354,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        mutex_unlock(&module_mutex);
  
        return 0;
-@@ -2781,10 +2867,16 @@ static const char *get_ksymbol(struct mo
+@@ -2799,10 +2889,16 @@ static const char *get_ksymbol(struct mo
        unsigned long nextval;
  
        /* At worse, next value is at end of module */
@@ -49442,7 +50374,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
        /* Scan for closest preceeding symbol, and next symbol. (ELF
           starts real symbols at 1). */
-@@ -3030,7 +3122,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3048,7 +3144,7 @@ static int m_show(struct seq_file *m, vo
        char buf[8];
  
        seq_printf(m, "%s %u",
@@ -49451,7 +50383,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        print_unload_info(m, mod);
  
        /* Informative for users. */
-@@ -3039,7 +3131,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3057,7 +3153,7 @@ static int m_show(struct seq_file *m, vo
                   mod->state == MODULE_STATE_COMING ? "Loading":
                   "Live");
        /* Used by oprofile and other similar tools. */
@@ -49460,7 +50392,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
  
        /* Taints info */
        if (mod->taints)
-@@ -3075,7 +3167,17 @@ static const struct file_operations proc
+@@ -3093,7 +3189,17 @@ static const struct file_operations proc
  
  static int __init proc_modules_init(void)
  {
@@ -49478,7 +50410,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
        return 0;
  }
  module_init(proc_modules_init);
-@@ -3134,12 +3236,12 @@ struct module *__module_address(unsigned
+@@ -3152,12 +3258,12 @@ struct module *__module_address(unsigned
  {
        struct module *mod;
  
@@ -49494,7 +50426,7 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                        return mod;
        return NULL;
  }
-@@ -3173,11 +3275,20 @@ bool is_module_text_address(unsigned lon
+@@ -3191,11 +3297,20 @@ bool is_module_text_address(unsigned lon
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -49518,22 +50450,31 @@ diff -urNp linux-2.6.36/kernel/module.c linux-2.6.36/kernel/module.c
                        mod = NULL;
        }
        return mod;
-diff -urNp linux-2.6.36/kernel/panic.c linux-2.6.36/kernel/panic.c
---- linux-2.6.36/kernel/panic.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/panic.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/panic.c linux-2.6.37/kernel/panic.c
+--- linux-2.6.37/kernel/panic.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/panic.c        2011-01-17 02:41:02.000000000 -0500
+@@ -368,7 +368,7 @@ static void warn_slowpath_common(const c
+       const char *board;
+ 
+       printk(KERN_WARNING "------------[ cut here ]------------\n");
+-      printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
++      printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
+       board = dmi_get_system_info(DMI_PRODUCT_NAME);
+       if (board)
+               printk(KERN_WARNING "Hardware name: %s\n", board);
 @@ -423,7 +423,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
 -      panic("stack-protector: Kernel stack is corrupted in: %p\n",
 +      dump_stack();
-+      panic("stack-protector: Kernel stack is corrupted in: %pS\n",
++      panic("stack-protector: Kernel stack is corrupted in: %pA\n",
                __builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.36/kernel/pid.c linux-2.6.36/kernel/pid.c
---- linux-2.6.36/kernel/pid.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/pid.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/pid.c linux-2.6.37/kernel/pid.c
+--- linux-2.6.37/kernel/pid.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/pid.c  2011-01-17 02:41:02.000000000 -0500
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -49551,13 +50492,14 @@ diff -urNp linux-2.6.36/kernel/pid.c linux-2.6.36/kernel/pid.c
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -416,7 +417,14 @@ EXPORT_SYMBOL(pid_task);
+@@ -416,8 +417,15 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
--      return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
 +      struct task_struct *task;
-+      
++
+       rcu_lockdep_assert(rcu_read_lock_held());
+-      return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
 +      task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
 +
 +      if (gr_pid_is_chrooted(task))
@@ -49567,9 +50509,9 @@ diff -urNp linux-2.6.36/kernel/pid.c linux-2.6.36/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.36/kernel/posix-cpu-timers.c linux-2.6.36/kernel/posix-cpu-timers.c
---- linux-2.6.36/kernel/posix-cpu-timers.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/posix-cpu-timers.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/posix-cpu-timers.c linux-2.6.37/kernel/posix-cpu-timers.c
+--- linux-2.6.37/kernel/posix-cpu-timers.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/posix-cpu-timers.c     2011-01-17 02:41:02.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -49578,26 +50520,35 @@ diff -urNp linux-2.6.36/kernel/posix-cpu-timers.c linux-2.6.36/kernel/posix-cpu-
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -965,6 +966,7 @@ static void check_thread_timers(struct t
-               unsigned long hard =
-                       ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
+diff -urNp linux-2.6.37/kernel/posix-timers.c linux-2.6.37/kernel/posix-timers.c
+--- linux-2.6.37/kernel/posix-timers.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/posix-timers.c 2011-01-17 02:41:02.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <linux/compiler.h>
+ #include <linux/idr.h>
+ #include <linux/posix-timers.h>
++#include <linux/grsecurity.h>
+ #include <linux/syscalls.h>
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+@@ -949,6 +950,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
+       if (copy_from_user(&new_tp, tp, sizeof (*tp)))
+               return -EFAULT;
  
-+              gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout * (USEC_PER_SEC/HZ), 1);
-               if (hard != RLIM_INFINITY &&
-                   tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
-                       /*
-@@ -1131,6 +1133,7 @@ static void check_process_timers(struct 
-               unsigned long hard =
-                       ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_max);
-               cputime_t x;
-+              gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0);
-               if (psecs >= hard) {
-                       /*
-                        * At the hard limit, we just die.
-diff -urNp linux-2.6.36/kernel/power/hibernate.c linux-2.6.36/kernel/power/hibernate.c
---- linux-2.6.36/kernel/power/hibernate.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/power/hibernate.c      2010-11-06 18:58:15.000000000 -0400
-@@ -50,14 +50,14 @@ enum {
++      /* only the CLOCK_REALTIME clock can be set, all other clocks
++         have their clock_set fptr set to a nosettime dummy function
++         CLOCK_REALTIME has a NULL clock_set fptr which causes it to
++         call common_clock_set, which calls do_sys_settimeofday, which
++         we hook
++      */
++
+       return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
+ }
+ 
+diff -urNp linux-2.6.37/kernel/power/hibernate.c linux-2.6.37/kernel/power/hibernate.c
+--- linux-2.6.37/kernel/power/hibernate.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/power/hibernate.c      2011-01-17 02:41:02.000000000 -0500
+@@ -51,14 +51,14 @@ enum {
  
  static int hibernation_mode = HIBERNATION_SHUTDOWN;
  
@@ -49614,9 +50565,9 @@ diff -urNp linux-2.6.36/kernel/power/hibernate.c linux-2.6.36/kernel/power/hiber
  {
        if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
            && ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.36/kernel/power/poweroff.c linux-2.6.36/kernel/power/poweroff.c
---- linux-2.6.36/kernel/power/poweroff.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/power/poweroff.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/power/poweroff.c linux-2.6.37/kernel/power/poweroff.c
+--- linux-2.6.37/kernel/power/poweroff.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/power/poweroff.c       2011-01-17 02:41:02.000000000 -0500
 @@ -37,7 +37,7 @@ static struct sysrq_key_op   sysrq_powerof
        .enable_mask    = SYSRQ_ENABLE_BOOT,
  };
@@ -49626,18 +50577,18 @@ diff -urNp linux-2.6.36/kernel/power/poweroff.c linux-2.6.36/kernel/power/powero
  {
        register_sysrq_key('o', &sysrq_poweroff_op);
        return 0;
-diff -urNp linux-2.6.36/kernel/power/process.c linux-2.6.36/kernel/power/process.c
---- linux-2.6.36/kernel/power/process.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/power/process.c        2010-11-06 18:58:15.000000000 -0400
-@@ -40,6 +40,7 @@ static int try_to_freeze_tasks(bool sig_
-       struct timeval start, end;
+diff -urNp linux-2.6.37/kernel/power/process.c linux-2.6.37/kernel/power/process.c
+--- linux-2.6.37/kernel/power/process.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/power/process.c        2011-01-17 02:41:02.000000000 -0500
+@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
        u64 elapsed_csecs64;
        unsigned int elapsed_csecs;
+       bool wakeup = false;
 +      bool timedout = false;
  
        do_gettimeofday(&start);
  
-@@ -50,6 +51,8 @@ static int try_to_freeze_tasks(bool sig_
+@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_
  
        while (true) {
                todo = 0;
@@ -49646,7 +50597,7 @@ diff -urNp linux-2.6.36/kernel/power/process.c linux-2.6.36/kernel/power/process
                read_lock(&tasklist_lock);
                do_each_thread(g, p) {
                        if (frozen(p) || !freezeable(p))
-@@ -64,9 +67,13 @@ static int try_to_freeze_tasks(bool sig_
+@@ -65,9 +68,13 @@ static int try_to_freeze_tasks(bool sig_
                         * It is "frozen enough".  If the task does wake
                         * up, it will immediately call try_to_freeze.
                         */
@@ -49662,7 +50613,7 @@ diff -urNp linux-2.6.36/kernel/power/process.c linux-2.6.36/kernel/power/process
                } while_each_thread(g, p);
                read_unlock(&tasklist_lock);
  
-@@ -75,7 +82,7 @@ static int try_to_freeze_tasks(bool sig_
+@@ -76,7 +83,7 @@ static int try_to_freeze_tasks(bool sig_
                        todo += wq_busy;
                }
  
@@ -49670,10 +50621,10 @@ diff -urNp linux-2.6.36/kernel/power/process.c linux-2.6.36/kernel/power/process
 +              if (!todo || timedout)
                        break;
  
-               /*
-diff -urNp linux-2.6.36/kernel/power/suspend.c linux-2.6.36/kernel/power/suspend.c
---- linux-2.6.36/kernel/power/suspend.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/power/suspend.c        2010-11-06 18:58:15.000000000 -0400
+               if (!pm_check_wakeup_events()) {
+diff -urNp linux-2.6.37/kernel/power/suspend.c linux-2.6.37/kernel/power/suspend.c
+--- linux-2.6.37/kernel/power/suspend.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/power/suspend.c        2011-01-17 02:41:02.000000000 -0500
 @@ -30,13 +30,13 @@ const char *const pm_states[PM_SUSPEND_M
        [PM_SUSPEND_MEM]        = "mem",
  };
@@ -49690,10 +50641,10 @@ diff -urNp linux-2.6.36/kernel/power/suspend.c linux-2.6.36/kernel/power/suspend
  {
        mutex_lock(&pm_mutex);
        suspend_ops = ops;
-diff -urNp linux-2.6.36/kernel/printk.c linux-2.6.36/kernel/printk.c
---- linux-2.6.36/kernel/printk.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/printk.c       2010-11-06 18:58:50.000000000 -0400
-@@ -268,6 +268,11 @@ int do_syslog(int type, char __user *buf
+diff -urNp linux-2.6.37/kernel/printk.c linux-2.6.37/kernel/printk.c
+--- linux-2.6.37/kernel/printk.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/printk.c       2011-01-17 02:41:02.000000000 -0500
+@@ -274,6 +274,11 @@ int do_syslog(int type, char __user *buf
        char c;
        int error = 0;
  
@@ -49702,12 +50653,12 @@ diff -urNp linux-2.6.36/kernel/printk.c linux-2.6.36/kernel/printk.c
 +              return -EPERM;
 +#endif
 +
-       error = security_syslog(type, from_file);
-       if (error)
-               return error;
-diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
---- linux-2.6.36/kernel/ptrace.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/ptrace.c       2010-11-06 18:58:50.000000000 -0400
+       /*
+        * If this is from /proc/kmsg we only do the capabilities checks
+        * at open time.
+diff -urNp linux-2.6.37/kernel/ptrace.c linux-2.6.37/kernel/ptrace.c
+--- linux-2.6.37/kernel/ptrace.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/ptrace.c       2011-01-17 02:41:02.000000000 -0500
 @@ -140,7 +140,7 @@ int __ptrace_may_access(struct task_stru
             cred->gid != tcred->egid ||
             cred->gid != tcred->sgid ||
@@ -49735,7 +50686,7 @@ diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
                task->ptrace |= PT_PTRACE_CAP;
  
        __ptrace_link(task, current);
-@@ -367,7 +367,7 @@ int ptrace_readdata(struct task_struct *
+@@ -369,7 +369,7 @@ int ptrace_readdata(struct task_struct *
                                break;
                        return -EIO;
                }
@@ -49744,29 +50695,16 @@ diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
                        return -EFAULT;
                copied += retval;
                src += retval;
-@@ -578,18 +578,18 @@ int ptrace_request(struct task_struct *c
-               ret = ptrace_setoptions(child, data);
-               break;
-       case PTRACE_GETEVENTMSG:
--              ret = put_user(child->ptrace_message, (unsigned long __user *) data);
-+              ret = put_user(child->ptrace_message, (__force unsigned long __user *) data);
-               break;
- 
-       case PTRACE_GETSIGINFO:
-               ret = ptrace_getsiginfo(child, &siginfo);
-               if (!ret)
--                      ret = copy_siginfo_to_user((siginfo_t __user *) data,
-+                      ret = copy_siginfo_to_user((__force siginfo_t __user *) data,
-                                                  &siginfo);
-               break;
+@@ -565,7 +565,7 @@ int ptrace_request(struct task_struct *c
+ {
+       int ret = -EIO;
+       siginfo_t siginfo;
+-      void __user *datavp = (void __user *) data;
++      void __user *datavp = (__force void __user *) data;
+       unsigned long __user *datalp = datavp;
  
-       case PTRACE_SETSIGINFO:
--              if (copy_from_user(&siginfo, (siginfo_t __user *) data,
-+              if (copy_from_user(&siginfo, (__force siginfo_t __user *) data,
-                                  sizeof siginfo))
-                       ret = -EFAULT;
-               else
-@@ -709,14 +709,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+       switch (request) {
+@@ -713,14 +713,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
                goto out;
        }
  
@@ -49789,7 +50727,7 @@ diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
                goto out_put_task_struct;
        }
  
-@@ -740,7 +747,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -745,7 +752,7 @@ int generic_ptrace_peekdata(struct task_
        copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
        if (copied != sizeof(tmp))
                return -EIO;
@@ -49797,11 +50735,34 @@ diff -urNp linux-2.6.36/kernel/ptrace.c linux-2.6.36/kernel/ptrace.c
 +      return put_user(tmp, (__force unsigned long __user *)data);
  }
  
- int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-diff -urNp linux-2.6.36/kernel/rcutree.c linux-2.6.36/kernel/rcutree.c
---- linux-2.6.36/kernel/rcutree.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/rcutree.c      2010-11-06 18:58:15.000000000 -0400
-@@ -1357,7 +1357,7 @@ __rcu_process_callbacks(struct rcu_state
+ int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
+@@ -855,14 +862,21 @@ asmlinkage long compat_sys_ptrace(compat
+               goto out;
+       }
+ 
++      if (gr_handle_ptrace(child, request)) {
++              ret = -EPERM;
++              goto out_put_task_struct;
++      }
++
+       if (request == PTRACE_ATTACH) {
+               ret = ptrace_attach(child);
+               /*
+                * Some architectures need to do book-keeping after
+                * a ptrace attach.
+                */
+-              if (!ret)
++              if (!ret) {
+                       arch_ptrace_attach(child);
++                      gr_audit_ptrace(child);
++              }
+               goto out_put_task_struct;
+       }
+ 
+diff -urNp linux-2.6.37/kernel/rcutree.c linux-2.6.37/kernel/rcutree.c
+--- linux-2.6.37/kernel/rcutree.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/rcutree.c      2011-01-17 02:41:02.000000000 -0500
+@@ -1394,7 +1394,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
   */
@@ -49810,9 +50771,21 @@ diff -urNp linux-2.6.36/kernel/rcutree.c linux-2.6.36/kernel/rcutree.c
  {
        /*
         * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.36/kernel/resource.c linux-2.6.36/kernel/resource.c
---- linux-2.6.36/kernel/resource.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/resource.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/rcutree_plugin.h linux-2.6.37/kernel/rcutree_plugin.h
+--- linux-2.6.37/kernel/rcutree_plugin.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/rcutree_plugin.h       2011-01-17 02:41:02.000000000 -0500
+@@ -729,7 +729,7 @@ void synchronize_rcu_expedited(void)
+ 
+       /* Clean up and exit. */
+       smp_mb(); /* ensure expedited GP seen before counter increment. */
+-      ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
++      ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
+ unlock_mb_ret:
+       mutex_unlock(&sync_rcu_preempt_exp_mutex);
+ mb_ret:
+diff -urNp linux-2.6.37/kernel/resource.c linux-2.6.37/kernel/resource.c
+--- linux-2.6.37/kernel/resource.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/resource.c     2011-01-17 02:41:02.000000000 -0500
 @@ -133,8 +133,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -49832,9 +50805,9 @@ diff -urNp linux-2.6.36/kernel/resource.c linux-2.6.36/kernel/resource.c
        return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.36/kernel/rtmutex.c linux-2.6.36/kernel/rtmutex.c
---- linux-2.6.36/kernel/rtmutex.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/rtmutex.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/rtmutex.c linux-2.6.37/kernel/rtmutex.c
+--- linux-2.6.37/kernel/rtmutex.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/rtmutex.c      2011-01-17 02:41:02.000000000 -0500
 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
         */
        raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -49844,10 +50817,10 @@ diff -urNp linux-2.6.36/kernel/rtmutex.c linux-2.6.36/kernel/rtmutex.c
        WARN_ON(pendowner->pi_blocked_on != waiter);
        WARN_ON(pendowner->pi_blocked_on->lock != lock);
  
-diff -urNp linux-2.6.36/kernel/sched.c linux-2.6.36/kernel/sched.c
---- linux-2.6.36/kernel/sched.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/sched.c        2010-11-06 19:41:42.000000000 -0400
-@@ -4443,6 +4443,8 @@ int can_nice(const struct task_struct *p
+diff -urNp linux-2.6.37/kernel/sched.c linux-2.6.37/kernel/sched.c
+--- linux-2.6.37/kernel/sched.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/sched.c        2011-01-17 02:41:02.000000000 -0500
+@@ -4770,6 +4770,8 @@ int can_nice(const struct task_struct *p
        /* convert nice value [19,-20] to rlimit style value [1,40] */
        int nice_rlim = 20 - nice;
  
@@ -49856,7 +50829,7 @@ diff -urNp linux-2.6.36/kernel/sched.c linux-2.6.36/kernel/sched.c
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
-@@ -4476,7 +4478,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4803,7 +4805,8 @@ SYSCALL_DEFINE1(nice, int, increment)
        if (nice > 19)
                nice = 19;
  
@@ -49866,7 +50839,7 @@ diff -urNp linux-2.6.36/kernel/sched.c linux-2.6.36/kernel/sched.c
                return -EPERM;
  
        retval = security_task_setnice(current, nice);
-@@ -4619,6 +4622,7 @@ recheck:
+@@ -4946,6 +4949,7 @@ recheck:
                        unsigned long rlim_rtprio =
                                        task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -49874,7 +50847,7 @@ diff -urNp linux-2.6.36/kernel/sched.c linux-2.6.36/kernel/sched.c
                        /* can't set/change the rt policy */
                        if (policy != p->policy && !rlim_rtprio)
                                return -EPERM;
-@@ -6785,7 +6789,7 @@ static void init_sched_groups_power(int 
+@@ -7155,7 +7159,7 @@ static void init_sched_groups_power(int 
        long power;
        int weight;
  
@@ -49883,10 +50856,10 @@ diff -urNp linux-2.6.36/kernel/sched.c linux-2.6.36/kernel/sched.c
  
        if (cpu != group_first_cpu(sd->groups))
                return;
-diff -urNp linux-2.6.36/kernel/sched_fair.c linux-2.6.36/kernel/sched_fair.c
---- linux-2.6.36/kernel/sched_fair.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/sched_fair.c   2010-11-06 18:58:15.000000000 -0400
-@@ -3662,7 +3662,7 @@ static void nohz_idle_balance(int this_c
+diff -urNp linux-2.6.37/kernel/sched_fair.c linux-2.6.37/kernel/sched_fair.c
+--- linux-2.6.37/kernel/sched_fair.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/sched_fair.c   2011-01-17 02:41:02.000000000 -0500
+@@ -3724,7 +3724,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
   */
@@ -49895,9 +50868,9 @@ diff -urNp linux-2.6.36/kernel/sched_fair.c linux-2.6.36/kernel/sched_fair.c
  {
        int this_cpu = smp_processor_id();
        struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.36/kernel/signal.c linux-2.6.36/kernel/signal.c
---- linux-2.6.36/kernel/signal.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/signal.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/signal.c linux-2.6.37/kernel/signal.c
+--- linux-2.6.37/kernel/signal.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/signal.c       2011-01-17 02:41:02.000000000 -0500
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -49970,7 +50943,7 @@ diff -urNp linux-2.6.36/kernel/signal.c linux-2.6.36/kernel/signal.c
        return ret;
  }
  
-@@ -1136,8 +1145,11 @@ int group_send_sig_info(int sig, struct 
+@@ -1137,8 +1146,11 @@ int group_send_sig_info(int sig, struct 
        ret = check_kill_permission(sig, info, p);
        rcu_read_unlock();
  
@@ -49983,10 +50956,10 @@ diff -urNp linux-2.6.36/kernel/signal.c linux-2.6.36/kernel/signal.c
  
        return ret;
  }
-diff -urNp linux-2.6.36/kernel/smp.c linux-2.6.36/kernel/smp.c
---- linux-2.6.36/kernel/smp.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/smp.c  2010-11-06 18:58:15.000000000 -0400
-@@ -510,22 +510,22 @@ int smp_call_function(void (*func)(void 
+diff -urNp linux-2.6.37/kernel/smp.c linux-2.6.37/kernel/smp.c
+--- linux-2.6.37/kernel/smp.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/smp.c  2011-01-17 02:41:02.000000000 -0500
+@@ -510,22 +510,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
  
@@ -50013,9 +50986,9 @@ diff -urNp linux-2.6.36/kernel/smp.c linux-2.6.36/kernel/smp.c
  {
        raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
---- linux-2.6.36/kernel/softirq.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/softirq.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/softirq.c linux-2.6.37/kernel/softirq.c
+--- linux-2.6.37/kernel/softirq.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/softirq.c      2011-01-17 02:41:02.000000000 -0500
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -50025,7 +50998,7 @@ diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
        "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
        "TASKLET", "SCHED", "HRTIMER",  "RCU"
  };
-@@ -190,7 +190,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
+@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
  
  asmlinkage void __do_softirq(void)
  {
@@ -50034,16 +51007,16 @@ diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
        __u32 pending;
        int max_restart = MAX_SOFTIRQ_RESTART;
        int cpu;
-@@ -216,7 +216,7 @@ restart:
-                       kstat_incr_softirqs_this_cpu(h - softirq_vec);
+@@ -235,7 +235,7 @@ restart:
+                       kstat_incr_softirqs_this_cpu(vec_nr);
  
-                       trace_softirq_entry(h, softirq_vec);
+                       trace_softirq_entry(vec_nr);
 -                      h->action(h);
 +                      h->action();
-                       trace_softirq_exit(h, softirq_vec);
+                       trace_softirq_exit(vec_nr);
                        if (unlikely(prev_count != preempt_count())) {
-                               printk(KERN_ERR "huh, entered softirq %td %s %p"
-@@ -340,7 +340,7 @@ void raise_softirq(unsigned int nr)
+                               printk(KERN_ERR "huh, entered softirq %u %s %p"
+@@ -365,7 +365,7 @@ void raise_softirq(unsigned int nr)
        local_irq_restore(flags);
  }
  
@@ -50052,7 +51025,7 @@ diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
  {
        softirq_vec[nr].action = action;
  }
-@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct 
+@@ -421,7 +421,7 @@ void __tasklet_hi_schedule_first(struct 
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -50061,7 +51034,7 @@ diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
  {
        struct tasklet_struct *list;
  
-@@ -431,7 +431,7 @@ static void tasklet_action(struct softir
+@@ -456,7 +456,7 @@ static void tasklet_action(struct softir
        }
  }
  
@@ -50070,9 +51043,9 @@ diff -urNp linux-2.6.36/kernel/softirq.c linux-2.6.36/kernel/softirq.c
  {
        struct tasklet_struct *list;
  
-diff -urNp linux-2.6.36/kernel/sys.c linux-2.6.36/kernel/sys.c
---- linux-2.6.36/kernel/sys.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/sys.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/sys.c linux-2.6.37/kernel/sys.c
+--- linux-2.6.37/kernel/sys.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/sys.c  2011-01-17 02:41:02.000000000 -0500
 @@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
                error = -EACCES;
                goto out;
@@ -50194,9 +51167,9 @@ diff -urNp linux-2.6.36/kernel/sys.c linux-2.6.36/kernel/sys.c
                                error = -EINVAL;
                                break;
                        }
-diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
---- linux-2.6.36/kernel/sysctl.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/sysctl.c       2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/sysctl.c linux-2.6.37/kernel/sysctl.c
+--- linux-2.6.37/kernel/sysctl.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/sysctl.c       2011-01-17 02:41:02.000000000 -0500
 @@ -83,6 +83,13 @@
  
  
@@ -50211,7 +51184,7 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
  
  /* External variables not in a header file. */
  extern int sysctl_overcommit_memory;
-@@ -190,6 +197,7 @@ static int sysrq_sysctl_handler(ctl_tabl
+@@ -188,6 +195,7 @@ static int sysrq_sysctl_handler(ctl_tabl
  }
  
  #endif
@@ -50219,7 +51192,7 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
  
  static struct ctl_table root_table[];
  static struct ctl_table_root sysctl_table_root;
-@@ -219,6 +227,20 @@ extern struct ctl_table epoll_table[];
+@@ -217,6 +225,20 @@ extern struct ctl_table epoll_table[];
  int sysctl_legacy_va_layout;
  #endif
  
@@ -50240,7 +51213,7 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
  /* The default sysctl tables: */
  
  static struct ctl_table root_table[] = {
-@@ -271,6 +293,22 @@ static int max_extfrag_threshold = 1000;
+@@ -269,6 +291,22 @@ static int max_extfrag_threshold = 1000;
  #endif
  
  static struct ctl_table kern_table[] = {
@@ -50263,7 +51236,16 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
        {
                .procname       = "sched_child_runs_first",
                .data           = &sysctl_sched_child_runs_first,
-@@ -1173,6 +1211,13 @@ static struct ctl_table vm_table[] = {
+@@ -549,7 +587,7 @@ static struct ctl_table kern_table[] = {
+               .data           = &modprobe_path,
+               .maxlen         = KMOD_PATH_LEN,
+               .mode           = 0644,
+-              .proc_handler   = proc_dostring,
++              .proc_handler   = proc_dostring_modpriv,
+       },
+       {
+               .procname       = "modules_disabled",
+@@ -1180,6 +1218,13 @@ static struct ctl_table vm_table[] = {
                .proc_handler   = proc_dointvec_minmax,
                .extra1         = &zero,
        },
@@ -50277,7 +51259,7 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
  #else
        {
                .procname       = "nr_trim_pages",
-@@ -1688,6 +1733,16 @@ int sysctl_perm(struct ctl_table_root *r
+@@ -1695,6 +1740,16 @@ int sysctl_perm(struct ctl_table_root *r
        int error;
        int mode;
  
@@ -50294,7 +51276,24 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
        error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
        if (error)
                return error;
-@@ -2200,6 +2255,8 @@ static int proc_put_long(void __user **b
+@@ -2102,6 +2157,16 @@ int proc_dostring(struct ctl_table *tabl
+                              buffer, lenp, ppos);
+ }
+ 
++int proc_dostring_modpriv(struct ctl_table *table, int write,
++                void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++      if (write && !capable(CAP_SYS_MODULE))
++              return -EPERM;
++
++      return _proc_do_string(table->data, table->maxlen, write,
++                             buffer, lenp, ppos);
++}
++
+ static size_t proc_skip_spaces(char **buf)
+ {
+       size_t ret;
+@@ -2207,6 +2272,8 @@ static int proc_put_long(void __user **b
        len = strlen(tmp);
        if (len > *size)
                len = *size;
@@ -50303,7 +51302,7 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
        if (copy_to_user(*buf, tmp, len))
                return -EFAULT;
        *size -= len;
-@@ -2505,8 +2562,11 @@ static int __do_proc_doulongvec_minmax(v
+@@ -2512,8 +2579,11 @@ static int __do_proc_doulongvec_minmax(v
                        *i = val;
                } else {
                        val = convdiv * (*i) / convmul;
@@ -50316,9 +51315,41 @@ diff -urNp linux-2.6.36/kernel/sysctl.c linux-2.6.36/kernel/sysctl.c
                        err = proc_put_long(&buffer, &left, val, false);
                        if (err)
                                break;
-diff -urNp linux-2.6.36/kernel/taskstats.c linux-2.6.36/kernel/taskstats.c
---- linux-2.6.36/kernel/taskstats.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/taskstats.c    2010-11-06 18:58:50.000000000 -0400
+@@ -2908,6 +2978,12 @@ int proc_dostring(struct ctl_table *tabl
+       return -ENOSYS;
+ }
+ 
++int proc_dostring_modpriv(struct ctl_table *table, int write,
++                void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++      return -ENOSYS;
++}
++
+ int proc_dointvec(struct ctl_table *table, int write,
+                 void __user *buffer, size_t *lenp, loff_t *ppos)
+ {
+@@ -2964,6 +3040,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+ EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
+ EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
+ EXPORT_SYMBOL(proc_dostring);
++EXPORT_SYMBOL(proc_dostring_modpriv);
+ EXPORT_SYMBOL(proc_doulongvec_minmax);
+ EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
+ EXPORT_SYMBOL(register_sysctl_table);
+diff -urNp linux-2.6.37/kernel/sysctl_check.c linux-2.6.37/kernel/sysctl_check.c
+--- linux-2.6.37/kernel/sysctl_check.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/sysctl_check.c 2011-01-17 02:41:02.000000000 -0500
+@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
+                               set_fail(&fail, table, "Directory with extra2");
+               } else {
+                       if ((table->proc_handler == proc_dostring) ||
++                          (table->proc_handler == proc_dostring_modpriv) ||
+                           (table->proc_handler == proc_dointvec) ||
+                           (table->proc_handler == proc_dointvec_minmax) ||
+                           (table->proc_handler == proc_dointvec_jiffies) ||
+diff -urNp linux-2.6.37/kernel/taskstats.c linux-2.6.37/kernel/taskstats.c
+--- linux-2.6.37/kernel/taskstats.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/taskstats.c    2011-01-17 02:41:02.000000000 -0500
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -50332,19 +51363,19 @@ diff -urNp linux-2.6.36/kernel/taskstats.c linux-2.6.36/kernel/taskstats.c
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -432,6 +435,9 @@ static int taskstats_user_cmd(struct sk_
-       size_t size;
-       cpumask_var_t mask;
+@@ -550,6 +553,9 @@ err:
  
+ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
+ {
 +      if (gr_is_taskstats_denied(current->pid))
 +              return -EACCES;
 +
-       if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-               return -ENOMEM;
- 
-diff -urNp linux-2.6.36/kernel/time/tick-broadcast.c linux-2.6.36/kernel/time/tick-broadcast.c
---- linux-2.6.36/kernel/time/tick-broadcast.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/time/tick-broadcast.c  2010-11-06 18:58:15.000000000 -0400
+       if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
+               return cmd_attr_register_cpumask(info);
+       else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
+diff -urNp linux-2.6.37/kernel/time/tick-broadcast.c linux-2.6.37/kernel/time/tick-broadcast.c
+--- linux-2.6.37/kernel/time/tick-broadcast.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/time/tick-broadcast.c  2011-01-17 02:41:02.000000000 -0500
 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
                 * then clear the broadcast bit.
                 */
@@ -50354,9 +51385,29 @@ diff -urNp linux-2.6.36/kernel/time/tick-broadcast.c linux-2.6.36/kernel/time/ti
  
                        cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
                        tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.36/kernel/time/timer_list.c linux-2.6.36/kernel/time/timer_list.c
---- linux-2.6.36/kernel/time/timer_list.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/time/timer_list.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/time/timekeeping.c linux-2.6.37/kernel/time/timekeeping.c
+--- linux-2.6.37/kernel/time/timekeeping.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/time/timekeeping.c     2011-01-17 02:41:02.000000000 -0500
+@@ -14,6 +14,7 @@
+ #include <linux/init.h>
+ #include <linux/mm.h>
+ #include <linux/sched.h>
++#include <linux/grsecurity.h>
+ #include <linux/sysdev.h>
+ #include <linux/clocksource.h>
+ #include <linux/jiffies.h>
+@@ -314,6 +315,8 @@ int do_settimeofday(struct timespec *tv)
+       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
+               return -EINVAL;
+ 
++      gr_log_timechange();
++
+       write_seqlock_irqsave(&xtime_lock, flags);
+ 
+       timekeeping_forward_now();
+diff -urNp linux-2.6.37/kernel/time/timer_list.c linux-2.6.37/kernel/time/timer_list.c
+--- linux-2.6.37/kernel/time/timer_list.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/time/timer_list.c      2011-01-17 02:41:02.000000000 -0500
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -50398,9 +51449,9 @@ diff -urNp linux-2.6.36/kernel/time/timer_list.c linux-2.6.36/kernel/time/timer_
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-2.6.36/kernel/time/timer_stats.c linux-2.6.36/kernel/time/timer_stats.c
---- linux-2.6.36/kernel/time/timer_stats.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/time/timer_stats.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/kernel/time/timer_stats.c linux-2.6.37/kernel/time/timer_stats.c
+--- linux-2.6.37/kernel/time/timer_stats.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/time/timer_stats.c     2011-01-17 02:41:02.000000000 -0500
 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
  
  static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -50430,28 +51481,21 @@ diff -urNp linux-2.6.36/kernel/time/timer_stats.c linux-2.6.36/kernel/time/timer
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-2.6.36/kernel/time.c linux-2.6.36/kernel/time.c
---- linux-2.6.36/kernel/time.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/time.c 2010-11-06 18:58:50.000000000 -0400
-@@ -93,6 +93,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
-               return err;
- 
-       do_settimeofday(&tv);
-+
-+      gr_log_timechange();
-+
-       return 0;
- }
- 
-@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(settimeofday, struct tim
-                       return -EFAULT;
-       }
+diff -urNp linux-2.6.37/kernel/time.c linux-2.6.37/kernel/time.c
+--- linux-2.6.37/kernel/time.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/time.c 2011-01-17 02:41:02.000000000 -0500
+@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec 
+               return error;
  
-+      gr_log_timechange();
+       if (tz) {
++              /* we log in do_settimeofday called below, so don't log twice
++              */
++              if (!tv)
++                      gr_log_timechange();
 +
-       return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
- }
- 
+               /* SMP safe, global irq locking makes it work. */
+               sys_tz = *tz;
+               update_vsyscall_tz();
 @@ -238,7 +243,7 @@ EXPORT_SYMBOL(current_fs_time);
   * Avoid unnecessary multiplications/divisions in the
   * two most common HZ cases:
@@ -50470,10 +51514,10 @@ diff -urNp linux-2.6.36/kernel/time.c linux-2.6.36/kernel/time.c
  {
  #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
        return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.36/kernel/timer.c linux-2.6.36/kernel/timer.c
---- linux-2.6.36/kernel/timer.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/timer.c        2010-11-06 18:58:15.000000000 -0400
-@@ -1287,7 +1287,7 @@ void update_process_times(int user_tick)
+diff -urNp linux-2.6.37/kernel/timer.c linux-2.6.37/kernel/timer.c
+--- linux-2.6.37/kernel/timer.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/timer.c        2011-01-17 02:41:02.000000000 -0500
+@@ -1296,7 +1296,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
   */
@@ -50482,10 +51526,10 @@ diff -urNp linux-2.6.36/kernel/timer.c linux-2.6.36/kernel/timer.c
  {
        struct tvec_base *base = __get_cpu_var(tvec_bases);
  
-diff -urNp linux-2.6.36/kernel/trace/ftrace.c linux-2.6.36/kernel/trace/ftrace.c
---- linux-2.6.36/kernel/trace/ftrace.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/trace/ftrace.c 2010-11-06 18:58:15.000000000 -0400
-@@ -1108,13 +1108,18 @@ ftrace_code_disable(struct module *mod, 
+diff -urNp linux-2.6.37/kernel/trace/ftrace.c linux-2.6.37/kernel/trace/ftrace.c
+--- linux-2.6.37/kernel/trace/ftrace.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/ftrace.c 2011-01-17 02:41:02.000000000 -0500
+@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, 
  
        ip = rec->ip;
  
@@ -50506,10 +51550,10 @@ diff -urNp linux-2.6.36/kernel/trace/ftrace.c linux-2.6.36/kernel/trace/ftrace.c
  }
  
  /*
-diff -urNp linux-2.6.36/kernel/trace/ring_buffer.c linux-2.6.36/kernel/trace/ring_buffer.c
---- linux-2.6.36/kernel/trace/ring_buffer.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/trace/ring_buffer.c    2010-11-06 18:58:15.000000000 -0400
-@@ -635,7 +635,7 @@ static struct list_head *rb_list_head(st
+diff -urNp linux-2.6.37/kernel/trace/ring_buffer.c linux-2.6.37/kernel/trace/ring_buffer.c
+--- linux-2.6.37/kernel/trace/ring_buffer.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/ring_buffer.c    2011-01-17 02:41:02.000000000 -0500
+@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
   * the reader page). But if the next page is a header page,
   * its flags will be non zero.
   */
@@ -50518,10 +51562,10 @@ diff -urNp linux-2.6.36/kernel/trace/ring_buffer.c linux-2.6.36/kernel/trace/rin
  rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
                struct buffer_page *page, struct list_head *list)
  {
-diff -urNp linux-2.6.36/kernel/trace/trace.c linux-2.6.36/kernel/trace/trace.c
---- linux-2.6.36/kernel/trace/trace.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/trace/trace.c  2010-11-06 18:58:15.000000000 -0400
-@@ -3943,10 +3943,9 @@ static const struct file_operations trac
+diff -urNp linux-2.6.37/kernel/trace/trace.c linux-2.6.37/kernel/trace/trace.c
+--- linux-2.6.37/kernel/trace/trace.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/trace.c  2011-01-17 02:41:02.000000000 -0500
+@@ -3969,10 +3969,9 @@ static const struct file_operations trac
  };
  #endif
  
@@ -50533,7 +51577,7 @@ diff -urNp linux-2.6.36/kernel/trace/trace.c linux-2.6.36/kernel/trace/trace.c
        static int once;
  
        if (d_tracer)
-@@ -3966,10 +3965,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -3992,10 +3991,9 @@ struct dentry *tracing_init_dentry(void)
        return d_tracer;
  }
  
@@ -50545,9 +51589,20 @@ diff -urNp linux-2.6.36/kernel/trace/trace.c linux-2.6.36/kernel/trace/trace.c
        static int once;
        struct dentry *d_tracer;
  
-diff -urNp linux-2.6.36/kernel/trace/trace_output.c linux-2.6.36/kernel/trace/trace_output.c
---- linux-2.6.36/kernel/trace/trace_output.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/trace/trace_output.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/trace/trace_events.c linux-2.6.37/kernel/trace/trace_events.c
+--- linux-2.6.37/kernel/trace/trace_events.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/trace_events.c   2011-01-17 02:41:02.000000000 -0500
+@@ -1231,6 +1231,7 @@ static LIST_HEAD(ftrace_module_file_list
+  * Modules must own their file_operations to keep up with
+  * reference counting.
+  */
++/* cannot be const, see trace_create_file_ops() */
+ struct ftrace_module_file_ops {
+       struct list_head                list;
+       struct module                   *mod;
+diff -urNp linux-2.6.37/kernel/trace/trace_output.c linux-2.6.37/kernel/trace/trace_output.c
+--- linux-2.6.37/kernel/trace/trace_output.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/trace_output.c   2011-01-17 02:41:02.000000000 -0500
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
        p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -50557,9 +51612,9 @@ diff -urNp linux-2.6.36/kernel/trace/trace_output.c linux-2.6.36/kernel/trace/tr
                if (p) {
                        s->len = p - s->buffer;
                        return 1;
-diff -urNp linux-2.6.36/kernel/trace/trace_stack.c linux-2.6.36/kernel/trace/trace_stack.c
---- linux-2.6.36/kernel/trace/trace_stack.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/kernel/trace/trace_stack.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/kernel/trace/trace_stack.c linux-2.6.37/kernel/trace/trace_stack.c
+--- linux-2.6.37/kernel/trace/trace_stack.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/kernel/trace/trace_stack.c    2011-01-17 02:41:02.000000000 -0500
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
                return;
  
@@ -50569,9 +51624,9 @@ diff -urNp linux-2.6.36/kernel/trace/trace_stack.c linux-2.6.36/kernel/trace/tra
                return;
  
        local_irq_save(flags);
-diff -urNp linux-2.6.36/lib/bug.c linux-2.6.36/lib/bug.c
---- linux-2.6.36/lib/bug.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/bug.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/lib/bug.c linux-2.6.37/lib/bug.c
+--- linux-2.6.37/lib/bug.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/bug.c     2011-01-17 02:41:02.000000000 -0500
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
                return BUG_TRAP_TYPE_NONE;
  
@@ -50581,9 +51636,9 @@ diff -urNp linux-2.6.36/lib/bug.c linux-2.6.36/lib/bug.c
  
        file = NULL;
        line = 0;
-diff -urNp linux-2.6.36/lib/debugobjects.c linux-2.6.36/lib/debugobjects.c
---- linux-2.6.36/lib/debugobjects.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/debugobjects.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/lib/debugobjects.c linux-2.6.37/lib/debugobjects.c
+--- linux-2.6.37/lib/debugobjects.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/debugobjects.c    2011-01-17 02:41:02.000000000 -0500
 @@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
        if (limit > 4)
                return;
@@ -50593,10 +51648,10 @@ diff -urNp linux-2.6.36/lib/debugobjects.c linux-2.6.36/lib/debugobjects.c
        if (is_on_stack == onstack)
                return;
  
-diff -urNp linux-2.6.36/lib/dma-debug.c linux-2.6.36/lib/dma-debug.c
---- linux-2.6.36/lib/dma-debug.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/dma-debug.c       2010-11-06 18:58:15.000000000 -0400
-@@ -861,7 +861,7 @@ out:
+diff -urNp linux-2.6.37/lib/dma-debug.c linux-2.6.37/lib/dma-debug.c
+--- linux-2.6.37/lib/dma-debug.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/dma-debug.c       2011-01-17 02:41:02.000000000 -0500
+@@ -862,7 +862,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
  {
@@ -50605,9 +51660,9 @@ diff -urNp linux-2.6.36/lib/dma-debug.c linux-2.6.36/lib/dma-debug.c
                err_printk(dev, NULL, "DMA-API: device driver maps memory from"
                                "stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.36/lib/inflate.c linux-2.6.36/lib/inflate.c
---- linux-2.6.36/lib/inflate.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/inflate.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/lib/inflate.c linux-2.6.37/lib/inflate.c
+--- linux-2.6.37/lib/inflate.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/inflate.c 2011-01-17 02:41:02.000000000 -0500
 @@ -269,7 +269,7 @@ static void free(void *where)
                malloc_ptr = free_mem_ptr;
  }
@@ -50617,10 +51672,10 @@ diff -urNp linux-2.6.36/lib/inflate.c linux-2.6.36/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.36/lib/Kconfig.debug linux-2.6.36/lib/Kconfig.debug
---- linux-2.6.36/lib/Kconfig.debug     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/Kconfig.debug     2010-11-06 19:03:24.000000000 -0400
-@@ -998,6 +998,7 @@ config LATENCYTOP
+diff -urNp linux-2.6.37/lib/Kconfig.debug linux-2.6.37/lib/Kconfig.debug
+--- linux-2.6.37/lib/Kconfig.debug     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/Kconfig.debug     2011-01-17 02:41:02.000000000 -0500
+@@ -1065,6 +1065,7 @@ config LATENCYTOP
        depends on DEBUG_KERNEL
        depends on STACKTRACE_SUPPORT
        depends on PROC_FS
@@ -50628,9 +51683,9 @@ diff -urNp linux-2.6.36/lib/Kconfig.debug linux-2.6.36/lib/Kconfig.debug
        select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
        select KALLSYMS
        select KALLSYMS_ALL
-diff -urNp linux-2.6.36/lib/kref.c linux-2.6.36/lib/kref.c
---- linux-2.6.36/lib/kref.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/kref.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/lib/kref.c linux-2.6.37/lib/kref.c
+--- linux-2.6.37/lib/kref.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/kref.c    2011-01-17 02:41:02.000000000 -0500
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -50640,21 +51695,9 @@ diff -urNp linux-2.6.36/lib/kref.c linux-2.6.36/lib/kref.c
        WARN_ON(release == (void (*)(struct kref *))kfree);
  
        if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.36/lib/parser.c linux-2.6.36/lib/parser.c
---- linux-2.6.36/lib/parser.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/parser.c  2010-11-06 18:58:15.000000000 -0400
-@@ -129,7 +129,7 @@ static int match_number(substring_t *s, 
-       char *buf;
-       int ret;
- 
--      buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
-+      buf = kmalloc((s->to - s->from) + 1, GFP_KERNEL);
-       if (!buf)
-               return -ENOMEM;
-       memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.36/lib/radix-tree.c linux-2.6.36/lib/radix-tree.c
---- linux-2.6.36/lib/radix-tree.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/radix-tree.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/lib/radix-tree.c linux-2.6.37/lib/radix-tree.c
+--- linux-2.6.37/lib/radix-tree.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/radix-tree.c      2011-01-17 02:41:02.000000000 -0500
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
        int nr;
        struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -50662,29 +51705,101 @@ diff -urNp linux-2.6.36/lib/radix-tree.c linux-2.6.36/lib/radix-tree.c
 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
  
- static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
+ static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-2.6.36/lib/vsprintf.c linux-2.6.36/lib/vsprintf.c
---- linux-2.6.36/lib/vsprintf.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/lib/vsprintf.c        2010-11-06 18:58:15.000000000 -0400
-@@ -989,7 +989,7 @@ char *pointer(const char *fmt, char *buf
-             struct printf_spec spec)
- {
-       if (!ptr)
+diff -urNp linux-2.6.37/lib/vsprintf.c linux-2.6.37/lib/vsprintf.c
+--- linux-2.6.37/lib/vsprintf.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/lib/vsprintf.c        2011-01-17 02:41:02.000000000 -0500
+@@ -16,6 +16,9 @@
+  * - scnprintf and vscnprintf
+  */
+ 
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++#define __INCLUDED_BY_HIDESYM 1
++#endif
+ #include <stdarg.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+@@ -574,7 +577,7 @@ char *symbol_string(char *buf, char *end
+       unsigned long value = (unsigned long) ptr;
+ #ifdef CONFIG_KALLSYMS
+       char sym[KSYM_SYMBOL_LEN];
+-      if (ext != 'f' && ext != 's')
++      if (ext != 'f' && ext != 's' && ext != 'a')
+               sprint_symbol(sym, value);
+       else
+               kallsyms_lookup(value, NULL, NULL, NULL, sym);
+@@ -947,6 +950,8 @@ char *uuid_string(char *buf, char *end, 
+  * - 'f' For simple symbolic function names without offset
+  * - 'S' For symbolic direct pointers with offset
+  * - 's' For symbolic direct pointers without offset
++ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
++ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
+  * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
+  * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
+  * - 'M' For a 6-byte MAC address, it prints the address in the
+@@ -990,12 +995,12 @@ char *pointer(const char *fmt, char *buf
+ {
+       if (!ptr) {
+               /*
+-               * Print (null) with the same width as a pointer so it makes
++               * Print (nil) with the same width as a pointer so it makes
+                * tabular output look nice.
+                */
+               if (spec.field_width == -1)
+                       spec.field_width = 2 * sizeof(void *);
 -              return string(buf, end, "(null)", spec);
 +              return string(buf, end, "(nil)", spec);
+       }
  
        switch (*fmt) {
-       case 'F':
-diff -urNp linux-2.6.36/localversion-grsec linux-2.6.36/localversion-grsec
---- linux-2.6.36/localversion-grsec    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/localversion-grsec    2010-11-06 18:58:50.000000000 -0400
+@@ -1005,6 +1010,13 @@ char *pointer(const char *fmt, char *buf
+               /* Fallthrough */
+       case 'S':
+       case 's':
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++              break;
++#else
++              return symbol_string(buf, end, ptr, spec, *fmt);
++#endif
++      case 'A':
++      case 'a':
+               return symbol_string(buf, end, ptr, spec, *fmt);
+       case 'R':
+       case 'r':
+@@ -1750,11 +1762,11 @@ int bstr_printf(char *buf, size_t size, 
+       typeof(type) value;                                             \
+       if (sizeof(type) == 8) {                                        \
+               args = PTR_ALIGN(args, sizeof(u32));                    \
+-              *(u32 *)&value = *(u32 *)args;                          \
+-              *((u32 *)&value + 1) = *(u32 *)(args + 4);              \
++              *(u32 *)&value = *(const u32 *)args;                    \
++              *((u32 *)&value + 1) = *(const u32 *)(args + 4);        \
+       } else {                                                        \
+               args = PTR_ALIGN(args, sizeof(type));                   \
+-              value = *(typeof(type) *)args;                          \
++              value = *(const typeof(type) *)args;                    \
+       }                                                               \
+       args += sizeof(type);                                           \
+       value;                                                          \
+@@ -1817,7 +1829,7 @@ int bstr_printf(char *buf, size_t size, 
+               case FORMAT_TYPE_STR: {
+                       const char *str_arg = args;
+                       args += strlen(str_arg) + 1;
+-                      str = string(str, end, (char *)str_arg, spec);
++                      str = string(str, end, str_arg, spec);
+                       break;
+               }
+ 
+diff -urNp linux-2.6.37/localversion-grsec linux-2.6.37/localversion-grsec
+--- linux-2.6.37/localversion-grsec    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/localversion-grsec    2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.36/Makefile linux-2.6.36/Makefile
---- linux-2.6.36/Makefile      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/Makefile      2010-11-06 18:58:50.000000000 -0400
-@@ -229,8 +229,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+diff -urNp linux-2.6.37/Makefile linux-2.6.37/Makefile
+--- linux-2.6.37/Makefile      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/Makefile      2011-01-17 02:41:02.000000000 -0500
+@@ -232,8 +232,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
  HOSTCXX      = g++
@@ -50695,7 +51810,7 @@ diff -urNp linux-2.6.36/Makefile linux-2.6.36/Makefile
  
  # Decide whether to build built-in, modular, or both.
  # Normally, just do built-in.
-@@ -659,7 +659,7 @@ export mod_strip_cmd
+@@ -680,7 +680,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -50704,10 +51819,10 @@ diff -urNp linux-2.6.36/Makefile linux-2.6.36/Makefile
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.36/mm/bootmem.c linux-2.6.36/mm/bootmem.c
---- linux-2.6.36/mm/bootmem.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/bootmem.c  2010-11-06 18:58:15.000000000 -0400
-@@ -200,19 +200,30 @@ static void __init __free_pages_memory(u
+diff -urNp linux-2.6.37/mm/bootmem.c linux-2.6.37/mm/bootmem.c
+--- linux-2.6.37/mm/bootmem.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/bootmem.c  2011-01-17 02:41:02.000000000 -0500
+@@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
        int i;
@@ -50740,10 +51855,10 @@ diff -urNp linux-2.6.36/mm/bootmem.c linux-2.6.36/mm/bootmem.c
  
        return count;
  }
-diff -urNp linux-2.6.36/mm/filemap.c linux-2.6.36/mm/filemap.c
---- linux-2.6.36/mm/filemap.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/filemap.c  2010-11-06 18:58:50.000000000 -0400
-@@ -1640,7 +1640,7 @@ int generic_file_mmap(struct file * file
+diff -urNp linux-2.6.37/mm/filemap.c linux-2.6.37/mm/filemap.c
+--- linux-2.6.37/mm/filemap.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/filemap.c  2011-01-17 02:41:02.000000000 -0500
+@@ -1660,7 +1660,7 @@ int generic_file_mmap(struct file * file
        struct address_space *mapping = file->f_mapping;
  
        if (!mapping->a_ops->readpage)
@@ -50752,7 +51867,7 @@ diff -urNp linux-2.6.36/mm/filemap.c linux-2.6.36/mm/filemap.c
        file_accessed(file);
        vma->vm_ops = &generic_file_vm_ops;
        vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2036,6 +2036,7 @@ inline int generic_write_checks(struct f
+@@ -2056,6 +2056,7 @@ inline int generic_write_checks(struct f
                          *pos = i_size_read(inode);
  
                if (limit != RLIM_INFINITY) {
@@ -50760,9 +51875,9 @@ diff -urNp linux-2.6.36/mm/filemap.c linux-2.6.36/mm/filemap.c
                        if (*pos >= limit) {
                                send_sig(SIGXFSZ, current, 0);
                                return -EFBIG;
-diff -urNp linux-2.6.36/mm/fremap.c linux-2.6.36/mm/fremap.c
---- linux-2.6.36/mm/fremap.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/fremap.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/fremap.c linux-2.6.37/mm/fremap.c
+--- linux-2.6.37/mm/fremap.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/fremap.c   2011-01-17 02:41:02.000000000 -0500
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
        vma = find_vma(mm, start);
@@ -50784,10 +51899,10 @@ diff -urNp linux-2.6.36/mm/fremap.c linux-2.6.36/mm/fremap.c
                munlock_vma_pages_range(vma, start, start + size);
                vma->vm_flags = saved_flags;
        }
-diff -urNp linux-2.6.36/mm/highmem.c linux-2.6.36/mm/highmem.c
---- linux-2.6.36/mm/highmem.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/highmem.c  2010-11-06 18:58:15.000000000 -0400
-@@ -117,9 +117,10 @@ static void flush_all_zero_pkmaps(void)
+diff -urNp linux-2.6.37/mm/highmem.c linux-2.6.37/mm/highmem.c
+--- linux-2.6.37/mm/highmem.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/highmem.c  2011-01-17 02:41:02.000000000 -0500
+@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
                 * So no dangers, even with speculative execution.
                 */
                page = pte_page(pkmap_page_table[i]);
@@ -50799,7 +51914,7 @@ diff -urNp linux-2.6.36/mm/highmem.c linux-2.6.36/mm/highmem.c
                set_page_address(page, NULL);
                need_flush = 1;
        }
-@@ -178,9 +179,11 @@ start:
+@@ -186,9 +187,11 @@ start:
                }
        }
        vaddr = PKMAP_ADDR(last_pkmap_nr);
@@ -50812,10 +51927,10 @@ diff -urNp linux-2.6.36/mm/highmem.c linux-2.6.36/mm/highmem.c
        pkmap_count[last_pkmap_nr] = 1;
        set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
---- linux-2.6.36/mm/hugetlb.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/hugetlb.c  2010-11-06 18:58:15.000000000 -0400
-@@ -2305,6 +2305,27 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-2.6.37/mm/hugetlb.c linux-2.6.37/mm/hugetlb.c
+--- linux-2.6.37/mm/hugetlb.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/hugetlb.c  2011-01-17 02:41:02.000000000 -0500
+@@ -2373,6 +2373,27 @@ static int unmap_ref_private(struct mm_s
        return 1;
  }
  
@@ -50843,7 +51958,7 @@ diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   */
-@@ -2402,6 +2423,11 @@ retry_avoidcopy:
+@@ -2473,6 +2494,11 @@ retry_avoidcopy:
                                make_huge_pte(vma, new_page, 1));
                page_remove_rmap(old_page);
                hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -50855,7 +51970,7 @@ diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
                /* Make the old page be freed below */
                new_page = old_page;
                mmu_notifier_invalidate_range_end(mm,
-@@ -2555,6 +2581,10 @@ retry:
+@@ -2624,6 +2650,10 @@ retry:
                                && (vma->vm_flags & VM_SHARED)));
        set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -50866,7 +51981,7 @@ diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
        if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
                /* Optimization, do the COW without a second fault */
                ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2584,6 +2614,10 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2653,6 +2683,10 @@ int hugetlb_fault(struct mm_struct *mm, 
        static DEFINE_MUTEX(hugetlb_instantiation_mutex);
        struct hstate *h = hstate_vma(vma);
  
@@ -50877,8 +51992,8 @@ diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
        ptep = huge_pte_offset(mm, address);
        if (ptep) {
                entry = huge_ptep_get(ptep);
-@@ -2591,6 +2625,26 @@ int hugetlb_fault(struct mm_struct *mm, 
-                       return VM_FAULT_HWPOISON;
+@@ -2664,6 +2698,26 @@ int hugetlb_fault(struct mm_struct *mm, 
+                              VM_FAULT_SET_HINDEX(h - hstates);
        }
  
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -50904,9 +52019,9 @@ diff -urNp linux-2.6.36/mm/hugetlb.c linux-2.6.36/mm/hugetlb.c
        ptep = huge_pte_alloc(mm, address, huge_page_size(h));
        if (!ptep)
                return VM_FAULT_OOM;
-diff -urNp linux-2.6.36/mm/Kconfig linux-2.6.36/mm/Kconfig
---- linux-2.6.36/mm/Kconfig    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/Kconfig    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/mm/Kconfig linux-2.6.37/mm/Kconfig
+--- linux-2.6.37/mm/Kconfig    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/Kconfig    2011-01-17 02:41:02.000000000 -0500
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -50916,9 +52031,21 @@ diff -urNp linux-2.6.36/mm/Kconfig linux-2.6.36/mm/Kconfig
          help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.36/mm/maccess.c linux-2.6.36/mm/maccess.c
---- linux-2.6.36/mm/maccess.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/maccess.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/kmemleak.c linux-2.6.37/mm/kmemleak.c
+--- linux-2.6.37/mm/kmemleak.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/kmemleak.c 2011-01-17 02:41:02.000000000 -0500
+@@ -355,7 +355,7 @@ static void print_unreferenced(struct se
+ 
+       for (i = 0; i < object->trace_len; i++) {
+               void *ptr = (void *)object->trace[i];
+-              seq_printf(seq, "    [<%p>] %pS\n", ptr, ptr);
++              seq_printf(seq, "    [<%p>] %pA\n", ptr, ptr);
+       }
+ }
+ 
+diff -urNp linux-2.6.37/mm/maccess.c linux-2.6.37/mm/maccess.c
+--- linux-2.6.37/mm/maccess.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/maccess.c  2011-01-17 02:41:02.000000000 -0500
 @@ -15,10 +15,10 @@
   * happens, handle that and return -EFAULT.
   */
@@ -50945,9 +52072,9 @@ diff -urNp linux-2.6.36/mm/maccess.c linux-2.6.36/mm/maccess.c
  {
        long ret;
        mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.36/mm/madvise.c linux-2.6.36/mm/madvise.c
---- linux-2.6.36/mm/madvise.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/madvise.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/madvise.c linux-2.6.37/mm/madvise.c
+--- linux-2.6.37/mm/madvise.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/madvise.c  2011-01-17 02:41:02.000000000 -0500
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
        pgoff_t pgoff;
        unsigned long new_flags = vma->vm_flags;
@@ -51024,9 +52151,9 @@ diff -urNp linux-2.6.36/mm/madvise.c linux-2.6.36/mm/madvise.c
        error = 0;
        if (end == start)
                goto out;
-diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
---- linux-2.6.36/mm/memory.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/memory.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/mm/memory.c linux-2.6.37/mm/memory.c
+--- linux-2.6.37/mm/memory.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/memory.c   2011-01-17 02:41:02.000000000 -0500
 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
                return;
  
@@ -51075,7 +52202,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
                    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
                    !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;
-@@ -1491,7 +1498,7 @@ int __get_user_pages(struct task_struct 
+@@ -1492,7 +1499,7 @@ int __get_user_pages(struct task_struct 
                        start += PAGE_SIZE;
                        nr_pages--;
                } while (nr_pages && start < vma->vm_end);
@@ -51084,7 +52211,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        return i;
  }
  
-@@ -1636,6 +1643,10 @@ static int insert_page(struct vm_area_st
+@@ -1637,6 +1644,10 @@ static int insert_page(struct vm_area_st
        page_add_file_rmap(page);
        set_pte_at(mm, addr, pte, mk_pte(page, prot));
  
@@ -51095,7 +52222,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        retval = 0;
        pte_unmap_unlock(pte, ptl);
        return retval;
-@@ -1670,10 +1681,22 @@ out:
+@@ -1671,10 +1682,22 @@ out:
  int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
                        struct page *page)
  {
@@ -51118,7 +52245,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        vma->vm_flags |= VM_INSERTPAGE;
        return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -1759,6 +1782,7 @@ int vm_insert_mixed(struct vm_area_struc
+@@ -1760,6 +1783,7 @@ int vm_insert_mixed(struct vm_area_struc
                        unsigned long pfn)
  {
        BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -51126,7 +52253,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
  
        if (addr < vma->vm_start || addr >= vma->vm_end)
                return -EFAULT;
-@@ -2086,6 +2110,186 @@ static inline void cow_user_page(struct 
+@@ -2087,6 +2111,186 @@ static inline void cow_user_page(struct 
                copy_user_highpage(dst, src, va, vma);
  }
  
@@ -51189,7 +52316,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +      BUG_ON(address >= SEGMEXEC_TASK_SIZE);
 +      address_m = address + SEGMEXEC_TASK_SIZE;
 +      pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
-+      pte_m = pte_offset_map_nested(pmd_m, address_m);
++      pte_m = pte_offset_map(pmd_m, address_m);
 +      ptl_m = pte_lockptr(mm, pmd_m);
 +      if (ptl != ptl_m) {
 +              spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
@@ -51206,7 +52333,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +out:
 +      if (ptl != ptl_m)
 +              spin_unlock(ptl_m);
-+      pte_unmap_nested(pte_m);
++      pte_unmap(pte_m);
 +      unlock_page(page_m);
 +}
 +
@@ -51228,7 +52355,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +      BUG_ON(address >= SEGMEXEC_TASK_SIZE);
 +      address_m = address + SEGMEXEC_TASK_SIZE;
 +      pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
-+      pte_m = pte_offset_map_nested(pmd_m, address_m);
++      pte_m = pte_offset_map(pmd_m, address_m);
 +      ptl_m = pte_lockptr(mm, pmd_m);
 +      if (ptl != ptl_m) {
 +              spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
@@ -51245,7 +52372,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +out:
 +      if (ptl != ptl_m)
 +              spin_unlock(ptl_m);
-+      pte_unmap_nested(pte_m);
++      pte_unmap(pte_m);
 +}
 +
 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
@@ -51264,7 +52391,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +      BUG_ON(address >= SEGMEXEC_TASK_SIZE);
 +      address_m = address + SEGMEXEC_TASK_SIZE;
 +      pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
-+      pte_m = pte_offset_map_nested(pmd_m, address_m);
++      pte_m = pte_offset_map(pmd_m, address_m);
 +      ptl_m = pte_lockptr(mm, pmd_m);
 +      if (ptl != ptl_m) {
 +              spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
@@ -51277,7 +52404,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +out:
 +      if (ptl != ptl_m)
 +              spin_unlock(ptl_m);
-+      pte_unmap_nested(pte_m);
++      pte_unmap(pte_m);
 +}
 +
 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
@@ -51313,7 +52440,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -2272,6 +2476,12 @@ gotten:
+@@ -2274,6 +2478,12 @@ gotten:
         */
        page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
        if (likely(pte_same(*page_table, orig_pte))) {
@@ -51326,7 +52453,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
                if (old_page) {
                        if (!PageAnon(old_page)) {
                                dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2323,6 +2533,10 @@ gotten:
+@@ -2325,6 +2535,10 @@ gotten:
                        page_remove_rmap(old_page);
                }
  
@@ -51337,7 +52464,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
                /* Free the old page.. */
                new_page = old_page;
                ret |= VM_FAULT_WRITE;
-@@ -2749,19 +2963,12 @@ static int do_swap_page(struct mm_struct
+@@ -2756,6 +2970,11 @@ static int do_swap_page(struct mm_struct
        swap_free(entry);
        if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
                try_to_free_swap(page);
@@ -51347,22 +52474,9 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
 +#endif
 +
        unlock_page(page);
--      if (swapcache) {
--              /*
--               * Hold the lock to avoid the swap entry to be reused
--               * until we take the PT lock for the pte_same() check
--               * (to avoid false positives from pte_same). For
--               * further safety release the lock after the swap_free
--               * so that the swap count won't change under a
--               * parallel locked swapcache.
--               */
--              unlock_page(swapcache);
--              page_cache_release(swapcache);
--      }
- 
-       if (flags & FAULT_FLAG_WRITE) {
-               ret |= do_wp_page(mm, vma, address, page_table, pmd, ptl, pte);
-@@ -2772,6 +2979,11 @@ static int do_swap_page(struct mm_struct
+       if (swapcache) {
+               /*
+@@ -2779,6 +2998,11 @@ static int do_swap_page(struct mm_struct
  
        /* No need to invalidate - it was non-present before */
        update_mmu_cache(vma, address, page_table);
@@ -51374,15 +52488,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2783,48 +2995,10 @@ out_page:
-       unlock_page(page);
- out_release:
-       page_cache_release(page);
--      if (swapcache) {
--              unlock_page(swapcache);
--              page_cache_release(swapcache);
--      }
-       return ret;
+@@ -2798,40 +3022,6 @@ out_release:
  }
  
  /*
@@ -51423,7 +52529,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
   * but allow concurrent faults), and pte mapped but not yet locked.
   * We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -2833,27 +3007,23 @@ static int do_anonymous_page(struct mm_s
+@@ -2840,27 +3030,23 @@ static int do_anonymous_page(struct mm_s
                unsigned long address, pte_t *page_table, pmd_t *pmd,
                unsigned int flags)
  {
@@ -51456,7 +52562,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        if (unlikely(anon_vma_prepare(vma)))
                goto oom;
        page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2872,6 +3042,11 @@ static int do_anonymous_page(struct mm_s
+@@ -2879,6 +3065,11 @@ static int do_anonymous_page(struct mm_s
        if (!pte_none(*page_table))
                goto release;
  
@@ -51468,7 +52574,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        inc_mm_counter_fast(mm, MM_ANONPAGES);
        page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -2879,6 +3054,12 @@ setpte:
+@@ -2886,6 +3077,12 @@ setpte:
  
        /* No need to invalidate - it was non-present before */
        update_mmu_cache(vma, address, page_table);
@@ -51481,7 +52587,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
        return 0;
-@@ -3021,6 +3202,12 @@ static int __do_fault(struct mm_struct *
+@@ -3029,6 +3226,12 @@ static int __do_fault(struct mm_struct *
         */
        /* Only go through if we didn't race with anybody else... */
        if (likely(pte_same(*page_table, orig_pte))) {
@@ -51494,7 +52600,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
                flush_icache_page(vma, page);
                entry = mk_pte(page, vma->vm_page_prot);
                if (flags & FAULT_FLAG_WRITE)
-@@ -3040,6 +3227,14 @@ static int __do_fault(struct mm_struct *
+@@ -3048,6 +3251,14 @@ static int __do_fault(struct mm_struct *
  
                /* no need to invalidate: a not-present page won't be cached */
                update_mmu_cache(vma, address, page_table);
@@ -51509,9 +52615,9 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        } else {
                if (charged)
                        mem_cgroup_uncharge_page(page);
-@@ -3187,6 +3382,12 @@ static inline int handle_pte_fault(struc
+@@ -3195,6 +3406,12 @@ static inline int handle_pte_fault(struc
                if (flags & FAULT_FLAG_WRITE)
-                       flush_tlb_page(vma, address);
+                       flush_tlb_fix_spurious_fault(vma, address);
        }
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -51522,7 +52628,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
  unlock:
        pte_unmap_unlock(pte, ptl);
        return 0;
-@@ -3203,6 +3404,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3211,6 +3428,10 @@ int handle_mm_fault(struct mm_struct *mm
        pmd_t *pmd;
        pte_t *pte;
  
@@ -51533,7 +52639,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        __set_current_state(TASK_RUNNING);
  
        count_vm_event(PGFAULT);
-@@ -3213,6 +3418,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3221,6 +3442,34 @@ int handle_mm_fault(struct mm_struct *mm
        if (unlikely(is_vm_hugetlb_page(vma)))
                return hugetlb_fault(mm, vma, address, flags);
  
@@ -51568,7 +52674,7 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        pgd = pgd_offset(mm, address);
        pud = pud_alloc(mm, pgd, address);
        if (!pud)
-@@ -3310,7 +3543,7 @@ static int __init gate_vma_init(void)
+@@ -3318,7 +3567,7 @@ static int __init gate_vma_init(void)
        gate_vma.vm_start = FIXADDR_USER_START;
        gate_vma.vm_end = FIXADDR_USER_END;
        gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
@@ -51577,10 +52683,10 @@ diff -urNp linux-2.6.36/mm/memory.c linux-2.6.36/mm/memory.c
        /*
         * Make sure the vDSO gets into every core dump.
         * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
---- linux-2.6.36/mm/memory-failure.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/memory-failure.c   2010-11-06 18:58:15.000000000 -0400
-@@ -53,7 +53,7 @@ int sysctl_memory_failure_early_kill __r
+diff -urNp linux-2.6.37/mm/memory-failure.c linux-2.6.37/mm/memory-failure.c
+--- linux-2.6.37/mm/memory-failure.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/memory-failure.c   2011-01-17 02:41:02.000000000 -0500
+@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
  
@@ -51589,7 +52695,7 @@ diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
  
  #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
  
-@@ -975,7 +975,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -967,7 +967,7 @@ int __memory_failure(unsigned long pfn, 
        }
  
        nr_pages = 1 << compound_order(hpage);
@@ -51598,7 +52704,16 @@ diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
  
        /*
         * We need/can do nothing about count=0 pages.
-@@ -1039,7 +1039,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -997,7 +997,7 @@ int __memory_failure(unsigned long pfn, 
+                       if (!PageHWPoison(hpage)
+                           || (hwpoison_filter(p) && TestClearPageHWPoison(p))
+                           || (p != hpage && TestSetPageHWPoison(hpage))) {
+-                              atomic_long_sub(nr_pages, &mce_bad_pages);
++                              atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+                               return 0;
+                       }
+                       set_page_hwpoison_huge_page(hpage);
+@@ -1052,7 +1052,7 @@ int __memory_failure(unsigned long pfn, 
        }
        if (hwpoison_filter(p)) {
                if (TestClearPageHWPoison(p))
@@ -51607,25 +52722,34 @@ diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
                unlock_page(hpage);
                put_page(hpage);
                return 0;
-@@ -1155,7 +1155,7 @@ int unpoison_memory(unsigned long pfn)
- 
-       if (!get_page_unless_zero(page)) {
+@@ -1178,7 +1178,7 @@ int unpoison_memory(unsigned long pfn)
+                       return 0;
+               }
                if (TestClearPageHWPoison(p))
 -                      atomic_long_sub(nr_pages, &mce_bad_pages);
 +                      atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
-               pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
+               pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
                return 0;
        }
-@@ -1169,7 +1169,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1192,7 +1192,7 @@ int unpoison_memory(unsigned long pfn)
         */
        if (TestClearPageHWPoison(page)) {
-               pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
+               pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
 -              atomic_long_sub(nr_pages, &mce_bad_pages);
 +              atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
                freeit = 1;
+               if (PageHuge(page))
+                       clear_page_hwpoison_huge_page(page);
+@@ -1301,7 +1301,7 @@ static int soft_offline_huge_page(struct
        }
-       if (PageHuge(p))
-@@ -1352,7 +1352,7 @@ int soft_offline_page(struct page *page,
+ done:
+       if (!PageHWPoison(hpage))
+-              atomic_long_add(1 << compound_order(hpage), &mce_bad_pages);
++              atomic_long_add_unchecked(1 << compound_order(hpage), &mce_bad_pages);
+       set_page_hwpoison_huge_page(hpage);
+       dequeue_hwpoisoned_huge_page(hpage);
+       /* keep elevated page count for bad page */
+@@ -1428,7 +1428,7 @@ int soft_offline_page(struct page *page,
                return ret;
  
  done:
@@ -51634,9 +52758,9 @@ diff -urNp linux-2.6.36/mm/memory-failure.c linux-2.6.36/mm/memory-failure.c
        SetPageHWPoison(page);
        /* keep elevated page count for bad page */
        return ret;
-diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
---- linux-2.6.36/mm/mempolicy.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/mempolicy.c        2010-11-06 19:43:34.000000000 -0400
+diff -urNp linux-2.6.37/mm/mempolicy.c linux-2.6.37/mm/mempolicy.c
+--- linux-2.6.37/mm/mempolicy.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/mempolicy.c        2011-01-17 02:41:02.000000000 -0500
 @@ -642,6 +642,10 @@ static int mbind_range(struct mm_struct 
        unsigned long vmstart;
        unsigned long vmend;
@@ -51665,7 +52789,7 @@ diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
        }
  
   out:
-@@ -1098,6 +1112,17 @@ static long do_mbind(unsigned long start
+@@ -1104,6 +1118,17 @@ static long do_mbind(unsigned long start
  
        if (end < start)
                return -EINVAL;
@@ -51683,7 +52807,7 @@ diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
        if (end == start)
                return 0;
  
-@@ -1312,6 +1337,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1324,6 +1349,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
        if (!mm)
                goto out;
  
@@ -51698,7 +52822,7 @@ diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
        /*
         * Check if this process has the right to modify the specified
         * process. The right exists if the process has administrative
-@@ -1321,8 +1354,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1333,8 +1366,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
        rcu_read_lock();
        tcred = __task_cred(task);
        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -51708,7 +52832,7 @@ diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-@@ -2620,7 +2652,7 @@ int show_numa_map(struct seq_file *m, vo
+@@ -2632,7 +2664,7 @@ int show_numa_map(struct seq_file *m, vo
  
        if (file) {
                seq_printf(m, " file=");
@@ -51717,10 +52841,10 @@ diff -urNp linux-2.6.36/mm/mempolicy.c linux-2.6.36/mm/mempolicy.c
        } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
                seq_printf(m, " heap");
        } else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.36/mm/migrate.c linux-2.6.36/mm/migrate.c
---- linux-2.6.36/mm/migrate.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/migrate.c  2010-11-06 18:58:50.000000000 -0400
-@@ -1098,6 +1098,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+diff -urNp linux-2.6.37/mm/migrate.c linux-2.6.37/mm/migrate.c
+--- linux-2.6.37/mm/migrate.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/migrate.c  2011-01-17 02:41:02.000000000 -0500
+@@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
        if (!mm)
                return -EINVAL;
  
@@ -51735,7 +52859,7 @@ diff -urNp linux-2.6.36/mm/migrate.c linux-2.6.36/mm/migrate.c
        /*
         * Check if this process has the right to modify the specified
         * process. The right exists if the process has administrative
-@@ -1107,8 +1115,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+@@ -1308,8 +1316,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
        rcu_read_lock();
        tcred = __task_cred(task);
        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -51745,9 +52869,9 @@ diff -urNp linux-2.6.36/mm/migrate.c linux-2.6.36/mm/migrate.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-2.6.36/mm/mlock.c linux-2.6.36/mm/mlock.c
---- linux-2.6.36/mm/mlock.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/mlock.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/mm/mlock.c linux-2.6.37/mm/mlock.c
+--- linux-2.6.37/mm/mlock.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/mlock.c    2011-01-17 02:41:02.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -51849,10 +52973,10 @@ diff -urNp linux-2.6.36/mm/mlock.c linux-2.6.36/mm/mlock.c
        if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
            capable(CAP_IPC_LOCK))
                ret = do_mlockall(flags);
-diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
---- linux-2.6.36/mm/mmap.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/mmap.c     2010-11-06 18:58:50.000000000 -0400
-@@ -44,6 +44,16 @@
+diff -urNp linux-2.6.37/mm/mmap.c linux-2.6.37/mm/mmap.c
+--- linux-2.6.37/mm/mmap.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/mmap.c     2011-01-17 02:41:02.000000000 -0500
+@@ -45,6 +45,16 @@
  #define arch_rebalance_pgtables(addr, len)            (addr)
  #endif
  
@@ -51869,7 +52993,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  static void unmap_region(struct mm_struct *mm,
                struct vm_area_struct *vma, struct vm_area_struct *prev,
                unsigned long start, unsigned long end);
-@@ -69,22 +79,32 @@ static void unmap_region(struct mm_struc
+@@ -70,22 +80,32 @@ static void unmap_region(struct mm_struc
   *            x: (no) no      x: (no) yes     x: (no) yes     x: (yes) yes
   *
   */
@@ -51904,7 +53028,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  struct percpu_counter vm_committed_as;
  
  /*
-@@ -230,6 +250,7 @@ static struct vm_area_struct *remove_vma
+@@ -231,6 +251,7 @@ static struct vm_area_struct *remove_vma
        struct vm_area_struct *next = vma->vm_next;
  
        might_sleep();
@@ -51912,7 +53036,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (vma->vm_ops && vma->vm_ops->close)
                vma->vm_ops->close(vma);
        if (vma->vm_file) {
-@@ -266,6 +287,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -267,6 +288,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
         * not page aligned -Ram Gupta
         */
        rlim = rlimit(RLIMIT_DATA);
@@ -51920,7 +53044,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
                        (mm->end_data - mm->start_data) > rlim)
                goto out;
-@@ -707,6 +729,12 @@ static int
+@@ -708,6 +730,12 @@ static int
  can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
        struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -51933,7 +53057,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
                if (vma->vm_pgoff == vm_pgoff)
-@@ -726,6 +754,12 @@ static int
+@@ -727,6 +755,12 @@ static int
  can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
        struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -51946,7 +53070,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
                pgoff_t vm_pglen;
-@@ -768,13 +802,20 @@ can_vma_merge_after(struct vm_area_struc
+@@ -769,13 +803,20 @@ can_vma_merge_after(struct vm_area_struc
  struct vm_area_struct *vma_merge(struct mm_struct *mm,
                        struct vm_area_struct *prev, unsigned long addr,
                        unsigned long end, unsigned long vm_flags,
@@ -51968,7 +53092,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /*
         * We later require that vma->vm_flags == vm_flags,
         * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -790,6 +831,15 @@ struct vm_area_struct *vma_merge(struct 
+@@ -791,6 +832,15 @@ struct vm_area_struct *vma_merge(struct 
        if (next && next->vm_end == end)                /* cases 6, 7, 8 */
                next = next->vm_next;
  
@@ -51984,7 +53108,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /*
         * Can it merge with the predecessor?
         */
-@@ -809,9 +859,24 @@ struct vm_area_struct *vma_merge(struct 
+@@ -810,9 +860,24 @@ struct vm_area_struct *vma_merge(struct 
                                                        /* cases 1, 6 */
                        err = vma_adjust(prev, prev->vm_start,
                                next->vm_end, prev->vm_pgoff, NULL);
@@ -52010,7 +53134,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (err)
                        return NULL;
                return prev;
-@@ -824,12 +889,27 @@ struct vm_area_struct *vma_merge(struct 
+@@ -825,12 +890,27 @@ struct vm_area_struct *vma_merge(struct 
                        mpol_equal(policy, vma_policy(next)) &&
                        can_vma_merge_before(next, vm_flags,
                                        anon_vma, file, pgoff+pglen)) {
@@ -52040,7 +53164,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (err)
                        return NULL;
                return area;
-@@ -944,14 +1024,11 @@ none:
+@@ -945,14 +1025,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
                                                struct file *file, long pages)
  {
@@ -52056,7 +53180,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                mm->stack_vm += pages;
        if (flags & (VM_RESERVED|VM_IO))
                mm->reserved_vm += pages;
-@@ -978,7 +1055,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -979,7 +1056,7 @@ unsigned long do_mmap_pgoff(struct file 
         * (the exception is when the underlying filesystem is noexec
         *  mounted, in which case we dont add PROT_EXEC.)
         */
@@ -52065,7 +53189,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
                        prot |= PROT_EXEC;
  
-@@ -1004,7 +1081,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1005,7 +1082,7 @@ unsigned long do_mmap_pgoff(struct file 
        /* Obtain the address to map to. we verify (or select) it and ensure
         * that it represents a valid section of the address space.
         */
@@ -52074,7 +53198,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (addr & ~PAGE_MASK)
                return addr;
  
-@@ -1015,6 +1092,31 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1016,6 +1093,31 @@ unsigned long do_mmap_pgoff(struct file 
        vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
                        mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
  
@@ -52106,7 +53230,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (flags & MAP_LOCKED)
                if (!can_do_mlock())
                        return -EPERM;
-@@ -1026,6 +1128,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1027,6 +1129,7 @@ unsigned long do_mmap_pgoff(struct file 
                locked += mm->locked_vm;
                lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
@@ -52114,7 +53238,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
                        return -EAGAIN;
        }
-@@ -1096,6 +1199,9 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1097,6 +1200,9 @@ unsigned long do_mmap_pgoff(struct file 
        if (error)
                return error;
  
@@ -52124,7 +53248,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1172,10 +1278,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar
+@@ -1174,10 +1280,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar
   */
  int vma_wants_writenotify(struct vm_area_struct *vma)
  {
@@ -52137,7 +53261,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                return 0;
  
        /* The backer wishes to know when pages are first written to? */
-@@ -1224,14 +1330,24 @@ unsigned long mmap_region(struct file *f
+@@ -1226,14 +1332,24 @@ unsigned long mmap_region(struct file *f
        unsigned long charged = 0;
        struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -52164,7 +53288,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        }
  
        /* Check against address space limit. */
-@@ -1280,6 +1396,16 @@ munmap_back:
+@@ -1282,6 +1398,16 @@ munmap_back:
                goto unacct_error;
        }
  
@@ -52181,7 +53305,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        vma->vm_mm = mm;
        vma->vm_start = addr;
        vma->vm_end = addr + len;
-@@ -1303,6 +1429,19 @@ munmap_back:
+@@ -1305,6 +1431,19 @@ munmap_back:
                error = file->f_op->mmap(file, vma);
                if (error)
                        goto unmap_and_free_vma;
@@ -52201,7 +53325,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (vm_flags & VM_EXECUTABLE)
                        added_exe_file_vma(mm);
  
-@@ -1338,6 +1477,11 @@ munmap_back:
+@@ -1340,6 +1479,11 @@ munmap_back:
        vma_link(mm, vma, prev, rb_link, rb_parent);
        file = vma->vm_file;
  
@@ -52213,7 +53337,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /* Once vma denies write, undo our temporary denial count */
        if (correct_wcount)
                atomic_inc(&inode->i_writecount);
-@@ -1346,6 +1490,7 @@ out:
+@@ -1348,6 +1492,7 @@ out:
  
        mm->total_vm += len >> PAGE_SHIFT;
        vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -52221,7 +53345,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (vm_flags & VM_LOCKED) {
                if (!mlock_vma_pages_range(vma, addr, addr + len))
                        mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1363,6 +1508,12 @@ unmap_and_free_vma:
+@@ -1365,6 +1510,12 @@ unmap_and_free_vma:
        unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
        charged = 0;
  free_vma:
@@ -52234,7 +53358,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
        if (charged)
-@@ -1370,6 +1521,33 @@ unacct_error:
+@@ -1372,6 +1523,33 @@ unacct_error:
        return error;
  }
  
@@ -52268,7 +53392,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  /* Get an address range which is currently unmapped.
   * For shmat() with addr=0.
   *
-@@ -1396,18 +1574,23 @@ arch_get_unmapped_area(struct file *filp
+@@ -1398,18 +1576,23 @@ arch_get_unmapped_area(struct file *filp
        if (flags & MAP_FIXED)
                return addr;
  
@@ -52299,7 +53423,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        }
  
  full_search:
-@@ -1418,34 +1601,40 @@ full_search:
+@@ -1420,34 +1603,40 @@ full_search:
                         * Start a new search - just in case we missed
                         * some holes.
                         */
@@ -52351,7 +53475,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                mm->free_area_cache = addr;
                mm->cached_hole_size = ~0UL;
        }
-@@ -1463,7 +1652,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1465,7 +1654,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;
@@ -52360,7 +53484,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  
        /* requested length too big for entire address space */
        if (len > TASK_SIZE)
-@@ -1472,13 +1661,18 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1474,13 +1663,18 @@ arch_get_unmapped_area_topdown(struct fi
        if (flags & MAP_FIXED)
                return addr;
  
@@ -52383,7 +53507,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        }
  
        /* check if free_area_cache is useful for us */
-@@ -1493,7 +1687,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1495,7 +1689,7 @@ arch_get_unmapped_area_topdown(struct fi
        /* make sure it can fit in the remaining address space */
        if (addr > len) {
                vma = find_vma(mm, addr-len);
@@ -52392,7 +53516,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                        /* remember the address as a hint for next time */
                        return (mm->free_area_cache = addr-len);
        }
-@@ -1510,7 +1704,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1512,7 +1706,7 @@ arch_get_unmapped_area_topdown(struct fi
                 * return with success:
                 */
                vma = find_vma(mm, addr);
@@ -52401,7 +53525,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                        /* remember the address as a hint for next time */
                        return (mm->free_area_cache = addr);
  
-@@ -1529,13 +1723,21 @@ bottomup:
+@@ -1531,13 +1725,21 @@ bottomup:
         * can happen with large stack limits and large mmap()
         * allocations.
         */
@@ -52425,7 +53549,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        mm->cached_hole_size = ~0UL;
  
        return addr;
-@@ -1544,6 +1746,12 @@ bottomup:
+@@ -1546,6 +1748,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -52438,7 +53562,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /*
         * Is this a new hole at the highest possible address?
         */
-@@ -1551,8 +1759,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1553,8 +1761,10 @@ void arch_unmap_area_topdown(struct mm_s
                mm->free_area_cache = addr;
  
        /* dont allow allocations above current base */
@@ -52450,7 +53574,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  }
  
  unsigned long
-@@ -1660,6 +1870,28 @@ out:
+@@ -1662,6 +1872,28 @@ out:
        return prev ? prev->vm_next : vma;
  }
  
@@ -52479,7 +53603,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1676,6 +1908,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1678,6 +1910,7 @@ static int acct_stack_growth(struct vm_a
                return -ENOMEM;
  
        /* Stack limit test */
@@ -52487,7 +53611,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
                return -ENOMEM;
  
-@@ -1686,6 +1919,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1688,6 +1921,7 @@ static int acct_stack_growth(struct vm_a
                locked = mm->locked_vm + grow;
                limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
                limit >>= PAGE_SHIFT;
@@ -52495,7 +53619,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                if (locked > limit && !capable(CAP_IPC_LOCK))
                        return -ENOMEM;
        }
-@@ -1716,37 +1950,47 @@ static int acct_stack_growth(struct vm_a
+@@ -1718,37 +1952,48 @@ static int acct_stack_growth(struct vm_a
   * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
   * vma is the last one with address > vma->vm_end.  Have to extend vma.
   */
@@ -52504,8 +53628,8 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
 +#endif
  int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  {
--      int error;
-+      int error, locknext;
+       int error;
++      bool locknext;
  
        if (!(vma->vm_flags & VM_GROWSUP))
                return -EFAULT;
@@ -52553,7 +53677,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                unsigned long size, grow;
  
                size = address - vma->vm_start;
-@@ -1758,6 +2002,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1760,6 +2005,8 @@ int expand_upwards(struct vm_area_struct
                        perf_event_mmap(vma);
                }
        }
@@ -52562,17 +53686,16 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        vma_unlock_anon_vma(vma);
        return error;
  }
-@@ -1769,7 +2015,8 @@ int expand_upwards(struct vm_area_struct
- static int expand_downwards(struct vm_area_struct *vma,
+@@ -1772,6 +2019,8 @@ static int expand_downwards(struct vm_ar
                                   unsigned long address)
  {
--      int error;
-+      int error, lockprev = 0;
+       int error;
++      bool lockprev = false;
 +      struct vm_area_struct *prev;
  
        /*
         * We must make sure the anon_vma is allocated
-@@ -1783,6 +2030,15 @@ static int expand_downwards(struct vm_ar
+@@ -1785,6 +2034,15 @@ static int expand_downwards(struct vm_ar
        if (error)
                return error;
  
@@ -52588,7 +53711,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        vma_lock_anon_vma(vma);
  
        /*
-@@ -1792,9 +2048,17 @@ static int expand_downwards(struct vm_ar
+@@ -1794,9 +2052,17 @@ static int expand_downwards(struct vm_ar
         */
  
        /* Somebody else might have raced and expanded it already */
@@ -52607,7 +53730,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                size = vma->vm_end - address;
                grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1802,10 +2066,21 @@ static int expand_downwards(struct vm_ar
+@@ -1804,10 +2070,21 @@ static int expand_downwards(struct vm_ar
                if (!error) {
                        vma->vm_start = address;
                        vma->vm_pgoff -= grow;
@@ -52629,7 +53752,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        return error;
  }
  
-@@ -1879,6 +2154,13 @@ static void remove_vma_list(struct mm_st
+@@ -1881,6 +2158,13 @@ static void remove_vma_list(struct mm_st
        do {
                long nrpages = vma_pages(vma);
  
@@ -52643,7 +53766,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                mm->total_vm -= nrpages;
                vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
                vma = remove_vma(vma);
-@@ -1924,6 +2206,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1926,6 +2210,16 @@ detach_vmas_to_be_unmapped(struct mm_str
        insertion_point = (prev ? &prev->vm_next : &mm->mmap);
        vma->vm_prev = NULL;
        do {
@@ -52660,7 +53783,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                rb_erase(&vma->vm_rb, &mm->mm_rb);
                mm->map_count--;
                tail_vma = vma;
-@@ -1952,14 +2244,33 @@ static int __split_vma(struct mm_struct 
+@@ -1954,14 +2248,33 @@ static int __split_vma(struct mm_struct 
        struct vm_area_struct *new;
        int err = -ENOMEM;
  
@@ -52694,7 +53817,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /* most fields are the same, copy all, and then fixup */
        *new = *vma;
  
-@@ -1972,6 +2283,22 @@ static int __split_vma(struct mm_struct 
+@@ -1974,6 +2287,22 @@ static int __split_vma(struct mm_struct 
                new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
        }
  
@@ -52717,7 +53840,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        pol = mpol_dup(vma_policy(vma));
        if (IS_ERR(pol)) {
                err = PTR_ERR(pol);
-@@ -1997,6 +2324,42 @@ static int __split_vma(struct mm_struct 
+@@ -1999,6 +2328,42 @@ static int __split_vma(struct mm_struct 
        else
                err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
@@ -52760,7 +53883,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /* Success. */
        if (!err)
                return 0;
-@@ -2009,10 +2372,18 @@ static int __split_vma(struct mm_struct 
+@@ -2011,10 +2376,18 @@ static int __split_vma(struct mm_struct 
                        removed_exe_file_vma(mm);
                fput(new->vm_file);
        }
@@ -52780,7 +53903,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        kmem_cache_free(vm_area_cachep, new);
   out_err:
        return err;
-@@ -2025,6 +2396,15 @@ static int __split_vma(struct mm_struct 
+@@ -2027,6 +2400,15 @@ static int __split_vma(struct mm_struct 
  int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
              unsigned long addr, int new_below)
  {
@@ -52796,7 +53919,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (mm->map_count >= sysctl_max_map_count)
                return -ENOMEM;
  
-@@ -2036,11 +2416,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2038,11 +2420,30 @@ int split_vma(struct mm_struct *mm, stru
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -52827,7 +53950,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
                return -EINVAL;
  
-@@ -2114,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2116,6 +2517,8 @@ int do_munmap(struct mm_struct *mm, unsi
        /* Fix up all other VM information */
        remove_vma_list(mm, vma);
  
@@ -52836,7 +53959,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        return 0;
  }
  
-@@ -2126,22 +2527,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2128,22 +2531,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
  
        profile_munmap(addr);
  
@@ -52865,7 +53988,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2155,6 +2552,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2157,6 +2556,7 @@ unsigned long do_brk(unsigned long addr,
        struct rb_node ** rb_link, * rb_parent;
        pgoff_t pgoff = addr >> PAGE_SHIFT;
        int error;
@@ -52873,7 +53996,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  
        len = PAGE_ALIGN(len);
        if (!len)
-@@ -2166,16 +2564,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2168,16 +2568,30 @@ unsigned long do_brk(unsigned long addr,
  
        flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -52905,7 +54028,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                locked += mm->locked_vm;
                lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
-@@ -2192,22 +2604,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2194,22 +2608,22 @@ unsigned long do_brk(unsigned long addr,
        /*
         * Clear old maps.  this also does some error checking for us
         */
@@ -52932,7 +54055,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                return -ENOMEM;
  
        /* Can we just expand an old private anonymous mapping? */
-@@ -2221,7 +2633,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2223,7 +2637,7 @@ unsigned long do_brk(unsigned long addr,
         */
        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
        if (!vma) {
@@ -52941,7 +54064,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
                return -ENOMEM;
        }
  
-@@ -2235,11 +2647,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2237,11 +2651,12 @@ unsigned long do_brk(unsigned long addr,
        vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
        perf_event_mmap(vma);
@@ -52956,7 +54079,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        return addr;
  }
  
-@@ -2286,8 +2699,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2288,8 +2703,10 @@ void exit_mmap(struct mm_struct *mm)
         * Walk the list again, actually closing and freeing it,
         * with preemption enabled, without holding any MM locks.
         */
@@ -52968,18 +54091,21 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  
        BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2301,6 +2716,10 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2303,6 +2720,13 @@ int insert_vm_struct(struct mm_struct * 
        struct vm_area_struct * __vma, * prev;
        struct rb_node ** rb_link, * rb_parent;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      struct vm_area_struct *vma_m = NULL;
 +#endif
++
++      if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
++              return -EPERM;
 +
        /*
         * The vm_pgoff of a purely anonymous vma should be irrelevant
         * until its first write fault, when page's anon_vma and index
-@@ -2323,7 +2742,22 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2325,7 +2749,22 @@ int insert_vm_struct(struct mm_struct * 
        if ((vma->vm_flags & VM_ACCOUNT) &&
             security_vm_enough_memory_mm(mm, vma_pages(vma)))
                return -ENOMEM;
@@ -53002,7 +54128,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        return 0;
  }
  
-@@ -2341,6 +2775,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2343,6 +2782,8 @@ struct vm_area_struct *copy_vma(struct v
        struct rb_node **rb_link, *rb_parent;
        struct mempolicy *pol;
  
@@ -53011,7 +54137,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        /*
         * If anonymous vma has not yet been faulted, update new pgoff
         * to match new location, to increase its chance of merging.
-@@ -2390,6 +2826,39 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2392,6 +2833,39 @@ struct vm_area_struct *copy_vma(struct v
        kmem_cache_free(vm_area_cachep, new_vma);
        return NULL;
  }
@@ -53051,7 +54177,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
  
  /*
   * Return true if the calling process may expand its vm space by the passed
-@@ -2401,7 +2870,7 @@ int may_expand_vm(struct mm_struct *mm, 
+@@ -2403,7 +2877,7 @@ int may_expand_vm(struct mm_struct *mm, 
        unsigned long lim;
  
        lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -53060,7 +54186,7 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        if (cur + npages > lim)
                return 0;
        return 1;
-@@ -2471,6 +2940,17 @@ int install_special_mapping(struct mm_st
+@@ -2474,6 +2948,17 @@ int install_special_mapping(struct mm_st
        vma->vm_start = addr;
        vma->vm_end = addr + len;
  
@@ -53078,9 +54204,9 @@ diff -urNp linux-2.6.36/mm/mmap.c linux-2.6.36/mm/mmap.c
        vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
---- linux-2.6.36/mm/mprotect.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/mprotect.c 2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/mm/mprotect.c linux-2.6.37/mm/mprotect.c
+--- linux-2.6.37/mm/mprotect.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/mprotect.c 2011-01-17 02:41:02.000000000 -0500
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -53243,7 +54369,7 @@ diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
  
        if (vma_wants_writenotify(vma)) {
                vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -237,6 +351,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -238,6 +352,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        end = start + len;
        if (end <= start)
                return -ENOMEM;
@@ -53261,7 +54387,7 @@ diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
        if (!arch_validate_prot(prot))
                return -EINVAL;
  
-@@ -244,7 +369,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -245,7 +370,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        /*
         * Does the application expect PROT_READ to imply PROT_EXEC:
         */
@@ -53270,7 +54396,7 @@ diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
                prot |= PROT_EXEC;
  
        vm_flags = calc_vm_prot_bits(prot);
-@@ -276,6 +401,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -277,6 +402,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        if (start > vma->vm_start)
                prev = vma;
  
@@ -53282,7 +54408,7 @@ diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
        for (nstart = start ; ; ) {
                unsigned long newflags;
  
-@@ -285,6 +415,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -286,6 +416,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  
                /* newflags >> 4 shift VM_MAY% in place of VM_% */
                if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
@@ -53298,18 +54424,18 @@ diff -urNp linux-2.6.36/mm/mprotect.c linux-2.6.36/mm/mprotect.c
                        goto out;
                }
 @@ -300,6 +438,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+               error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
                if (error)
                        goto out;
-               perf_event_mmap(vma);
 +
 +              track_exec_limit(current->mm, nstart, tmp, vm_flags);
 +
                nstart = tmp;
  
                if (nstart < prev->vm_end)
-diff -urNp linux-2.6.36/mm/mremap.c linux-2.6.36/mm/mremap.c
---- linux-2.6.36/mm/mremap.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/mremap.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/mremap.c linux-2.6.37/mm/mremap.c
+--- linux-2.6.37/mm/mremap.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/mremap.c   2011-01-17 02:41:02.000000000 -0500
 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
                        continue;
                pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -53414,10 +54540,10 @@ diff -urNp linux-2.6.36/mm/mremap.c linux-2.6.36/mm/mremap.c
        }
  out:
        if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.36/mm/nommu.c linux-2.6.36/mm/nommu.c
---- linux-2.6.36/mm/nommu.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/nommu.c    2010-11-06 18:58:15.000000000 -0400
-@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMI
+diff -urNp linux-2.6.37/mm/nommu.c linux-2.6.37/mm/nommu.c
+--- linux-2.6.37/mm/nommu.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/nommu.c    2011-01-17 02:41:02.000000000 -0500
+@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
  int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
@@ -53425,7 +54551,7 @@ diff -urNp linux-2.6.36/mm/nommu.c linux-2.6.36/mm/nommu.c
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -757,15 +756,6 @@ struct vm_area_struct *find_vma(struct m
+@@ -831,15 +830,6 @@ struct vm_area_struct *find_vma(struct m
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -53441,7 +54567,7 @@ diff -urNp linux-2.6.36/mm/nommu.c linux-2.6.36/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1486,6 +1476,7 @@ int split_vma(struct mm_struct *mm, stru
+@@ -1561,6 +1551,7 @@ int split_vma(struct mm_struct *mm, stru
  
        /* most fields are the same, copy all, and then fixup */
        *new = *vma;
@@ -53449,10 +54575,10 @@ diff -urNp linux-2.6.36/mm/nommu.c linux-2.6.36/mm/nommu.c
        *region = *vma->vm_region;
        new->vm_region = region;
  
-diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
---- linux-2.6.36/mm/page_alloc.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/page_alloc.c       2010-11-06 18:58:15.000000000 -0400
-@@ -642,6 +642,10 @@ static bool free_pages_prepare(struct pa
+diff -urNp linux-2.6.37/mm/page_alloc.c linux-2.6.37/mm/page_alloc.c
+--- linux-2.6.37/mm/page_alloc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/page_alloc.c       2011-01-17 02:41:02.000000000 -0500
+@@ -648,6 +648,10 @@ static bool free_pages_prepare(struct pa
        int i;
        int bad = 0;
  
@@ -53463,7 +54589,7 @@ diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
        trace_mm_page_free_direct(page, order);
        kmemcheck_free_shadow(page, order);
  
-@@ -660,6 +664,12 @@ static bool free_pages_prepare(struct pa
+@@ -666,6 +670,12 @@ static bool free_pages_prepare(struct pa
                debug_check_no_obj_freed(page_address(page),
                                           PAGE_SIZE << order);
        }
@@ -53476,7 +54602,7 @@ diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
        arch_free_page(page, order);
        kernel_map_pages(page, 1 << order, 0);
  
-@@ -774,8 +784,10 @@ static int prep_new_page(struct page *pa
+@@ -780,8 +790,10 @@ static int prep_new_page(struct page *pa
        arch_alloc_page(page, order);
        kernel_map_pages(page, 1 << order, 1);
  
@@ -53487,7 +54613,7 @@ diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
  
        if (order && (gfp_flags & __GFP_COMP))
                prep_compound_page(page, order);
-@@ -3997,7 +4009,7 @@ static void __init setup_usemap(struct p
+@@ -4014,7 +4026,7 @@ static void __init setup_usemap(struct p
                zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
  }
  #else
@@ -53496,10 +54622,10 @@ diff -urNp linux-2.6.36/mm/page_alloc.c linux-2.6.36/mm/page_alloc.c
                                struct zone *zone, unsigned long zonesize) {}
  #endif /* CONFIG_SPARSEMEM */
  
-diff -urNp linux-2.6.36/mm/percpu.c linux-2.6.36/mm/percpu.c
---- linux-2.6.36/mm/percpu.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/percpu.c   2010-11-06 18:58:15.000000000 -0400
-@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 
+diff -urNp linux-2.6.37/mm/percpu.c linux-2.6.37/mm/percpu.c
+--- linux-2.6.37/mm/percpu.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/percpu.c   2011-01-17 02:41:02.000000000 -0500
+@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
  /* the address of the first chunk which starts with the kernel static area */
@@ -53508,9 +54634,9 @@ diff -urNp linux-2.6.36/mm/percpu.c linux-2.6.36/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;                /* cpu -> unit */
-diff -urNp linux-2.6.36/mm/rmap.c linux-2.6.36/mm/rmap.c
---- linux-2.6.36/mm/rmap.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/rmap.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/rmap.c linux-2.6.37/mm/rmap.c
+--- linux-2.6.37/mm/rmap.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/rmap.c     2011-01-17 02:41:02.000000000 -0500
 @@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
        struct anon_vma *anon_vma = vma->anon_vma;
        struct anon_vma_chain *avc;
@@ -53600,9 +54726,9 @@ diff -urNp linux-2.6.36/mm/rmap.c linux-2.6.36/mm/rmap.c
  {
        struct anon_vma_chain *avc;
        struct anon_vma *anon_vma;
-diff -urNp linux-2.6.36/mm/shmem.c linux-2.6.36/mm/shmem.c
---- linux-2.6.36/mm/shmem.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/shmem.c    2010-11-06 19:42:24.000000000 -0400
+diff -urNp linux-2.6.37/mm/shmem.c linux-2.6.37/mm/shmem.c
+--- linux-2.6.37/mm/shmem.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/shmem.c    2011-01-17 02:41:02.000000000 -0500
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -53612,9 +54738,9 @@ diff -urNp linux-2.6.36/mm/shmem.c linux-2.6.36/mm/shmem.c
  
  #ifdef CONFIG_SHMEM
  /*
-diff -urNp linux-2.6.36/mm/slab.c linux-2.6.36/mm/slab.c
---- linux-2.6.36/mm/slab.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/slab.c     2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/mm/slab.c linux-2.6.37/mm/slab.c
+--- linux-2.6.37/mm/slab.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/slab.c     2011-01-17 02:41:02.000000000 -0500
 @@ -284,7 +284,7 @@ struct kmem_list3 {
   * Need this for bootstrapping a per node allocator.
   */
@@ -53720,9 +54846,9 @@ diff -urNp linux-2.6.36/mm/slab.c linux-2.6.36/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
---- linux-2.6.36/mm/slob.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/slob.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/slob.c linux-2.6.37/mm/slob.c
+--- linux-2.6.37/mm/slob.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/slob.c     2011-01-17 02:41:02.000000000 -0500
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -53841,9 +54967,9 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
                ret = (void *)m + align;
  
                trace_kmalloc_node(_RET_IP_, ret,
-@@ -502,9 +507,9 @@ void *__kmalloc_node(size_t size, gfp_t 
- 
-               ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
+@@ -504,9 +509,9 @@ void *__kmalloc_node(size_t size, gfp_t 
+                       gfp |= __GFP_COMP;
+               ret = slob_new_pages(gfp, order, node);
                if (ret) {
 -                      struct page *page;
 -                      page = virt_to_page(ret);
@@ -53854,7 +54980,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
                }
  
                trace_kmalloc_node(_RET_IP_, ret,
-@@ -514,6 +519,13 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -516,6 +521,13 @@ void *__kmalloc_node(size_t size, gfp_t 
        kmemleak_alloc(ret, size, 1, gfp);
        return ret;
  }
@@ -53868,7 +54994,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
  EXPORT_SYMBOL(__kmalloc_node);
  
  void kfree(const void *block)
-@@ -529,13 +541,84 @@ void kfree(const void *block)
+@@ -531,13 +543,84 @@ void kfree(const void *block)
        sp = slob_page(block);
        if (is_slob_page(sp)) {
                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -53956,7 +55082,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
  /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
  size_t ksize(const void *block)
  {
-@@ -548,10 +631,10 @@ size_t ksize(const void *block)
+@@ -550,10 +633,10 @@ size_t ksize(const void *block)
        sp = slob_page(block);
        if (is_slob_page(sp)) {
                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -53970,7 +55096,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
  }
  EXPORT_SYMBOL(ksize);
  
-@@ -606,17 +689,25 @@ void *kmem_cache_alloc_node(struct kmem_
+@@ -608,17 +691,25 @@ void *kmem_cache_alloc_node(struct kmem_
  {
        void *b;
  
@@ -53996,7 +55122,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
  
        if (c->ctor)
                c->ctor(b);
-@@ -628,10 +719,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -630,10 +721,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -54015,7 +55141,7 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -644,14 +741,23 @@ static void kmem_rcu_free(struct rcu_hea
+@@ -646,14 +743,23 @@ static void kmem_rcu_free(struct rcu_hea
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -54042,10 +55168,19 @@ diff -urNp linux-2.6.36/mm/slob.c linux-2.6.36/mm/slob.c
        }
  
        trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
---- linux-2.6.36/mm/slub.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/slub.c     2010-11-06 18:58:50.000000000 -0400
-@@ -1873,6 +1873,8 @@ void kmem_cache_free(struct kmem_cache *
+diff -urNp linux-2.6.37/mm/slub.c linux-2.6.37/mm/slub.c
+--- linux-2.6.37/mm/slub.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/slub.c     2011-01-17 02:41:02.000000000 -0500
+@@ -388,7 +388,7 @@ static void print_track(const char *s, s
+       if (!t->addr)
+               return;
+ 
+-      printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
++      printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
+               s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
+ }
+ 
+@@ -1911,6 +1911,8 @@ void kmem_cache_free(struct kmem_cache *
  
        page = virt_to_head_page(x);
  
@@ -54054,7 +55189,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
        slab_free(s, page, x, _RET_IP_);
  
        trace_kmem_cache_free(_RET_IP_, x);
-@@ -1917,7 +1919,7 @@ static int slub_min_objects;
+@@ -1955,7 +1957,7 @@ static int slub_min_objects;
   * Merge control. If this is set then no merging of slab caches will occur.
   * (Could be removed. This was introduced to pacify the merge skeptics.)
   */
@@ -54063,7 +55198,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2344,7 +2346,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2365,7 +2367,7 @@ static int kmem_cache_open(struct kmem_c
         * list to avoid pounding the page allocator excessively.
         */
        set_min_partial(s, ilog2(s->size));
@@ -54072,7 +55207,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
  #ifdef CONFIG_NUMA
        s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2487,8 +2489,7 @@ static inline int kmem_cache_close(struc
+@@ -2506,8 +2508,7 @@ static inline int kmem_cache_close(struc
  void kmem_cache_destroy(struct kmem_cache *s)
  {
        down_write(&slub_lock);
@@ -54082,7 +55217,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
                list_del(&s->list);
                if (kmem_cache_close(s)) {
                        printk(KERN_ERR "SLUB %s: %s called for cache that "
-@@ -2779,6 +2780,46 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -2717,6 +2718,46 @@ void *__kmalloc_node(size_t size, gfp_t 
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -54129,16 +55264,16 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
  size_t ksize(const void *object)
  {
        struct page *page;
-@@ -3048,7 +3089,7 @@ void __init kmem_cache_init(void)
-        */
-       create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
-               sizeof(struct kmem_cache_node), GFP_NOWAIT);
--      kmalloc_caches[0].refcount = -1;
-+      atomic_set(&kmalloc_caches[0].refcount, -1);
-       caches++;
- 
-       hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
-@@ -3160,7 +3201,7 @@ static int slab_unmergeable(struct kmem_
+@@ -2982,7 +3023,7 @@ static void __init kmem_cache_bootstrap_
+       int node;
+ 
+       list_add(&s->list, &slab_caches);
+-      s->refcount = -1;
++      atomic_set(&s->refcount, -1);
+ 
+       for_each_node_state(node, N_NORMAL_MEMORY) {
+               struct kmem_cache_node *n = get_node(s, node);
+@@ -3177,7 +3218,7 @@ static int slab_unmergeable(struct kmem_
        /*
         * We may have set a slab to be unmergeable during bootstrap.
         */
@@ -54147,7 +55282,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
                return 1;
  
        return 0;
-@@ -3218,7 +3259,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3236,7 +3277,7 @@ struct kmem_cache *kmem_cache_create(con
        down_write(&slub_lock);
        s = find_mergeable(size, align, flags, name, ctor);
        if (s) {
@@ -54156,7 +55291,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
                /*
                 * Adjust the object sizes so that we clear
                 * the complete object on kzalloc.
-@@ -3227,7 +3268,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3245,7 +3286,7 @@ struct kmem_cache *kmem_cache_create(con
                s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
  
                if (sysfs_slab_alias(s, name)) {
@@ -54165,7 +55300,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
                        goto err;
                }
                up_write(&slub_lock);
-@@ -3941,7 +3982,7 @@ SLAB_ATTR_RO(ctor);
+@@ -3981,7 +4022,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -54174,7 +55309,7 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4673,7 +4714,13 @@ static const struct file_operations proc
+@@ -4718,7 +4759,13 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -54189,9 +55324,9 @@ diff -urNp linux-2.6.36/mm/slub.c linux-2.6.36/mm/slub.c
        return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-2.6.36/mm/util.c linux-2.6.36/mm/util.c
---- linux-2.6.36/mm/util.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/util.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/mm/util.c linux-2.6.37/mm/util.c
+--- linux-2.6.37/mm/util.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/util.c     2011-01-17 02:41:02.000000000 -0500
 @@ -240,6 +240,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
@@ -54205,10 +55340,10 @@ diff -urNp linux-2.6.36/mm/util.c linux-2.6.36/mm/util.c
        mm->get_unmapped_area = arch_get_unmapped_area;
        mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
---- linux-2.6.36/mm/vmalloc.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/vmalloc.c  2010-11-06 18:58:15.000000000 -0400
-@@ -41,8 +41,19 @@ static void vunmap_pte_range(pmd_t *pmd,
+diff -urNp linux-2.6.37/mm/vmalloc.c linux-2.6.37/mm/vmalloc.c
+--- linux-2.6.37/mm/vmalloc.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/vmalloc.c  2011-01-17 02:41:02.000000000 -0500
+@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
        pte = pte_offset_kernel(pmd, addr);
        do {
@@ -54230,7 +55365,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        } while (pte++, addr += PAGE_SIZE, addr != end);
  }
  
-@@ -93,6 +104,7 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, un
                unsigned long end, pgprot_t prot, struct page **pages, int *nr)
  {
        pte_t *pte;
@@ -54238,7 +55373,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  
        /*
         * nr is a running index into the array which helps higher level
-@@ -102,17 +114,30 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, un
        pte = pte_alloc_kernel(pmd, addr);
        if (!pte)
                return -ENOMEM;
@@ -54274,7 +55409,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  }
  
  static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -193,11 +218,20 @@ int is_vmalloc_or_module_addr(const void
+@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void
         * and fall back on vmalloc() if that fails. Others
         * just put it in the vmalloc space.
         */
@@ -54296,7 +55431,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        return is_vmalloc_addr(x);
  }
  
-@@ -218,8 +252,14 @@ struct page *vmalloc_to_page(const void 
+@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void 
  
        if (!pgd_none(*pgd)) {
                pud_t *pud = pud_offset(pgd, addr);
@@ -54311,25 +55446,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
                        if (!pmd_none(*pmd)) {
                                pte_t *ptep, pte;
  
-@@ -293,13 +333,13 @@ static void __insert_vmap_area(struct vm
-       struct rb_node *tmp;
- 
-       while (*p) {
--              struct vmap_area *tmp;
-+              struct vmap_area *varea;
- 
-               parent = *p;
--              tmp = rb_entry(parent, struct vmap_area, rb_node);
--              if (va->va_start < tmp->va_end)
-+              varea = rb_entry(parent, struct vmap_area, rb_node);
-+              if (va->va_start < varea->va_end)
-                       p = &(*p)->rb_left;
--              else if (va->va_end > tmp->va_start)
-+              else if (va->va_end > varea->va_start)
-                       p = &(*p)->rb_right;
-               else
-                       BUG();
-@@ -1228,6 +1268,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1243,6 +1283,16 @@ static struct vm_struct *__get_vm_area_n
        struct vm_struct *area;
  
        BUG_ON(in_interrupt());
@@ -54346,7 +55463,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        if (flags & VM_IOREMAP) {
                int bit = fls(size);
  
-@@ -1453,6 +1503,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1468,6 +1518,11 @@ void *vmap(struct page **pages, unsigned
        if (count > totalram_pages)
                return NULL;
  
@@ -54358,7 +55475,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
                                        __builtin_return_address(0));
        if (!area)
-@@ -1562,6 +1617,13 @@ static void *__vmalloc_node(unsigned lon
+@@ -1577,6 +1632,13 @@ static void *__vmalloc_node(unsigned lon
        if (!size || (size >> PAGE_SHIFT) > totalram_pages)
                return NULL;
  
@@ -54372,7 +55489,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
                                  VMALLOC_END, node, gfp_mask, caller);
  
-@@ -1580,6 +1642,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1595,6 +1657,7 @@ static void *__vmalloc_node(unsigned lon
        return addr;
  }
  
@@ -54380,15 +55497,23 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
        return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1596,6 +1659,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1618,6 +1681,7 @@ static inline void *__vmalloc_node_flags
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
 +#undef vmalloc
  void *vmalloc(unsigned long size)
  {
-       return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1610,6 +1674,7 @@ EXPORT_SYMBOL(vmalloc);
+       return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
+@@ -1634,6 +1698,7 @@ EXPORT_SYMBOL(vmalloc);
+  *    For tight control over page level allocator and protection flags
+  *    use __vmalloc() instead.
+  */
++#undef vzalloc
+ void *vzalloc(unsigned long size)
+ {
+       return __vmalloc_node_flags(size, -1,
+@@ -1648,6 +1713,7 @@ EXPORT_SYMBOL(vzalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -54396,7 +55521,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
        struct vm_struct *area;
-@@ -1637,6 +1702,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1675,6 +1741,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -54404,7 +55529,15 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
        return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1659,10 +1725,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1694,6 +1761,7 @@ EXPORT_SYMBOL(vmalloc_node);
+  * For tight control over page level allocator and protection flags
+  * use __vmalloc_node() instead.
+  */
++#undef vzalloc_node
+ void *vzalloc_node(unsigned long size, int node)
+ {
+       return __vmalloc_node_flags(size, node,
+@@ -1716,10 +1784,10 @@ EXPORT_SYMBOL(vzalloc_node);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -54417,7 +55550,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
                              -1, __builtin_return_address(0));
  }
  
-@@ -1681,6 +1747,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1738,6 +1806,7 @@ void *vmalloc_exec(unsigned long size)
   *    Allocate enough 32bit PA addressable pages to cover @size from the
   *    page level allocator and map them into contiguous kernel virtual space.
   */
@@ -54425,7 +55558,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
        return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1695,6 +1762,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1752,6 +1821,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -54433,7 +55566,7 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
        struct vm_struct *area;
-@@ -1959,6 +2027,8 @@ int remap_vmalloc_range(struct vm_area_s
+@@ -2016,6 +2086,8 @@ int remap_vmalloc_range(struct vm_area_s
        unsigned long uaddr = vma->vm_start;
        unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -54442,10 +55575,10 @@ diff -urNp linux-2.6.36/mm/vmalloc.c linux-2.6.36/mm/vmalloc.c
        if ((PAGE_SIZE-1) & (unsigned long)addr)
                return -EINVAL;
  
-diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
---- linux-2.6.36/mm/vmstat.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/mm/vmstat.c   2010-11-06 18:58:50.000000000 -0400
-@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
+diff -urNp linux-2.6.37/mm/vmstat.c linux-2.6.37/mm/vmstat.c
+--- linux-2.6.37/mm/vmstat.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/mm/vmstat.c   2011-01-17 02:41:02.000000000 -0500
+@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
   */
@@ -54454,7 +55587,7 @@ diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
  EXPORT_SYMBOL(vm_stat);
  
  #ifdef CONFIG_SMP
-@@ -328,7 +328,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -330,7 +330,7 @@ void refresh_cpu_vm_stats(int cpu)
                                v = p->vm_stat_diff[i];
                                p->vm_stat_diff[i] = 0;
                                local_irq_restore(flags);
@@ -54463,7 +55596,7 @@ diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
                                global_diff[i] += v;
  #ifdef CONFIG_NUMA
                                /* 3 seconds idle till flush */
-@@ -366,7 +366,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -368,7 +368,7 @@ void refresh_cpu_vm_stats(int cpu)
  
        for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
                if (global_diff[i])
@@ -54472,7 +55605,7 @@ diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
  }
  
  #endif
-@@ -1050,10 +1050,16 @@ static int __init setup_vmstat(void)
+@@ -1066,10 +1066,20 @@ static int __init setup_vmstat(void)
                start_cpu_timer(cpu);
  #endif
  #ifdef CONFIG_PROC_FS
@@ -54487,16 +55620,20 @@ diff -urNp linux-2.6.36/mm/vmstat.c linux-2.6.36/mm/vmstat.c
 +#endif
 +              proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
 +              proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++              proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
++#else
 +              proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
++#endif
 +              proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
 +      }
  #endif
        return 0;
  }
-diff -urNp linux-2.6.36/net/8021q/vlan.c linux-2.6.36/net/8021q/vlan.c
---- linux-2.6.36/net/8021q/vlan.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/8021q/vlan.c      2010-11-06 18:58:15.000000000 -0400
-@@ -627,8 +627,7 @@ static int vlan_ioctl_handler(struct net
+diff -urNp linux-2.6.37/net/8021q/vlan.c linux-2.6.37/net/8021q/vlan.c
+--- linux-2.6.37/net/8021q/vlan.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/8021q/vlan.c      2011-01-17 02:41:02.000000000 -0500
+@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
                err = -EPERM;
                if (!capable(CAP_NET_ADMIN))
                        break;
@@ -54506,9 +55643,9 @@ diff -urNp linux-2.6.36/net/8021q/vlan.c linux-2.6.36/net/8021q/vlan.c
                        struct vlan_net *vn;
  
                        vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.36/net/atm/atm_misc.c linux-2.6.36/net/atm/atm_misc.c
---- linux-2.6.36/net/atm/atm_misc.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/atm/atm_misc.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/atm/atm_misc.c linux-2.6.37/net/atm/atm_misc.c
+--- linux-2.6.37/net/atm/atm_misc.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/atm/atm_misc.c    2011-01-17 02:41:02.000000000 -0500
 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
        if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
                return 1;
@@ -54545,10 +55682,10 @@ diff -urNp linux-2.6.36/net/atm/atm_misc.c linux-2.6.36/net/atm/atm_misc.c
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.36/net/atm/proc.c linux-2.6.36/net/atm/proc.c
---- linux-2.6.36/net/atm/proc.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/atm/proc.c        2010-11-06 18:58:50.000000000 -0400
-@@ -44,9 +44,9 @@ static void add_stats(struct seq_file *s
+diff -urNp linux-2.6.37/net/atm/proc.c linux-2.6.37/net/atm/proc.c
+--- linux-2.6.37/net/atm/proc.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/atm/proc.c        2011-01-17 02:41:02.000000000 -0500
+@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
        seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
@@ -54561,7 +55698,7 @@ diff -urNp linux-2.6.36/net/atm/proc.c linux-2.6.36/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-@@ -190,7 +190,12 @@ static void vcc_info(struct seq_file *se
+@@ -191,7 +191,12 @@ static void vcc_info(struct seq_file *se
  {
        struct sock *sk = sk_atm(vcc);
  
@@ -54574,10 +55711,10 @@ diff -urNp linux-2.6.36/net/atm/proc.c linux-2.6.36/net/atm/proc.c
        if (!vcc->dev)
                seq_printf(seq, "Unassigned    ");
        else
-diff -urNp linux-2.6.36/net/atm/resources.c linux-2.6.36/net/atm/resources.c
---- linux-2.6.36/net/atm/resources.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/atm/resources.c   2010-11-06 18:58:15.000000000 -0400
-@@ -159,7 +159,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
+diff -urNp linux-2.6.37/net/atm/resources.c linux-2.6.37/net/atm/resources.c
+--- linux-2.6.37/net/atm/resources.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/atm/resources.c   2011-01-17 02:41:02.000000000 -0500
+@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -54586,7 +55723,7 @@ diff -urNp linux-2.6.36/net/atm/resources.c linux-2.6.36/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -167,7 +167,7 @@ static void copy_aal_stats(struct k_atm_
+@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_
  static void subtract_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -54595,28 +55732,21 @@ diff -urNp linux-2.6.36/net/atm/resources.c linux-2.6.36/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.36/net/ax25/af_ax25.c linux-2.6.36/net/ax25/af_ax25.c
---- linux-2.6.36/net/ax25/af_ax25.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ax25/af_ax25.c    2010-11-06 18:58:50.000000000 -0400
-@@ -1392,6 +1392,7 @@ static int ax25_getname(struct socket *s
+diff -urNp linux-2.6.37/net/ax25/af_ax25.c linux-2.6.37/net/ax25/af_ax25.c
+--- linux-2.6.37/net/ax25/af_ax25.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ax25/af_ax25.c    2011-01-17 02:41:02.000000000 -0500
+@@ -1392,7 +1392,7 @@ static int ax25_getname(struct socket *s
        ax25_cb *ax25;
        int err = 0;
  
+-      memset(fsa, 0, sizeof(fsa));
 +      memset(fsa, 0, sizeof(*fsa));
        lock_sock(sk);
        ax25 = ax25_sk(sk);
  
-@@ -1403,7 +1404,6 @@ static int ax25_getname(struct socket *s
- 
-               fsa->fsa_ax25.sax25_family = AF_AX25;
-               fsa->fsa_ax25.sax25_call   = ax25->dest_addr;
--              fsa->fsa_ax25.sax25_ndigis = 0;
- 
-               if (ax25->digipeat != NULL) {
-                       ndigi = ax25->digipeat->ndigi;
-diff -urNp linux-2.6.36/net/bridge/br_multicast.c linux-2.6.36/net/bridge/br_multicast.c
---- linux-2.6.36/net/bridge/br_multicast.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/bridge/br_multicast.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/bridge/br_multicast.c linux-2.6.37/net/bridge/br_multicast.c
+--- linux-2.6.37/net/bridge/br_multicast.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/bridge/br_multicast.c     2011-01-17 02:41:02.000000000 -0500
 @@ -1461,7 +1461,7 @@ static int br_multicast_ipv6_rcv(struct 
        nexthdr = ip6h->nexthdr;
        offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -54626,9 +55756,9 @@ diff -urNp linux-2.6.36/net/bridge/br_multicast.c linux-2.6.36/net/bridge/br_mul
                return 0;
  
        /* Okay, we found ICMPv6 header */
-diff -urNp linux-2.6.36/net/bridge/br_stp_if.c linux-2.6.36/net/bridge/br_stp_if.c
---- linux-2.6.36/net/bridge/br_stp_if.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/bridge/br_stp_if.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/bridge/br_stp_if.c linux-2.6.37/net/bridge/br_stp_if.c
+--- linux-2.6.37/net/bridge/br_stp_if.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/bridge/br_stp_if.c        2011-01-17 02:41:02.000000000 -0500
 @@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridg
        char *envp[] = { NULL };
  
@@ -54638,10 +55768,10 @@ diff -urNp linux-2.6.36/net/bridge/br_stp_if.c linux-2.6.36/net/bridge/br_stp_if
                br_info(br, "userspace STP stopped, return code %d\n", r);
  
                /* To start timers on any ports left in blocking */
-diff -urNp linux-2.6.36/net/bridge/netfilter/ebtables.c linux-2.6.36/net/bridge/netfilter/ebtables.c
---- linux-2.6.36/net/bridge/netfilter/ebtables.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/bridge/netfilter/ebtables.c       2010-11-06 18:58:15.000000000 -0400
-@@ -1504,7 +1504,7 @@ static int do_ebt_get_ctl(struct sock *s
+diff -urNp linux-2.6.37/net/bridge/netfilter/ebtables.c linux-2.6.37/net/bridge/netfilter/ebtables.c
+--- linux-2.6.37/net/bridge/netfilter/ebtables.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/bridge/netfilter/ebtables.c       2011-01-17 02:41:02.000000000 -0500
+@@ -1511,7 +1511,7 @@ static int do_ebt_get_ctl(struct sock *s
                        tmp.valid_hooks = t->table->valid_hooks;
                }
                mutex_unlock(&ebt_mutex);
@@ -54650,10 +55780,10 @@ diff -urNp linux-2.6.36/net/bridge/netfilter/ebtables.c linux-2.6.36/net/bridge/
                        BUGPRINT("c2u Didn't work\n");
                        ret = -EFAULT;
                        break;
-diff -urNp linux-2.6.36/net/core/dev.c linux-2.6.36/net/core/dev.c
---- linux-2.6.36/net/core/dev.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/core/dev.c        2010-11-06 18:58:15.000000000 -0400
-@@ -2554,7 +2554,7 @@ int netif_rx_ni(struct sk_buff *skb)
+diff -urNp linux-2.6.37/net/core/dev.c linux-2.6.37/net/core/dev.c
+--- linux-2.6.37/net/core/dev.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/core/dev.c        2011-01-17 02:41:02.000000000 -0500
+@@ -2654,7 +2654,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -54662,7 +55792,7 @@ diff -urNp linux-2.6.36/net/core/dev.c linux-2.6.36/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3482,7 +3482,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3570,7 +3570,7 @@ void netif_napi_del(struct napi_struct *
  }
  EXPORT_SYMBOL(netif_napi_del);
  
@@ -54671,21 +55801,9 @@ diff -urNp linux-2.6.36/net/core/dev.c linux-2.6.36/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
        unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.36/net/core/net-sysfs.c linux-2.6.36/net/core/net-sysfs.c
---- linux-2.6.36/net/core/net-sysfs.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/core/net-sysfs.c  2010-11-06 18:58:15.000000000 -0400
-@@ -515,7 +515,7 @@ static ssize_t rx_queue_attr_store(struc
-       return attribute->store(queue, attribute, buf, count);
- }
- 
--static struct sysfs_ops rx_queue_sysfs_ops = {
-+static const struct sysfs_ops rx_queue_sysfs_ops = {
-       .show = rx_queue_attr_show,
-       .store = rx_queue_attr_store,
- };
-diff -urNp linux-2.6.36/net/core/sock.c linux-2.6.36/net/core/sock.c
---- linux-2.6.36/net/core/sock.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/core/sock.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/core/sock.c linux-2.6.37/net/core/sock.c
+--- linux-2.6.37/net/core/sock.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/core/sock.c       2011-01-17 02:41:02.000000000 -0500
 @@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
                        return -ENOTCONN;
                if (lv < len)
@@ -54704,9 +55822,9 @@ diff -urNp linux-2.6.36/net/core/sock.c linux-2.6.36/net/core/sock.c
                return -EFAULT;
  lenout:
        if (put_user(len, optlen))
-diff -urNp linux-2.6.36/net/dccp/ccids/ccid3.c linux-2.6.36/net/dccp/ccids/ccid3.c
---- linux-2.6.36/net/dccp/ccids/ccid3.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/dccp/ccids/ccid3.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/dccp/ccids/ccid3.c linux-2.6.37/net/dccp/ccids/ccid3.c
+--- linux-2.6.37/net/dccp/ccids/ccid3.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/dccp/ccids/ccid3.c        2011-01-17 02:41:02.000000000 -0500
 @@ -41,7 +41,7 @@
  static int ccid3_debug;
  #define ccid3_pr_debug(format, a...)  DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -54716,9 +55834,9 @@ diff -urNp linux-2.6.36/net/dccp/ccids/ccid3.c linux-2.6.36/net/dccp/ccids/ccid3
  #endif
  
  /*
-diff -urNp linux-2.6.36/net/dccp/dccp.h linux-2.6.36/net/dccp/dccp.h
---- linux-2.6.36/net/dccp/dccp.h       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/dccp/dccp.h       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/dccp/dccp.h linux-2.6.37/net/dccp/dccp.h
+--- linux-2.6.37/net/dccp/dccp.h       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/dccp/dccp.h       2011-01-17 02:41:02.000000000 -0500
 @@ -44,9 +44,9 @@ extern int dccp_debug;
  #define dccp_pr_debug_cat(format, a...)   DCCP_PRINTK(dccp_debug, format, ##a)
  #define dccp_debug(fmt, a...)           dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -54732,15 +55850,15 @@ diff -urNp linux-2.6.36/net/dccp/dccp.h linux-2.6.36/net/dccp/dccp.h
  #endif
  
  extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.36/net/decnet/sysctl_net_decnet.c linux-2.6.36/net/decnet/sysctl_net_decnet.c
---- linux-2.6.36/net/decnet/sysctl_net_decnet.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/decnet/sysctl_net_decnet.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/decnet/sysctl_net_decnet.c linux-2.6.37/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.37/net/decnet/sysctl_net_decnet.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/decnet/sysctl_net_decnet.c        2011-01-17 02:41:02.000000000 -0500
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
        if (len > *lenp) len = *lenp;
  
 -      if (copy_to_user(buffer, addr, len))
-+      if (len > sizeof(addr) || copy_to_user(buffer, addr, len))
++      if (len > sizeof addr || copy_to_user(buffer, addr, len))
                return -EFAULT;
  
        *lenp = len;
@@ -54749,13 +55867,89 @@ diff -urNp linux-2.6.36/net/decnet/sysctl_net_decnet.c linux-2.6.36/net/decnet/s
        if (len > *lenp) len = *lenp;
  
 -      if (copy_to_user(buffer, devname, len))
-+      if (len > sizeof(devname) || copy_to_user(buffer, devname, len))
++      if (len > sizeof devname || copy_to_user(buffer, devname, len))
                return -EFAULT;
  
        *lenp = len;
-diff -urNp linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36/net/ipv4/inet_hashtables.c
---- linux-2.6.36/net/ipv4/inet_hashtables.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/inet_hashtables.c    2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/econet/Kconfig linux-2.6.37/net/econet/Kconfig
+--- linux-2.6.37/net/econet/Kconfig    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/econet/Kconfig    2011-01-17 02:41:02.000000000 -0500
+@@ -4,7 +4,7 @@
+ 
+ config ECONET
+       tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
+-      depends on EXPERIMENTAL && INET
++      depends on EXPERIMENTAL && INET && BROKEN
+       ---help---
+         Econet is a fairly old and slow networking protocol mainly used by
+         Acorn computers to access file and print servers. It uses native
+diff -urNp linux-2.6.37/net/ipv4/inet_diag.c linux-2.6.37/net/ipv4/inet_diag.c
+--- linux-2.6.37/net/ipv4/inet_diag.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/inet_diag.c  2011-01-17 02:41:02.000000000 -0500
+@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
+       r->idiag_retrans = 0;
+ 
+       r->id.idiag_if = sk->sk_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++      r->id.idiag_cookie[0] = 0;
++      r->id.idiag_cookie[1] = 0;
++#else
+       r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
+       r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
++#endif
+ 
+       r->id.idiag_sport = inet->inet_sport;
+       r->id.idiag_dport = inet->inet_dport;
+@@ -201,8 +207,15 @@ static int inet_twsk_diag_fill(struct in
+       r->idiag_family       = tw->tw_family;
+       r->idiag_retrans      = 0;
+       r->id.idiag_if        = tw->tw_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++      r->id.idiag_cookie[0] = 0;
++      r->id.idiag_cookie[1] = 0;
++#else
+       r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
+       r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
++#endif
++
+       r->id.idiag_sport     = tw->tw_sport;
+       r->id.idiag_dport     = tw->tw_dport;
+       r->id.idiag_src[0]    = tw->tw_rcv_saddr;
+@@ -285,12 +298,14 @@ static int inet_diag_get_exact(struct sk
+       if (sk == NULL)
+               goto unlock;
+ 
++#ifndef CONFIG_GRKERNSEC_HIDESYM
+       err = -ESTALE;
+       if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
+            req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
+           ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
+            (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
+               goto out;
++#endif
+ 
+       err = -ENOMEM;
+       rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
+@@ -582,8 +597,14 @@ static int inet_diag_fill_req(struct sk_
+       r->idiag_retrans = req->retrans;
+ 
+       r->id.idiag_if = sk->sk_bound_dev_if;
++
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++      r->id.idiag_cookie[0] = 0;
++      r->id.idiag_cookie[1] = 0;
++#else
+       r->id.idiag_cookie[0] = (u32)(unsigned long)req;
+       r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
++#endif
+ 
+       tmo = req->expires - jiffies;
+       if (tmo < 0)
+diff -urNp linux-2.6.37/net/ipv4/inet_hashtables.c linux-2.6.37/net/ipv4/inet_hashtables.c
+--- linux-2.6.37/net/ipv4/inet_hashtables.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/inet_hashtables.c    2011-01-17 02:41:02.000000000 -0500
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -54771,7 +55965,7 @@ diff -urNp linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36/net/ipv4/inet_ha
  /*
   * Allocate and initialize a new local port bind bucket.
   * The bindhash mutex for snum's hash chain must be held here.
-@@ -506,6 +509,8 @@ ok:
+@@ -529,6 +532,8 @@ ok:
                        twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
                spin_unlock(&head->lock);
  
@@ -54780,10 +55974,10 @@ diff -urNp linux-2.6.36/net/ipv4/inet_hashtables.c linux-2.6.36/net/ipv4/inet_ha
                if (tw) {
                        inet_twsk_deschedule(tw, death_row);
                        while (twrefcnt) {
-diff -urNp linux-2.6.36/net/ipv4/inetpeer.c linux-2.6.36/net/ipv4/inetpeer.c
---- linux-2.6.36/net/ipv4/inetpeer.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/inetpeer.c   2010-11-06 18:58:15.000000000 -0400
-@@ -447,8 +447,8 @@ struct inet_peer *inet_getpeer(__be32 da
+diff -urNp linux-2.6.37/net/ipv4/inetpeer.c linux-2.6.37/net/ipv4/inetpeer.c
+--- linux-2.6.37/net/ipv4/inetpeer.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/inetpeer.c   2011-01-17 02:41:02.000000000 -0500
+@@ -469,8 +469,8 @@ struct inet_peer *inet_getpeer(__be32 da
        if (p) {
                p->v4daddr = daddr;
                atomic_set(&p->refcnt, 1);
@@ -54794,9 +55988,9 @@ diff -urNp linux-2.6.36/net/ipv4/inetpeer.c linux-2.6.36/net/ipv4/inetpeer.c
                p->tcp_ts_stamp = 0;
                INIT_LIST_HEAD(&p->unused);
  
-diff -urNp linux-2.6.36/net/ipv4/ip_fragment.c linux-2.6.36/net/ipv4/ip_fragment.c
---- linux-2.6.36/net/ipv4/ip_fragment.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/ip_fragment.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/ip_fragment.c linux-2.6.37/net/ipv4/ip_fragment.c
+--- linux-2.6.37/net/ipv4/ip_fragment.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/ip_fragment.c        2011-01-17 02:41:02.000000000 -0500
 @@ -279,7 +279,7 @@ static inline int ip_frag_too_far(struct
                return 0;
  
@@ -54806,31 +56000,9 @@ diff -urNp linux-2.6.36/net/ipv4/ip_fragment.c linux-2.6.36/net/ipv4/ip_fragment
        qp->rid = end;
  
        rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.36/net/ipv4/netfilter/arp_tables.c linux-2.6.36/net/ipv4/netfilter/arp_tables.c
---- linux-2.6.36/net/ipv4/netfilter/arp_tables.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/netfilter/arp_tables.c       2010-11-06 18:58:50.000000000 -0400
-@@ -927,6 +927,7 @@ static int get_info(struct net *net, voi
-                       private = &tmp;
-               }
- #endif
-+              memset(&info, 0, sizeof(info));
-               info.valid_hooks = t->valid_hooks;
-               memcpy(info.hook_entry, private->hook_entry,
-                      sizeof(info.hook_entry));
-diff -urNp linux-2.6.36/net/ipv4/netfilter/ip_tables.c linux-2.6.36/net/ipv4/netfilter/ip_tables.c
---- linux-2.6.36/net/ipv4/netfilter/ip_tables.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/netfilter/ip_tables.c        2010-11-06 18:58:50.000000000 -0400
-@@ -1124,6 +1124,7 @@ static int get_info(struct net *net, voi
-                       private = &tmp;
-               }
- #endif
-+              memset(&info, 0, sizeof(info));
-               info.valid_hooks = t->valid_hooks;
-               memcpy(info.hook_entry, private->hook_entry,
-                      sizeof(info.hook_entry));
-diff -urNp linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/netfilter/nf_nat_snmp_basic.c        2011-01-17 02:41:02.000000000 -0500
 @@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
  
        *len = 0;
@@ -54840,10 +56012,10 @@ diff -urNp linux-2.6.36/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.36/net/
        if (*octets == NULL) {
                if (net_ratelimit())
                        pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.36/net/ipv4/route.c linux-2.6.36/net/ipv4/route.c
---- linux-2.6.36/net/ipv4/route.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/route.c      2010-11-06 18:58:15.000000000 -0400
-@@ -2890,7 +2890,7 @@ static int rt_fill_info(struct net *net,
+diff -urNp linux-2.6.37/net/ipv4/route.c linux-2.6.37/net/ipv4/route.c
+--- linux-2.6.37/net/ipv4/route.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/route.c      2011-01-17 02:41:02.000000000 -0500
+@@ -2876,7 +2876,7 @@ static int rt_fill_info(struct net *net,
        expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
        if (rt->peer) {
                inet_peer_refcheck(rt->peer);
@@ -54852,9 +56024,9 @@ diff -urNp linux-2.6.36/net/ipv4/route.c linux-2.6.36/net/ipv4/route.c
                if (rt->peer->tcp_ts_stamp) {
                        ts = rt->peer->tcp_ts;
                        tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
---- linux-2.6.36/net/ipv4/tcp_ipv4.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/tcp_ipv4.c   2010-11-06 19:08:40.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/tcp_ipv4.c linux-2.6.37/net/ipv4/tcp_ipv4.c
+--- linux-2.6.37/net/ipv4/tcp_ipv4.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/tcp_ipv4.c   2011-01-17 02:41:02.000000000 -0500
 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -54865,7 +56037,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1597,6 +1600,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
+@@ -1599,6 +1602,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
        return 0;
  
  reset:
@@ -54875,7 +56047,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
        tcp_v4_send_reset(rsk, skb);
  discard:
        kfree_skb(skb);
-@@ -1659,12 +1665,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1661,12 +1667,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
        TCP_SKB_CB(skb)->sacked  = 0;
  
        sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -54898,7 +56070,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
  
        if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
                NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1714,6 +1727,10 @@ no_tcp_socket:
+@@ -1716,6 +1729,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
@@ -54909,7 +56081,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
                tcp_v4_send_reset(NULL, skb);
        }
  
-@@ -2400,7 +2417,11 @@ static void get_openreq4(struct sock *sk
+@@ -2404,7 +2421,11 @@ static void get_openreq4(struct sock *sk
                0,  /* non standard timer */
                0, /* open_requests have no inode */
                atomic_read(&sk->sk_refcnt),
@@ -54921,7 +56093,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
                len);
  }
  
-@@ -2450,7 +2471,12 @@ static void get_tcp4_sock(struct sock *s
+@@ -2454,7 +2475,12 @@ static void get_tcp4_sock(struct sock *s
                sock_i_uid(sk),
                icsk->icsk_probes_out,
                sock_i_ino(sk),
@@ -54935,7 +56107,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
                jiffies_to_clock_t(icsk->icsk_rto),
                jiffies_to_clock_t(icsk->icsk_ack.ato),
                (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
-@@ -2478,7 +2504,13 @@ static void get_timewait4_sock(struct in
+@@ -2482,7 +2508,13 @@ static void get_timewait4_sock(struct in
                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
                i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
                3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -54950,9 +56122,9 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_ipv4.c linux-2.6.36/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36/net/ipv4/tcp_minisocks.c
---- linux-2.6.36/net/ipv4/tcp_minisocks.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/tcp_minisocks.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/tcp_minisocks.c linux-2.6.37/net/ipv4/tcp_minisocks.c
+--- linux-2.6.37/net/ipv4/tcp_minisocks.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/tcp_minisocks.c      2011-01-17 02:41:02.000000000 -0500
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -54975,21 +56147,21 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_minisocks.c linux-2.6.36/net/ipv4/tcp_minis
        if (!(flg & TCP_FLAG_RST))
                req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.36/net/ipv4/tcp_probe.c linux-2.6.36/net/ipv4/tcp_probe.c
---- linux-2.6.36/net/ipv4/tcp_probe.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/tcp_probe.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/tcp_probe.c linux-2.6.37/net/ipv4/tcp_probe.c
+--- linux-2.6.37/net/ipv4/tcp_probe.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/tcp_probe.c  2011-01-17 02:41:02.000000000 -0500
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
                if (cnt + width >= len)
                        break;
  
 -              if (copy_to_user(buf + cnt, tbuf, width))
-+              if (width > sizeof(tbuf) || copy_to_user(buf + cnt, tbuf, width))
++              if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
                        return -EFAULT;
                cnt += width;
        }
-diff -urNp linux-2.6.36/net/ipv4/tcp_timer.c linux-2.6.36/net/ipv4/tcp_timer.c
---- linux-2.6.36/net/ipv4/tcp_timer.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/tcp_timer.c  2010-11-06 19:10:03.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/tcp_timer.c linux-2.6.37/net/ipv4/tcp_timer.c
+--- linux-2.6.37/net/ipv4/tcp_timer.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/tcp_timer.c  2011-01-17 02:41:02.000000000 -0500
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -55001,7 +56173,7 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_timer.c linux-2.6.36/net/ipv4/tcp_timer.c
  int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
  int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
  int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -198,6 +202,13 @@ static int tcp_write_timeout(struct sock
+@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock
                }
        }
  
@@ -55012,12 +56184,12 @@ diff -urNp linux-2.6.36/net/ipv4/tcp_timer.c linux-2.6.36/net/ipv4/tcp_timer.c
 +              retry_until = grsec_lastack_retries;
 +#endif
 +
-       if (retransmits_timed_out(sk, retry_until, syn_set)) {
+       if (retransmits_timed_out(sk, retry_until,
+                                 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
                /* Has it gone just too far? */
-               tcp_write_err(sk);
-diff -urNp linux-2.6.36/net/ipv4/udp.c linux-2.6.36/net/ipv4/udp.c
---- linux-2.6.36/net/ipv4/udp.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv4/udp.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv4/udp.c linux-2.6.37/net/ipv4/udp.c
+--- linux-2.6.37/net/ipv4/udp.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv4/udp.c        2011-01-17 02:41:02.000000000 -0500
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -55087,7 +56259,7 @@ diff -urNp linux-2.6.36/net/ipv4/udp.c linux-2.6.36/net/ipv4/udp.c
        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
        /*
-@@ -2051,7 +2075,12 @@ static void udp4_format_sock(struct sock
+@@ -2052,7 +2076,12 @@ static void udp4_format_sock(struct sock
                sk_wmem_alloc_get(sp),
                sk_rmem_alloc_get(sp),
                0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -55101,9 +56273,9 @@ diff -urNp linux-2.6.36/net/ipv4/udp.c linux-2.6.36/net/ipv4/udp.c
                atomic_read(&sp->sk_drops), len);
  }
  
-diff -urNp linux-2.6.36/net/ipv6/exthdrs.c linux-2.6.36/net/ipv6/exthdrs.c
---- linux-2.6.36/net/ipv6/exthdrs.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv6/exthdrs.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv6/exthdrs.c linux-2.6.37/net/ipv6/exthdrs.c
+--- linux-2.6.37/net/ipv6/exthdrs.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv6/exthdrs.c    2011-01-17 02:41:02.000000000 -0500
 @@ -634,7 +634,7 @@ static struct tlvtype_proc tlvprochopopt
                .type   = IPV6_TLV_JUMBO,
                .func   = ipv6_hop_jumbo,
@@ -55113,20 +56285,9 @@ diff -urNp linux-2.6.36/net/ipv6/exthdrs.c linux-2.6.36/net/ipv6/exthdrs.c
  };
  
  int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.36/net/ipv6/netfilter/ip6_tables.c linux-2.6.36/net/ipv6/netfilter/ip6_tables.c
---- linux-2.6.36/net/ipv6/netfilter/ip6_tables.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv6/netfilter/ip6_tables.c       2010-11-06 18:58:50.000000000 -0400
-@@ -1137,6 +1137,7 @@ static int get_info(struct net *net, voi
-                       private = &tmp;
-               }
- #endif
-+              memset(&info, 0, sizeof(info));
-               info.valid_hooks = t->valid_hooks;
-               memcpy(info.hook_entry, private->hook_entry,
-                      sizeof(info.hook_entry));
-diff -urNp linux-2.6.36/net/ipv6/raw.c linux-2.6.36/net/ipv6/raw.c
---- linux-2.6.36/net/ipv6/raw.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv6/raw.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv6/raw.c linux-2.6.37/net/ipv6/raw.c
+--- linux-2.6.37/net/ipv6/raw.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv6/raw.c        2011-01-17 02:41:02.000000000 -0500
 @@ -601,7 +601,7 @@ out:
        return err;
  }
@@ -55151,9 +56312,9 @@ diff -urNp linux-2.6.36/net/ipv6/raw.c linux-2.6.36/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
---- linux-2.6.36/net/ipv6/tcp_ipv6.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv6/tcp_ipv6.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv6/tcp_ipv6.c linux-2.6.37/net/ipv6/tcp_ipv6.c
+--- linux-2.6.37/net/ipv6/tcp_ipv6.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv6/tcp_ipv6.c   2011-01-17 02:41:02.000000000 -0500
 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -55165,7 +56326,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
  static void tcp_v6_hash(struct sock *sk)
  {
        if (sk->sk_state != TCP_CLOSE) {
-@@ -1627,6 +1631,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1631,6 +1635,9 @@ static int tcp_v6_do_rcv(struct sock *sk
        return 0;
  
  reset:
@@ -55175,7 +56336,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
        tcp_v6_send_reset(sk, skb);
  discard:
        if (opt_skb)
-@@ -1706,12 +1713,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+@@ -1710,12 +1717,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
        TCP_SKB_CB(skb)->sacked = 0;
  
        sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -55198,7 +56359,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
  
        if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
                NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1759,6 +1774,10 @@ no_tcp_socket:
+@@ -1763,6 +1778,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
@@ -55209,7 +56370,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
                tcp_v6_send_reset(NULL, skb);
        }
  
-@@ -1987,7 +2006,13 @@ static void get_openreq6(struct seq_file
+@@ -1991,7 +2010,13 @@ static void get_openreq6(struct seq_file
                   uid,
                   0,  /* non standard timer */
                   0, /* open_requests have no inode */
@@ -55224,7 +56385,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
  }
  
  static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -2037,7 +2062,12 @@ static void get_tcp6_sock(struct seq_fil
+@@ -2041,7 +2066,12 @@ static void get_tcp6_sock(struct seq_fil
                   sock_i_uid(sp),
                   icsk->icsk_probes_out,
                   sock_i_ino(sp),
@@ -55238,7 +56399,7 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
                   jiffies_to_clock_t(icsk->icsk_rto),
                   jiffies_to_clock_t(icsk->icsk_ack.ato),
                   (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
-@@ -2072,7 +2102,13 @@ static void get_timewait6_sock(struct se
+@@ -2076,7 +2106,13 @@ static void get_timewait6_sock(struct se
                   dest->s6_addr32[2], dest->s6_addr32[3], destp,
                   tw->tw_substate, 0, 0,
                   3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -55253,9 +56414,9 @@ diff -urNp linux-2.6.36/net/ipv6/tcp_ipv6.c linux-2.6.36/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.36/net/ipv6/udp.c linux-2.6.36/net/ipv6/udp.c
---- linux-2.6.36/net/ipv6/udp.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/ipv6/udp.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/ipv6/udp.c linux-2.6.37/net/ipv6/udp.c
+--- linux-2.6.37/net/ipv6/udp.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/ipv6/udp.c        2011-01-17 02:41:02.000000000 -0500
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -55267,7 +56428,7 @@ diff -urNp linux-2.6.36/net/ipv6/udp.c linux-2.6.36/net/ipv6/udp.c
  int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
  {
        const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
-@@ -765,6 +769,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
+@@ -773,6 +777,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
                UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
                                proto == IPPROTO_UDPLITE);
  
@@ -55277,7 +56438,7 @@ diff -urNp linux-2.6.36/net/ipv6/udp.c linux-2.6.36/net/ipv6/udp.c
                icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
  
                kfree_skb(skb);
-@@ -1399,7 +1406,12 @@ static void udp6_sock_seq_show(struct se
+@@ -1407,7 +1414,12 @@ static void udp6_sock_seq_show(struct se
                   0, 0L, 0,
                   sock_i_uid(sp), 0,
                   sock_i_ino(sp),
@@ -55291,9 +56452,9 @@ diff -urNp linux-2.6.36/net/ipv6/udp.c linux-2.6.36/net/ipv6/udp.c
                   atomic_read(&sp->sk_drops));
  }
  
-diff -urNp linux-2.6.36/net/irda/ircomm/ircomm_tty.c linux-2.6.36/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.36/net/irda/ircomm/ircomm_tty.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/irda/ircomm/ircomm_tty.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/irda/ircomm/ircomm_tty.c linux-2.6.37/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.37/net/irda/ircomm/ircomm_tty.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/irda/ircomm/ircomm_tty.c  2011-01-17 02:41:02.000000000 -0500
 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
        add_wait_queue(&self->open_wait, &wait);
  
@@ -55416,9 +56577,9 @@ diff -urNp linux-2.6.36/net/irda/ircomm/ircomm_tty.c linux-2.6.36/net/irda/ircom
        seq_printf(m, "Max data size: %d\n", self->max_data_size);
        seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.36/net/key/af_key.c linux-2.6.36/net/key/af_key.c
---- linux-2.6.36/net/key/af_key.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/key/af_key.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/key/af_key.c linux-2.6.37/net/key/af_key.c
+--- linux-2.6.37/net/key/af_key.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/key/af_key.c      2011-01-17 02:41:02.000000000 -0500
 @@ -3644,7 +3644,11 @@ static int pfkey_seq_show(struct seq_fil
                seq_printf(f ,"sk       RefCnt Rmem   Wmem   User   Inode\n");
        else
@@ -55431,10 +56592,10 @@ diff -urNp linux-2.6.36/net/key/af_key.c linux-2.6.36/net/key/af_key.c
                               atomic_read(&s->sk_refcnt),
                               sk_rmem_alloc_get(s),
                               sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.36/net/mac80211/ieee80211_i.h linux-2.6.36/net/mac80211/ieee80211_i.h
---- linux-2.6.36/net/mac80211/ieee80211_i.h    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/ieee80211_i.h    2010-11-06 18:58:15.000000000 -0400
-@@ -650,7 +650,7 @@ struct ieee80211_local {
+diff -urNp linux-2.6.37/net/mac80211/ieee80211_i.h linux-2.6.37/net/mac80211/ieee80211_i.h
+--- linux-2.6.37/net/mac80211/ieee80211_i.h    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/ieee80211_i.h    2011-01-17 02:41:02.000000000 -0500
+@@ -704,7 +704,7 @@ struct ieee80211_local {
        /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
        spinlock_t queue_stop_reason_lock;
  
@@ -55442,11 +56603,11 @@ diff -urNp linux-2.6.36/net/mac80211/ieee80211_i.h linux-2.6.36/net/mac80211/iee
 +      atomic_t open_count;
        int monitors, cooked_mntrs;
        /* number of interfaces with corresponding FIF_ flags */
-       int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
-diff -urNp linux-2.6.36/net/mac80211/iface.c linux-2.6.36/net/mac80211/iface.c
---- linux-2.6.36/net/mac80211/iface.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/iface.c  2010-11-06 18:58:15.000000000 -0400
-@@ -183,7 +183,7 @@ static int ieee80211_open(struct net_dev
+       int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
+diff -urNp linux-2.6.37/net/mac80211/iface.c linux-2.6.37/net/mac80211/iface.c
+--- linux-2.6.37/net/mac80211/iface.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/iface.c  2011-01-17 02:41:02.000000000 -0500
+@@ -216,7 +216,7 @@ static int ieee80211_do_open(struct net_
                break;
        }
  
@@ -55455,25 +56616,25 @@ diff -urNp linux-2.6.36/net/mac80211/iface.c linux-2.6.36/net/mac80211/iface.c
                res = drv_start(local);
                if (res)
                        goto err_del_bss;
-@@ -215,7 +215,7 @@ static int ieee80211_open(struct net_dev
-        * Validate the MAC address for this device.
-        */
-       if (!is_valid_ether_addr(dev->dev_addr)) {
--              if (!local->open_count)
-+              if (!atomic_read(&local->open_count))
-                       drv_stop(local);
-               return -EADDRNOTAVAIL;
-       }
-@@ -309,7 +309,7 @@ static int ieee80211_open(struct net_dev
+@@ -238,7 +238,7 @@ static int ieee80211_do_open(struct net_
+               memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
+ 
+               if (!is_valid_ether_addr(dev->dev_addr)) {
+-                      if (!local->open_count)
++                      if (!atomic_read(&local->open_count))
+                               drv_stop(local);
+                       return -EADDRNOTAVAIL;
+               }
+@@ -335,7 +335,7 @@ static int ieee80211_do_open(struct net_
+       mutex_unlock(&local->mtx);
  
-       hw_reconf_flags |= __ieee80211_recalc_idle(local);
+       if (coming_up)
+-              local->open_count++;
++              atomic_inc(&local->open_count);
  
--      local->open_count++;
-+      atomic_inc(&local->open_count);
        if (hw_reconf_flags) {
                ieee80211_hw_config(local, hw_reconf_flags);
-               /*
-@@ -328,7 +328,7 @@ static int ieee80211_open(struct net_dev
+@@ -355,7 +355,7 @@ static int ieee80211_do_open(struct net_
   err_del_interface:
        drv_remove_interface(local, &sdata->vif);
   err_stop:
@@ -55482,28 +56643,28 @@ diff -urNp linux-2.6.36/net/mac80211/iface.c linux-2.6.36/net/mac80211/iface.c
                drv_stop(local);
   err_del_bss:
        sdata->bss = NULL;
-@@ -418,7 +418,7 @@ static int ieee80211_stop(struct net_dev
-               WARN_ON(!list_empty(&sdata->u.ap.vlans));
+@@ -481,7 +481,7 @@ static void ieee80211_do_stop(struct iee
        }
  
--      local->open_count--;
-+      atomic_dec(&local->open_count);
+       if (going_down)
+-              local->open_count--;
++              atomic_dec(&local->open_count);
  
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_AP_VLAN:
-@@ -518,7 +518,7 @@ static int ieee80211_stop(struct net_dev
+@@ -552,7 +552,7 @@ static void ieee80211_do_stop(struct iee
  
        ieee80211_recalc_ps(local, -1);
  
 -      if (local->open_count == 0) {
 +      if (atomic_read(&local->open_count) == 0) {
+               if (local->ops->napi_poll)
+                       napi_disable(&local->napi);
                ieee80211_clear_tx_pending(local);
-               ieee80211_stop_device(local);
- 
-diff -urNp linux-2.6.36/net/mac80211/main.c linux-2.6.36/net/mac80211/main.c
---- linux-2.6.36/net/mac80211/main.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/main.c   2010-11-06 18:58:15.000000000 -0400
-@@ -152,7 +152,7 @@ int ieee80211_hw_config(struct ieee80211
+diff -urNp linux-2.6.37/net/mac80211/main.c linux-2.6.37/net/mac80211/main.c
+--- linux-2.6.37/net/mac80211/main.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/main.c   2011-01-17 02:41:02.000000000 -0500
+@@ -159,7 +159,7 @@ int ieee80211_hw_config(struct ieee80211
                local->hw.conf.power_level = power;
        }
  
@@ -55512,9 +56673,9 @@ diff -urNp linux-2.6.36/net/mac80211/main.c linux-2.6.36/net/mac80211/main.c
                ret = drv_config(local, changed);
                /*
                 * Goal:
-diff -urNp linux-2.6.36/net/mac80211/pm.c linux-2.6.36/net/mac80211/pm.c
---- linux-2.6.36/net/mac80211/pm.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/pm.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/mac80211/pm.c linux-2.6.37/net/mac80211/pm.c
+--- linux-2.6.37/net/mac80211/pm.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/pm.c     2011-01-17 02:41:02.000000000 -0500
 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
        }
  
@@ -55524,10 +56685,10 @@ diff -urNp linux-2.6.36/net/mac80211/pm.c linux-2.6.36/net/mac80211/pm.c
                ieee80211_stop_device(local);
  
        local->suspended = true;
-diff -urNp linux-2.6.36/net/mac80211/rate.c linux-2.6.36/net/mac80211/rate.c
---- linux-2.6.36/net/mac80211/rate.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/rate.c   2010-11-06 18:58:15.000000000 -0400
-@@ -357,7 +357,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
+diff -urNp linux-2.6.37/net/mac80211/rate.c linux-2.6.37/net/mac80211/rate.c
+--- linux-2.6.37/net/mac80211/rate.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/rate.c   2011-01-17 02:41:02.000000000 -0500
+@@ -361,7 +361,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
        ASSERT_RTNL();
  
@@ -55536,9 +56697,9 @@ diff -urNp linux-2.6.36/net/mac80211/rate.c linux-2.6.36/net/mac80211/rate.c
                return -EBUSY;
  
        if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/rc80211_pid_debugfs.c    2011-01-17 02:41:02.000000000 -0500
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
        spin_unlock_irqrestore(&events->lock, status);
@@ -55548,9 +56709,9 @@ diff -urNp linux-2.6.36/net/mac80211/rc80211_pid_debugfs.c linux-2.6.36/net/mac8
                return -EFAULT;
  
        return p;
-diff -urNp linux-2.6.36/net/mac80211/tx.c linux-2.6.36/net/mac80211/tx.c
---- linux-2.6.36/net/mac80211/tx.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/tx.c     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/mac80211/tx.c linux-2.6.37/net/mac80211/tx.c
+--- linux-2.6.37/net/mac80211/tx.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/tx.c     2011-01-17 02:41:02.000000000 -0500
 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
        return cpu_to_le16(dur);
  }
@@ -55560,10 +56721,10 @@ diff -urNp linux-2.6.36/net/mac80211/tx.c linux-2.6.36/net/mac80211/tx.c
                                      struct net_device *dev)
  {
        return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.36/net/mac80211/util.c linux-2.6.36/net/mac80211/util.c
---- linux-2.6.36/net/mac80211/util.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/mac80211/util.c   2010-11-06 18:58:15.000000000 -0400
-@@ -1101,7 +1101,7 @@ int ieee80211_reconfig(struct ieee80211_
+diff -urNp linux-2.6.37/net/mac80211/util.c linux-2.6.37/net/mac80211/util.c
+--- linux-2.6.37/net/mac80211/util.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/mac80211/util.c   2011-01-17 02:41:02.000000000 -0500
+@@ -1111,7 +1111,7 @@ int ieee80211_reconfig(struct ieee80211_
                local->resuming = true;
  
        /* restart hardware */
@@ -55572,10 +56733,10 @@ diff -urNp linux-2.6.36/net/mac80211/util.c linux-2.6.36/net/mac80211/util.c
                /*
                 * Upon resume hardware can sometimes be goofy due to
                 * various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.36/net/netfilter/Kconfig linux-2.6.36/net/netfilter/Kconfig
---- linux-2.6.36/net/netfilter/Kconfig 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/netfilter/Kconfig 2010-11-06 18:58:50.000000000 -0400
-@@ -708,6 +708,16 @@ config NETFILTER_XT_MATCH_ESP
+diff -urNp linux-2.6.37/net/netfilter/Kconfig linux-2.6.37/net/netfilter/Kconfig
+--- linux-2.6.37/net/netfilter/Kconfig 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/netfilter/Kconfig 2011-01-17 02:41:02.000000000 -0500
+@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
  
          To compile it as a module, choose M here.  If unsure, say N.
  
@@ -55592,9 +56753,9 @@ diff -urNp linux-2.6.36/net/netfilter/Kconfig linux-2.6.36/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_HASHLIMIT
        tristate '"hashlimit" match support'
        depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.36/net/netfilter/Makefile linux-2.6.36/net/netfilter/Makefile
---- linux-2.6.36/net/netfilter/Makefile        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/netfilter/Makefile        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/netfilter/Makefile linux-2.6.37/net/netfilter/Makefile
+--- linux-2.6.37/net/netfilter/Makefile        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/netfilter/Makefile        2011-01-17 02:41:02.000000000 -0500
 @@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += 
  obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -55603,9 +56764,21 @@ diff -urNp linux-2.6.36/net/netfilter/Makefile linux-2.6.36/net/netfilter/Makefi
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.36/net/netfilter/xt_gradm.c linux-2.6.36/net/netfilter/xt_gradm.c
---- linux-2.6.36/net/netfilter/xt_gradm.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.36/net/netfilter/xt_gradm.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/netfilter/nf_conntrack_netlink.c linux-2.6.37/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.37/net/netfilter/nf_conntrack_netlink.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/netfilter/nf_conntrack_netlink.c  2011-01-17 02:41:02.000000000 -0500
+@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla
+ static int
+ ctnetlink_parse_tuple(const struct nlattr * const cda[],
+                     struct nf_conntrack_tuple *tuple,
+-                    enum ctattr_tuple type, u_int8_t l3num)
++                    enum ctattr_type type, u_int8_t l3num)
+ {
+       struct nlattr *tb[CTA_TUPLE_MAX+1];
+       int err;
+diff -urNp linux-2.6.37/net/netfilter/xt_gradm.c linux-2.6.37/net/netfilter/xt_gradm.c
+--- linux-2.6.37/net/netfilter/xt_gradm.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.37/net/netfilter/xt_gradm.c      2011-01-17 02:41:02.000000000 -0500
 @@ -0,0 +1,51 @@
 +/*
 + *    gradm match for netfilter
@@ -55658,10 +56831,10 @@ diff -urNp linux-2.6.36/net/netfilter/xt_gradm.c linux-2.6.36/net/netfilter/xt_g
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36/net/netlink/af_netlink.c
---- linux-2.6.36/net/netlink/af_netlink.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/netlink/af_netlink.c      2010-11-06 18:58:50.000000000 -0400
-@@ -2007,13 +2007,21 @@ static int netlink_seq_show(struct seq_f
+diff -urNp linux-2.6.37/net/netlink/af_netlink.c linux-2.6.37/net/netlink/af_netlink.c
+--- linux-2.6.37/net/netlink/af_netlink.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/netlink/af_netlink.c      2011-01-17 02:41:02.000000000 -0500
+@@ -1991,13 +1991,21 @@ static int netlink_seq_show(struct seq_f
                struct netlink_sock *nlk = nlk_sk(s);
  
                seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d %-8lu\n",
@@ -55683,9 +56856,9 @@ diff -urNp linux-2.6.36/net/netlink/af_netlink.c linux-2.6.36/net/netlink/af_net
                           atomic_read(&s->sk_refcnt),
                           atomic_read(&s->sk_drops),
                           sock_i_ino(s)
-diff -urNp linux-2.6.36/net/netrom/af_netrom.c linux-2.6.36/net/netrom/af_netrom.c
---- linux-2.6.36/net/netrom/af_netrom.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/netrom/af_netrom.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/netrom/af_netrom.c linux-2.6.37/net/netrom/af_netrom.c
+--- linux-2.6.37/net/netrom/af_netrom.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/netrom/af_netrom.c        2011-01-17 02:41:02.000000000 -0500
 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
        struct sock *sk = sock->sk;
        struct nr_sock *nr = nr_sk(sk);
@@ -55702,38 +56875,10 @@ diff -urNp linux-2.6.36/net/netrom/af_netrom.c linux-2.6.36/net/netrom/af_netrom
                sax->fsa_ax25.sax25_call   = nr->source_addr;
                *uaddr_len = sizeof(struct sockaddr_ax25);
        }
-diff -urNp linux-2.6.36/net/packet/af_packet.c linux-2.6.36/net/packet/af_packet.c
---- linux-2.6.36/net/packet/af_packet.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/packet/af_packet.c        2010-11-06 18:58:50.000000000 -0400
-@@ -1610,8 +1610,9 @@ static int packet_recvmsg(struct kiocb *
- 
-               err = -EINVAL;
-               vnet_hdr_len = sizeof(vnet_hdr);
--              if ((len -= vnet_hdr_len) < 0)
-+              if (len < vnet_hdr_len)
-                       goto out_free;
-+              len -= vnet_hdr_len;
- 
-               if (skb_is_gso(skb)) {
-                       struct skb_shared_info *sinfo = skb_shinfo(skb);
-@@ -1719,7 +1720,7 @@ static int packet_getname_spkt(struct so
-       rcu_read_lock();
-       dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex);
-       if (dev)
--              strlcpy(uaddr->sa_data, dev->name, 15);
-+              strncpy(uaddr->sa_data, dev->name, 14);
-       else
-               memset(uaddr->sa_data, 0, 14);
-       rcu_read_unlock();
-@@ -1742,6 +1743,7 @@ static int packet_getname(struct socket 
-       sll->sll_family = AF_PACKET;
-       sll->sll_ifindex = po->ifindex;
-       sll->sll_protocol = po->num;
-+      sll->sll_pkttype = 0;
-       rcu_read_lock();
-       dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex);
-       if (dev) {
-@@ -2120,7 +2122,7 @@ static int packet_getsockopt(struct sock
+diff -urNp linux-2.6.37/net/packet/af_packet.c linux-2.6.37/net/packet/af_packet.c
+--- linux-2.6.37/net/packet/af_packet.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/packet/af_packet.c        2011-01-17 02:41:02.000000000 -0500
+@@ -2123,7 +2123,7 @@ static int packet_getsockopt(struct sock
        case PACKET_HDRLEN:
                if (len > sizeof(int))
                        len = sizeof(int);
@@ -55742,7 +56887,7 @@ diff -urNp linux-2.6.36/net/packet/af_packet.c linux-2.6.36/net/packet/af_packet
                        return -EFAULT;
                switch (val) {
                case TPACKET_V1:
-@@ -2158,7 +2160,7 @@ static int packet_getsockopt(struct sock
+@@ -2161,7 +2161,7 @@ static int packet_getsockopt(struct sock
  
        if (put_user(len, optlen))
                return -EFAULT;
@@ -55751,7 +56896,7 @@ diff -urNp linux-2.6.36/net/packet/af_packet.c linux-2.6.36/net/packet/af_packet
                return -EFAULT;
        return 0;
  }
-@@ -2637,7 +2639,11 @@ static int packet_seq_show(struct seq_fi
+@@ -2640,7 +2640,11 @@ static int packet_seq_show(struct seq_fi
  
                seq_printf(seq,
                           "%p %-6d %-4d %04x   %-5d %1d %-6u %-6u %-6lu\n",
@@ -55763,9 +56908,9 @@ diff -urNp linux-2.6.36/net/packet/af_packet.c linux-2.6.36/net/packet/af_packet
                           atomic_read(&s->sk_refcnt),
                           s->sk_type,
                           ntohs(po->num),
-diff -urNp linux-2.6.36/net/phonet/af_phonet.c linux-2.6.36/net/phonet/af_phonet.c
---- linux-2.6.36/net/phonet/af_phonet.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/phonet/af_phonet.c        2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/phonet/af_phonet.c linux-2.6.37/net/phonet/af_phonet.c
+--- linux-2.6.37/net/phonet/af_phonet.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/phonet/af_phonet.c        2011-01-17 02:41:02.000000000 -0500
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
        struct phonet_protocol *pp;
@@ -55775,7 +56920,7 @@ diff -urNp linux-2.6.36/net/phonet/af_phonet.c linux-2.6.36/net/phonet/af_phonet
                return NULL;
  
        rcu_read_lock();
-@@ -446,7 +446,7 @@ int __init_or_module phonet_proto_regist
+@@ -463,7 +463,7 @@ int __init_or_module phonet_proto_regist
  {
        int err = 0;
  
@@ -55784,10 +56929,58 @@ diff -urNp linux-2.6.36/net/phonet/af_phonet.c linux-2.6.36/net/phonet/af_phonet
                return -EINVAL;
  
        err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.36/net/sctp/socket.c linux-2.6.36/net/sctp/socket.c
---- linux-2.6.36/net/sctp/socket.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/sctp/socket.c     2010-11-06 18:58:15.000000000 -0400
-@@ -1494,7 +1494,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
+diff -urNp linux-2.6.37/net/phonet/socket.c linux-2.6.37/net/phonet/socket.c
+--- linux-2.6.37/net/phonet/socket.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/phonet/socket.c   2011-01-17 02:41:02.000000000 -0500
+@@ -637,7 +637,12 @@ static int pn_sock_seq_show(struct seq_f
+                       sk->sk_state,
+                       sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
+                       sock_i_uid(sk), sock_i_ino(sk),
+-                      atomic_read(&sk->sk_refcnt), sk,
++                      atomic_read(&sk->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++                      NULL,
++#else
++                      sk,
++#endif
+                       atomic_read(&sk->sk_drops), &len);
+       }
+       seq_printf(seq, "%*s\n", 127 - len, "");
+diff -urNp linux-2.6.37/net/sctp/proc.c linux-2.6.37/net/sctp/proc.c
+--- linux-2.6.37/net/sctp/proc.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/sctp/proc.c       2011-01-17 02:41:02.000000000 -0500
+@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
+       sctp_for_each_hentry(epb, node, &head->chain) {
+               ep = sctp_ep(epb);
+               sk = epb->sk;
+-              seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,
++              seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ",
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++                         NULL, NULL,
++#else
++                         ep, sk,
++#endif
+                          sctp_sk(sk)->type, sk->sk_state, hash,
+                          epb->bind_addr.port,
+                          sock_i_uid(sk), sock_i_ino(sk));
+@@ -318,7 +323,12 @@ static int sctp_assocs_seq_show(struct s
+               seq_printf(seq,
+                          "%8p %8p %-3d %-3d %-2d %-4d "
+                          "%4d %8d %8d %7d %5lu %-5d %5d ",
+-                         assoc, sk, sctp_sk(sk)->type, sk->sk_state,
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++                         NULL, NULL,
++#else
++                         assoc, sk,
++#endif
++                         sctp_sk(sk)->type, sk->sk_state,
+                          assoc->state, hash,
+                          assoc->assoc_id,
+                          assoc->sndbuf_used,
+diff -urNp linux-2.6.37/net/sctp/socket.c linux-2.6.37/net/sctp/socket.c
+--- linux-2.6.37/net/sctp/socket.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/sctp/socket.c     2011-01-17 02:41:02.000000000 -0500
+@@ -1496,7 +1496,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
        struct sctp_sndrcvinfo *sinfo;
        struct sctp_initmsg *sinit;
        sctp_assoc_t associd = 0;
@@ -55796,7 +56989,7 @@ diff -urNp linux-2.6.36/net/sctp/socket.c linux-2.6.36/net/sctp/socket.c
        int err;
        sctp_scope_t scope;
        long timeo;
-@@ -4398,7 +4398,7 @@ static int sctp_getsockopt_peer_addrs(st
+@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st
                addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
                if (space_left < addrlen)
                        return -ENOMEM;
@@ -55805,9 +56998,9 @@ diff -urNp linux-2.6.36/net/sctp/socket.c linux-2.6.36/net/sctp/socket.c
                        return -EFAULT;
                to += addrlen;
                cnt++;
-diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
---- linux-2.6.36/net/socket.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/socket.c  2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/socket.c linux-2.6.37/net/socket.c
+--- linux-2.6.37/net/socket.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/socket.c  2011-01-17 02:41:02.000000000 -0500
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -55825,8 +57018,8 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
  static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
  static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         unsigned long nr_segs, loff_t pos);
-@@ -313,7 +316,7 @@ static int sockfs_get_sb(struct file_sys
-                            mnt);
+@@ -311,7 +314,7 @@ static struct dentry *sockfs_mount(struc
+       return mount_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC);
  }
  
 -static struct vfsmount *sock_mnt __read_mostly;
@@ -55834,7 +57027,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
  
  static struct file_system_type sock_fs_type = {
        .name =         "sockfs",
-@@ -1158,6 +1161,8 @@ static int __sock_create(struct net *net
+@@ -1173,6 +1176,8 @@ int __sock_create(struct net *net, int f
                return -EAFNOSUPPORT;
        if (type < 0 || type >= SOCK_MAX)
                return -EINVAL;
@@ -55843,7 +57036,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
  
        /* Compatibility.
  
-@@ -1289,6 +1294,16 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1305,6 +1310,16 @@ SYSCALL_DEFINE3(socket, int, family, int
        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
  
@@ -55860,7 +57053,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
        retval = sock_create(family, type, protocol, &sock);
        if (retval < 0)
                goto out;
-@@ -1401,6 +1416,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1417,6 +1432,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
        if (sock) {
                err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
                if (err >= 0) {
@@ -55875,7 +57068,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
                        err = security_socket_bind(sock,
                                                   (struct sockaddr *)&address,
                                                   addrlen);
-@@ -1409,6 +1432,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1425,6 +1448,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
                                                      (struct sockaddr *)
                                                      &address, addrlen);
                }
@@ -55883,7 +57076,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
                fput_light(sock->file, fput_needed);
        }
        return err;
-@@ -1432,10 +1456,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
+@@ -1448,10 +1472,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
                if ((unsigned)backlog > somaxconn)
                        backlog = somaxconn;
  
@@ -55904,7 +57097,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
                fput_light(sock->file, fput_needed);
        }
        return err;
-@@ -1479,6 +1513,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1495,6 +1529,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        newsock->type = sock->type;
        newsock->ops = sock->ops;
  
@@ -55923,7 +57116,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
        /*
         * We don't need try_module_get here, as the listening socket (sock)
         * has the protocol module (sock->ops->owner) held.
-@@ -1517,6 +1563,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1533,6 +1579,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        fd_install(newfd, newfile);
        err = newfd;
  
@@ -55932,7 +57125,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
  out_put:
        fput_light(sock->file, fput_needed);
  out:
-@@ -1549,6 +1597,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1565,6 +1613,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
                int, addrlen)
  {
        struct socket *sock;
@@ -55940,7 +57133,7 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
        struct sockaddr_storage address;
        int err, fput_needed;
  
-@@ -1559,6 +1608,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1575,6 +1624,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
        if (err < 0)
                goto out_put;
  
@@ -55958,9 +57151,9 @@ diff -urNp linux-2.6.36/net/socket.c linux-2.6.36/net/socket.c
        err =
            security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
        if (err)
-diff -urNp linux-2.6.36/net/sunrpc/sched.c linux-2.6.36/net/sunrpc/sched.c
---- linux-2.6.36/net/sunrpc/sched.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/sunrpc/sched.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/sunrpc/sched.c linux-2.6.37/net/sunrpc/sched.c
+--- linux-2.6.37/net/sunrpc/sched.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/sunrpc/sched.c    2011-01-17 02:41:02.000000000 -0500
 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -55973,21 +57166,21 @@ diff -urNp linux-2.6.36/net/sunrpc/sched.c linux-2.6.36/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/sunrpc/xprtrdma/svc_rdma.c        2010-11-06 18:58:50.000000000 -0400
-@@ -106,7 +106,7 @@ static int read_reset_stat(ctl_table *ta
+diff -urNp linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/sunrpc/xprtrdma/svc_rdma.c        2011-01-17 02:41:02.000000000 -0500
+@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta
                len -= *ppos;
                if (len > *lenp)
                        len = *lenp;
 -              if (len && copy_to_user(buffer, str_buf, len))
-+              if (len > sizeof(str_buf) || (len && copy_to_user(buffer, str_buf, len)))
++              if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
                        return -EFAULT;
                *lenp = len;
                *ppos += len;
-diff -urNp linux-2.6.36/net/sysctl_net.c linux-2.6.36/net/sysctl_net.c
---- linux-2.6.36/net/sysctl_net.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/sysctl_net.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/net/sysctl_net.c linux-2.6.37/net/sysctl_net.c
+--- linux-2.6.37/net/sysctl_net.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/sysctl_net.c      2011-01-17 02:41:02.000000000 -0500
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
                               struct ctl_table *table)
  {
@@ -55997,18 +57190,10 @@ diff -urNp linux-2.6.36/net/sysctl_net.c linux-2.6.36/net/sysctl_net.c
                int mode = (table->mode >> 6) & 7;
                return (mode << 6) | (mode << 3) | mode;
        }
-diff -urNp linux-2.6.36/net/tipc/socket.c linux-2.6.36/net/tipc/socket.c
---- linux-2.6.36/net/tipc/socket.c     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/tipc/socket.c     2010-11-06 18:58:50.000000000 -0400
-@@ -395,6 +395,7 @@ static int get_name(struct socket *sock,
-       struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
-       struct tipc_sock *tsock = tipc_sk(sock->sk);
- 
-+      memset(addr, 0, sizeof(*addr));
-       if (peer) {
-               if ((sock->state != SS_CONNECTED) &&
-                       ((peer != 2) || (sock->state != SS_DISCONNECTING)))
-@@ -1451,8 +1452,9 @@ static int connect(struct socket *sock, 
+diff -urNp linux-2.6.37/net/tipc/socket.c linux-2.6.37/net/tipc/socket.c
+--- linux-2.6.37/net/tipc/socket.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/tipc/socket.c     2011-01-17 02:41:02.000000000 -0500
+@@ -1475,8 +1475,9 @@ static int connect(struct socket *sock, 
        } else {
                if (res == 0)
                        res = -ETIMEDOUT;
@@ -56020,9 +57205,9 @@ diff -urNp linux-2.6.36/net/tipc/socket.c linux-2.6.36/net/tipc/socket.c
                sock->state = SS_DISCONNECTING;
        }
  
-diff -urNp linux-2.6.36/net/unix/af_unix.c linux-2.6.36/net/unix/af_unix.c
---- linux-2.6.36/net/unix/af_unix.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/unix/af_unix.c    2010-11-06 20:08:14.000000000 -0400
+diff -urNp linux-2.6.37/net/unix/af_unix.c linux-2.6.37/net/unix/af_unix.c
+--- linux-2.6.37/net/unix/af_unix.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/unix/af_unix.c    2011-01-17 02:41:02.000000000 -0500
 @@ -764,6 +764,12 @@ static struct sock *unix_find_other(stru
                err = -ECONNREFUSED;
                if (!S_ISSOCK(inode->i_mode))
@@ -56081,7 +57266,7 @@ diff -urNp linux-2.6.36/net/unix/af_unix.c linux-2.6.36/net/unix/af_unix.c
                list = &unix_socket_table[addr->hash];
        } else {
                list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2195,7 +2220,11 @@ static int unix_seq_show(struct seq_file
+@@ -2226,7 +2251,11 @@ static int unix_seq_show(struct seq_file
                unix_state_lock(s);
  
                seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
@@ -56093,10 +57278,10 @@ diff -urNp linux-2.6.36/net/unix/af_unix.c linux-2.6.36/net/unix/af_unix.c
                        atomic_read(&s->sk_refcnt),
                        0,
                        s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.36/net/wireless/reg.c linux-2.6.36/net/wireless/reg.c
---- linux-2.6.36/net/wireless/reg.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/wireless/reg.c    2010-11-06 18:58:15.000000000 -0400
-@@ -50,7 +50,7 @@
+diff -urNp linux-2.6.37/net/wireless/reg.c linux-2.6.37/net/wireless/reg.c
+--- linux-2.6.37/net/wireless/reg.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/wireless/reg.c    2011-01-17 02:41:02.000000000 -0500
+@@ -51,7 +51,7 @@
                printk(KERN_DEBUG format , ## args); \
        } while (0)
  #else
@@ -56105,9 +57290,9 @@ diff -urNp linux-2.6.36/net/wireless/reg.c linux-2.6.36/net/wireless/reg.c
  #endif
  
  /* Receipt of information from last regulatory request */
-diff -urNp linux-2.6.36/net/wireless/wext-core.c linux-2.6.36/net/wireless/wext-core.c
---- linux-2.6.36/net/wireless/wext-core.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/wireless/wext-core.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/net/wireless/wext-core.c linux-2.6.37/net/wireless/wext-core.c
+--- linux-2.6.37/net/wireless/wext-core.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/wireless/wext-core.c      2011-01-17 02:41:02.000000000 -0500
 @@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struc
                 */
  
@@ -56141,45 +57326,23 @@ diff -urNp linux-2.6.36/net/wireless/wext-core.c linux-2.6.36/net/wireless/wext-
        err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
        iwp->length += essid_compat;
-diff -urNp linux-2.6.36/net/x25/x25_facilities.c linux-2.6.36/net/x25/x25_facilities.c
---- linux-2.6.36/net/x25/x25_facilities.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/x25/x25_facilities.c      2010-11-06 18:58:50.000000000 -0400
-@@ -134,15 +134,15 @@ int x25_parse_facilities(struct sk_buff 
-               case X25_FAC_CLASS_D:
-                       switch (*p) {
-                       case X25_FAC_CALLING_AE:
--                              if (p[1] > X25_MAX_DTE_FACIL_LEN)
--                                      break;
-+                              if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
-+                                      return 0;
-                               dte_facs->calling_len = p[2];
-                               memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);
-                               *vc_fac_mask |= X25_MASK_CALLING_AE;
+diff -urNp linux-2.6.37/net/x25/x25_facilities.c linux-2.6.37/net/x25/x25_facilities.c
+--- linux-2.6.37/net/x25/x25_facilities.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/x25/x25_facilities.c      2011-01-17 02:41:02.000000000 -0500
+@@ -157,7 +157,8 @@ int x25_parse_facilities(struct sk_buff 
                                break;
-                       case X25_FAC_CALLED_AE:
--                              if (p[1] > X25_MAX_DTE_FACIL_LEN)
--                                      break;
-+                              if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
-+                                      return 0;
-                               dte_facs->called_len = p[2];
-                               memcpy(dte_facs->called_ae, &p[3], p[1] - 1);
-                               *vc_fac_mask |= X25_MASK_CALLED_AE;
-diff -urNp linux-2.6.36/net/x25/x25_in.c linux-2.6.36/net/x25/x25_in.c
---- linux-2.6.36/net/x25/x25_in.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/x25/x25_in.c      2010-11-06 18:58:50.000000000 -0400
-@@ -119,6 +119,8 @@ static int x25_state1_machine(struct soc
-                                               &x25->vc_facil_mask);
-                       if (len > 0)
-                               skb_pull(skb, len);
-+                      else
-+                              return -1;
-                       /*
-                        *      Copy any Call User Data.
-                        */
-diff -urNp linux-2.6.36/net/xfrm/xfrm_policy.c linux-2.6.36/net/xfrm/xfrm_policy.c
---- linux-2.6.36/net/xfrm/xfrm_policy.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/net/xfrm/xfrm_policy.c        2010-11-06 18:58:15.000000000 -0400
-@@ -1501,7 +1501,7 @@ free_dst:
+                       default:
+                               printk(KERN_DEBUG "X.25: unknown facility %02X,"
+-                                      "length %d\n", p[0], p[1]);
++                                      "length %d, values %02X, %02X\n",
++                                      p[0], p[1], p[2], p[3]);
+                               break;
+                       }
+                       len -= p[1] + 2;
+diff -urNp linux-2.6.37/net/xfrm/xfrm_policy.c linux-2.6.37/net/xfrm/xfrm_policy.c
+--- linux-2.6.37/net/xfrm/xfrm_policy.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/net/xfrm/xfrm_policy.c        2011-01-17 02:41:02.000000000 -0500
+@@ -1504,7 +1504,7 @@ free_dst:
        goto out;
  }
  
@@ -56188,7 +57351,7 @@ diff -urNp linux-2.6.36/net/xfrm/xfrm_policy.c linux-2.6.36/net/xfrm/xfrm_policy
  xfrm_dst_alloc_copy(void **target, void *src, int size)
  {
        if (!*target) {
-@@ -1513,7 +1513,7 @@ xfrm_dst_alloc_copy(void **target, void 
+@@ -1516,7 +1516,7 @@ xfrm_dst_alloc_copy(void **target, void 
        return 0;
  }
  
@@ -56197,7 +57360,7 @@ diff -urNp linux-2.6.36/net/xfrm/xfrm_policy.c linux-2.6.36/net/xfrm/xfrm_policy
  xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1525,7 +1525,7 @@ xfrm_dst_update_parent(struct dst_entry 
+@@ -1528,7 +1528,7 @@ xfrm_dst_update_parent(struct dst_entry 
  #endif
  }
  
@@ -56206,9 +57369,9 @@ diff -urNp linux-2.6.36/net/xfrm/xfrm_policy.c linux-2.6.36/net/xfrm/xfrm_policy
  xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.36/scripts/basic/fixdep.c linux-2.6.36/scripts/basic/fixdep.c
---- linux-2.6.36/scripts/basic/fixdep.c        2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/basic/fixdep.c        2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/basic/fixdep.c linux-2.6.37/scripts/basic/fixdep.c
+--- linux-2.6.37/scripts/basic/fixdep.c        2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/basic/fixdep.c        2011-01-17 02:41:02.000000000 -0500
 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
  
  static void parse_config_file(char *map, size_t len)
@@ -56230,9 +57393,9 @@ diff -urNp linux-2.6.36/scripts/basic/fixdep.c linux-2.6.36/scripts/basic/fixdep
  
        if (*p != INT_CONF) {
                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.36/scripts/kallsyms.c linux-2.6.36/scripts/kallsyms.c
---- linux-2.6.36/scripts/kallsyms.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/kallsyms.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/kallsyms.c linux-2.6.37/scripts/kallsyms.c
+--- linux-2.6.37/scripts/kallsyms.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/kallsyms.c    2011-01-17 02:41:02.000000000 -0500
 @@ -43,10 +43,10 @@ struct text_range {
  
  static unsigned long long _text;
@@ -56248,9 +57411,9 @@ diff -urNp linux-2.6.36/scripts/kallsyms.c linux-2.6.36/scripts/kallsyms.c
  };
  #define text_range_text     (&text_ranges[0])
  #define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.36/scripts/mod/file2alias.c linux-2.6.36/scripts/mod/file2alias.c
---- linux-2.6.36/scripts/mod/file2alias.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/mod/file2alias.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/mod/file2alias.c linux-2.6.37/scripts/mod/file2alias.c
+--- linux-2.6.37/scripts/mod/file2alias.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/mod/file2alias.c      2011-01-17 02:41:02.000000000 -0500
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
                            unsigned long size, unsigned long id_size,
                            void *symval)
@@ -56305,9 +57468,9 @@ diff -urNp linux-2.6.36/scripts/mod/file2alias.c linux-2.6.36/scripts/mod/file2a
  
        sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
---- linux-2.6.36/scripts/mod/modpost.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/mod/modpost.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/mod/modpost.c linux-2.6.37/scripts/mod/modpost.c
+--- linux-2.6.37/scripts/mod/modpost.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/mod/modpost.c 2011-01-17 02:41:02.000000000 -0500
 @@ -895,6 +895,7 @@ enum mismatch {
        ANY_INIT_TO_ANY_EXIT,
        ANY_EXIT_TO_ANY_INIT,
@@ -56342,7 +57505,7 @@ diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
                if (d < 0)
                        d = addr - sym->st_value;
                if (d < distance) {
-@@ -1397,6 +1404,14 @@ static void report_sec_mismatch(const ch
+@@ -1400,6 +1407,14 @@ static void report_sec_mismatch(const ch
                tosym, prl_to, prl_to, tosym);
                free(prl_to);
                break;
@@ -56357,7 +57520,7 @@ diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
        }
        fprintf(stderr, "\n");
  }
-@@ -1720,7 +1735,7 @@ void __attribute__((format(printf, 2, 3)
+@@ -1723,7 +1738,7 @@ void __attribute__((format(printf, 2, 3)
        va_end(ap);
  }
  
@@ -56366,7 +57529,7 @@ diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
  {
        if (buf->size - buf->pos < len) {
                buf->size += len + SZ;
-@@ -1932,7 +1947,7 @@ static void write_if_changed(struct buff
+@@ -1935,7 +1950,7 @@ static void write_if_changed(struct buff
        if (fstat(fileno(file), &st) < 0)
                goto close_write;
  
@@ -56375,9 +57538,9 @@ diff -urNp linux-2.6.36/scripts/mod/modpost.c linux-2.6.36/scripts/mod/modpost.c
                goto close_write;
  
        tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.36/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h
---- linux-2.6.36/scripts/mod/modpost.h 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/mod/modpost.h 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/mod/modpost.h linux-2.6.37/scripts/mod/modpost.h
+--- linux-2.6.37/scripts/mod/modpost.h 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/mod/modpost.h 2011-01-17 02:41:02.000000000 -0500
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -56397,9 +57560,9 @@ diff -urNp linux-2.6.36/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h
  
  struct module {
        struct module *next;
-diff -urNp linux-2.6.36/scripts/mod/sumversion.c linux-2.6.36/scripts/mod/sumversion.c
---- linux-2.6.36/scripts/mod/sumversion.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/mod/sumversion.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/mod/sumversion.c linux-2.6.37/scripts/mod/sumversion.c
+--- linux-2.6.37/scripts/mod/sumversion.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/mod/sumversion.c      2011-01-17 02:41:02.000000000 -0500
 @@ -455,7 +455,7 @@ static void write_version(const char *fi
                goto out;
        }
@@ -56409,9 +57572,9 @@ diff -urNp linux-2.6.36/scripts/mod/sumversion.c linux-2.6.36/scripts/mod/sumver
                warn("writing sum in %s failed: %s\n",
                        filename, strerror(errno));
                goto out;
-diff -urNp linux-2.6.36/scripts/pnmtologo.c linux-2.6.36/scripts/pnmtologo.c
---- linux-2.6.36/scripts/pnmtologo.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/scripts/pnmtologo.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/scripts/pnmtologo.c linux-2.6.37/scripts/pnmtologo.c
+--- linux-2.6.37/scripts/pnmtologo.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/scripts/pnmtologo.c   2011-01-17 02:41:02.000000000 -0500
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -56438,9 +57601,9 @@ diff -urNp linux-2.6.36/scripts/pnmtologo.c linux-2.6.36/scripts/pnmtologo.c
            logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.36/security/apparmor/lsm.c linux-2.6.36/security/apparmor/lsm.c
---- linux-2.6.36/security/apparmor/lsm.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/apparmor/lsm.c       2010-11-06 19:46:26.000000000 -0400
+diff -urNp linux-2.6.37/security/apparmor/lsm.c linux-2.6.37/security/apparmor/lsm.c
+--- linux-2.6.37/security/apparmor/lsm.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/apparmor/lsm.c       2011-01-17 02:41:02.000000000 -0500
 @@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
        return error;
  }
@@ -56450,18 +57613,18 @@ diff -urNp linux-2.6.36/security/apparmor/lsm.c linux-2.6.36/security/apparmor/l
        .name =                         "apparmor",
  
        .ptrace_access_check =          apparmor_ptrace_access_check,
-diff -urNp linux-2.6.36/security/commoncap.c linux-2.6.36/security/commoncap.c
---- linux-2.6.36/security/commoncap.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/commoncap.c  2010-11-06 18:58:50.000000000 -0400
-@@ -28,6 +28,7 @@
+diff -urNp linux-2.6.37/security/commoncap.c linux-2.6.37/security/commoncap.c
+--- linux-2.6.37/security/commoncap.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/commoncap.c  2011-01-17 02:41:02.000000000 -0500
+@@ -27,6 +27,7 @@
+ #include <linux/sched.h>
  #include <linux/prctl.h>
  #include <linux/securebits.h>
- #include <linux/syslog.h>
 +#include <net/sock.h>
  
  /*
   * If a non-root user executes a setuid-root binary in
-@@ -51,9 +52,11 @@ static void warn_setuid_and_fcaps_mixed(
+@@ -50,9 +51,11 @@ static void warn_setuid_and_fcaps_mixed(
        }
  }
  
@@ -56474,9 +57637,19 @@ diff -urNp linux-2.6.36/security/commoncap.c linux-2.6.36/security/commoncap.c
        return 0;
  }
  
-diff -urNp linux-2.6.36/security/integrity/ima/ima_api.c linux-2.6.36/security/integrity/ima/ima_api.c
---- linux-2.6.36/security/integrity/ima/ima_api.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/integrity/ima/ima_api.c      2010-11-06 18:58:15.000000000 -0400
+@@ -534,6 +537,9 @@ int cap_bprm_secureexec(struct linux_bin
+ {
+       const struct cred *cred = current_cred();
+ 
++      if (gr_acl_enable_at_secure())
++              return 1;
++
+       if (cred->uid != 0) {
+               if (bprm->cap_effective)
+                       return 1;
+diff -urNp linux-2.6.37/security/integrity/ima/ima_api.c linux-2.6.37/security/integrity/ima/ima_api.c
+--- linux-2.6.37/security/integrity/ima/ima_api.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/integrity/ima/ima_api.c      2011-01-17 02:41:02.000000000 -0500
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
        int result;
  
@@ -56486,9 +57659,9 @@ diff -urNp linux-2.6.36/security/integrity/ima/ima_api.c linux-2.6.36/security/i
  
        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
-diff -urNp linux-2.6.36/security/integrity/ima/ima_fs.c linux-2.6.36/security/integrity/ima/ima_fs.c
---- linux-2.6.36/security/integrity/ima/ima_fs.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/integrity/ima/ima_fs.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/security/integrity/ima/ima_fs.c linux-2.6.37/security/integrity/ima/ima_fs.c
+--- linux-2.6.37/security/integrity/ima/ima_fs.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/integrity/ima/ima_fs.c       2011-01-17 02:41:02.000000000 -0500
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -56504,10 +57677,10 @@ diff -urNp linux-2.6.36/security/integrity/ima/ima_fs.c linux-2.6.36/security/in
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.36/security/integrity/ima/ima.h linux-2.6.36/security/integrity/ima/ima.h
---- linux-2.6.36/security/integrity/ima/ima.h  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/integrity/ima/ima.h  2010-11-06 18:58:15.000000000 -0400
-@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
+diff -urNp linux-2.6.37/security/integrity/ima/ima.h linux-2.6.37/security/integrity/ima/ima.h
+--- linux-2.6.37/security/integrity/ima/ima.h  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/integrity/ima/ima.h  2011-01-17 02:41:02.000000000 -0500
+@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
  struct ima_h_table {
@@ -56518,9 +57691,9 @@ diff -urNp linux-2.6.36/security/integrity/ima/ima.h linux-2.6.36/security/integ
        struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.36/security/integrity/ima/ima_queue.c linux-2.6.36/security/integrity/ima/ima_queue.c
---- linux-2.6.36/security/integrity/ima/ima_queue.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/integrity/ima/ima_queue.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/security/integrity/ima/ima_queue.c linux-2.6.37/security/integrity/ima/ima_queue.c
+--- linux-2.6.37/security/integrity/ima/ima_queue.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/integrity/ima/ima_queue.c    2011-01-17 02:41:02.000000000 -0500
 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
        INIT_LIST_HEAD(&qe->later);
        list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -56530,10 +57703,10 @@ diff -urNp linux-2.6.36/security/integrity/ima/ima_queue.c linux-2.6.36/security
        key = ima_hash_key(entry->digest);
        hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
        return 0;
-diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
---- linux-2.6.36/security/Kconfig      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/Kconfig      2010-11-06 18:58:50.000000000 -0400
-@@ -4,6 +4,505 @@
+diff -urNp linux-2.6.37/security/Kconfig linux-2.6.37/security/Kconfig
+--- linux-2.6.37/security/Kconfig      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/Kconfig      2011-01-17 02:41:02.000000000 -0500
+@@ -4,6 +4,509 @@
  
  menu "Security options"
  
@@ -56541,6 +57714,9 @@ diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
 +
 +menu "PaX"
 +
++      config ARCH_TRACK_EXEC_LIMIT
++      bool
++
 +      config PAX_PER_CPU_PGD
 +      bool
 +
@@ -56676,6 +57852,7 @@ diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
 +      depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MATOM || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
 +      select S390_SWITCH_AMODE if S390
 +      select S390_EXEC_PROTECT if S390
++      select ARCH_TRACK_EXEC_LIMIT if X86_32
 +      help
 +        This implementation is based on the paging feature of the CPU.
 +        On i386 without hardware non-executable bit support there is a
@@ -57025,9 +58202,9 @@ diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
 +        Note that the current implementation provides the strictest checks
 +        for the SLUB allocator.
 +
-+        If frame pointers are enabled on x86, this option will also
-+        restrict copies into and out of the kernel stack to local variables
-+        within a single frame.
++        If frame pointers are enabled on x86, this option will also restrict
++        copies into and out of the kernel stack to local variables within a
++        single frame.
 +
 +        Since this has a negligible performance impact, you should enable
 +        this feature.
@@ -57039,7 +58216,7 @@ diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
  config KEYS
        bool "Enable access key retention support"
        help
-@@ -124,7 +623,7 @@ config INTEL_TXT
+@@ -136,7 +639,7 @@ config INTEL_TXT
  config LSM_MMAP_MIN_ADDR
        int "Low address space for LSM to protect from user allocation"
        depends on SECURITY && SECURITY_SELINUX
@@ -57048,9 +58225,9 @@ diff -urNp linux-2.6.36/security/Kconfig linux-2.6.36/security/Kconfig
        help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.36/security/min_addr.c linux-2.6.36/security/min_addr.c
---- linux-2.6.36/security/min_addr.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/min_addr.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/security/min_addr.c linux-2.6.37/security/min_addr.c
+--- linux-2.6.37/security/min_addr.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/min_addr.c   2011-01-17 02:41:02.000000000 -0500
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -57067,9 +58244,9 @@ diff -urNp linux-2.6.36/security/min_addr.c linux-2.6.36/security/min_addr.c
  }
  
  /*
-diff -urNp linux-2.6.36/security/security.c linux-2.6.36/security/security.c
---- linux-2.6.36/security/security.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/security.c   2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/security/security.c linux-2.6.37/security/security.c
+--- linux-2.6.37/security/security.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/security.c   2011-01-17 02:41:02.000000000 -0500
 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
  /* things that live in capability.c */
  extern void __init security_fixup_ops(struct security_operations *ops);
@@ -57091,9 +58268,9 @@ diff -urNp linux-2.6.36/security/security.c linux-2.6.36/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-2.6.36/security/selinux/hooks.c linux-2.6.36/security/selinux/hooks.c
---- linux-2.6.36/security/selinux/hooks.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/selinux/hooks.c      2010-11-06 18:58:50.000000000 -0400
+diff -urNp linux-2.6.37/security/selinux/hooks.c linux-2.6.37/security/selinux/hooks.c
+--- linux-2.6.37/security/selinux/hooks.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/selinux/hooks.c      2011-01-17 02:41:02.000000000 -0500
 @@ -90,7 +90,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -57102,7 +58279,7 @@ diff -urNp linux-2.6.36/security/selinux/hooks.c linux-2.6.36/security/selinux/h
  
  /* SECMARK reference count */
  atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5371,7 +5370,7 @@ static int selinux_key_getsecurity(struc
+@@ -5388,7 +5387,7 @@ static int selinux_key_getsecurity(struc
  
  #endif
  
@@ -57111,10 +58288,10 @@ diff -urNp linux-2.6.36/security/selinux/hooks.c linux-2.6.36/security/selinux/h
        .name =                         "selinux",
  
        .ptrace_access_check =          selinux_ptrace_access_check,
-diff -urNp linux-2.6.36/security/smack/smack_lsm.c linux-2.6.36/security/smack/smack_lsm.c
---- linux-2.6.36/security/smack/smack_lsm.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/smack/smack_lsm.c    2010-11-06 18:58:15.000000000 -0400
-@@ -3056,7 +3056,7 @@ static int smack_inode_getsecctx(struct 
+diff -urNp linux-2.6.37/security/smack/smack_lsm.c linux-2.6.37/security/smack/smack_lsm.c
+--- linux-2.6.37/security/smack/smack_lsm.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/smack/smack_lsm.c    2011-01-17 02:41:02.000000000 -0500
+@@ -3052,7 +3052,7 @@ static int smack_inode_getsecctx(struct 
        return 0;
  }
  
@@ -57123,9 +58300,9 @@ diff -urNp linux-2.6.36/security/smack/smack_lsm.c linux-2.6.36/security/smack/s
        .name =                         "smack",
  
        .ptrace_access_check =          smack_ptrace_access_check,
-diff -urNp linux-2.6.36/security/tomoyo/tomoyo.c linux-2.6.36/security/tomoyo/tomoyo.c
---- linux-2.6.36/security/tomoyo/tomoyo.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/security/tomoyo/tomoyo.c      2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/security/tomoyo/tomoyo.c linux-2.6.37/security/tomoyo/tomoyo.c
+--- linux-2.6.37/security/tomoyo/tomoyo.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/security/tomoyo/tomoyo.c      2011-01-17 02:41:02.000000000 -0500
 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -57135,9 +58312,9 @@ diff -urNp linux-2.6.36/security/tomoyo/tomoyo.c linux-2.6.36/security/tomoyo/to
        .name                = "tomoyo",
        .cred_alloc_blank    = tomoyo_cred_alloc_blank,
        .cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-2.6.36/sound/aoa/codecs/onyx.c linux-2.6.36/sound/aoa/codecs/onyx.c
---- linux-2.6.36/sound/aoa/codecs/onyx.c       2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/aoa/codecs/onyx.c       2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/aoa/codecs/onyx.c linux-2.6.37/sound/aoa/codecs/onyx.c
+--- linux-2.6.37/sound/aoa/codecs/onyx.c       2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/aoa/codecs/onyx.c       2011-01-17 02:41:02.000000000 -0500
 @@ -54,7 +54,7 @@ struct onyx {
                                spdif_locked:1,
                                analog_locked:1,
@@ -57166,10 +58343,10 @@ diff -urNp linux-2.6.36/sound/aoa/codecs/onyx.c linux-2.6.36/sound/aoa/codecs/on
                onyx->spdif_locked = onyx->analog_locked = 0;
        mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.36/sound/core/oss/pcm_oss.c linux-2.6.36/sound/core/oss/pcm_oss.c
---- linux-2.6.36/sound/core/oss/pcm_oss.c      2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/core/oss/pcm_oss.c      2010-11-06 18:58:15.000000000 -0400
-@@ -2966,8 +2966,8 @@ static void snd_pcm_oss_proc_done(struct
+diff -urNp linux-2.6.37/sound/core/oss/pcm_oss.c linux-2.6.37/sound/core/oss/pcm_oss.c
+--- linux-2.6.37/sound/core/oss/pcm_oss.c      2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/core/oss/pcm_oss.c      2011-01-17 02:41:02.000000000 -0500
+@@ -2969,8 +2969,8 @@ static void snd_pcm_oss_proc_done(struct
        }
  }
  #else /* !CONFIG_SND_VERBOSE_PROCFS */
@@ -57180,9 +58357,9 @@ diff -urNp linux-2.6.36/sound/core/oss/pcm_oss.c linux-2.6.36/sound/core/oss/pcm
  #endif /* CONFIG_SND_VERBOSE_PROCFS */
  
  /*
-diff -urNp linux-2.6.36/sound/core/seq/seq_lock.h linux-2.6.36/sound/core/seq/seq_lock.h
---- linux-2.6.36/sound/core/seq/seq_lock.h     2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/core/seq/seq_lock.h     2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/core/seq/seq_lock.h linux-2.6.37/sound/core/seq/seq_lock.h
+--- linux-2.6.37/sound/core/seq/seq_lock.h     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/core/seq/seq_lock.h     2011-01-17 02:41:02.000000000 -0500
 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
  #else /* SMP || CONFIG_SND_DEBUG */
  
@@ -57198,9 +58375,9 @@ diff -urNp linux-2.6.36/sound/core/seq/seq_lock.h linux-2.6.36/sound/core/seq/se
  
  #endif /* SMP || CONFIG_SND_DEBUG */
  
-diff -urNp linux-2.6.36/sound/drivers/mts64.c linux-2.6.36/sound/drivers/mts64.c
---- linux-2.6.36/sound/drivers/mts64.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/drivers/mts64.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/drivers/mts64.c linux-2.6.37/sound/drivers/mts64.c
+--- linux-2.6.37/sound/drivers/mts64.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/drivers/mts64.c 2011-01-17 02:41:02.000000000 -0500
 @@ -66,7 +66,7 @@ struct mts64 {
        struct pardevice *pardev;
        int pardev_claimed;
@@ -57249,9 +58426,9 @@ diff -urNp linux-2.6.36/sound/drivers/mts64.c linux-2.6.36/sound/drivers/mts64.c
  
        return 0;
  }
-diff -urNp linux-2.6.36/sound/drivers/portman2x4.c linux-2.6.36/sound/drivers/portman2x4.c
---- linux-2.6.36/sound/drivers/portman2x4.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/drivers/portman2x4.c    2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/drivers/portman2x4.c linux-2.6.37/sound/drivers/portman2x4.c
+--- linux-2.6.37/sound/drivers/portman2x4.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/drivers/portman2x4.c    2011-01-17 02:41:02.000000000 -0500
 @@ -84,7 +84,7 @@ struct portman {
        struct pardevice *pardev;
        int pardev_claimed;
@@ -57261,9 +58438,9 @@ diff -urNp linux-2.6.36/sound/drivers/portman2x4.c linux-2.6.36/sound/drivers/po
        int mode[PORTMAN_NUM_INPUT_PORTS];
        struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.36/sound/oss/sb_audio.c linux-2.6.36/sound/oss/sb_audio.c
---- linux-2.6.36/sound/oss/sb_audio.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/oss/sb_audio.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/oss/sb_audio.c linux-2.6.37/sound/oss/sb_audio.c
+--- linux-2.6.37/sound/oss/sb_audio.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/oss/sb_audio.c  2011-01-17 02:41:02.000000000 -0500
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
                buf16 = (signed short *)(localbuf + localoffs);
                while (c)
@@ -57273,9 +58450,46 @@ diff -urNp linux-2.6.36/sound/oss/sb_audio.c linux-2.6.36/sound/oss/sb_audio.c
                        if (copy_from_user(lbuf8,
                                           userbuf+useroffs + p,
                                           locallen))
-diff -urNp linux-2.6.36/sound/pci/ac97/ac97_codec.c linux-2.6.36/sound/pci/ac97/ac97_codec.c
---- linux-2.6.36/sound/pci/ac97/ac97_codec.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/ac97/ac97_codec.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/oss/swarm_cs4297a.c linux-2.6.37/sound/oss/swarm_cs4297a.c
+--- linux-2.6.37/sound/oss/swarm_cs4297a.c     2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/oss/swarm_cs4297a.c     2011-01-17 02:41:02.000000000 -0500
+@@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
+ {
+       struct cs4297a_state *s;
+       u32 pwr, id;
+-      mm_segment_t fs;
+       int rval;
+ #ifndef CONFIG_BCM_CS4297A_CSWARM
+       u64 cfg;
+@@ -2696,22 +2695,23 @@ static int __init cs4297a_init(void)
+         if (!rval) {
+               char *sb1250_duart_present;
+ 
++#if 0
++                mm_segment_t fs;
+                 fs = get_fs();
+                 set_fs(KERNEL_DS);
+-#if 0
+                 val = SOUND_MASK_LINE;
+                 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
+                 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
+                         val = initvol[i].vol;
+                         mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
+                 }
++                set_fs(fs);
+ //                cs4297a_write_ac97(s, 0x18, 0x0808);
+ #else
+                 //                cs4297a_write_ac97(s, 0x5e, 0x180);
+                 cs4297a_write_ac97(s, 0x02, 0x0808);
+                 cs4297a_write_ac97(s, 0x18, 0x0808);
+ #endif
+-                set_fs(fs);
+ 
+                 list_add(&s->list, &cs4297a_devs);
+ 
+diff -urNp linux-2.6.37/sound/pci/ac97/ac97_codec.c linux-2.6.37/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.37/sound/pci/ac97/ac97_codec.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/ac97/ac97_codec.c   2011-01-17 02:41:02.000000000 -0500
 @@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc
  }
  
@@ -57285,9 +58499,9 @@ diff -urNp linux-2.6.36/sound/pci/ac97/ac97_codec.c linux-2.6.36/sound/pci/ac97/
  
  #ifdef CONFIG_SND_AC97_POWER_SAVE
  static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.36/sound/pci/ac97/ac97_patch.c linux-2.6.36/sound/pci/ac97/ac97_patch.c
---- linux-2.6.36/sound/pci/ac97/ac97_patch.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/ac97/ac97_patch.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/pci/ac97/ac97_patch.c linux-2.6.37/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.37/sound/pci/ac97/ac97_patch.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/ac97/ac97_patch.c   2011-01-17 02:41:02.000000000 -0500
 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
        return 0;
  }
@@ -57585,9 +58799,9 @@ diff -urNp linux-2.6.36/sound/pci/ac97/ac97_patch.c linux-2.6.36/sound/pci/ac97/
        .build_specific = patch_ucb1400_specific,
  };
  
-diff -urNp linux-2.6.36/sound/pci/ens1370.c linux-2.6.36/sound/pci/ens1370.c
---- linux-2.6.36/sound/pci/ens1370.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/ens1370.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/pci/ens1370.c linux-2.6.37/sound/pci/ens1370.c
+--- linux-2.6.37/sound/pci/ens1370.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/ens1370.c   2011-01-17 02:41:02.000000000 -0500
 @@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
        { PCI_VDEVICE(ENSONIQ, 0x5880), 0, },   /* ES1373 - CT5880 */
        { PCI_VDEVICE(ECTIVA, 0x8938), 0, },    /* Ectiva EV1938 */
@@ -57597,10 +58811,10 @@ diff -urNp linux-2.6.36/sound/pci/ens1370.c linux-2.6.36/sound/pci/ens1370.c
  };
  
  MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.36/sound/pci/hda/patch_hdmi.c linux-2.6.36/sound/pci/hda/patch_hdmi.c
---- linux-2.6.36/sound/pci/hda/patch_hdmi.c    2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/hda/patch_hdmi.c    2010-11-06 18:58:15.000000000 -0400
-@@ -671,10 +671,10 @@ static void hdmi_non_intrinsic_event(str
+diff -urNp linux-2.6.37/sound/pci/hda/patch_hdmi.c linux-2.6.37/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.37/sound/pci/hda/patch_hdmi.c    2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/hda/patch_hdmi.c    2011-01-17 02:41:02.000000000 -0500
+@@ -726,10 +726,10 @@ static void hdmi_non_intrinsic_event(str
                cp_ready);
  
        /* TODO */
@@ -57615,9 +58829,9 @@ diff -urNp linux-2.6.36/sound/pci/hda/patch_hdmi.c linux-2.6.36/sound/pci/hda/pa
  }
  
  
-diff -urNp linux-2.6.36/sound/pci/intel8x0.c linux-2.6.36/sound/pci/intel8x0.c
---- linux-2.6.36/sound/pci/intel8x0.c  2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/intel8x0.c  2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/pci/intel8x0.c linux-2.6.37/sound/pci/intel8x0.c
+--- linux-2.6.37/sound/pci/intel8x0.c  2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/intel8x0.c  2011-01-17 02:41:02.000000000 -0500
 @@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
        { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },     /* AMD8111 */
        { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL },     /* AMD768 */
@@ -57627,7 +58841,7 @@ diff -urNp linux-2.6.36/sound/pci/intel8x0.c linux-2.6.36/sound/pci/intel8x0.c
  };
  
  MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids);
-@@ -2135,7 +2135,7 @@ static struct ac97_quirk ac97_quirks[] _
+@@ -2141,7 +2141,7 @@ static struct ac97_quirk ac97_quirks[] _
                .type = AC97_TUNE_HP_ONLY
        },
  #endif
@@ -57636,9 +58850,9 @@ diff -urNp linux-2.6.36/sound/pci/intel8x0.c linux-2.6.36/sound/pci/intel8x0.c
  };
  
  static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.36/sound/pci/intel8x0m.c linux-2.6.36/sound/pci/intel8x0m.c
---- linux-2.6.36/sound/pci/intel8x0m.c 2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/sound/pci/intel8x0m.c 2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/sound/pci/intel8x0m.c linux-2.6.37/sound/pci/intel8x0m.c
+--- linux-2.6.37/sound/pci/intel8x0m.c 2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/sound/pci/intel8x0m.c 2011-01-17 02:41:02.000000000 -0500
 @@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
        { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },     /* AMD8111 */
        { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
@@ -57657,9 +58871,9 @@ diff -urNp linux-2.6.36/sound/pci/intel8x0m.c linux-2.6.36/sound/pci/intel8x0m.c
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.36/usr/gen_init_cpio.c linux-2.6.36/usr/gen_init_cpio.c
---- linux-2.6.36/usr/gen_init_cpio.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/usr/gen_init_cpio.c   2010-11-06 18:58:15.000000000 -0400
+diff -urNp linux-2.6.37/usr/gen_init_cpio.c linux-2.6.37/usr/gen_init_cpio.c
+--- linux-2.6.37/usr/gen_init_cpio.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/usr/gen_init_cpio.c   2011-01-17 02:41:02.000000000 -0500
 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
        int retval;
        int rc = -1;
@@ -57682,10 +58896,10 @@ diff -urNp linux-2.6.36/usr/gen_init_cpio.c linux-2.6.36/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
---- linux-2.6.36/virt/kvm/kvm_main.c   2010-10-20 16:30:22.000000000 -0400
-+++ linux-2.6.36/virt/kvm/kvm_main.c   2010-11-06 18:58:15.000000000 -0400
-@@ -1300,6 +1300,7 @@ static int kvm_vcpu_release(struct inode
+diff -urNp linux-2.6.37/virt/kvm/kvm_main.c linux-2.6.37/virt/kvm/kvm_main.c
+--- linux-2.6.37/virt/kvm/kvm_main.c   2011-01-04 19:50:19.000000000 -0500
++++ linux-2.6.37/virt/kvm/kvm_main.c   2011-01-17 02:41:02.000000000 -0500
+@@ -1344,6 +1344,7 @@ static int kvm_vcpu_release(struct inode
        return 0;
  }
  
@@ -57693,7 +58907,7 @@ diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
  static struct file_operations kvm_vcpu_fops = {
        .release        = kvm_vcpu_release,
        .unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -1767,6 +1768,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -1812,6 +1813,7 @@ static int kvm_vm_mmap(struct file *file
        return 0;
  }
  
@@ -57701,7 +58915,7 @@ diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
  static struct file_operations kvm_vm_fops = {
        .release        = kvm_vm_release,
        .unlocked_ioctl = kvm_vm_ioctl,
-@@ -1864,6 +1866,7 @@ out:
+@@ -1910,6 +1912,7 @@ out:
        return r;
  }
  
@@ -57709,7 +58923,7 @@ diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
  static struct file_operations kvm_chardev_ops = {
        .unlocked_ioctl = kvm_dev_ioctl,
        .compat_ioctl   = kvm_dev_ioctl,
-@@ -1873,6 +1876,9 @@ static struct miscdevice kvm_dev = {
+@@ -1920,6 +1923,9 @@ static struct miscdevice kvm_dev = {
        KVM_MINOR,
        "kvm",
        &kvm_chardev_ops,
@@ -57719,16 +58933,7 @@ diff -urNp linux-2.6.36/virt/kvm/kvm_main.c linux-2.6.36/virt/kvm/kvm_main.c
  };
  
  static void hardware_enable(void *junk)
-@@ -1974,7 +1980,7 @@ asmlinkage void kvm_handle_fault_on_rebo
-               /* spin while reset goes on */
-               local_irq_enable();
-               while (true)
--                      ;
-+                      cpu_relax();
-       }
-       /* Fault while not rebooting.  We want the trace. */
-       BUG();
-@@ -2208,7 +2214,7 @@ static void kvm_sched_out(struct preempt
+@@ -2259,7 +2265,7 @@ static void kvm_sched_out(struct preempt
        kvm_arch_vcpu_put(vcpu);
  }
  

diff --git a/pkgs/core/kernel/patches/linux-2.6.31.1-scsi.h-fix-1.patch.off b/pkgs/core/kernel/patches/linux-2.6.31.1-scsi.h-fix-1.patch.off
deleted file mode 100644 (file)
index 7ff5ef0..0000000
--- a/pkgs/core/kernel/patches/linux-2.6.31.1-scsi.h-fix-1.patch.off
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 084478e..dfcfaab 100644
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--      u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--      u8 control;
--      u8 misc[5];
--      u8 additional_cdb_length;         /* total cdb length - 8 */
-+      __u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+      __u8 control;
-+      __u8 misc[5];
-+      __u8 additional_cdb_length;         /* total cdb length - 8 */
-       __be16 service_action;
-       /* service specific data follows */
- };

diff --git a/pkgs/core/kernel/patches/routes-2.6.36-16.diff b/pkgs/core/kernel/patches/routes-2.6.37-16.diff
similarity index 73%
rename from pkgs/core/kernel/patches/routes-2.6.36-16.diff
rename to pkgs/core/kernel/patches/routes-2.6.37-16.diff
index f25fcc030f1b2627f7fcfb4dfab42f298448ae26..7950bde1140c3e32648a1b85305d86c429d85e2e 100644 (file)
--- a/pkgs/core/kernel/patches/routes-2.6.36-16.diff
+++ b/pkgs/core/kernel/patches/routes-2.6.37-16.diff
@@ -1,6 +1,6 @@
-diff -urp v2.6.36/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
---- v2.6.36/linux/include/linux/rtnetlink.h    2010-10-22 11:34:37.000000000 +0300
-+++ linux/include/linux/rtnetlink.h    2010-10-23 15:03:19.704274198 +0300
+diff -urp v2.6.37/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
+--- v2.6.37/linux/include/linux/rtnetlink.h    2011-01-06 00:01:18.000000000 +0200
++++ linux/include/linux/rtnetlink.h    2011-01-08 17:20:30.066270851 +0200
 @@ -312,6 +312,8 @@ struct rtnexthop {
  #define RTNH_F_DEAD           1       /* Nexthop is dead (used by multipath)  */
  #define RTNH_F_PERVASIVE      2       /* Do recursive gateway lookup  */
@@ -10,9 +10,9 @@ diff -urp v2.6.36/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.
  
  /* Macros to handle hexthops */
  
-diff -urp v2.6.36/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.36/linux/include/net/flow.h   2010-08-02 09:37:48.000000000 +0300
-+++ linux/include/net/flow.h   2010-10-23 15:04:36.408274819 +0300
+diff -urp v2.6.37/linux/include/net/flow.h linux/include/net/flow.h
+--- v2.6.37/linux/include/net/flow.h   2010-08-02 09:37:48.000000000 +0300
++++ linux/include/net/flow.h   2011-01-08 17:21:40.092271753 +0200
 @@ -19,6 +19,8 @@ struct flowi {
                struct {
                        __be32                  daddr;
@@ -31,10 +31,10 @@ diff -urp v2.6.36/linux/include/net/flow.h linux/include/net/flow.h
  #define fl4_tos               nl_u.ip4_u.tos
  #define fl4_scope     nl_u.ip4_u.scope
  
-diff -urp v2.6.36/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.36/linux/include/net/ip_fib.h 2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/ip_fib.h 2010-10-23 15:03:19.704274198 +0300
-@@ -207,6 +207,8 @@ extern int fib_lookup(struct net *n, str
+diff -urp v2.6.37/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
+--- v2.6.37/linux/include/net/ip_fib.h 2011-01-06 00:01:19.000000000 +0200
++++ linux/include/net/ip_fib.h 2011-01-08 17:20:30.066270851 +0200
+@@ -210,6 +210,8 @@ extern int fib_lookup(struct net *n, str
  extern struct fib_table *fib_new_table(struct net *net, u32 id);
  extern struct fib_table *fib_get_table(struct net *net, u32 id);
  
@@ -43,16 +43,16 @@ diff -urp v2.6.36/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
  #endif /* CONFIG_IP_MULTIPLE_TABLES */
  
  /* Exported by fib_frontend.c */
-@@ -277,4 +279,6 @@ static inline void fib_proc_exit(struct 
+@@ -270,4 +272,6 @@ static inline void fib_proc_exit(struct 
  }
  #endif
  
 +extern rwlock_t fib_nhflags_lock;
 +
  #endif  /* _NET_FIB_H */
-diff -urp v2.6.36/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilter/nf_nat.h
---- v2.6.36/linux/include/net/netfilter/nf_nat.h       2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/netfilter/nf_nat.h       2010-10-23 15:04:36.408274819 +0300
+diff -urp v2.6.37/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilter/nf_nat.h
+--- v2.6.37/linux/include/net/netfilter/nf_nat.h       2010-02-25 09:01:36.000000000 +0200
++++ linux/include/net/netfilter/nf_nat.h       2011-01-08 17:21:40.092271753 +0200
 @@ -73,6 +73,13 @@ struct nf_conn_nat {
  #endif
  };
@@ -67,9 +67,9 @@ diff -urp v2.6.36/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilt
  /* Set up the info structure to map into this range. */
  extern unsigned int nf_nat_setup_info(struct nf_conn *ct,
                                      const struct nf_nat_range *range,
-diff -urp v2.6.36/linux/include/net/route.h linux/include/net/route.h
---- v2.6.36/linux/include/net/route.h  2010-10-22 11:34:37.000000000 +0300
-+++ linux/include/net/route.h  2010-10-23 15:04:36.409274028 +0300
+diff -urp v2.6.37/linux/include/net/route.h linux/include/net/route.h
+--- v2.6.37/linux/include/net/route.h  2010-10-22 11:34:37.000000000 +0300
++++ linux/include/net/route.h  2011-01-08 17:21:40.093271136 +0200
 @@ -126,6 +126,7 @@ static inline int ip_route_input_noref(s
        return ip_route_input_common(skb, dst, src, tos, devin, true);
  }
@@ -78,10 +78,10 @@ diff -urp v2.6.36/linux/include/net/route.h linux/include/net/route.h
  extern unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph, unsigned short new_mtu, struct net_device *dev);
  extern void           ip_rt_send_redirect(struct sk_buff *skb);
  
-diff -urp v2.6.36/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
---- v2.6.36/linux/net/bridge/br_netfilter.c    2010-10-22 11:34:37.000000000 +0300
-+++ linux/net/bridge/br_netfilter.c    2010-10-23 15:04:36.410274544 +0300
-@@ -337,6 +337,9 @@ static int br_nf_pre_routing_finish(stru
+diff -urp v2.6.37/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
+--- v2.6.37/linux/net/bridge/br_netfilter.c    2011-01-06 00:01:21.000000000 +0200
++++ linux/net/bridge/br_netfilter.c    2011-01-08 17:21:40.094271883 +0200
+@@ -404,6 +404,9 @@ static int br_nf_pre_routing_finish(stru
        struct rtable *rt;
        int err;
  
@@ -91,9 +91,9 @@ diff -urp v2.6.36/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.
        if (nf_bridge->mask & BRNF_PKT_TYPE) {
                skb->pkt_type = PACKET_OTHERHOST;
                nf_bridge->mask ^= BRNF_PKT_TYPE;
-diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.36/linux/net/ipv4/fib_frontend.c      2010-10-22 11:34:38.000000000 +0300
-+++ linux/net/ipv4/fib_frontend.c      2010-10-23 15:03:19.706274107 +0300
+diff -urp v2.6.37/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
+--- v2.6.37/linux/net/ipv4/fib_frontend.c      2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_frontend.c      2011-01-08 17:20:30.067270952 +0200
 @@ -47,6 +47,8 @@
  
  #ifndef CONFIG_IP_MULTIPLE_TABLES
@@ -122,9 +122,9 @@ diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                fib_table_select_default(tb, flp, res);
  }
  
-@@ -245,6 +250,9 @@ int fib_validate_source(__be32 src, __be
-                           .iif = oif };
- 
+@@ -264,6 +269,9 @@ int fib_validate_source(__be32 src, __be
+               .iif = oif
+       };
        struct fib_result res;
 +      int table;
 +      unsigned char prefixlen;
@@ -132,14 +132,13 @@ diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
        int no_addr, rpf, accept_local;
        bool dev_match;
        int ret;
-@@ -294,21 +302,29 @@ int fib_validate_source(__be32 src, __be
-               fib_res_put(&res);
+@@ -310,19 +318,26 @@ int fib_validate_source(__be32 src, __be
+               ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
                return ret;
        }
 +      table = FIB_RES_TABLE(&res);
 +      prefixlen = res.prefixlen;
 +      scope = res.scope;
-       fib_res_put(&res);
        if (no_addr)
                goto last_resort;
 -      if (rpf == 1)
@@ -155,17 +154,15 @@ diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
 +                   !rpf)) {
                        *spec_dst = FIB_RES_PREFSRC(res);
                        ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
-+                      fib_res_put(&res);
 +                      return ret;
                }
-               fib_res_put(&res);
        }
 +      if (rpf == 1)
 +              goto e_rpf;
        return ret;
  
  last_resort:
-@@ -933,9 +949,7 @@ static int fib_inetaddr_event(struct not
+@@ -954,9 +969,7 @@ static int fib_inetaddr_event(struct not
        switch (event) {
        case NETDEV_UP:
                fib_add_ifaddr(ifa);
@@ -175,7 +172,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-@@ -971,9 +985,7 @@ static int fib_netdev_event(struct notif
+@@ -992,9 +1005,7 @@ static int fib_netdev_event(struct notif
                for_ifa(in_dev) {
                        fib_add_ifaddr(ifa);
                } endfor_ifa(in_dev);
@@ -185,49 +182,59 @@ diff -urp v2.6.36/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-diff -urp v2.6.36/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.36/linux/net/ipv4/fib_hash.c  2010-05-17 10:49:01.000000000 +0300
-+++ linux/net/ipv4/fib_hash.c  2010-10-23 15:03:19.707274360 +0300
-@@ -278,25 +278,35 @@ out:
+diff -urp v2.6.37/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
+--- v2.6.37/linux/net/ipv4/fib_hash.c  2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_hash.c  2011-01-08 17:20:30.068270994 +0200
+@@ -305,27 +305,43 @@ out:
  void fib_table_select_default(struct fib_table *tb,
                              const struct flowi *flp, struct fib_result *res)
  {
 -      int order, last_idx;
-+      int order, last_idx, last_dflt, last_nhsel;
-+      struct fib_alias *first_fa = NULL;
-+      struct hlist_head *head;
++      int order, last_idx, last_dflt, last_nhsel, good;
++      struct fib_alias *first_fa;
        struct hlist_node *node;
        struct fib_node *f;
-       struct fib_info *fi = NULL;
+-      struct fib_info *fi = NULL;
++      struct fib_info *fi;
        struct fib_info *last_resort;
        struct fn_hash *t = (struct fn_hash *)tb->tb_data;
 -      struct fn_zone *fz = t->fn_zones[0];
 +      struct fn_zone *fz = t->fn_zones[res->prefixlen];
+       struct hlist_head *head;
 +      __be32 k;
++      unsigned int seq;
  
        if (fz == NULL)
                return;
  
 +      k = fz_key(flp->fl4_dst, fz);
++
++      rcu_read_lock();
++
++retry:
 +      last_dflt = -2;
 +      last_nhsel = 0;
        last_idx = -1;
        last_resort = NULL;
        order = -1;
- 
-       read_lock(&fib_hash_lock);
--      hlist_for_each_entry(f, node, &fz->fz_hash[0], fn_hash) {
-+      head = &fz->fz_hash[fn_hash(k, fz)];
-+      hlist_for_each_entry(f, node, head, fn_hash) {
++      fi = NULL;
++      first_fa = NULL;
++      good = 0;
+ 
+-      rcu_read_lock();
+-      head = rcu_dereference(fz->fz_hash);
++      seq = read_seqbegin(&fz->fz_lock);
++      head = rcu_dereference(fz->fz_hash) + fn_hash(k, fz);
+       hlist_for_each_entry_rcu(f, node, head, fn_hash) {
                struct fib_alias *fa;
  
 +              if (f->fn_key != k)
 +                      continue;
 +
-               list_for_each_entry(fa, &f->fn_alias, fa_list) {
+               list_for_each_entry_rcu(fa, &f->fn_alias, fa_list) {
                        struct fib_info *next_fi = fa->fa_info;
  
-@@ -304,42 +314,56 @@ void fib_table_select_default(struct fib
+@@ -333,43 +349,66 @@ void fib_table_select_default(struct fib
                            fa->fa_type != RTN_UNICAST)
                                continue;
  
@@ -239,28 +246,40 @@ diff -urp v2.6.36/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
 -                      if (!next_fi->fib_nh[0].nh_gw ||
 -                          next_fi->fib_nh[0].nh_scope != RT_SCOPE_LINK)
 -                              continue;
-                       fa->fa_state |= FA_S_ACCESSED;
+ 
+                       fib_alias_accessed(fa);
  
 -                      if (fi == NULL) {
 -                              if (next_fi != res->fi)
 -                                      break;
 -                      } else if (!fib_detect_death(fi, order, &last_resort,
 -                                              &last_idx, tb->tb_default)) {
+-                              fib_result_assign(res, fi);
+-                              tb->tb_default = order;
+-                              goto out;
 +                      if (!first_fa) {
 +                              last_dflt = fa->fa_last_dflt;
 +                              first_fa = fa;
 +                      }
 +                      if (fi && !fib_detect_death(fi, order, &last_resort,
 +                              &last_idx, &last_dflt, &last_nhsel, flp)) {
-                               fib_result_assign(res, fi);
--                              tb->tb_default = order;
-+                              first_fa->fa_last_dflt = order;
-                               goto out;
++                              good = 1;
++                              goto done1;
                        }
                        fi = next_fi;
                        order++;
                }
 +              break;
++      }
++
++done1:
++      if (read_seqretry(&fz->fz_lock, seq))
++              goto retry;
++
++      if (good) {
++              fib_result_assign(res, fi);
++              first_fa->fa_last_dflt = order;
++              goto out;
        }
  
        if (order <= 0 || fi == NULL) {
@@ -296,17 +315,17 @@ diff -urp v2.6.36/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
 +              first_fa->fa_last_dflt = last_idx;
 +      }
  out:
-       read_unlock(&fib_hash_lock);
+       rcu_read_unlock();
  }
-@@ -463,6 +487,7 @@ int fib_table_insert(struct fib_table *t
-                       write_lock_bh(&fib_hash_lock);
-                       fi_drop = fa->fa_info;
-                       fa->fa_info = fi;
-+                      fa->fa_last_dflt = -1;
-                       fa->fa_type = cfg->fc_type;
-                       fa->fa_scope = cfg->fc_scope;
+@@ -507,6 +546,7 @@ int fib_table_insert(struct fib_table *t
+ 
+                       new_fa->fa_tos = fa->fa_tos;
+                       new_fa->fa_info = fi;
++                      new_fa->fa_last_dflt = -1;
+                       new_fa->fa_type = cfg->fc_type;
+                       new_fa->fa_scope = cfg->fc_scope;
                        state = fa->fa_state;
-@@ -517,6 +542,7 @@ int fib_table_insert(struct fib_table *t
+@@ -559,6 +599,7 @@ int fib_table_insert(struct fib_table *t
        new_fa->fa_type = cfg->fc_type;
        new_fa->fa_scope = cfg->fc_scope;
        new_fa->fa_state = 0;
@@ -314,9 +333,9 @@ diff -urp v2.6.36/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
  
        /*
         * Insert new entry to the list.
-diff -urp v2.6.36/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.36/linux/net/ipv4/fib_lookup.h        2009-09-11 10:27:17.000000000 +0300
-+++ linux/net/ipv4/fib_lookup.h        2010-10-23 15:03:19.707274360 +0300
+diff -urp v2.6.37/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
+--- v2.6.37/linux/net/ipv4/fib_lookup.h        2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_lookup.h        2011-01-08 17:20:30.069271071 +0200
 @@ -8,6 +8,7 @@
  struct fib_alias {
        struct list_head        fa_list;
@@ -325,7 +344,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
        u8                      fa_tos;
        u8                      fa_type;
        u8                      fa_scope;
-@@ -37,7 +38,8 @@ extern struct fib_alias *fib_find_alias(
+@@ -42,7 +43,8 @@ extern struct fib_alias *fib_find_alias(
                                        u8 tos, u32 prio);
  extern int fib_detect_death(struct fib_info *fi, int order,
                            struct fib_info **last_resort,
@@ -335,10 +354,10 @@ diff -urp v2.6.36/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
  
  static inline void fib_result_assign(struct fib_result *res,
                                     struct fib_info *fi)
-diff -urp v2.6.36/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.36/linux/net/ipv4/fib_rules.c 2010-08-02 09:37:49.000000000 +0300
-+++ linux/net/ipv4/fib_rules.c 2010-10-23 15:03:19.708274528 +0300
-@@ -54,6 +54,11 @@ u32 fib_rules_tclass(struct fib_result *
+diff -urp v2.6.37/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
+--- v2.6.37/linux/net/ipv4/fib_rules.c 2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_rules.c 2011-01-08 17:20:30.070271447 +0200
+@@ -53,6 +53,11 @@ u32 fib_rules_tclass(struct fib_result *
  }
  #endif
  
@@ -350,9 +369,9 @@ diff -urp v2.6.36/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
  int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)
  {
        struct fib_lookup_arg arg = {
-diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.36/linux/net/ipv4/fib_semantics.c     2010-05-17 10:49:01.000000000 +0300
-+++ linux/net/ipv4/fib_semantics.c     2010-10-23 15:04:36.412272841 +0300
+diff -urp v2.6.37/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
+--- v2.6.37/linux/net/ipv4/fib_semantics.c     2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_semantics.c     2011-01-08 17:21:40.095271450 +0200
 @@ -51,6 +51,7 @@ static struct hlist_head *fib_info_hash;
  static struct hlist_head *fib_info_laddrhash;
  static unsigned int fib_hash_size;
@@ -361,25 +380,25 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  
  #define DEVINDEX_HASHBITS 8
  #define DEVINDEX_HASHSIZE (1U << DEVINDEX_HASHBITS)
-@@ -187,7 +188,7 @@ static __inline__ int nh_comp(const stru
+@@ -203,7 +204,7 @@ static inline int nh_comp(const struct f
  #ifdef CONFIG_NET_CLS_ROUTE
                    nh->nh_tclassid != onh->nh_tclassid ||
  #endif
--                  ((nh->nh_flags^onh->nh_flags)&~RTNH_F_DEAD))
-+                  ((nh->nh_flags^onh->nh_flags)&~RTNH_F_BADSTATE))
+-                  ((nh->nh_flags ^ onh->nh_flags) & ~RTNH_F_DEAD))
++                  ((nh->nh_flags ^ onh->nh_flags) & ~RTNH_F_BADSTATE))
                        return -1;
                onh++;
        } endfor_nexthops(fi);
-@@ -238,7 +239,7 @@ static struct fib_info *fib_find_info(co
+@@ -254,7 +255,7 @@ static struct fib_info *fib_find_info(co
                    nfi->fib_priority == fi->fib_priority &&
                    memcmp(nfi->fib_metrics, fi->fib_metrics,
                           sizeof(fi->fib_metrics)) == 0 &&
--                  ((nfi->fib_flags^fi->fib_flags)&~RTNH_F_DEAD) == 0 &&
-+                  ((nfi->fib_flags^fi->fib_flags)&~RTNH_F_BADSTATE) == 0 &&
+-                  ((nfi->fib_flags ^ fi->fib_flags) & ~RTNH_F_DEAD) == 0 &&
++                  ((nfi->fib_flags ^ fi->fib_flags) & ~RTNH_F_BADSTATE) == 0 &&
                    (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
                        return fi;
        }
-@@ -350,26 +351,70 @@ struct fib_alias *fib_find_alias(struct 
+@@ -365,26 +366,70 @@ struct fib_alias *fib_find_alias(struct 
  }
  
  int fib_detect_death(struct fib_info *fi, int order,
@@ -412,10 +431,10 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 -      }
 -      if (state == NUD_REACHABLE)
 -              return 0;
--      if ((state&NUD_VALID) && order != dflt)
+-      if ((state & NUD_VALID) && order != dflt)
 -              return 0;
--      if ((state&NUD_VALID) ||
--          (*last_idx<0 && order > dflt)) {
+-      if ((state & NUD_VALID) ||
+-          (*last_idx < 0 && order > dflt)) {
 -              *last_resort = fi;
 -              *last_idx = order;
 +              flag = 0;
@@ -434,17 +453,17 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +                      state = n->nud_state;
 +                      neigh_release(n);
 +              }
-+              if (state==NUD_REACHABLE ||
-+                      ((state&NUD_VALID) && order != *dflt)) {
++              if (state == NUD_REACHABLE ||
++                  ((state & NUD_VALID) && order != *dflt)) {
 +                      dead = 0;
 +                      goto setfl;
 +              }
-+              if (!(state&NUD_VALID))
++              if (!(state & NUD_VALID))
 +                      flag = 1;
 +              if (!dead)
 +                      goto setfl;
-+              if ((state&NUD_VALID) ||
-+                  (*last_idx<0 && order >= *dflt)) {
++              if ((state & NUD_VALID) ||
++                  (*last_idx < 0 && order >= *dflt)) {
 +                      *last_resort = fi;
 +                      *last_idx = order;
 +                      *last_nhsel = nhsel;
@@ -466,13 +485,13 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  }
  
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
-@@ -538,8 +583,11 @@ static int fib_check_nh(struct fib_confi
-                               return -EINVAL;
-                       if ((dev = __dev_get_by_index(net, nh->nh_oif)) == NULL)
+@@ -553,8 +598,11 @@ static int fib_check_nh(struct fib_confi
+                       dev = __dev_get_by_index(net, nh->nh_oif);
+                       if (!dev)
                                return -ENODEV;
--                      if (!(dev->flags&IFF_UP))
+-                      if (!(dev->flags & IFF_UP))
 -                              return -ENETDOWN;
-+                      if (!(dev->flags&IFF_UP)) {
++                      if (!(dev->flags & IFF_UP)) {
 +                              if (fi->fib_protocol != RTPROT_STATIC)
 +                                      return -ENETDOWN;
 +                              nh->nh_flags |= RTNH_F_DEAD;
@@ -480,88 +499,78 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                        nh->nh_dev = dev;
                        dev_hold(dev);
                        nh->nh_scope = RT_SCOPE_LINK;
-@@ -559,24 +607,48 @@ static int fib_check_nh(struct fib_confi
-                       /* It is not necessary, but requires a bit of thinking */
+@@ -576,21 +624,41 @@ static int fib_check_nh(struct fib_confi
                        if (fl.fl4_scope < RT_SCOPE_LINK)
                                fl.fl4_scope = RT_SCOPE_LINK;
--                      if ((err = fib_lookup(net, &fl, &res)) != 0)
+                       err = fib_lookup(net, &fl, &res);
+-                      if (err) {
+-                              rcu_read_unlock();
 -                              return err;
-+                      err = fib_lookup(net, &fl, &res);
-               }
--              err = -EINVAL;
--              if (res.type != RTN_UNICAST && res.type != RTN_LOCAL)
--                      goto out;
--              nh->nh_scope = res.scope;
--              nh->nh_oif = FIB_RES_OIF(res);
--              if ((nh->nh_dev = FIB_RES_DEV(res)) == NULL)
--                      goto out;
--              dev_hold(nh->nh_dev);
--              err = -ENETDOWN;
--              if (!(nh->nh_dev->flags & IFF_UP))
--                      goto out;
--              err = 0;
++              }
 +              if (err) {
 +                      struct in_device *in_dev;
 +
 +                      if (err != -ENETUNREACH ||
 +                          fi->fib_protocol != RTPROT_STATIC)
-+                              return err;
++                              goto out;
 +
 +                      in_dev = inetdev_by_index(net, nh->nh_oif);
 +                      if (in_dev == NULL ||
-+                          in_dev->dev->flags & IFF_UP) {
-+                              if (in_dev)
-+                                      in_dev_put(in_dev);
-+                              return err;
-+                      }
++                          in_dev->dev->flags & IFF_UP)
++                              goto out;
 +                      nh->nh_flags |= RTNH_F_DEAD;
 +                      nh->nh_scope = RT_SCOPE_LINK;
 +                      nh->nh_dev = in_dev->dev;
 +                      dev_hold(nh->nh_dev);
-+                      in_dev_put(in_dev);
 +              } else {
 +                      err = -EINVAL;
 +                      if (res.type != RTN_UNICAST && res.type != RTN_LOCAL)
 +                              goto out;
 +                      nh->nh_scope = res.scope;
 +                      nh->nh_oif = FIB_RES_OIF(res);
-+                      if ((nh->nh_dev = FIB_RES_DEV(res)) == NULL)
++                      nh->nh_dev = dev = FIB_RES_DEV(res);
++                      if (!dev)
 +                              goto out;
-+                      dev_hold(nh->nh_dev);
++                      dev_hold(dev);
 +                      if (!(nh->nh_dev->flags & IFF_UP)) {
 +                              if (fi->fib_protocol != RTPROT_STATIC) {
 +                                      err = -ENETDOWN;
 +                                      goto out;
 +                              }
 +                              nh->nh_flags |= RTNH_F_DEAD;
-+                      }
+                       }
 +                      err = 0;
- out:
--              fib_res_put(&res);
--              return err;
-+                      fib_res_put(&res);
-+                      return err;
-+              }
+               }
+-              err = -EINVAL;
+-              if (res.type != RTN_UNICAST && res.type != RTN_LOCAL)
+-                      goto out;
+-              nh->nh_scope = res.scope;
+-              nh->nh_oif = FIB_RES_OIF(res);
+-              nh->nh_dev = dev = FIB_RES_DEV(res);
+-              if (!dev)
+-                      goto out;
+-              dev_hold(dev);
+-              err = (dev->flags & IFF_UP) ? 0 : -ENETDOWN;
        } else {
                struct in_device *in_dev;
  
-@@ -587,8 +659,11 @@ out:
+@@ -603,8 +671,11 @@ static int fib_check_nh(struct fib_confi
                if (in_dev == NULL)
-                       return -ENODEV;
-               if (!(in_dev->dev->flags&IFF_UP)) {
--                      in_dev_put(in_dev);
--                      return -ENETDOWN;
-+                      if (fi->fib_protocol != RTPROT_STATIC) {
-+                              in_dev_put(in_dev);
-+                              return -ENETDOWN;
-+                      }
+                       goto out;
+               err = -ENETDOWN;
+-              if (!(in_dev->dev->flags & IFF_UP))
+-                      goto out;
++              if (!(in_dev->dev->flags & IFF_UP)) {
++                      if (fi->fib_protocol != RTPROT_STATIC)
++                              goto out;
 +                      nh->nh_flags |= RTNH_F_DEAD;
-               }
++              }
                nh->nh_dev = in_dev->dev;
                dev_hold(nh->nh_dev);
-@@ -897,8 +972,12 @@ int fib_semantic_match(struct list_head 
+               nh->nh_scope = RT_SCOPE_HOST;
+@@ -919,8 +990,12 @@ int fib_semantic_match(struct list_head 
                                for_nexthops(fi) {
-                                       if (nh->nh_flags&RTNH_F_DEAD)
+                                       if (nh->nh_flags & RTNH_F_DEAD)
                                                continue;
 -                                      if (!flp->oif || flp->oif == nh->nh_oif)
 -                                              break;
@@ -574,17 +583,17 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                                }
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
                                if (nhsel < fi->fib_nhs) {
-@@ -1078,18 +1157,29 @@ int fib_sync_down_dev(struct net_device 
+@@ -1100,18 +1175,29 @@ int fib_sync_down_dev(struct net_device 
                prev_fi = fi;
                dead = 0;
                change_nexthops(fi) {
--                      if (nexthop_nh->nh_flags&RTNH_F_DEAD)
+-                      if (nexthop_nh->nh_flags & RTNH_F_DEAD)
 -                              dead++;
 -                      else if (nexthop_nh->nh_dev == dev &&
 -                               nexthop_nh->nh_scope != scope) {
 -                              nexthop_nh->nh_flags |= RTNH_F_DEAD;
-+                      if (nexthop_nh->nh_flags&RTNH_F_DEAD) {
-+                              if (fi->fib_protocol!=RTPROT_STATIC ||
++                      if (nexthop_nh->nh_flags & RTNH_F_DEAD) {
++                              if (fi->fib_protocol != RTPROT_STATIC ||
 +                                  nexthop_nh->nh_dev == NULL ||
 +                                  __in_dev_get_rtnl(nexthop_nh->nh_dev) == NULL ||
 +                                  nexthop_nh->nh_dev->flags&IFF_UP)
@@ -612,20 +621,20 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                        }
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
                        if (force > 1 && nexthop_nh->nh_dev == dev) {
-@@ -1107,11 +1197,8 @@ int fib_sync_down_dev(struct net_device 
+@@ -1129,11 +1215,8 @@ int fib_sync_down_dev(struct net_device 
        return ret;
  }
  
 -#ifdef CONFIG_IP_ROUTE_MULTIPATH
 -
  /*
--   Dead device goes up. We wake up dead nexthops.
--   It takes sense only on multipath routes.
-+   Dead device goes up or new address is added. We wake up dead nexthops.
+- * Dead device goes up. We wake up dead nexthops.
+- * It takes sense only on multipath routes.
+++   Dead device goes up or new address is added. We wake up dead nexthops.
   */
- 
  int fib_sync_up(struct net_device *dev)
-@@ -1121,8 +1208,10 @@ int fib_sync_up(struct net_device *dev)
+ {
+@@ -1142,8 +1225,10 @@ int fib_sync_up(struct net_device *dev)
        struct hlist_head *head;
        struct hlist_node *node;
        struct fib_nh *nh;
@@ -634,10 +643,10 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +      int ret, rep;
  
 +repeat:
-       if (!(dev->flags&IFF_UP))
+       if (!(dev->flags & IFF_UP))
                return 0;
  
-@@ -1130,6 +1219,7 @@ int fib_sync_up(struct net_device *dev)
+@@ -1151,6 +1236,7 @@ int fib_sync_up(struct net_device *dev)
        hash = fib_devindex_hashfn(dev->ifindex);
        head = &fib_info_devhash[hash];
        ret = 0;
@@ -645,17 +654,17 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  
        hlist_for_each_entry(nh, node, head, nh_hash) {
                struct fib_info *fi = nh->nh_parent;
-@@ -1142,21 +1232,41 @@ int fib_sync_up(struct net_device *dev)
+@@ -1163,21 +1249,45 @@ int fib_sync_up(struct net_device *dev)
                prev_fi = fi;
                alive = 0;
                change_nexthops(fi) {
--                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
+-                      if (!(nexthop_nh->nh_flags & RTNH_F_DEAD)) {
 -                              alive++;
-+                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD))
++                      if (!(nexthop_nh->nh_flags & RTNH_F_DEAD))
                                continue;
 -                      }
                        if (nexthop_nh->nh_dev == NULL ||
-                           !(nexthop_nh->nh_dev->flags&IFF_UP))
+                           !(nexthop_nh->nh_dev->flags & IFF_UP))
                                continue;
                        if (nexthop_nh->nh_dev != dev ||
                            !__in_dev_get_rtnl(dev))
@@ -667,15 +676,19 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +                                                  .scope = nexthop_nh->nh_scope } },
 +                                      .oif =  nexthop_nh->nh_oif,
 +                              };
-+                              if (fib_lookup(dev_net(dev), &fl, &res) != 0)
++
++                              rcu_read_lock();
++                              if (fib_lookup(dev_net(dev), &fl, &res) != 0) {
++                                      rcu_read_unlock();
 +                                      continue;
++                              }
 +                              if (res.type != RTN_UNICAST &&
 +                                  res.type != RTN_LOCAL) {
-+                                      fib_res_put(&res);
++                                      rcu_read_unlock();
 +                                      continue;
 +                              }
 +                              nexthop_nh->nh_scope = res.scope;
-+                              fib_res_put(&res);
++                              rcu_read_unlock();
 +                              rep = 1;
 +                      }
                        alive++;
@@ -690,7 +703,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                } endfor_nexthops(fi)
  
                if (alive > 0) {
-@@ -1164,10 +1274,14 @@ int fib_sync_up(struct net_device *dev)
+@@ -1185,10 +1295,14 @@ int fib_sync_up(struct net_device *dev)
                        ret++;
                }
        }
@@ -703,9 +716,9 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +#ifdef CONFIG_IP_ROUTE_MULTIPATH
 +
  /*
-    The algorithm is suboptimal, but it provides really
-    fair weighted route distribution.
-@@ -1176,24 +1290,45 @@ int fib_sync_up(struct net_device *dev)
+  * The algorithm is suboptimal, but it provides really
+  * fair weighted route distribution.
+@@ -1196,24 +1310,46 @@ int fib_sync_up(struct net_device *dev)
  void fib_select_multipath(const struct flowi *flp, struct fib_result *res)
  {
        struct fib_info *fi = res->fi;
@@ -720,9 +733,10 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +                      if (flp->oif != nexthop_nh->nh_oif)
 +                              continue;
 +                      if (flp->fl4_gw && flp->fl4_gw != nexthop_nh->nh_gw &&
-+                          nexthop_nh->nh_gw && nexthop_nh->nh_scope == RT_SCOPE_LINK)
++                          nexthop_nh->nh_gw &&
++                          nexthop_nh->nh_scope == RT_SCOPE_LINK)
 +                              continue;
-+                      if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
++                      if (!(nexthop_nh->nh_flags & RTNH_F_BADSTATE)) {
 +                              if (nexthop_nh->nh_power > w) {
 +                                      w = nexthop_nh->nh_power;
 +                                      sel = nhsel;
@@ -741,8 +755,8 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        if (fi->fib_power <= 0) {
                int power = 0;
                change_nexthops(fi) {
--                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
-+                      if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
+-                      if (!(nexthop_nh->nh_flags & RTNH_F_DEAD)) {
++                      if (!(nexthop_nh->nh_flags & RTNH_F_BADSTATE)) {
                                power += nexthop_nh->nh_weight;
                                nexthop_nh->nh_power = nexthop_nh->nh_weight;
                        }
@@ -759,21 +773,19 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        }
  
  
-@@ -1203,21 +1338,41 @@ void fib_select_multipath(const struct f
+@@ -1223,8 +1359,9 @@ void fib_select_multipath(const struct f
  
        w = jiffies % fi->fib_power;
  
 +      alive = 0;
        change_nexthops(fi) {
--              if (!(nexthop_nh->nh_flags&RTNH_F_DEAD) &&
-+              if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE) &&
+-              if (!(nexthop_nh->nh_flags & RTNH_F_DEAD) &&
++              if (!(nexthop_nh->nh_flags & RTNH_F_BADSTATE) &&
                    nexthop_nh->nh_power) {
-                       if ((w -= nexthop_nh->nh_power) <= 0) {
-                               nexthop_nh->nh_power--;
-                               fi->fib_power--;
--                              res->nh_sel = nhsel;
+                       w -= nexthop_nh->nh_power;
+                       if (w <= 0) {
+@@ -1234,11 +1371,29 @@ void fib_select_multipath(const struct f
                                spin_unlock_bh(&fib_multipath_lock);
-+                              res->nh_sel = nhsel;
                                return;
                        }
 +                      alive = 1;
@@ -785,9 +797,8 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +      }
 +
 +last_resort:
-+
 +      for_nexthops(fi) {
-+              if (!(nh->nh_flags&RTNH_F_DEAD)) {
++              if (!(nh->nh_flags & RTNH_F_DEAD)) {
 +                      if (flp->oif && flp->oif != nh->nh_oif)
 +                              continue;
 +                      if (flp->fl4_gw && flp->fl4_gw != nh->nh_gw &&
@@ -804,10 +815,10 @@ diff -urp v2.6.36/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        spin_unlock_bh(&fib_multipath_lock);
  }
  #endif
-diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
---- v2.6.36/linux/net/ipv4/fib_trie.c  2010-10-22 11:34:38.000000000 +0300
-+++ linux/net/ipv4/fib_trie.c  2010-10-23 15:03:19.712272951 +0300
-@@ -1277,6 +1277,7 @@ int fib_table_insert(struct fib_table *t
+diff -urp v2.6.37/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
+--- v2.6.37/linux/net/ipv4/fib_trie.c  2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/fib_trie.c  2011-01-08 17:20:30.073271586 +0200
+@@ -1270,6 +1270,7 @@ int fib_table_insert(struct fib_table *t
                        fi_drop = fa->fa_info;
                        new_fa->fa_tos = fa->fa_tos;
                        new_fa->fa_info = fi;
@@ -815,7 +826,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
                        new_fa->fa_type = cfg->fc_type;
                        new_fa->fa_scope = cfg->fc_scope;
                        state = fa->fa_state;
-@@ -1317,6 +1318,7 @@ int fib_table_insert(struct fib_table *t
+@@ -1310,6 +1311,7 @@ int fib_table_insert(struct fib_table *t
        new_fa->fa_type = cfg->fc_type;
        new_fa->fa_scope = cfg->fc_scope;
        new_fa->fa_state = 0;
@@ -823,7 +834,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
        /*
         * Insert new entry to the list.
         */
-@@ -1819,24 +1821,31 @@ void fib_table_select_default(struct fib
+@@ -1807,24 +1809,31 @@ void fib_table_select_default(struct fib
                              struct fib_result *res)
  {
        struct trie *t = (struct trie *) tb->tb_data;
@@ -858,7 +869,7 @@ diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
        if (!fa_head)
                goto out;
  
-@@ -1850,39 +1859,52 @@ void fib_table_select_default(struct fib
+@@ -1838,40 +1847,53 @@ void fib_table_select_default(struct fib
                    fa->fa_type != RTN_UNICAST)
                        continue;
  
@@ -870,7 +881,8 @@ diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
 -              if (!next_fi->fib_nh[0].nh_gw ||
 -                  next_fi->fib_nh[0].nh_scope != RT_SCOPE_LINK)
 -                      continue;
-               fa->fa_state |= FA_S_ACCESSED;
+ 
+               fib_alias_accessed(fa);
  
 -              if (fi == NULL) {
 -                      if (next_fi != res->fi)
@@ -925,9 +937,9 @@ diff -urp v2.6.36/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
  out:
        rcu_read_unlock();
  }
-diff -urp v2.6.36/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.36/linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-08-02 09:37:49.000000000 +0300
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-10-23 15:04:36.412272841 +0300
+diff -urp v2.6.37/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- v2.6.37/linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-08-02 09:37:49.000000000 +0300
++++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2011-01-08 17:21:40.096271293 +0200
 @@ -51,7 +51,7 @@ masquerade_tg(struct sk_buff *skb, const
        enum ip_conntrack_info ctinfo;
        struct nf_nat_range newrange;
@@ -972,10 +984,10 @@ diff -urp v2.6.36/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfi
        nat->masq_index = par->out->ifindex;
  
        /* Transfer from original range. */
-diff -urp v2.6.36/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilter/nf_nat_core.c
---- v2.6.36/linux/net/ipv4/netfilter/nf_nat_core.c     2010-10-22 11:34:38.000000000 +0300
-+++ linux/net/ipv4/netfilter/nf_nat_core.c     2010-10-23 15:04:36.413274353 +0300
-@@ -706,6 +706,52 @@ static struct pernet_operations nf_nat_n
+diff -urp v2.6.37/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilter/nf_nat_core.c
+--- v2.6.37/linux/net/ipv4/netfilter/nf_nat_core.c     2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/netfilter/nf_nat_core.c     2011-01-08 17:21:40.097270104 +0200
+@@ -711,6 +711,52 @@ static struct pernet_operations nf_nat_n
        .exit = nf_nat_net_exit,
  };
  
@@ -1028,9 +1040,9 @@ diff -urp v2.6.36/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilte
  static int __init nf_nat_init(void)
  {
        size_t i;
-diff -urp v2.6.36/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/netfilter/nf_nat_standalone.c
---- v2.6.36/linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-10-22 11:34:38.000000000 +0300
-+++ linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-10-23 15:04:36.414274319 +0300
+diff -urp v2.6.37/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/netfilter/nf_nat_standalone.c
+--- v2.6.37/linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-10-22 11:34:38.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_standalone.c       2011-01-08 17:21:40.097270104 +0200
 @@ -249,6 +249,14 @@ static struct nf_hook_ops nf_nat_ops[] _
                .hooknum        = NF_INET_PRE_ROUTING,
                .priority       = NF_IP_PRI_NAT_DST,
@@ -1046,10 +1058,10 @@ diff -urp v2.6.36/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/ne
        /* After packet filtering, change source */
        {
                .hook           = nf_nat_out,
-diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.36/linux/net/ipv4/route.c     2010-10-22 11:34:38.000000000 +0300
-+++ linux/net/ipv4/route.c     2010-10-23 15:08:07.188273891 +0300
-@@ -693,6 +693,8 @@ static inline int compare_keys(struct fl
+diff -urp v2.6.37/linux/net/ipv4/route.c linux/net/ipv4/route.c
+--- v2.6.37/linux/net/ipv4/route.c     2011-01-06 00:01:22.000000000 +0200
++++ linux/net/ipv4/route.c     2011-01-08 17:21:40.100270360 +0200
+@@ -692,6 +692,8 @@ static inline int compare_keys(struct fl
        return (((__force u32)fl1->nl_u.ip4_u.daddr ^ (__force u32)fl2->nl_u.ip4_u.daddr) |
                ((__force u32)fl1->nl_u.ip4_u.saddr ^ (__force u32)fl2->nl_u.ip4_u.saddr) |
                (fl1->mark ^ fl2->mark) |
@@ -1058,7 +1070,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
                (*(u16 *)&fl1->nl_u.ip4_u.tos ^ *(u16 *)&fl2->nl_u.ip4_u.tos) |
                (fl1->oif ^ fl2->oif) |
                (fl1->iif ^ fl2->iif)) == 0;
-@@ -1435,6 +1437,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+@@ -1448,6 +1450,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
  
                                /* Gateway is different ... */
                                rt->rt_gateway          = new_gw;
@@ -1066,7 +1078,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
                                /* Redirect received -> path was valid */
                                dst_confirm(&rth->dst);
-@@ -1886,6 +1889,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1902,6 +1905,7 @@ static int ip_route_input_mc(struct sk_b
        rth->fl.fl4_tos = tos;
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
@@ -1074,7 +1086,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_src     = saddr;
  #ifdef CONFIG_NET_CLS_ROUTE
        rth->dst.tclassid = itag;
-@@ -1896,6 +1900,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1912,6 +1916,7 @@ static int ip_route_input_mc(struct sk_b
        dev_hold(rth->dst.dev);
        rth->idev       = in_dev_get(rth->dst.dev);
        rth->fl.oif     = 0;
@@ -1082,7 +1094,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->rt_genid   = rt_genid(dev_net(dev));
-@@ -1959,7 +1964,7 @@ static int __mkroute_input(struct sk_buf
+@@ -1975,7 +1980,7 @@ static int __mkroute_input(struct sk_buf
                           struct fib_result *res,
                           struct in_device *in_dev,
                           __be32 daddr, __be32 saddr, u32 tos,
@@ -1091,7 +1103,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  {
        struct rtable *rth;
        int err;
-@@ -1991,6 +1996,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2007,6 +2012,7 @@ static int __mkroute_input(struct sk_buf
                flags |= RTCF_DIRECTSRC;
  
        if (out_dev == in_dev && err &&
@@ -1099,7 +1111,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
            (IN_DEV_SHARED_MEDIA(out_dev) ||
             inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
                flags |= RTCF_DOREDIRECT;
-@@ -2029,6 +2035,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2045,6 +2051,7 @@ static int __mkroute_input(struct sk_buf
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
        rth->rt_src     = saddr;
@@ -1107,7 +1119,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_iif     =
                rth->fl.iif     = in_dev->dev->ifindex;
-@@ -2036,6 +2043,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2052,6 +2059,7 @@ static int __mkroute_input(struct sk_buf
        dev_hold(rth->dst.dev);
        rth->idev       = in_dev_get(rth->dst.dev);
        rth->fl.oif     = 0;
@@ -1115,7 +1127,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_spec_dst= spec_dst;
  
        rth->dst.obsolete = -1;
-@@ -2055,21 +2063,23 @@ static int __mkroute_input(struct sk_buf
+@@ -2071,21 +2079,23 @@ static int __mkroute_input(struct sk_buf
  
  static int ip_mkroute_input(struct sk_buff *skb,
                            struct fib_result *res,
@@ -1142,7 +1154,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        if (err)
                return err;
  
-@@ -2090,18 +2100,20 @@ static int ip_mkroute_input(struct sk_bu
+@@ -2107,18 +2117,20 @@ static int ip_mkroute_input(struct sk_bu
   */
  
  static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -1166,8 +1178,8 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        unsigned        flags = 0;
        u32             itag = 0;
        struct rtable * rth;
-@@ -2137,6 +2149,12 @@ static int ip_route_input_slow(struct sk
-           ipv4_is_loopback(daddr))
+@@ -2152,6 +2164,12 @@ static int ip_route_input_slow(struct sk
+       if (ipv4_is_zeronet(daddr) || ipv4_is_loopback(daddr))
                goto martian_destination;
  
 +      if (lsrc) {
@@ -1179,25 +1191,23 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        /*
         *      Now we are ready to route packet.
         */
-@@ -2146,6 +2164,8 @@ static int ip_route_input_slow(struct sk
+@@ -2161,6 +2179,8 @@ static int ip_route_input_slow(struct sk
+                       goto e_hostunreach;
                goto no_route;
        }
-       free_res = 1;
 +      fl.iif = dev->ifindex;
 +      fl.fl4_src = saddr;
  
        RT_CACHE_STAT_INC(in_slow_tot);
  
-@@ -2169,7 +2189,7 @@ static int ip_route_input_slow(struct sk
+@@ -2184,12 +2204,14 @@ static int ip_route_input_slow(struct sk
        if (res.type != RTN_UNICAST)
                goto martian_destination;
  
 -      err = ip_mkroute_input(skb, &res, &fl, in_dev, daddr, saddr, tos);
 +      err = ip_mkroute_input(skb, &res, net, &fl, in_dev, daddr, saddr, tos, lsrc);
- done:
-       if (free_res)
-               fib_res_put(&res);
-@@ -2178,6 +2198,8 @@ out:     return err;
+ out:  return err;
+ 
  brd_input:
        if (skb->protocol != htons(ETH_P_IP))
                goto e_inval;
@@ -1206,7 +1216,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
        if (ipv4_is_zeronet(saddr))
                spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-@@ -2220,6 +2242,7 @@ local_input:
+@@ -2232,6 +2254,7 @@ local_input:
        rth->dst.dev    = net->loopback_dev;
        dev_hold(rth->dst.dev);
        rth->idev       = in_dev_get(rth->dst.dev);
@@ -1214,8 +1224,8 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->dst.input= ip_local_deliver;
-@@ -2272,8 +2295,9 @@ martian_source_keep_err:
-       goto done;
+@@ -2284,8 +2307,9 @@ martian_source_keep_err:
+       goto out;
  }
  
 -int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -1226,7 +1236,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  {
        struct rtable * rth;
        unsigned        hash;
-@@ -2296,6 +2320,7 @@ int ip_route_input_common(struct sk_buff
+@@ -2308,6 +2332,7 @@ int ip_route_input_common(struct sk_buff
                if ((((__force u32)rth->fl.fl4_dst ^ (__force u32)daddr) |
                     ((__force u32)rth->fl.fl4_src ^ (__force u32)saddr) |
                     (rth->fl.iif ^ iif) |
@@ -1234,7 +1244,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
                     rth->fl.oif |
                     (rth->fl.fl4_tos ^ tos)) == 0 &&
                    rth->fl.mark == skb->mark &&
-@@ -2349,12 +2374,25 @@ skip_cache:
+@@ -2361,12 +2386,25 @@ skip_cache:
                rcu_read_unlock();
                return -EINVAL;
        }
@@ -1245,7 +1255,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  }
 +
 +int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
-+                 u8 tos, struct net_device *dev, bool noref)
++                        u8 tos, struct net_device *dev, bool noref)
 +{
 +      return ip_route_input_cached(skb, daddr, saddr, tos, dev, noref, 0);
 +}
@@ -1258,10 +1268,10 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
 +}
 +EXPORT_SYMBOL(ip_route_input_lookup);
 +
+ /* called with rcu_read_lock() */
  static int __mkroute_output(struct rtable **result,
                            struct fib_result *res,
-                           const struct flowi *fl,
-@@ -2424,6 +2462,7 @@ static int __mkroute_output(struct rtabl
+@@ -2431,6 +2469,7 @@ static int __mkroute_output(struct rtabl
        rth->fl.fl4_tos = tos;
        rth->fl.fl4_src = oldflp->fl4_src;
        rth->fl.oif     = oldflp->oif;
@@ -1269,7 +1279,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->fl.mark    = oldflp->mark;
        rth->rt_dst     = fl->fl4_dst;
        rth->rt_src     = fl->fl4_src;
-@@ -2506,6 +2545,7 @@ static int ip_route_output_slow(struct n
+@@ -2509,6 +2548,7 @@ static int ip_route_output_slow(struct n
        struct flowi fl = { .nl_u = { .ip4_u =
                                      { .daddr = oldflp->fl4_dst,
                                        .saddr = oldflp->fl4_src,
@@ -1277,15 +1287,15 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
                                        .tos = tos & IPTOS_RT_MASK,
                                        .scope = ((tos & RTO_ONLINK) ?
                                                  RT_SCOPE_LINK :
-@@ -2617,6 +2657,7 @@ static int ip_route_output_slow(struct n
+@@ -2612,6 +2652,7 @@ static int ip_route_output_slow(struct n
+                       fl.fl4_dst = fl.fl4_src = htonl(INADDR_LOOPBACK);
                dev_out = net->loopback_dev;
-               dev_hold(dev_out);
                fl.oif = net->loopback_dev->ifindex;
 +              fl.fl4_gw = 0;
                res.type = RTN_LOCAL;
                flags |= RTCF_LOCAL;
                goto make_route;
-@@ -2624,7 +2665,7 @@ static int ip_route_output_slow(struct n
+@@ -2619,7 +2660,7 @@ static int ip_route_output_slow(struct n
  
        if (fib_lookup(net, &fl, &res)) {
                res.fi = NULL;
@@ -1294,15 +1304,13 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
                        /* Apparently, routing tables are wrong. Assume,
                           that the destination is on link.
  
-@@ -2664,6 +2705,7 @@ static int ip_route_output_slow(struct n
+@@ -2657,18 +2698,18 @@ static int ip_route_output_slow(struct n
+               }
                dev_out = net->loopback_dev;
-               dev_hold(dev_out);
                fl.oif = dev_out->ifindex;
 +              fl.fl4_gw = 0;
-               if (res.fi)
-                       fib_info_put(res.fi);
                res.fi = NULL;
-@@ -2671,13 +2713,12 @@ static int ip_route_output_slow(struct n
+               flags |= RTCF_LOCAL;
                goto make_route;
        }
  
@@ -1319,7 +1327,7 @@ diff -urp v2.6.36/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
        if (!fl.fl4_src)
                fl.fl4_src = FIB_RES_PREFSRC(res);
-@@ -2718,6 +2759,7 @@ int __ip_route_output_key(struct net *ne
+@@ -2702,6 +2743,7 @@ int __ip_route_output_key(struct net *ne
                    rth->fl.fl4_src == flp->fl4_src &&
                    rth->fl.iif == 0 &&
                    rth->fl.oif == flp->oif &&