kernel: Update to 3.1.1.

Packaging cpupower.

diff --git a/kernel/config.i686 b/kernel/config.i686
index 44d699037f53b57232e23f88f9d2d449056757fe..0cb854c3119ed7c1fca5725eecd3a36e25612ed4 100644 (file)
--- a/kernel/config.i686
+++ b/kernel/config.i686
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.4-9.ip3.i686 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.1.1-1.ip3.i686 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -163,6 +163,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -207,6 +208,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -226,6 +228,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
 
@@ -284,13 +287,14 @@ CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_BIGSMP=y
 CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_MRST is not set
+# CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_32_NON_STANDARD is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_X86_32_IRIS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -330,6 +334,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_PPRO_FENCE=y
@@ -355,7 +360,6 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -429,7 +433,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
-# CONFIG_EFI is not set
+CONFIG_EFI=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -485,11 +489,12 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_SFI=y
@@ -560,9 +565,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-CONFIG_DMAR_DEFAULT_ON=y
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
@@ -828,6 +830,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
@@ -1139,6 +1142,7 @@ CONFIG_RFKILL_INPUT=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
 
 #
 # Device Drivers
@@ -1187,6 +1191,7 @@ CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
@@ -1227,6 +1232,7 @@ CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
 # CONFIG_BMP085 is not set
 CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_C2PORT is not set
 
 #
@@ -1321,6 +1327,7 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
@@ -1655,6 +1662,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_VIA_VELOCITY=m
@@ -1737,6 +1745,7 @@ CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_SDIO=y
@@ -1836,6 +1845,7 @@ CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2118,12 +2128,15 @@ CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
@@ -2330,7 +2343,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # Memory mapped GPIO drivers:
 #
-# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_VX855 is not set
@@ -2356,6 +2369,7 @@ CONFIG_GPIO_SCH=m
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MCP23S08 is not set
 
 #
 # AC97 GPIO expanders:
@@ -2464,17 +2478,21 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -2491,7 +2509,9 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_AMC6821=m
@@ -2523,6 +2543,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 
 #
@@ -2628,6 +2649,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -2644,6 +2666,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -2676,6 +2699,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@@ -2692,6 +2716,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -2756,6 +2783,10 @@ CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9V011=m
 
+#
+# Flash devices
+#
+
 #
 # Video improvement chips
 #
@@ -2820,6 +2851,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -2848,6 +2880,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -2879,6 +2912,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3021,6 +3055,11 @@ CONFIG_DVB_HOPPER=m
 #
 CONFIG_DVB_NGENE=m
 
+#
+# Supported ddbridge ('Octopus') Adapters
+#
+# CONFIG_DVB_DDBRIDGE is not set
+
 #
 # Supported DVB Frontends
 #
@@ -3038,6 +3077,12 @@ CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
 #
 # DVB-S (satellite) frontends
 #
@@ -3210,6 +3255,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_VGA16=m
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -3362,6 +3408,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3411,8 +3458,8 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3420,6 +3467,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -3427,6 +3475,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -3498,6 +3547,7 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_ELECOM is not set
 CONFIG_HID_EZKEY=y
+# CONFIG_HID_HOLTEK is not set
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
@@ -3534,12 +3584,14 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 # CONFIG_HID_SONY is not set
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
 CONFIG_HID_TOPSEED=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
 CONFIG_USB_SUPPORT=y
@@ -3606,6 +3658,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3801,7 +3854,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-# CONFIG_NFC_DEVICES is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC=y
@@ -3920,11 +3972,15 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 # CONFIG_SLICOSS is not set
@@ -3974,7 +4030,6 @@ CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
-# CONFIG_CS5535_GPIO is not set
 # CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_ZCACHE is not set
@@ -3986,7 +4041,6 @@ CONFIG_HYPERV_MOUSE=m
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
-CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_ATH6K_LEGACY is not set
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
@@ -3999,10 +4053,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_DRM_PSB is not set
-
-#
-# Altera FPGA firmware download module
-#
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_INTEL_MEI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -4049,7 +4099,17 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
 CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -4057,6 +4117,7 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -4189,13 +4250,13 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -4206,6 +4267,7 @@ CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -4327,7 +4389,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -4741,10 +4803,6 @@ CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
 # CONFIG_LGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -4760,6 +4818,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -4779,6 +4838,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -4790,3 +4850,5 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y

diff --git a/kernel/config.i686-PAE b/kernel/config.i686-PAE
index 2b374db8598b8187e83a66f4688c36bf7170687c..6344c968fb8c71481afd43853f6f3e93583e6984 100644 (file)
--- a/kernel/config.i686-PAE
+++ b/kernel/config.i686-PAE
@@ -1,6 +1,6 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.4-9.ip3.i686.PAE Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.1.1-1.ip3.i686.PAE Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -163,6 +163,7 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -207,6 +208,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 
 #
 # GCOV-based kernel profiling
@@ -226,6 +228,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
 
@@ -284,13 +287,14 @@ CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_BIGSMP=y
 CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_MRST is not set
+# CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_32_NON_STANDARD is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_X86_32_IRIS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_XEN is not set
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
@@ -331,6 +335,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_PPRO_FENCE=y
@@ -356,7 +361,6 @@ CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -442,7 +446,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
-# CONFIG_EFI is not set
+CONFIG_EFI=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -500,11 +504,12 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 # CONFIG_ACPI_APEI_EINJ is not set
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_SFI=y
@@ -575,9 +580,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-CONFIG_DMAR_DEFAULT_ON=y
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
@@ -842,6 +844,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
@@ -1153,6 +1156,7 @@ CONFIG_RFKILL_INPUT=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
 
 #
 # Device Drivers
@@ -1201,6 +1205,7 @@ CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
@@ -1241,6 +1246,7 @@ CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
 # CONFIG_BMP085 is not set
 CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_C2PORT is not set
 
 #
@@ -1335,6 +1341,7 @@ CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
@@ -1670,6 +1677,7 @@ CONFIG_R8169=m
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_VIA_VELOCITY=m
@@ -1752,6 +1760,7 @@ CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_WPC=y
 CONFIG_B43=m
+CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_SDIO=y
@@ -1851,6 +1860,7 @@ CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2133,12 +2143,15 @@ CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
@@ -2345,7 +2358,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # Memory mapped GPIO drivers:
 #
-# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_VX855 is not set
@@ -2371,6 +2384,7 @@ CONFIG_GPIO_SCH=m
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MCP23S08 is not set
 
 #
 # AC97 GPIO expanders:
@@ -2479,17 +2493,21 @@ CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
@@ -2506,7 +2524,9 @@ CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_AMC6821=m
@@ -2538,6 +2558,7 @@ CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 
 #
@@ -2643,6 +2664,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
 CONFIG_VIDEO_MEDIA=m
 
 #
@@ -2659,6 +2681,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -2691,6 +2714,7 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
@@ -2707,6 +2731,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -2771,6 +2798,10 @@ CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9V011=m
 
+#
+# Flash devices
+#
+
 #
 # Video improvement chips
 #
@@ -2835,6 +2866,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -2863,6 +2895,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -2894,6 +2927,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3036,6 +3070,11 @@ CONFIG_DVB_HOPPER=m
 #
 CONFIG_DVB_NGENE=m
 
+#
+# Supported ddbridge ('Octopus') Adapters
+#
+# CONFIG_DVB_DDBRIDGE is not set
+
 #
 # Supported DVB Frontends
 #
@@ -3053,6 +3092,12 @@ CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
 #
 # DVB-S (satellite) frontends
 #
@@ -3225,6 +3270,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_VGA16=m
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -3377,6 +3423,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3426,8 +3473,8 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
@@ -3435,6 +3482,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -3442,6 +3490,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -3513,6 +3562,7 @@ CONFIG_HID_CYPRESS=y
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_ELECOM is not set
 CONFIG_HID_EZKEY=y
+# CONFIG_HID_HOLTEK is not set
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
@@ -3549,12 +3599,14 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 # CONFIG_HID_SONY is not set
+CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_SUNPLUS=m
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
 CONFIG_HID_TOPSEED=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
 CONFIG_USB_SUPPORT=y
@@ -3621,6 +3673,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3816,7 +3869,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-# CONFIG_NFC_DEVICES is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC=y
@@ -3935,11 +3987,15 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
 CONFIG_STAGING=y
-# CONFIG_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 # CONFIG_SLICOSS is not set
@@ -3989,7 +4045,6 @@ CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
-# CONFIG_CS5535_GPIO is not set
 # CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_ZCACHE is not set
@@ -4001,7 +4056,6 @@ CONFIG_HYPERV_MOUSE=m
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
-CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_ATH6K_LEGACY is not set
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
@@ -4014,10 +4068,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_DRM_PSB is not set
-
-#
-# Altera FPGA firmware download module
-#
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_INTEL_MEI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -4064,7 +4114,17 @@ CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
 CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_VIRT_DRIVERS=y
 
 #
 # Firmware Drivers
@@ -4072,6 +4132,7 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -4204,13 +4265,13 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
@@ -4221,6 +4282,7 @@ CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -4342,7 +4404,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -4757,10 +4819,6 @@ CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
 # CONFIG_LGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -4776,6 +4834,7 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -4795,6 +4854,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -4806,3 +4866,5 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_LLIST=y

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index c8b1b4517f1e5e491360337a70ecd11dde163f33..0db132d5ef2230f51b67450d6d45b9dfd95382c3 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.0.4
-release    = 11
+version    = 3.1.1
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -37,10 +37,12 @@ build
        requires
                binutils-devel
                elfutils-devel
+               gettext
                module-init-tools
                ncurses-devel
                net-tools
                newt-devel
+               pciutils-devel
                perl
                python-devel
                slang-devel
@@ -138,8 +140,8 @@ build
                        # Install modules.
                        make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \
                                KERNELRELEASE=${fullversion} modules_install
-                       #make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
-                       #       KERNELRELEASE=${fullversion} vdso_install
+                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
+                               KERNELRELEASE=${fullversion} vdso_install
 
                        # Create an empty settings file for dracut
                        mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d
@@ -195,6 +197,15 @@ build
                for kernel in %{kernels}; do
                        build_kernel ${kernel}
                done
+
+               # Build tools.
+               # cpupower
+               chmod +x tools/power/cpupower/utils/version-gen.sh
+               make -C tools/power/cpupower CPUFREQ_BENCH=false %{PARALLELISMFLAGS}
+
+               cd tools/power/cpupower/debug/i386
+               make %{PARALLELISMFLAGS} centrino-decode powernow-k8-decode
+               cd -
        end
 
        install
@@ -218,6 +229,15 @@ build
                make -C tools/perf DESTDIR=%{BUILDROOT} \
                        HAVE_CPLUS_DEMANGLE=1 prefix=/usr perfexecdir=lib/perf-core \
                        install #install-man
+
+               # cpupower
+               make -C tools/power/cpupower DESTDIR=%{BUILDROOT} libdir=/usr/lib \
+                       mandir=/usr/share/man CPUFREQ_BENCH=false install
+               cd tools/power/cpupower/debug/i386
+               install -m 755 centrino-decode %{BUILDROOT}/usr/bin/centrino-decode
+               install -m 755 powernow-k8-decode %{BUILDROOT}/usr/bin/powernow-k8-decode
+               cd -
+               chmod 0755 %{BUILDROOT}/usr/lib/libcpupower.so*
        end
 end
 

diff --git a/kernel/patches/grsecurity-2.2.2-3.0.4-201109261052.patch b/kernel/patches/grsecurity-2.2.2-3.1.1-201111171911.patch
similarity index 78%
rename from kernel/patches/grsecurity-2.2.2-3.0.4-201109261052.patch
rename to kernel/patches/grsecurity-2.2.2-3.1.1-201111171911.patch
index cce98cf9edca949a2b539b93b10312b41fc41f6d..0a5ebc1b9699787ff003e6e9007c256b39c225de 100644 (file)
--- a/kernel/patches/grsecurity-2.2.2-3.0.4-201109261052.patch
+++ b/kernel/patches/grsecurity-2.2.2-3.1.1-201111171911.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/include/asm/elf.h
---- linux-3.0.4/arch/alpha/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/include/asm/elf.h linux-3.1.1/arch/alpha/include/asm/elf.h
+--- linux-3.1.1/arch/alpha/include/asm/elf.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/elf.h   2011-11-16 18:39:07.000000000 -0500
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/inclu
  /* $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-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/include/asm/pgtable.h
---- linux-3.0.4/arch/alpha/include/asm/pgtable.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/include/asm/pgtable.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/include/asm/pgtable.h linux-3.1.1/arch/alpha/include/asm/pgtable.h
+--- linux-3.1.1/arch/alpha/include/asm/pgtable.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/include/asm/pgtable.h       2011-11-16 18:39:07.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)
@@ -36,10 +36,10 @@ diff -urNp linux-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/i
  #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-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/module.c
---- linux-3.0.4/arch/alpha/kernel/module.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/kernel/module.c     2011-08-23 21:47:55.000000000 -0400
-@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
+diff -urNp linux-3.1.1/arch/alpha/kernel/module.c linux-3.1.1/arch/alpha/kernel/module.c
+--- linux-3.1.1/arch/alpha/kernel/module.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/module.c     2011-11-16 18:39:07.000000000 -0500
+@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
        /* The small sections were sorted to the end of the segment.
           The following should definitely cover them.  */
@@ -48,10 +48,10 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/
        got = sechdrs[me->arch.gotsecindex].sh_addr;
  
        for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel/osf_sys.c
---- linux-3.0.4/arch/alpha/kernel/osf_sys.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/kernel/osf_sys.c    2011-08-23 21:47:55.000000000 -0400
-@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
+diff -urNp linux-3.1.1/arch/alpha/kernel/osf_sys.c linux-3.1.1/arch/alpha/kernel/osf_sys.c
+--- linux-3.1.1/arch/alpha/kernel/osf_sys.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/kernel/osf_sys.c    2011-11-16 18:39:07.000000000 -0500
+@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long a
                /* At this point:  (!vma || addr < vma->vm_end). */
                if (limit - len < addr)
                        return -ENOMEM;
@@ -60,7 +60,7 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel
                        return addr;
                addr = vma->vm_end;
                vma = vma->vm_next;
-@@ -1181,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp
           merely specific addresses, but regions of memory -- perhaps
           this feature should be incorporated into all ports?  */
  
@@ -71,7 +71,7 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel
        if (addr) {
                addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
                if (addr != (unsigned long) -ENOMEM)
-@@ -1188,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp
        }
  
        /* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -82,9 +82,9 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel
        if (addr != (unsigned long) -ENOMEM)
                return addr;
  
-diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
---- linux-3.0.4/arch/alpha/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/alpha/mm/fault.c linux-3.1.1/arch/alpha/mm/fault.c
+--- linux-3.1.1/arch/alpha/mm/fault.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/alpha/mm/fault.c  2011-11-16 18:39:07.000000000 -0500
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
        __reload_thread(pcb);
  }
@@ -192,7 +192,7 @@ diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
 +      return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -241,9 +241,9 @@ diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/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-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/asm/elf.h
---- linux-3.0.4/arch/arm/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/elf.h linux-3.1.1/arch/arm/include/asm/elf.h
+--- linux-3.1.1/arch/arm/include/asm/elf.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/elf.h     2011-11-16 18:39:07.000000000 -0500
 @@ -116,7 +116,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.  */
@@ -271,9 +271,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/a
  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-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/include/asm/kmap_types.h
---- linux-3.0.4/arch/arm/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/kmap_types.h linux-3.1.1/arch/arm/include/asm/kmap_types.h
+--- linux-3.1.1/arch/arm/include/asm/kmap_types.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/kmap_types.h      2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@ enum km_type {
        KM_L1_CACHE,
        KM_L2_CACHE,
@@ -282,9 +282,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/in
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/include/asm/uaccess.h
---- linux-3.0.4/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/include/asm/uaccess.h linux-3.1.1/arch/arm/include/asm/uaccess.h
+--- linux-3.1.1/arch/arm/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -340,9 +340,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/inclu
        if (access_ok(VERIFY_WRITE, to, n))
                n = __copy_to_user(to, from, n);
        return n;
-diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/armksyms.c
---- linux-3.0.4/arch/arm/kernel/armksyms.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/armksyms.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/armksyms.c linux-3.1.1/arch/arm/kernel/armksyms.c
+--- linux-3.1.1/arch/arm/kernel/armksyms.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/armksyms.c     2011-11-16 18:39:07.000000000 -0500
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -354,18 +354,18 @@ diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/ar
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/process.c
---- linux-3.0.4/arch/arm/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/process.c linux-3.1.1/arch/arm/kernel/process.c
+--- linux-3.1.1/arch/arm/kernel/process.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/process.c      2011-11-16 18:39:07.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 <linux/cpuidle.h>
  
- #include <asm/cacheflush.h>
-@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru
+@@ -481,12 +480,6 @@ unsigned long get_wchan(struct task_stru
        return 0;
  }
  
@@ -378,9 +378,9 @@ diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/pro
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps.c
---- linux-3.0.4/arch/arm/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/traps.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/kernel/traps.c linux-3.1.1/arch/arm/kernel/traps.c
+--- linux-3.1.1/arch/arm/kernel/traps.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/kernel/traps.c        2011-11-16 18:40:08.000000000 -0500
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -400,9 +400,9 @@ diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps
        if (ret != NOTIFY_STOP)
                do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/copy_from_user.S
---- linux-3.0.4/arch/arm/lib/copy_from_user.S  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/copy_from_user.S  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/copy_from_user.S linux-3.1.1/arch/arm/lib/copy_from_user.S
+--- linux-3.1.1/arch/arm/lib/copy_from_user.S  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_from_user.S  2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +426,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/co
  
        .pushsection .fixup,"ax"
        .align 0
-diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy_to_user.S
---- linux-3.0.4/arch/arm/lib/copy_to_user.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/copy_to_user.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/copy_to_user.S linux-3.1.1/arch/arm/lib/copy_to_user.S
+--- linux-3.1.1/arch/arm/lib/copy_to_user.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/copy_to_user.S    2011-11-16 18:39:07.000000000 -0500
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +452,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy
  ENDPROC(__copy_to_user_std)
  
        .pushsection .fixup,"ax"
-diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
---- linux-3.0.4/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess.S linux-3.1.1/arch/arm/lib/uaccess.S
+--- linux-3.1.1/arch/arm/lib/uaccess.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess.S 2011-11-16 18:39:07.000000000 -0500
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +508,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
  
                .pushsection .fixup,"ax"
                .align  0
-diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/lib/uaccess_with_memcpy.c     2011-11-16 18:39:07.000000000 -0500
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +520,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/l
  {
        /*
         * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mach-ux500/mbox-db5500.c      2011-11-16 18:40:08.000000000 -0500
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
        return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -532,9 +532,9 @@ diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/ma
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
---- linux-3.0.4/arch/arm/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mm/fault.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mm/fault.c linux-3.1.1/arch/arm/mm/fault.c
+--- linux-3.1.1/arch/arm/mm/fault.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/fault.c    2011-11-16 18:39:07.000000000 -0500
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
        }
  #endif
@@ -549,12 +549,12 @@ diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
        tsk->thread.address = addr;
        tsk->thread.error_code = fsr;
        tsk->thread.trap_no = 14;
-@@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -383,6 +390,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif                                        /* CONFIG_MMU */
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      long i;
 +
@@ -583,9 +583,9 @@ diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
---- linux-3.0.4/arch/arm/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/arm/mm/mmap.c linux-3.1.1/arch/arm/mm/mmap.c
+--- linux-3.1.1/arch/arm/mm/mmap.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/arm/mm/mmap.c     2011-11-16 18:39:07.000000000 -0500
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
        if (len > TASK_SIZE)
                return -ENOMEM;
@@ -635,9 +635,9 @@ diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
                        /*
                         * Remember the place where we stopped the search:
                         */
-diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/include/asm/elf.h
---- linux-3.0.4/arch/avr32/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/include/asm/elf.h linux-3.1.1/arch/avr32/include/asm/elf.h
+--- linux-3.1.1/arch/avr32/include/asm/elf.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/elf.h   2011-11-16 18:39:07.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.  */
@@ -654,9 +654,9 @@ diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/inclu
  
  /* 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-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.4/arch/avr32/include/asm/kmap_types.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/include/asm/kmap_types.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/include/asm/kmap_types.h linux-3.1.1/arch/avr32/include/asm/kmap_types.h
+--- linux-3.1.1/arch/avr32/include/asm/kmap_types.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/include/asm/kmap_types.h    2011-11-16 18:39:07.000000000 -0500
 @@ -22,7 +22,8 @@ D(10)        KM_IRQ0,
  D(11) KM_IRQ1,
  D(12) KM_SOFTIRQ0,
@@ -667,15 +667,15 @@ diff -urNp linux-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr3
  };
  
  #undef D
-diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/arch/avr32/mm/fault.c
---- linux-3.0.4/arch/avr32/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/avr32/mm/fault.c linux-3.1.1/arch/avr32/mm/fault.c
+--- linux-3.1.1/arch/avr32/mm/fault.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/avr32/mm/fault.c  2011-11-16 18:39:07.000000000 -0500
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -711,9 +711,9 @@ diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/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-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/include/asm/kmap_types.h
---- linux-3.0.4/arch/frv/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/frv/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/frv/include/asm/kmap_types.h linux-3.1.1/arch/frv/include/asm/kmap_types.h
+--- linux-3.1.1/arch/frv/include/asm/kmap_types.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/include/asm/kmap_types.h      2011-11-16 18:39:07.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -722,9 +722,9 @@ diff -urNp linux-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/in
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic.c
---- linux-3.0.4/arch/frv/mm/elf-fdpic.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/frv/mm/elf-fdpic.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/frv/mm/elf-fdpic.c linux-3.1.1/arch/frv/mm/elf-fdpic.c
+--- linux-3.1.1/arch/frv/mm/elf-fdpic.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/frv/mm/elf-fdpic.c        2011-11-16 18:39:07.000000000 -0500
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
        if (addr) {
                addr = PAGE_ALIGN(addr);
@@ -753,9 +753,9 @@ diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic
                                goto success;
                        addr = vma->vm_end;
                }
-diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include/asm/elf.h
---- linux-3.0.4/arch/ia64/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/elf.h linux-3.1.1/arch/ia64/include/asm/elf.h
+--- linux-3.1.1/arch/ia64/include/asm/elf.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/elf.h    2011-11-16 18:39:07.000000000 -0500
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -770,9 +770,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include
  #define PT_IA_64_UNWIND               0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/include/asm/pgtable.h
---- linux-3.0.4/arch/ia64/include/asm/pgtable.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/pgtable.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/pgtable.h linux-3.1.1/arch/ia64/include/asm/pgtable.h
+--- linux-3.1.1/arch/ia64/include/asm/pgtable.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/pgtable.h        2011-11-16 18:39:07.000000000 -0500
 @@ -12,7 +12,7 @@
   *    David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -800,9 +800,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/inc
  #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-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/include/asm/spinlock.h
---- linux-3.0.4/arch/ia64/include/asm/spinlock.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/spinlock.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/spinlock.h linux-3.1.1/arch/ia64/include/asm/spinlock.h
+--- linux-3.1.1/arch/ia64/include/asm/spinlock.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/spinlock.h       2011-11-16 18:39:07.000000000 -0500
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
        unsigned short  *p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -812,9 +812,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/in
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/include/asm/uaccess.h
---- linux-3.0.4/arch/ia64/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/include/asm/uaccess.h linux-3.1.1/arch/ia64/include/asm/uaccess.h
+--- linux-3.1.1/arch/ia64/include/asm/uaccess.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/include/asm/uaccess.h        2011-11-16 18:39:07.000000000 -0500
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
        const void *__cu_from = (from);                                                 \
        long __cu_len = (n);                                                            \
@@ -833,10 +833,10 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/inc
                __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);   \
        __cu_len;                                                                       \
  })
-diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/module.c
---- linux-3.0.4/arch/ia64/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
-@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
+diff -urNp linux-3.1.1/arch/ia64/kernel/module.c linux-3.1.1/arch/ia64/kernel/module.c
+--- linux-3.1.1/arch/ia64/kernel/module.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/module.c      2011-11-16 18:39:07.000000000 -0500
+@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
  void
  module_free (struct module *mod, void *module_region)
  {
@@ -846,7 +846,7 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/mo
                unw_remove_unwind_table(mod->arch.init_unw_table);
                mod->arch.init_unw_table = NULL;
        }
-@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
+@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
  }
  
  static inline int
@@ -888,7 +888,7 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/mo
  }
  
  static inline int
-@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
+@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_
                break;
  
              case RV_BDREL:
@@ -904,7 +904,7 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/mo
                break;
  
              case RV_LTV:
-@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
+@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
                 *     addresses have been selected...
                 */
                uint64_t gp;
@@ -924,9 +924,9 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/mo
                mod->arch.gp = gp;
                DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
        }
-diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.4/arch/ia64/kernel/sys_ia64.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/sys_ia64.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/kernel/sys_ia64.c linux-3.1.1/arch/ia64/kernel/sys_ia64.c
+--- linux-3.1.1/arch/ia64/kernel/sys_ia64.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/sys_ia64.c    2011-11-16 18:39:07.000000000 -0500
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
        if (REGION_NUMBER(addr) == RGN_HPAGE)
                addr = 0;
@@ -959,9 +959,9 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/
                        /* Remember the address where we stopped this search:  */
                        mm->free_area_cache = addr + len;
                        return addr;
-diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/kernel/vmlinux.lds.S 2011-11-16 18:39:07.000000000 -0500
 @@ -199,7 +199,7 @@ SECTIONS {
        /* Per-cpu data: */
        . = ALIGN(PERCPU_PAGE_SIZE);
@@ -971,15 +971,15 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kern
        /*
         * ensure percpu data fits
         * into percpu page size
-diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/arch/ia64/mm/fault.c
---- linux-3.0.4/arch/ia64/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/fault.c linux-3.1.1/arch/ia64/mm/fault.c
+--- linux-3.1.1/arch/ia64/mm/fault.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/fault.c   2011-11-16 18:39:07.000000000 -0500
 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
        return pte_present(pte);
  }
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -1023,9 +1023,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/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-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.4/arch/ia64/mm/hugetlbpage.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/hugetlbpage.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/hugetlbpage.c linux-3.1.1/arch/ia64/mm/hugetlbpage.c
+--- linux-3.1.1/arch/ia64/mm/hugetlbpage.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/hugetlbpage.c     2011-11-16 18:39:07.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)
@@ -1035,9 +1035,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/huget
                        return addr;
                addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
        }
-diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/arch/ia64/mm/init.c
---- linux-3.0.4/arch/ia64/mm/init.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/init.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/ia64/mm/init.c linux-3.1.1/arch/ia64/mm/init.c
+--- linux-3.1.1/arch/ia64/mm/init.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/ia64/mm/init.c    2011-11-16 18:39:07.000000000 -0500
 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
                vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1058,9 +1058,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/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-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/usercopy.c
---- linux-3.0.4/arch/m32r/lib/usercopy.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/m32r/lib/usercopy.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/m32r/lib/usercopy.c linux-3.1.1/arch/m32r/lib/usercopy.c
+--- linux-3.1.1/arch/m32r/lib/usercopy.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/m32r/lib/usercopy.c       2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1081,9 +1081,9 @@ diff -urNp linux-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/userco
        prefetchw(to);
        if (access_ok(VERIFY_READ, from, n))
                __copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include/asm/elf.h
---- linux-3.0.4/arch/mips/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/elf.h linux-3.1.1/arch/mips/include/asm/elf.h
+--- linux-3.1.1/arch/mips/include/asm/elf.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/elf.h    2011-11-16 18:39:07.000000000 -0500
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1105,9 +1105,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/include/asm/page.h
---- linux-3.0.4/arch/mips/include/asm/page.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/page.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/page.h linux-3.1.1/arch/mips/include/asm/page.h
+--- linux-3.1.1/arch/mips/include/asm/page.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/page.h   2011-11-16 18:39:07.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;
@@ -1117,9 +1117,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/includ
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)       ((x).pte)
-diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/include/asm/system.h
---- linux-3.0.4/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/include/asm/system.h linux-3.1.1/arch/mips/include/asm/system.h
+--- linux-3.1.1/arch/mips/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1128,9 +1128,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/incl
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/binfmt_elfn32.c       2011-11-16 18:39:07.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)
@@ -1145,9 +1145,9 @@ diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/ke
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/binfmt_elfo32.c       2011-11-16 18:39:07.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)
@@ -1162,10 +1162,10 @@ diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/ke
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/process.c
---- linux-3.0.4/arch/mips/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
-@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
+diff -urNp linux-3.1.1/arch/mips/kernel/process.c linux-3.1.1/arch/mips/kernel/process.c
+--- linux-3.1.1/arch/mips/kernel/process.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/kernel/process.c     2011-11-16 18:39:07.000000000 -0500
+@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_stru
  out:
        return pc;
  }
@@ -1181,15 +1181,15 @@ diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/p
 -
 -      return sp & ALMASK;
 -}
-diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/arch/mips/mm/fault.c
---- linux-3.0.4/arch/mips/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/mips/mm/fault.c linux-3.1.1/arch/mips/mm/fault.c
+--- linux-3.1.1/arch/mips/mm/fault.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/mm/fault.c   2011-11-16 18:39:07.000000000 -0500
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>              /* For VMALLOC_END */
  #include <linux/kdebug.h>
  
 +#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -1208,13 +1208,13 @@ diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/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-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
---- linux-3.0.4/arch/mips/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
-@@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
-       do_color_align = 0;
-       if (filp || (flags & MAP_SHARED))
+diff -urNp linux-3.1.1/arch/mips/mm/mmap.c linux-3.1.1/arch/mips/mm/mmap.c
+--- linux-3.1.1/arch/mips/mm/mmap.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/mips/mm/mmap.c    2011-11-16 18:39:07.000000000 -0500
+@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_a
                do_color_align = 1;
+ 
+       /* requesting a specific address */
 +
 +#ifdef CONFIG_PAX_RANDMMAP
 +      if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
@@ -1223,27 +1223,46 @@ diff -urNp linux-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
        if (addr) {
                if (do_color_align)
                        addr = COLOUR_ALIGN(addr, pgoff);
-               else
+@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_a
                        addr = PAGE_ALIGN(addr);
-               vmm = find_vma(current->mm, addr);
+ 
+               vma = find_vma(mm, addr);
 -              if (TASK_SIZE - len >= addr &&
--                  (!vmm || addr + len <= vmm->vm_start))
+-                  (!vma || addr + len <= vma->vm_start))
 +              if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
                        return addr;
        }
-       addr = current->mm->mmap_base;
-@@ -68,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
-               /* At this point:  (!vmm || addr < vmm->vm_end). */
-               if (TASK_SIZE - len < addr)
-                       return -ENOMEM;
--              if (!vmm || addr + len <= vmm->vm_start)
-+              if (check_heap_stack_gap(vmm, addr, len))
-                       return addr;
-               addr = vmm->vm_end;
-               if (do_color_align)
-@@ -93,30 +97,3 @@ void arch_pick_mmap_layout(struct mm_str
-       mm->get_unmapped_area = arch_get_unmapped_area;
-       mm->unmap_area = arch_unmap_area;
+ 
+@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_a
+                       /* At this point:  (!vma || addr < vma->vm_end). */
+                       if (TASK_SIZE - len < addr)
+                               return -ENOMEM;
+-                      if (!vma || addr + len <= vma->vm_start)
++                      if (check_heap_stack_gap(vmm, addr, len))
+                               return addr;
+                       addr = vma->vm_end;
+                       if (do_color_align)
+@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_a
+               /* make sure it can fit in the remaining address space */
+               if (likely(addr > len)) {
+                       vma = find_vma(mm, addr - len);
+-                      if (!vma || addr <= vma->vm_start) {
++                      if (check_heap_stack_gap(vmm, addr - len, len))
+                               /* cache the address as a hint for next time */
+                               return mm->free_area_cache = addr - len;
+                       }
+@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_a
+                        * return with success:
+                        */
+                       vma = find_vma(mm, addr);
+-                      if (likely(!vma || addr + len <= vma->vm_start)) {
++                      if (check_heap_stack_gap(vmm, addr, len)) {
+                               /* cache the address as a hint for next time */
+                               return mm->free_area_cache = addr;
+                       }
+@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_str
+               mm->unmap_area = arch_unmap_area_topdown;
+       }
  }
 -
 -static inline unsigned long brk_rnd(void)
@@ -1272,9 +1291,9 @@ diff -urNp linux-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
 -
 -      return ret;
 -}
-diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/include/asm/elf.h
---- linux-3.0.4/arch/parisc/include/asm/elf.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/include/asm/elf.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/include/asm/elf.h linux-3.1.1/arch/parisc/include/asm/elf.h
+--- linux-3.1.1/arch/parisc/include/asm/elf.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/include/asm/elf.h  2011-11-16 18:39:07.000000000 -0500
 @@ -342,6 +342,13 @@ struct pt_regs;   /* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1289,9 +1308,9 @@ diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/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,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc/include/asm/pgtable.h
---- linux-3.0.4/arch/parisc/include/asm/pgtable.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/include/asm/pgtable.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/include/asm/pgtable.h linux-3.1.1/arch/parisc/include/asm/pgtable.h
+--- linux-3.1.1/arch/parisc/include/asm/pgtable.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/include/asm/pgtable.h      2011-11-16 18:39:07.000000000 -0500
 @@ -210,6 +210,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1310,9 +1329,9 @@ diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc
  #define PAGE_KERNEL   __pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_EXEC      __pgprot(_PAGE_KERNEL_EXEC)
  #define PAGE_KERNEL_RWX       __pgprot(_PAGE_KERNEL_RWX)
-diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kernel/module.c
---- linux-3.0.4/arch/parisc/kernel/module.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/module.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/kernel/module.c linux-3.1.1/arch/parisc/kernel/module.c
+--- linux-3.1.1/arch/parisc/kernel/module.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/module.c    2011-11-16 18:39:07.000000000 -0500
 @@ -98,16 +98,38 @@
  
  /* three functions to determine where in the module core
@@ -1404,7 +1423,7 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kerne
        return (Elf_Addr)fdesc;
  }
  #endif /* CONFIG_64BIT */
-@@ -857,7 +879,7 @@ register_unwind_table(struct module *me,
+@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
  
        table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
        end = table + sechdrs[me->arch.unwind_section].sh_size;
@@ -1413,9 +1432,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kerne
  
        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-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/kernel/sys_parisc.c
---- linux-3.0.4/arch/parisc/kernel/sys_parisc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/sys_parisc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/kernel/sys_parisc.c linux-3.1.1/arch/parisc/kernel/sys_parisc.c
+--- linux-3.1.1/arch/parisc/kernel/sys_parisc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/sys_parisc.c        2011-11-16 18:39:07.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)
@@ -1443,9 +1462,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/k
  
        if (filp) {
                addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel/traps.c
---- linux-3.0.4/arch/parisc/kernel/traps.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/traps.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/kernel/traps.c linux-3.1.1/arch/parisc/kernel/traps.c
+--- linux-3.1.1/arch/parisc/kernel/traps.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/kernel/traps.c     2011-11-16 18:39:07.000000000 -0500
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
                        down_read(&current->mm->mmap_sem);
@@ -1457,9 +1476,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel
                                fault_address = regs->iaoq[0];
                                fault_space = regs->iasq[0];
  
-diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
---- linux-3.0.4/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/parisc/mm/fault.c linux-3.1.1/arch/parisc/mm/fault.c
+--- linux-3.1.1/arch/parisc/mm/fault.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/parisc/mm/fault.c 2011-11-16 18:39:07.000000000 -0500
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1575,7 +1594,7 @@ diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
 +      return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -1629,9 +1648,9 @@ diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
  
        /*
         * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/include/asm/elf.h
---- linux-3.0.4/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/elf.h linux-3.1.1/arch/powerpc/include/asm/elf.h
+--- linux-3.1.1/arch/powerpc/include/asm/elf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/elf.h 2011-11-16 18:39:07.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.  */
@@ -1664,9 +1683,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/i
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/powerpc/include/asm/kmap_types.h
---- linux-3.0.4/arch/powerpc/include/asm/kmap_types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/kmap_types.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/kmap_types.h linux-3.1.1/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.1.1/arch/powerpc/include/asm/kmap_types.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/kmap_types.h  2011-11-16 18:39:07.000000000 -0500
 @@ -27,6 +27,7 @@ enum km_type {
        KM_PPC_SYNC_PAGE,
        KM_PPC_SYNC_ICACHE,
@@ -1675,9 +1694,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/po
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/include/asm/mman.h
---- linux-3.0.4/arch/powerpc/include/asm/mman.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/mman.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/mman.h linux-3.1.1/arch/powerpc/include/asm/mman.h
+--- linux-3.1.1/arch/powerpc/include/asm/mman.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/mman.h        2011-11-16 18:39:07.000000000 -0500
 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
  }
  #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
@@ -1687,9 +1706,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/
  {
        return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
  }
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/page_64.h linux-3.0.4/arch/powerpc/include/asm/page_64.h
---- linux-3.0.4/arch/powerpc/include/asm/page_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/page_64.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/page_64.h linux-3.1.1/arch/powerpc/include/asm/page_64.h
+--- linux-3.1.1/arch/powerpc/include/asm/page_64.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/page_64.h     2011-11-16 18:39:07.000000000 -0500
 @@ -155,15 +155,18 @@ do {                                             \
   * stack by default, so in the absence of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1711,9 +1730,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/page_64.h linux-3.0.4/arch/power
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/include/asm/page.h
---- linux-3.0.4/arch/powerpc/include/asm/page.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/page.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/page.h linux-3.1.1/arch/powerpc/include/asm/page.h
+--- linux-3.1.1/arch/powerpc/include/asm/page.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/page.h        2011-11-16 18:39:07.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.
@@ -1736,9 +1755,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/powerpc/include/asm/pgtable.h
---- linux-3.0.4/arch/powerpc/include/asm/pgtable.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/pgtable.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/pgtable.h linux-3.1.1/arch/powerpc/include/asm/pgtable.h
+--- linux-3.1.1/arch/powerpc/include/asm/pgtable.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/pgtable.h     2011-11-16 18:39:07.000000000 -0500
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -1747,9 +1766,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/power
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>            /* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/pte-hash32.h  2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE    0x004   /* when !present: nonlinear file mapping */
  #define _PAGE_USER    0x004   /* usermode access allowed */
@@ -1758,10 +1777,10 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/po
  #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-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/include/asm/reg.h
---- linux-3.0.4/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400
-@@ -209,6 +209,7 @@
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/reg.h linux-3.1.1/arch/powerpc/include/asm/reg.h
+--- linux-3.1.1/arch/powerpc/include/asm/reg.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/reg.h 2011-11-16 18:39:07.000000000 -0500
+@@ -212,6 +212,7 @@
  #define SPRN_DBCR     0x136   /* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR    0x012   /* Data Storage Interrupt Status Register */
  #define   DSISR_NOHPTE                0x40000000      /* no translation found */
@@ -1769,10 +1788,10 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/i
  #define   DSISR_PROTFAULT     0x08000000      /* protection fault */
  #define   DSISR_ISSTORE               0x02000000      /* access was a store */
  #define   DSISR_DABRMATCH     0x00400000      /* hit data breakpoint */
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerpc/include/asm/system.h
---- linux-3.0.4/arch/powerpc/include/asm/system.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/system.h      2011-08-23 21:47:55.000000000 -0400
-@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/system.h linux-3.1.1/arch/powerpc/include/asm/system.h
+--- linux-3.1.1/arch/powerpc/include/asm/system.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/system.h      2011-11-16 18:39:07.000000000 -0500
+@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
  
@@ -1781,9 +1800,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerp
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/powerpc/include/asm/uaccess.h
---- linux-3.0.4/arch/powerpc/include/asm/uaccess.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/uaccess.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/include/asm/uaccess.h linux-3.1.1/arch/powerpc/include/asm/uaccess.h
+--- linux-3.1.1/arch/powerpc/include/asm/uaccess.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/include/asm/uaccess.h     2011-11-16 18:39:07.000000000 -0500
 @@ -13,6 +13,8 @@
  #define VERIFY_READ   0
  #define VERIFY_WRITE  1
@@ -1961,10 +1980,10 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/power
  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-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S   2011-08-23 21:47:55.000000000 -0400
-@@ -567,6 +567,7 @@ storage_fault_common:
+diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/exceptions-64e.S   2011-11-16 18:39:07.000000000 -0500
+@@ -587,6 +587,7 @@ storage_fault_common:
        std     r14,_DAR(r1)
        std     r15,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
@@ -1972,7 +1991,7 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/pow
        mr      r4,r14
        mr      r5,r15
        ld      r14,PACA_EXGEN+EX_R14(r13)
-@@ -576,8 +577,7 @@ storage_fault_common:
+@@ -596,8 +597,7 @@ storage_fault_common:
        cmpdi   r3,0
        bne-    1f
        b       .ret_from_except_lite
@@ -1982,10 +2001,10 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/pow
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
        bl      .bad_page_fault
-diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S   2011-08-23 21:47:55.000000000 -0400
-@@ -956,10 +956,10 @@ handle_page_fault:
+diff -urNp linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/exceptions-64s.S   2011-11-16 18:39:07.000000000 -0500
+@@ -1014,10 +1014,10 @@ handle_page_fault:
  11:   ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
@@ -1997,9 +2016,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/pow
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
-diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/kernel/module_32.c
---- linux-3.0.4/arch/powerpc/kernel/module_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/module_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/kernel/module_32.c linux-3.1.1/arch/powerpc/kernel/module_32.c
+--- linux-3.1.1/arch/powerpc/kernel/module_32.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/module_32.c        2011-11-16 18:39:07.000000000 -0500
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
                        me->arch.core_plt_section = i;
        }
@@ -2009,7 +2028,7 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/
                return -ENOEXEC;
        }
  
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *locati
  
        DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
        /* Init, or core PLT? */
@@ -2029,52 +2048,10 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/
  
        /* Find this entry, or if that fails, the next avail. entry */
        while (entry->jump[0]) {
-diff -urNp linux-3.0.4/arch/powerpc/kernel/module.c linux-3.0.4/arch/powerpc/kernel/module.c
---- linux-3.0.4/arch/powerpc/kernel/module.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/module.c   2011-08-23 21:47:55.000000000 -0400
-@@ -31,11 +31,24 @@
- 
- LIST_HEAD(module_bug_list);
- 
-+#ifdef CONFIG_PAX_KERNEXEC
- void *module_alloc(unsigned long size)
- {
-       if (size == 0)
-               return NULL;
- 
-+      return vmalloc(size);
-+}
-+
-+void *module_alloc_exec(unsigned long size)
-+#else
-+void *module_alloc(unsigned long size)
-+#endif
-+
-+{
-+      if (size == 0)
-+              return NULL;
-+
-       return vmalloc_exec(size);
- }
- 
-@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
-       vfree(module_region);
- }
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+void module_free_exec(struct module *mod, void *module_region)
-+{
-+      module_free(mod, module_region);
-+}
-+#endif
-+
- static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
-                                   const Elf_Shdr *sechdrs,
-                                   const char *name)
-diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/kernel/process.c
---- linux-3.0.4/arch/powerpc/kernel/process.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/process.c  2011-08-23 21:48:14.000000000 -0400
-@@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
+diff -urNp linux-3.1.1/arch/powerpc/kernel/process.c linux-3.1.1/arch/powerpc/kernel/process.c
+--- linux-3.1.1/arch/powerpc/kernel/process.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/process.c  2011-11-16 18:40:08.000000000 -0500
+@@ -682,8 +682,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
         */
@@ -2085,7 +2062,7 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/ke
  #endif
        show_stack(current, (unsigned long *) regs->gpr[1]);
        if (!user_mode(regs))
-@@ -1183,10 +1183,10 @@ void show_stack(struct task_struct *tsk,
+@@ -1187,10 +1187,10 @@ void show_stack(struct task_struct *tsk,
                newsp = stack[0];
                ip = stack[STACK_FRAME_LR_SAVE];
                if (!firstframe || ip != lr) {
@@ -2098,7 +2075,7 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/ke
                                       (void *)current->ret_stack[curr_frame].ret);
                                curr_frame--;
                        }
-@@ -1206,7 +1206,7 @@ void show_stack(struct task_struct *tsk,
+@@ -1210,7 +1210,7 @@ void show_stack(struct task_struct *tsk,
                        struct pt_regs *regs = (struct pt_regs *)
                                (sp + STACK_FRAME_OVERHEAD);
                        lr = regs->link;
@@ -2107,7 +2084,7 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/ke
                               regs->trap, (void *)regs->nip, (void *)lr);
                        firstframe = 1;
                }
-@@ -1281,58 +1281,3 @@ void thread_info_cache_init(void)
+@@ -1285,58 +1285,3 @@ void thread_info_cache_init(void)
  }
  
  #endif /* THREAD_SHIFT < PAGE_SHIFT */
@@ -2166,9 +2143,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/ke
 -
 -      return ret;
 -}
-diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/kernel/signal_32.c
---- linux-3.0.4/arch/powerpc/kernel/signal_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/signal_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_32.c linux-3.1.1/arch/powerpc/kernel/signal_32.c
+--- linux-3.1.1/arch/powerpc/kernel/signal_32.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/signal_32.c        2011-11-16 18:39:07.000000000 -0500
 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
        /* Save user registers on the stack */
        frame = &rt_sf->uc.uc_mcontext;
@@ -2178,9 +2155,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/
                if (save_user_regs(regs, frame, 0, 1))
                        goto badframe;
                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/kernel/signal_64.c
---- linux-3.0.4/arch/powerpc/kernel/signal_64.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/signal_64.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/kernel/signal_64.c linux-3.1.1/arch/powerpc/kernel/signal_64.c
+--- linux-3.1.1/arch/powerpc/kernel/signal_64.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/signal_64.c        2011-11-16 18:39:07.000000000 -0500
 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
        current->thread.fpscr.val = 0;
  
@@ -2190,9 +2167,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/
                regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
        } else {
                err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kernel/traps.c
---- linux-3.0.4/arch/powerpc/kernel/traps.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/traps.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/kernel/traps.c linux-3.1.1/arch/powerpc/kernel/traps.c
+--- linux-3.1.1/arch/powerpc/kernel/traps.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/traps.c    2011-11-16 18:40:08.000000000 -0500
 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -2211,9 +2188,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kern
        oops_exit();
        do_exit(err);
  
-diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kernel/vdso.c
---- linux-3.0.4/arch/powerpc/kernel/vdso.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/vdso.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/kernel/vdso.c linux-3.1.1/arch/powerpc/kernel/vdso.c
+--- linux-3.1.1/arch/powerpc/kernel/vdso.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/kernel/vdso.c     2011-11-16 18:39:07.000000000 -0500
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2240,9 +2217,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kerne
        if (IS_ERR_VALUE(vdso_base)) {
                rc = vdso_base;
                goto fail_mmapsem;
-diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/lib/usercopy_64.c
---- linux-3.0.4/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/lib/usercopy_64.c linux-3.1.1/arch/powerpc/lib/usercopy_64.c
+--- linux-3.1.1/arch/powerpc/lib/usercopy_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/lib/usercopy_64.c 2011-11-16 18:39:07.000000000 -0500
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2274,9 +2251,9 @@ diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/l
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault.c
---- linux-3.0.4/arch/powerpc/mm/fault.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/fault.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/mm/fault.c linux-3.1.1/arch/powerpc/mm/fault.c
+--- linux-3.1.1/arch/powerpc/mm/fault.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/fault.c        2011-11-16 18:39:07.000000000 -0500
 @@ -32,6 +32,10 @@
  #include <linux/perf_event.h>
  #include <linux/magic.h>
@@ -2311,7 +2288,7 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault
 +      return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -2381,9 +2358,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault
                _exception(SIGSEGV, regs, code, address);
                return 0;
        }
-diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mmap_64.c
---- linux-3.0.4/arch/powerpc/mm/mmap_64.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/mmap_64.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/mm/mmap_64.c linux-3.1.1/arch/powerpc/mm/mmap_64.c
+--- linux-3.1.1/arch/powerpc/mm/mmap_64.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/mmap_64.c      2011-11-16 18:39:07.000000000 -0500
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2407,9 +2384,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mma
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice.c
---- linux-3.0.4/arch/powerpc/mm/slice.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/slice.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/powerpc/mm/slice.c linux-3.1.1/arch/powerpc/mm/slice.c
+--- linux-3.1.1/arch/powerpc/mm/slice.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/powerpc/mm/slice.c        2011-11-16 18:39:07.000000000 -0500
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
        if ((mm->task_size - len) < addr)
                return 0;
@@ -2476,9 +2453,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice
        /* If hint, make sure it matches our alignment restrictions */
        if (!fixed && addr) {
                addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include/asm/elf.h
---- linux-3.0.4/arch/s390/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/s390/include/asm/elf.h linux-3.1.1/arch/s390/include/asm/elf.h
+--- linux-3.1.1/arch/s390/include/asm/elf.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/elf.h    2011-11-16 18:39:07.000000000 -0500
 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
     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.  */
@@ -2496,7 +2473,7 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
-@@ -210,7 +216,4 @@ struct linux_binprm;
+@@ -211,7 +217,4 @@ struct linux_binprm;
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
  int arch_setup_additional_pages(struct linux_binprm *, int);
  
@@ -2504,10 +2481,10 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/include/asm/system.h
---- linux-3.0.4/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
-@@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
+diff -urNp linux-3.1.1/arch/s390/include/asm/system.h linux-3.1.1/arch/s390/include/asm/system.h
+--- linux-3.1.1/arch/s390/include/asm/system.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/system.h 2011-11-16 18:39:07.000000000 -0500
+@@ -256,7 +256,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
  
@@ -2516,9 +2493,9 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/incl
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/include/asm/uaccess.h
---- linux-3.0.4/arch/s390/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/s390/include/asm/uaccess.h linux-3.1.1/arch/s390/include/asm/uaccess.h
+--- linux-3.1.1/arch/s390/include/asm/uaccess.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/include/asm/uaccess.h        2011-11-16 18:39:07.000000000 -0500
 @@ -235,6 +235,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -2551,10 +2528,10 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/inc
        if (unlikely(sz != -1 && sz < n)) {
                copy_from_user_overflow();
                return n;
-diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/module.c
---- linux-3.0.4/arch/s390/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
-@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
+diff -urNp linux-3.1.1/arch/s390/kernel/module.c linux-3.1.1/arch/s390/kernel/module.c
+--- linux-3.1.1/arch/s390/kernel/module.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/module.c      2011-11-16 18:39:07.000000000 -0500
+@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
        /* Increase core size by size of got & plt and set start
           offsets for got and plt. */
@@ -2571,7 +2548,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
        return 0;
  }
  
-@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
                if (info->got_initialized == 0) {
                        Elf_Addr *gotent;
  
@@ -2580,7 +2557,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                                info->got_offset;
                        *gotent = val;
                        info->got_initialized = 1;
-@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
                else if (r_type == R_390_GOTENT ||
                         r_type == R_390_GOTPLTENT)
                        *(unsigned int *) loc =
@@ -2589,7 +2566,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                else if (r_type == R_390_GOT64 ||
                         r_type == R_390_GOTPLT64)
                        *(unsigned long *) loc = val;
-@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
        case R_390_PLTOFF64:    /* 16 bit offset from GOT to PLT. */
                if (info->plt_initialized == 0) {
                        unsigned int *ip;
@@ -2598,7 +2575,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                                info->plt_offset;
  #ifndef CONFIG_64BIT
                        ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
                               val - loc + 0xffffUL < 0x1ffffeUL) ||
                              (r_type == R_390_PLT32DBL &&
                               val - loc + 0xffffffffULL < 0x1fffffffeULL)))
@@ -2607,7 +2584,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                                        me->arch.plt_offset +
                                        info->plt_offset;
                        val += rela->r_addend - loc;
-@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
        case R_390_GOTOFF32:    /* 32 bit offset to GOT.  */
        case R_390_GOTOFF64:    /* 64 bit offset to GOT. */
                val = val + rela->r_addend -
@@ -2616,7 +2593,7 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                if (r_type == R_390_GOTOFF16)
                        *(unsigned short *) loc = val;
                else if (r_type == R_390_GOTOFF32)
-@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
+@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
                break;
        case R_390_GOTPC:       /* 32 bit PC relative offset to GOT. */
        case R_390_GOTPCDBL:    /* 32 bit PC rel. off. to GOT shifted by 1. */
@@ -2625,9 +2602,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
                        rela->r_addend - loc;
                if (r_type == R_390_GOTPC)
                        *(unsigned int *) loc = val;
-diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/process.c
---- linux-3.0.4/arch/s390/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/s390/kernel/process.c linux-3.1.1/arch/s390/kernel/process.c
+--- linux-3.1.1/arch/s390/kernel/process.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/process.c     2011-11-16 18:39:07.000000000 -0500
 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
        }
        return 0;
@@ -2668,9 +2645,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/p
 -              return base;
 -      return ret;
 -}
-diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/setup.c
---- linux-3.0.4/arch/s390/kernel/setup.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/setup.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/s390/kernel/setup.c linux-3.1.1/arch/s390/kernel/setup.c
+--- linux-3.1.1/arch/s390/kernel/setup.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/kernel/setup.c       2011-11-16 18:39:07.000000000 -0500
 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -2680,9 +2657,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/set
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
---- linux-3.0.4/arch/s390/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/s390/mm/mmap.c linux-3.1.1/arch/s390/mm/mmap.c
+--- linux-3.1.1/arch/s390/mm/mmap.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/s390/mm/mmap.c    2011-11-16 18:39:07.000000000 -0500
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2729,9 +2706,9 @@ diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
                mm->get_unmapped_area = s390_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/include/asm/system.h
---- linux-3.0.4/arch/score/include/asm/system.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/score/include/asm/system.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/score/include/asm/system.h linux-3.1.1/arch/score/include/asm/system.h
+--- linux-3.1.1/arch/score/include/asm/system.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/score/include/asm/system.h        2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@ do {                                                         \
  #define finish_arch_switch(prev)      do {} while (0)
  
@@ -2741,9 +2718,9 @@ diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/in
  
  #define mb()          barrier()
  #define rmb()         barrier()
-diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel/process.c
---- linux-3.0.4/arch/score/kernel/process.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/score/kernel/process.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/score/kernel/process.c linux-3.1.1/arch/score/kernel/process.c
+--- linux-3.1.1/arch/score/kernel/process.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/score/kernel/process.c    2011-11-16 18:39:07.000000000 -0500
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
        return task_pt_regs(task)->cp0_epc;
@@ -2753,9 +2730,9 @@ diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel
 -{
 -      return sp;
 -}
-diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
---- linux-3.0.4/arch/sh/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sh/mm/mmap.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sh/mm/mmap.c linux-3.1.1/arch/sh/mm/mmap.c
+--- linux-3.1.1/arch/sh/mm/mmap.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sh/mm/mmap.c      2011-11-16 18:39:07.000000000 -0500
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
                        addr = PAGE_ALIGN(addr);
  
@@ -2830,9 +2807,9 @@ diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
  
  bottomup:
        /*
-diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc/include/asm/atomic_64.h
---- linux-3.0.4/arch/sparc/include/asm/atomic_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/atomic_64.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/atomic_64.h linux-3.1.1/arch/sparc/include/asm/atomic_64.h
+--- linux-3.1.1/arch/sparc/include/asm/atomic_64.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/atomic_64.h     2011-11-16 18:39:07.000000000 -0500
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)      { (i) }
  
@@ -2915,7 +2892,7 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc
  #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
  
  #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
-@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomi
+@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -2954,7 +2931,7 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc
 +      return xchg(&v->counter, new);
 +}
  
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  {
 -      int c, old;
 +      int c, old, new;
@@ -2979,13 +2956,7 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc
                if (likely(old == c))
                        break;
                c = old;
-       }
--      return c != (u);
-+      return c != u;
- }
- 
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -90,20 +167,35 @@ static inline int atomic_add_unless(atom
+@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(at
  #define atomic64_cmpxchg(v, o, n) \
        ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
  #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
@@ -3025,9 +2996,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/include/asm/cache.h
---- linux-3.0.4/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/cache.h linux-3.1.1/arch/sparc/include/asm/cache.h
+--- linux-3.1.1/arch/sparc/include/asm/cache.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/cache.h 2011-11-16 18:39:07.000000000 -0500
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN    __alignof__(unsigned long long)
  
@@ -3037,9 +3008,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/inc
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/include/asm/elf_32.h
---- linux-3.0.4/arch/sparc/include/asm/elf_32.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/elf_32.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_32.h linux-3.1.1/arch/sparc/include/asm/elf_32.h
+--- linux-3.1.1/arch/sparc/include/asm/elf_32.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/elf_32.h        2011-11-16 18:39:07.000000000 -0500
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3054,9 +3025,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/in
  /* 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-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/include/asm/elf_64.h
---- linux-3.0.4/arch/sparc/include/asm/elf_64.h        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/elf_64.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/elf_64.h linux-3.1.1/arch/sparc/include/asm/elf_64.h
+--- linux-3.1.1/arch/sparc/include/asm/elf_64.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/elf_64.h        2011-11-16 18:39:07.000000000 -0500
 @@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE               0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE        0x0000000070000000UL
@@ -3071,9 +3042,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/in
  extern unsigned long sparc64_elf_hwcap;
  #define ELF_HWCAP     sparc64_elf_hwcap
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/sparc/include/asm/pgtable_32.h
---- linux-3.0.4/arch/sparc/include/asm/pgtable_32.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/pgtable_32.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtable_32.h linux-3.1.1/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.1.1/arch/sparc/include/asm/pgtable_32.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/pgtable_32.h    2011-11-16 18:39:07.000000000 -0500
 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3105,9 +3076,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/spar
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/pgtsrmmu.h      2011-11-16 18:39:07.000000000 -0500
 @@ -115,6 +115,13 @@
                                    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3122,9 +3093,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
                                    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/sparc/include/asm/spinlock_64.h
---- linux-3.0.4/arch/sparc/include/asm/spinlock_64.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/spinlock_64.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/spinlock_64.h linux-3.1.1/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.1.1/arch/sparc/include/asm/spinlock_64.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/spinlock_64.h   2011-11-16 18:39:07.000000000 -0500
 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -3222,9 +3193,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/spa
  {
        unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/sparc/include/asm/thread_info_32.h
---- linux-3.0.4/arch/sparc/include/asm/thread_info_32.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/thread_info_32.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_32.h linux-3.1.1/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.1.1/arch/sparc/include/asm/thread_info_32.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/thread_info_32.h        2011-11-16 18:39:07.000000000 -0500
 @@ -50,6 +50,8 @@ struct thread_info {
        unsigned long           w_saved;
  
@@ -3234,9 +3205,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/
  };
  
  /*
-diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/sparc/include/asm/thread_info_64.h
---- linux-3.0.4/arch/sparc/include/asm/thread_info_64.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/thread_info_64.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/thread_info_64.h linux-3.1.1/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.1.1/arch/sparc/include/asm/thread_info_64.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/thread_info_64.h        2011-11-16 18:39:07.000000000 -0500
 @@ -63,6 +63,8 @@ struct thread_info {
        struct pt_regs          *kern_una_regs;
        unsigned int            kern_una_insn;
@@ -3246,9 +3217,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/
        unsigned long           fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/sparc/include/asm/uaccess_32.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess_32.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/uaccess_32.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_32.h linux-3.1.1/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess_32.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess_32.h    2011-11-16 18:39:07.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)
@@ -3300,9 +3271,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/spar
        return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/sparc/include/asm/uaccess_64.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess_64.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/uaccess_64.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess_64.h linux-3.1.1/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess_64.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess_64.h    2011-11-16 18:39:07.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3345,9 +3316,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/spar
        if (unlikely(ret))
                ret = copy_to_user_fixup(to, from, size);
        return ret;
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess.h linux-3.0.4/arch/sparc/include/asm/uaccess.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/uaccess.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/include/asm/uaccess.h linux-3.1.1/arch/sparc/include/asm/uaccess.h
+--- linux-3.1.1/arch/sparc/include/asm/uaccess.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/include/asm/uaccess.h       2011-11-16 18:39:07.000000000 -0500
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3362,9 +3333,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess.h linux-3.0.4/arch/sparc/i
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-3.0.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/Makefile
---- linux-3.0.4/arch/sparc/kernel/Makefile     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/Makefile     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/Makefile linux-3.1.1/arch/sparc/kernel/Makefile
+--- linux-3.1.1/arch/sparc/kernel/Makefile     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/Makefile     2011-11-16 18:39:07.000000000 -0500
 @@ -3,7 +3,7 @@
  #
  
@@ -3374,9 +3345,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/kernel/process_32.c
---- linux-3.0.4/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/process_32.c linux-3.1.1/arch/sparc/kernel/process_32.c
+--- linux-3.1.1/arch/sparc/kernel/process_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/process_32.c 2011-11-16 18:40:08.000000000 -0500
 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
                       rw->ins[4], rw->ins[5],
                       rw->ins[6],
@@ -3412,9 +3383,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/ker
                fp = rw->ins[6];
        } while (++count < 16);
        printk("\n");
-diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/kernel/process_64.c
---- linux-3.0.4/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/process_64.c linux-3.1.1/arch/sparc/kernel/process_64.c
+--- linux-3.1.1/arch/sparc/kernel/process_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/process_64.c 2011-11-16 18:40:08.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]);
@@ -3450,9 +3421,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/ker
                               (void *) gp->tpc,
                               (void *) gp->o7,
                               (void *) gp->i7,
-diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/sys_sparc_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
        if (ARCH_SUN4C && len > 0x20000000)
                return -ENOMEM;
@@ -3471,9 +3442,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/k
                        return addr;
                addr = vmm->vm_end;
                if (flags & MAP_SHARED)
-diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/sys_sparc_64.c       2011-11-16 18:39:07.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.
@@ -3621,9 +3592,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/k
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kernel/traps_32.c
---- linux-3.0.4/arch/sparc/kernel/traps_32.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/traps_32.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/traps_32.c linux-3.1.1/arch/sparc/kernel/traps_32.c
+--- linux-3.1.1/arch/sparc/kernel/traps_32.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/traps_32.c   2011-11-16 18:40:08.000000000 -0500
 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
  #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
  #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -3653,9 +3624,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kerne
        do_exit(SIGSEGV);
  }
  
-diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kernel/traps_64.c
---- linux-3.0.4/arch/sparc/kernel/traps_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/traps_64.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/traps_64.c linux-3.1.1/arch/sparc/kernel/traps_64.c
+--- linux-3.1.1/arch/sparc/kernel/traps_64.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/traps_64.c   2011-11-16 18:40:08.000000000 -0500
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
                       i + 1,
                       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -3793,9 +3764,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kerne
        do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/kernel/unaligned_64.c
---- linux-3.0.4/arch/sparc/kernel/unaligned_64.c       2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/unaligned_64.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/kernel/unaligned_64.c linux-3.1.1/arch/sparc/kernel/unaligned_64.c
+--- linux-3.1.1/arch/sparc/kernel/unaligned_64.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/kernel/unaligned_64.c       2011-11-16 18:40:08.000000000 -0500
 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
        static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -3805,9 +3776,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/k
                       regs->tpc, (void *) regs->tpc);
        }
  }
-diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/atomic_64.S
---- linux-3.0.4/arch/sparc/lib/atomic_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/atomic_64.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/lib/atomic_64.S linux-3.1.1/arch/sparc/lib/atomic_64.S
+--- linux-3.1.1/arch/sparc/lib/atomic_64.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/atomic_64.S     2011-11-16 18:39:07.000000000 -0500
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
        BACKOFF_SETUP(%o2)
@@ -4042,9 +4013,9 @@ diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/ato
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
---- linux-3.0.4/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/lib/ksyms.c linux-3.1.1/arch/sparc/lib/ksyms.c
+--- linux-3.1.1/arch/sparc/lib/ksyms.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/ksyms.c 2011-11-16 18:39:07.000000000 -0500
 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4064,9 +4035,9 @@ diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-3.0.4/arch/sparc/lib/Makefile linux-3.0.4/arch/sparc/lib/Makefile
---- linux-3.0.4/arch/sparc/lib/Makefile        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/Makefile        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/lib/Makefile linux-3.1.1/arch/sparc/lib/Makefile
+--- linux-3.1.1/arch/sparc/lib/Makefile        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/lib/Makefile        2011-11-16 18:39:07.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  
@@ -4076,9 +4047,9 @@ diff -urNp linux-3.0.4/arch/sparc/lib/Makefile linux-3.0.4/arch/sparc/lib/Makefi
  
  lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
  lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff -urNp linux-3.0.4/arch/sparc/Makefile linux-3.0.4/arch/sparc/Makefile
---- linux-3.0.4/arch/sparc/Makefile    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/Makefile    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/Makefile linux-3.1.1/arch/sparc/Makefile
+--- linux-3.1.1/arch/sparc/Makefile    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/Makefile    2011-11-16 18:40:08.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
@@ -4088,9 +4059,9 @@ diff -urNp linux-3.0.4/arch/sparc/Makefile linux-3.0.4/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_32.c
---- linux-3.0.4/arch/sparc/mm/fault_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/fault_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/fault_32.c linux-3.1.1/arch/sparc/mm/fault_32.c
+--- linux-3.1.1/arch/sparc/mm/fault_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/fault_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4351,7 +4322,7 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_
 +      return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -4395,9 +4366,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_
                /* Allow reads even for write-only mappings */
                if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
                        goto bad_area;
-diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_64.c
---- linux-3.0.4/arch/sparc/mm/fault_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/fault_64.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/fault_64.c linux-3.1.1/arch/sparc/mm/fault_64.c
+--- linux-3.1.1/arch/sparc/mm/fault_64.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/fault_64.c       2011-11-16 18:40:08.000000000 -0500
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4856,7 +4827,7 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_
 +      return 1;
 +}
 +
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      unsigned long i;
 +
@@ -4905,9 +4876,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_
        /* 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-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hugetlbpage.c
---- linux-3.0.4/arch/sparc/mm/hugetlbpage.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/hugetlbpage.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/hugetlbpage.c linux-3.1.1/arch/sparc/mm/hugetlbpage.c
+--- linux-3.1.1/arch/sparc/mm/hugetlbpage.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/hugetlbpage.c    2011-11-16 18:39:07.000000000 -0500
 @@ -68,7 +68,7 @@ full_search:
                        }
                        return -ENOMEM;
@@ -4967,9 +4938,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hug
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32.c
---- linux-3.0.4/arch/sparc/mm/init_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/init_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/init_32.c linux-3.1.1/arch/sparc/mm/init_32.c
+--- linux-3.1.1/arch/sparc/mm/init_32.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/init_32.c        2011-11-16 18:39:07.000000000 -0500
 @@ -316,6 +316,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5004,9 +4975,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32
        protection_map[12] = PAGE_READONLY;
        protection_map[13] = PAGE_READONLY;
        protection_map[14] = PAGE_SHARED;
-diff -urNp linux-3.0.4/arch/sparc/mm/Makefile linux-3.0.4/arch/sparc/mm/Makefile
---- linux-3.0.4/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/Makefile linux-3.1.1/arch/sparc/mm/Makefile
+--- linux-3.1.1/arch/sparc/mm/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/Makefile 2011-11-16 18:39:07.000000000 -0500
 @@ -2,7 +2,7 @@
  #
  
@@ -5014,11 +4985,11 @@ diff -urNp linux-3.0.4/arch/sparc/mm/Makefile linux-3.0.4/arch/sparc/mm/Makefile
 -ccflags-y := -Werror
 +#ccflags-y := -Werror
  
- obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o gup.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-3.0.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
---- linux-3.0.4/arch/sparc/mm/srmmu.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/srmmu.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/sparc/mm/srmmu.c linux-3.1.1/arch/sparc/mm/srmmu.c
+--- linux-3.1.1/arch/sparc/mm/srmmu.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/sparc/mm/srmmu.c  2011-11-16 18:39:07.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));
@@ -5033,9 +5004,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
        BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
        page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/include/asm/kmap_types.h
---- linux-3.0.4/arch/um/include/asm/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/include/asm/kmap_types.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/um/include/asm/kmap_types.h linux-3.1.1/arch/um/include/asm/kmap_types.h
+--- linux-3.1.1/arch/um/include/asm/kmap_types.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/include/asm/kmap_types.h       2011-11-16 18:39:07.000000000 -0500
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -5044,9 +5015,9 @@ diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/incl
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/asm/page.h
---- linux-3.0.4/arch/um/include/asm/page.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/include/asm/page.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/um/include/asm/page.h linux-3.1.1/arch/um/include/asm/page.h
+--- linux-3.1.1/arch/um/include/asm/page.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/include/asm/page.h     2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE     (_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK     (~(PAGE_SIZE-1))
@@ -5057,9 +5028,9 @@ diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/as
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/process.c
---- linux-3.0.4/arch/um/kernel/process.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/kernel/process.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/um/kernel/process.c linux-3.1.1/arch/um/kernel/process.c
+--- linux-3.1.1/arch/um/kernel/process.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/kernel/process.c       2011-11-16 18:39:07.000000000 -0500
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
        return 2;
  }
@@ -5083,9 +5054,35 @@ diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/proce
  unsigned long get_wchan(struct task_struct *p)
  {
        unsigned long stack_page, sp, ip;
-diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/syscalls.c
---- linux-3.0.4/arch/um/sys-i386/syscalls.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/sys-i386/syscalls.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/um/Makefile linux-3.1.1/arch/um/Makefile
+--- linux-3.1.1/arch/um/Makefile       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/Makefile       2011-11-16 18:39:07.000000000 -0500
+@@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE
+       $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
+       $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
+ 
++ifdef CONSTIFY_PLUGIN
++USER_CFLAGS   += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
++
+ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
+ 
+ #This will adjust *FLAGS accordingly to the platform.
+diff -urNp linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h
+--- linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-i386/shared/sysdep/system.h        2011-11-16 18:39:07.000000000 -0500
+@@ -17,7 +17,7 @@
+ # define AT_VECTOR_SIZE_ARCH 1
+ #endif
+ 
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
+ 
+ void default_idle(void);
+ 
+diff -urNp linux-3.1.1/arch/um/sys-i386/syscalls.c linux-3.1.1/arch/um/sys-i386/syscalls.c
+--- linux-3.1.1/arch/um/sys-i386/syscalls.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-i386/syscalls.c    2011-11-16 18:39:07.000000000 -0500
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5108,9 +5105,21 @@ diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
---- linux-3.0.4/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h
+--- linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/um/sys-x86_64/shared/sysdep/system.h      2011-11-16 18:39:07.000000000 -0500
+@@ -17,7 +17,7 @@
+ # define AT_VECTOR_SIZE_ARCH 1
+ #endif
+ 
+-extern unsigned long arch_align_stack(unsigned long sp);
++#define arch_align_stack(x) ((x) & ~0xfUL)
+ 
+ void default_idle(void);
+ 
+diff -urNp linux-3.1.1/arch/x86/boot/bitops.h linux-3.1.1/arch/x86/boot/bitops.h
+--- linux-3.1.1/arch/x86/boot/bitops.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/bitops.h 2011-11-16 18:39:07.000000000 -0500
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
        u8 v;
        const u32 *p = (const u32 *)addr;
@@ -5129,9 +5138,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
---- linux-3.0.4/arch/x86/boot/boot.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/boot.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/boot.h linux-3.1.1/arch/x86/boot/boot.h
+--- linux-3.1.1/arch/x86/boot/boot.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/boot.h   2011-11-16 18:39:07.000000000 -0500
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5150,9 +5159,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
        return diff;
  }
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/boot/compressed/head_32.S
---- linux-3.0.4/arch/x86/boot/compressed/head_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/head_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_32.S linux-3.1.1/arch/x86/boot/compressed/head_32.S
+--- linux-3.1.1/arch/x86/boot/compressed/head_32.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/head_32.S     2011-11-16 18:39:07.000000000 -0500
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5181,9 +5190,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/b
        addl    %ebx, -__PAGE_OFFSET(%ebx, %ecx)
        jmp     1b
  2:
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/boot/compressed/head_64.S
---- linux-3.0.4/arch/x86/boot/compressed/head_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/head_64.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/head_64.S linux-3.1.1/arch/x86/boot/compressed/head_64.S
+--- linux-3.1.1/arch/x86/boot/compressed/head_64.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/head_64.S     2011-11-16 18:39:07.000000000 -0500
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5202,9 +5211,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/b
  #endif
  
        /* Target address to relocate to for decompression */
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/Makefile linux-3.0.4/arch/x86/boot/compressed/Makefile
---- linux-3.0.4/arch/x86/boot/compressed/Makefile      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/Makefile      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/Makefile linux-3.1.1/arch/x86/boot/compressed/Makefile
+--- linux-3.1.1/arch/x86/boot/compressed/Makefile      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/Makefile      2011-11-16 18:39:07.000000000 -0500
 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -5215,9 +5224,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/Makefile linux-3.0.4/arch/x86/bo
  
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot/compressed/misc.c
---- linux-3.0.4/arch/x86/boot/compressed/misc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/misc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/misc.c linux-3.1.1/arch/x86/boot/compressed/misc.c
+--- linux-3.1.1/arch/x86/boot/compressed/misc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/misc.c        2011-11-16 18:39:07.000000000 -0500
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
                case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -5236,9 +5245,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot
                error("Wrong destination address");
  #endif
  
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/boot/compressed/relocs.c
---- linux-3.0.4/arch/x86/boot/compressed/relocs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/relocs.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/compressed/relocs.c linux-3.1.1/arch/x86/boot/compressed/relocs.c
+--- linux-3.1.1/arch/x86/boot/compressed/relocs.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/compressed/relocs.c      2011-11-16 18:39:07.000000000 -0500
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5431,9 +5440,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/bo
        read_shdrs(fp);
        read_strtabs(fp);
        read_symtabs(fp);
-diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpucheck.c
---- linux-3.0.4/arch/x86/boot/cpucheck.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/cpucheck.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/cpucheck.c linux-3.1.1/arch/x86/boot/cpucheck.c
+--- linux-3.1.1/arch/x86/boot/cpucheck.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/cpucheck.c       2011-11-16 18:39:07.000000000 -0500
 @@ -74,7 +74,7 @@ static int has_fpu(void)
        u16 fcw = -1, fsw = -1;
        u32 cr0;
@@ -5529,9 +5538,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpuche
  
                err = check_flags();
        }
-diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
---- linux-3.0.4/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/header.S linux-3.1.1/arch/x86/boot/header.S
+--- linux-3.1.1/arch/x86/boot/header.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/header.S 2011-11-16 18:39:07.000000000 -0500
 @@ -224,7 +224,7 @@ setup_data:                .quad 0                 # 64-bit physical
                                                # single linked list of
                                                # struct setup_data
@@ -5541,10 +5550,10 @@ diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
  
  #define ZO_INIT_SIZE  (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE  (VO__end - VO__text)
-diff -urNp linux-3.0.4/arch/x86/boot/Makefile linux-3.0.4/arch/x86/boot/Makefile
---- linux-3.0.4/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400
-@@ -69,6 +69,9 @@ KBUILD_CFLAGS        := $(LINUXINCLUDE) -g -Os 
+diff -urNp linux-3.1.1/arch/x86/boot/Makefile linux-3.1.1/arch/x86/boot/Makefile
+--- linux-3.1.1/arch/x86/boot/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/Makefile 2011-11-16 18:39:07.000000000 -0500
+@@ -63,6 +63,9 @@ KBUILD_CFLAGS        := $(LINUXINCLUDE) -g -Os 
                   $(call cc-option, -fno-stack-protector) \
                   $(call cc-option, -mpreferred-stack-boundary=2)
  KBUILD_CFLAGS += $(call cc-option, -m32)
@@ -5554,9 +5563,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/Makefile linux-3.0.4/arch/x86/boot/Makefile
  KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
---- linux-3.0.4/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/memory.c linux-3.1.1/arch/x86/boot/memory.c
+--- linux-3.1.1/arch/x86/boot/memory.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/memory.c 2011-11-16 18:39:07.000000000 -0500
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5566,9 +5575,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
        struct biosregs ireg, oreg;
        struct e820entry *desc = boot_params.e820_map;
        static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
---- linux-3.0.4/arch/x86/boot/video.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/video.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/video.c linux-3.1.1/arch/x86/boot/video.c
+--- linux-3.1.1/arch/x86/boot/video.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/video.c  2011-11-16 18:39:07.000000000 -0500
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -5578,9 +5587,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
        int key;
        unsigned int v;
  
-diff -urNp linux-3.0.4/arch/x86/boot/video-vesa.c linux-3.0.4/arch/x86/boot/video-vesa.c
---- linux-3.0.4/arch/x86/boot/video-vesa.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/video-vesa.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/boot/video-vesa.c linux-3.1.1/arch/x86/boot/video-vesa.c
+--- linux-3.1.1/arch/x86/boot/video-vesa.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/boot/video-vesa.c     2011-11-16 18:39:07.000000000 -0500
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
        boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5589,77 +5598,86 @@ diff -urNp linux-3.0.4/arch/x86/boot/video-vesa.c linux-3.0.4/arch/x86/boot/vide
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S    2011-09-17 18:31:51.000000000 -0400
-@@ -71,6 +71,12 @@ FUNC:       movq    r1,r2;                  \
+diff -urNp linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/aes-x86_64-asm_64.S    2011-11-16 18:39:07.000000000 -0500
+@@ -8,6 +8,8 @@
+  * including this sentence is retained in full.
+  */
+ 
++#include <asm/alternative-asm.h>
++
+ .extern crypto_ft_tab
+ .extern crypto_it_tab
+ .extern crypto_fl_tab
+@@ -71,6 +73,8 @@ FUNC:        movq    r1,r2;                  \
        je      B192;                   \
        leaq    32(r9),r9;
  
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+#define ret   orb $0x80, 0x7(%rsp); ret
-+#else
-+#define ret   ret
-+#endif
++#define ret   pax_force_retaddr; ret
 +
  #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
        movq    r1,r2;                  \
        movq    r3,r4;                  \
-diff -urNp linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S        2011-09-17 18:31:51.000000000 -0400
-@@ -790,6 +790,9 @@ ECRYPT_encrypt_bytes:
+diff -urNp linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/salsa20-x86_64-asm_64.S        2011-11-16 18:39:07.000000000 -0500
+@@ -1,3 +1,5 @@
++#include <asm/alternative-asm.h>
++
+ # enter ECRYPT_encrypt_bytes
+ .text
+ .p2align 5
+@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
        add     %r11,%rsp
        mov     %rdi,%rax
        mov     %rsi,%rdx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  #   bytesatleast65:
  ._bytesatleast65:
-@@ -891,6 +894,9 @@ ECRYPT_keysetup:
+@@ -891,6 +894,7 @@ ECRYPT_keysetup:
        add     %r11,%rsp
        mov     %rdi,%rax
        mov     %rsi,%rdx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  # enter ECRYPT_ivsetup
  .text
-@@ -917,4 +923,7 @@ ECRYPT_ivsetup:
+@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
        add     %r11,%rsp
        mov     %rdi,%rax
        mov     %rsi,%rdx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
-diff -urNp linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S        2011-09-17 18:31:51.000000000 -0400
-@@ -269,6 +269,9 @@ twofish_enc_blk:
+diff -urNp linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S
+--- linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/crypto/twofish-x86_64-asm_64.S        2011-11-16 18:39:07.000000000 -0500
+@@ -21,6 +21,7 @@
+ .text
+ 
+ #include <asm/asm-offsets.h>
++#include <asm/alternative-asm.h>
+ 
+ #define a_offset      0
+ #define b_offset      4
+@@ -269,6 +270,7 @@ twofish_enc_blk:
  
        popq    R1
        movq    $1,%rax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
  twofish_dec_blk:
-@@ -321,4 +324,7 @@ twofish_dec_blk:
+@@ -321,4 +323,5 @@ twofish_dec_blk:
  
        popq    R1
        movq    $1,%rax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_aout.c
---- linux-3.0.4/arch/x86/ia32/ia32_aout.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32_aout.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32_aout.c linux-3.1.1/arch/x86/ia32/ia32_aout.c
+--- linux-3.1.1/arch/x86/ia32/ia32_aout.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32_aout.c      2011-11-16 18:40:08.000000000 -0500
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
        unsigned long dump_start, dump_size;
        struct user32 dump;
@@ -5669,18 +5687,20 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_
        fs = get_fs();
        set_fs(KERNEL_DS);
        has_dumped = 1;
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32entry.S
---- linux-3.0.4/arch/x86/ia32/ia32entry.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32entry.S      2011-08-25 17:36:37.000000000 -0400
-@@ -13,6 +13,7 @@
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32entry.S linux-3.1.1/arch/x86/ia32/ia32entry.S
+--- linux-3.1.1/arch/x86/ia32/ia32entry.S      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32entry.S      2011-11-17 18:27:57.000000000 -0500
+@@ -13,7 +13,9 @@
  #include <asm/thread_info.h>  
  #include <asm/segment.h>
  #include <asm/irqflags.h>
 +#include <asm/pgtable.h>
  #include <linux/linkage.h>
++#include <asm/alternative-asm.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -95,6 +96,29 @@ ENTRY(native_irq_enable_sysexit)
+ #include <linux/elf-em.h>
+@@ -95,6 +97,29 @@ ENTRY(native_irq_enable_sysexit)
  ENDPROC(native_irq_enable_sysexit)
  #endif
  
@@ -5701,16 +5721,16 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
 +#endif
 +      .endm
 +
-+      .macro pax_erase_kstack
++.macro pax_erase_kstack
 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
 +      call pax_erase_kstack
 +#endif
-+      .endm
++.endm
 +
  /*
   * 32bit SYSENTER instruction entry.
   *
-@@ -121,7 +145,7 @@ ENTRY(ia32_sysenter_target)
+@@ -121,7 +146,7 @@ ENTRY(ia32_sysenter_target)
        CFI_REGISTER    rsp,rbp
        SWAPGS_UNSAFE_STACK
        movq    PER_CPU_VAR(kernel_stack), %rsp
@@ -5719,7 +5739,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        /*
         * No need to follow this irqs on/off section: the syscall
         * disabled irqs, here we enable it straight after entry:
-@@ -134,7 +158,8 @@ ENTRY(ia32_sysenter_target)
+@@ -134,7 +159,8 @@ ENTRY(ia32_sysenter_target)
        CFI_REL_OFFSET rsp,0
        pushfq_cfi
        /*CFI_REL_OFFSET rflags,0*/
@@ -5729,8 +5749,8 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        CFI_REGISTER rip,r10
        pushq_cfi $__USER32_CS
        /*CFI_REL_OFFSET cs,0*/
-@@ -146,6 +171,12 @@ ENTRY(ia32_sysenter_target)
-       SAVE_ARGS 0,0,1
+@@ -146,6 +172,12 @@ ENTRY(ia32_sysenter_target)
+       SAVE_ARGS 0,1,0
        /* no need to do an access_ok check here because rbp has been
           32bit zero extended */ 
 +
@@ -5742,7 +5762,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  1:    movl    (%rbp),%ebp
        .section __ex_table,"a"
        .quad 1b,ia32_badarg
-@@ -168,6 +199,8 @@ sysenter_dispatch:
+@@ -168,6 +200,8 @@ sysenter_dispatch:
        testl   $_TIF_ALLWORK_MASK,TI_flags(%r10)
        jnz     sysexit_audit
  sysexit_from_sys_call:
@@ -5751,7 +5771,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        andl    $~TS_COMPAT,TI_status(%r10)
        /* clear IF, that popfq doesn't enable interrupts early */
        andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -194,6 +227,9 @@ sysexit_from_sys_call:
+@@ -194,6 +228,9 @@ sysexit_from_sys_call:
        movl %eax,%esi                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_I386,%edi      /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -5761,7 +5781,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        movl RAX-ARGOFFSET(%rsp),%eax   /* reload syscall number */
        cmpq $(IA32_NR_syscalls-1),%rax
        ja ia32_badsys
-@@ -246,6 +282,9 @@ sysenter_tracesys:
+@@ -246,6 +283,9 @@ sysenter_tracesys:
        movq    $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
        movq    %rsp,%rdi        /* &pt_regs -> arg1 */
        call    syscall_trace_enter
@@ -5771,7 +5791,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        cmpq    $(IA32_NR_syscalls-1),%rax
-@@ -277,19 +316,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -277,19 +317,24 @@ ENDPROC(ia32_sysenter_target)
  ENTRY(ia32_cstar_target)
        CFI_STARTPROC32 simple
        CFI_SIGNAL_FRAME
@@ -5793,12 +5813,12 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
         * disabled irqs and here we enable it straight after entry:
         */
        ENABLE_INTERRUPTS(CLBR_NONE)
--      SAVE_ARGS 8,1,1
-+      SAVE_ARGS 8*6,1,1
+-      SAVE_ARGS 8,0,0
++      SAVE_ARGS 8*6,0,0
        movl    %eax,%eax       /* zero extension */
        movq    %rax,ORIG_RAX-ARGOFFSET(%rsp)
        movq    %rcx,RIP-ARGOFFSET(%rsp)
-@@ -305,6 +349,12 @@ ENTRY(ia32_cstar_target)
+@@ -305,6 +350,12 @@ ENTRY(ia32_cstar_target)
        /* no need to do an access_ok check here because r8 has been
           32bit zero extended */ 
        /* hardware stack frame is complete now */      
@@ -5811,16 +5831,16 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  1:    movl    (%r8),%r9d
        .section __ex_table,"a"
        .quad 1b,ia32_badarg
-@@ -327,6 +377,8 @@ cstar_dispatch:
+@@ -327,6 +378,8 @@ cstar_dispatch:
        testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
        jnz sysretl_audit
  sysretl_from_sys_call:
 +      pax_exit_kernel_user
 +      pax_erase_kstack
        andl $~TS_COMPAT,TI_status(%r10)
-       RESTORE_ARGS 1,-ARG_SKIP,1,1,1
+       RESTORE_ARGS 0,-ARG_SKIP,0,0,0
        movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -364,6 +416,9 @@ cstar_tracesys:
+@@ -364,6 +417,9 @@ cstar_tracesys:
        movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
        movq %rsp,%rdi        /* &pt_regs -> arg1 */
        call syscall_trace_enter
@@ -5830,7 +5850,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        xchgl %ebp,%r9d
-@@ -409,6 +464,7 @@ ENTRY(ia32_syscall)
+@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
        CFI_REL_OFFSET  rip,RIP-RIP
        PARAVIRT_ADJUST_EXCEPTION_FRAME
        SWAPGS
@@ -5838,7 +5858,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        /*
         * No need to follow this irqs on/off section: the syscall
         * disabled irqs and here we enable it straight after entry:
-@@ -441,6 +497,9 @@ ia32_tracesys:                      
+@@ -441,6 +498,9 @@ ia32_tracesys:                      
        movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
        movq %rsp,%rdi        /* &pt_regs -> arg1 */
        call syscall_trace_enter
@@ -5848,10 +5868,45 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia32_signal.c
---- linux-3.0.4/arch/x86/ia32/ia32_signal.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32_signal.c    2011-08-23 21:47:55.000000000 -0400
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
+@@ -455,6 +515,7 @@ ia32_badsys:
+ 
+ quiet_ni_syscall:
+       movq $-ENOSYS,%rax
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+       
+diff -urNp linux-3.1.1/arch/x86/ia32/ia32_signal.c linux-3.1.1/arch/x86/ia32/ia32_signal.c
+--- linux-3.1.1/arch/x86/ia32/ia32_signal.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/ia32_signal.c    2011-11-16 18:39:07.000000000 -0500
+@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const 
+       }
+       seg = get_fs();
+       set_fs(KERNEL_DS);
+-      ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
++      ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
+       set_fs(seg);
+       if (ret >= 0 && uoss_ptr)  {
+               if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
+@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct 
+  */
+ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+                                size_t frame_size,
+-                               void **fpstate)
++                               void __user **fpstate)
+ {
+       unsigned long sp;
+ 
+@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct 
+ 
+       if (used_math()) {
+               sp = sp - sig_xstate_ia32_size;
+-              *fpstate = (struct _fpstate_ia32 *) sp;
++              *fpstate = (struct _fpstate_ia32 __user *) sp;
+               if (save_i387_xstate_ia32(*fpstate) < 0)
+                       return (void __user *) -1L;
+       }
+@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct 
        sp -= frame_size;
        /* Align the stack pointer according to the i386 ABI,
         * i.e. so that on function entry ((sp + 4) & 15) == 0. */
@@ -5860,16 +5915,16 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia3
        return (void __user *) sp;
  }
  
-@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s
+@@ -457,7 +457,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_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
        } put_user_catch(err);
  
        if (err)
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct 
                0xb8,
                __NR_ia32_rt_sigreturn,
                0x80cd,
@@ -5878,7 +5933,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia3
        };
  
        frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct 
+@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct 
  
                if (ka->sa.sa_flags & SA_RESTORER)
                        restorer = ka->sa.sa_restorer;
@@ -5896,14 +5951,108 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia3
                 * versions need it.
                 */
 -              put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
-+              put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode);
++              put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
        } put_user_catch(err);
  
        if (err)
-diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/include/asm/alternative.h
---- linux-3.0.4/arch/x86/include/asm/alternative.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/alternative.h     2011-08-23 21:47:55.000000000 -0400
-@@ -93,7 +93,7 @@ static inline int alternatives_text_rese
+diff -urNp linux-3.1.1/arch/x86/ia32/sys_ia32.c linux-3.1.1/arch/x86/ia32/sys_ia32.c
+--- linux-3.1.1/arch/x86/ia32/sys_ia32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/ia32/sys_ia32.c       2011-11-16 18:39:07.000000000 -0500
+@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
+  */
+ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
+ {
+-      typeof(ubuf->st_uid) uid = 0;
+-      typeof(ubuf->st_gid) gid = 0;
++      typeof(((struct stat64 *)0)->st_uid) uid = 0;
++      typeof(((struct stat64 *)0)->st_gid) gid = 0;
+       SET_UID(uid, stat->uid);
+       SET_GID(gid, stat->gid);
+       if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
+@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int
+       }
+       set_fs(KERNEL_DS);
+       ret = sys_rt_sigprocmask(how,
+-                               set ? (sigset_t __user *)&s : NULL,
+-                               oset ? (sigset_t __user *)&s : NULL,
++                               set ? (sigset_t __force_user *)&s : NULL,
++                               oset ? (sigset_t __force_user *)&s : NULL,
+                                sigsetsize);
+       set_fs(old_fs);
+       if (ret)
+@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int
+       return alarm_setitimer(seconds);
+ }
+ 
+-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
++asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
+                             int options)
+ {
+       return compat_sys_wait4(pid, stat_addr, options, NULL);
+@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_inter
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
++      ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
+       set_fs(old_fs);
+       if (put_compat_timespec(&t, interval))
+               return -EFAULT;
+@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(comp
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
++      ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
+       set_fs(old_fs);
+       if (!ret) {
+               switch (_NSIG_WORDS) {
+@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(in
+       if (copy_siginfo_from_user32(&info, uinfo))
+               return -EFAULT;
+       set_fs(KERNEL_DS);
+-      ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
++      ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
+       set_fs(old_fs);
+       return ret;
+ }
+@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_f
+               return -EFAULT;
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
++      ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
+                          count);
+       set_fs(old_fs);
+ 
+diff -urNp linux-3.1.1/arch/x86/include/asm/alternative-asm.h linux-3.1.1/arch/x86/include/asm/alternative-asm.h
+--- linux-3.1.1/arch/x86/include/asm/alternative-asm.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/alternative-asm.h 2011-11-16 18:39:07.000000000 -0500
+@@ -15,6 +15,20 @@
+       .endm
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++      .macro pax_force_retaddr rip=0
++      btsq $63,\rip(%rsp)
++      .endm
++      .macro pax_force_fptr ptr
++      btsq $63,\ptr
++      .endm
++#else
++      .macro pax_force_retaddr rip=0
++      .endm
++      .macro pax_force_fptr ptr
++      .endm
++#endif
++
+ .macro altinstruction_entry orig alt feature orig_len alt_len
+       .long \orig - .
+       .long \alt - .
+diff -urNp linux-3.1.1/arch/x86/include/asm/alternative.h linux-3.1.1/arch/x86/include/asm/alternative.h
+--- linux-3.1.1/arch/x86/include/asm/alternative.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/alternative.h     2011-11-16 18:39:07.000000000 -0500
+@@ -89,7 +89,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"                          \
        "        .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */   \
        ".previous\n"                                                   \
@@ -5912,9 +6061,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/i
        "663:\n\t" newinstr "\n664:\n"          /* replacement     */   \
        ".previous"
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/asm/apic.h
---- linux-3.0.4/arch/x86/include/asm/apic.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/apic.h    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/apic.h linux-3.1.1/arch/x86/include/asm/apic.h
+--- linux-3.1.1/arch/x86/include/asm/apic.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/apic.h    2011-11-16 18:39:07.000000000 -0500
 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
  
  #ifdef CONFIG_X86_LOCAL_APIC
@@ -5924,9 +6073,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/asm/apm.h
---- linux-3.0.4/arch/x86/include/asm/apm.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/apm.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/apm.h linux-3.1.1/arch/x86/include/asm/apm.h
+--- linux-3.1.1/arch/x86/include/asm/apm.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/apm.h     2011-11-16 18:39:07.000000000 -0500
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
        __asm__ __volatile__(APM_DO_ZERO_SEGS
                "pushl %%edi\n\t"
@@ -5945,9 +6094,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/a
                "setc %%bl\n\t"
                "popl %%ebp\n\t"
                "popl %%edi\n\t"
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/include/asm/atomic64_32.h
---- linux-3.0.4/arch/x86/include/asm/atomic64_32.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/atomic64_32.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_32.h linux-3.1.1/arch/x86/include/asm/atomic64_32.h
+--- linux-3.1.1/arch/x86/include/asm/atomic64_32.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic64_32.h     2011-11-16 18:39:07.000000000 -0500
 @@ -12,6 +12,14 @@ typedef struct {
        u64 __aligned(8) counter;
  } atomic64_t;
@@ -6097,9 +6246,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/i
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/include/asm/atomic64_64.h
---- linux-3.0.4/arch/x86/include/asm/atomic64_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/atomic64_64.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic64_64.h linux-3.1.1/arch/x86/include/asm/atomic64_64.h
+--- linux-3.1.1/arch/x86/include/asm/atomic64_64.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic64_64.h     2011-11-16 18:39:07.000000000 -0500
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -6421,9 +6570,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/i
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/include/asm/atomic.h
---- linux-3.0.4/arch/x86/include/asm/atomic.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/atomic.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/atomic.h linux-3.1.1/arch/x86/include/asm/atomic.h
+--- linux-3.1.1/arch/x86/include/asm/atomic.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/atomic.h  2011-11-16 18:39:07.000000000 -0500
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -6752,11 +6901,11 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/includ
 +}
 +
  /**
-  * atomic_add_unless - add unless the number is already a given value
+  * __atomic_add_unless - add unless the number is already a given value
   * @v: pointer of type atomic_t
-@@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t *
+@@ -231,12 +447,25 @@ static inline int atomic_xchg(atomic_t *
   */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  {
 -      int c, old;
 +      int c, old, new;
@@ -6783,13 +6932,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/includ
                if (likely(old == c))
                        break;
                c = old;
-       }
--      return c != (u);
-+      return c != u;
+@@ -244,6 +473,48 @@ static inline int __atomic_add_unless(at
+       return c;
  }
  
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
- 
 +/**
 + * atomic_inc_not_zero_hint - increment if not null
 + * @v: pointer of type atomic_t
@@ -6809,7 +6955,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/includ
 +
 +      /* sanity test, should be removed by compiler if hint is a constant */
 +      if (!hint)
-+              return atomic_inc_not_zero(v);
++              return __atomic_add_unless(v, 1, 0);
 +
 +      do {
 +              asm volatile("incl %0\n"
@@ -6832,13 +6978,12 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/includ
 +
 +      return 0;
 +}
-+
+ 
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
-  * @v: pointer of type atomic_t
-diff -urNp linux-3.0.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/include/asm/bitops.h
---- linux-3.0.4/arch/x86/include/asm/bitops.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/bitops.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/bitops.h linux-3.1.1/arch/x86/include/asm/bitops.h
+--- linux-3.1.1/arch/x86/include/asm/bitops.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/bitops.h  2011-11-16 18:39:07.000000000 -0500
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -6848,9 +6993,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/includ
  #define CONST_MASK(nr)                        (1 << ((nr) & 7))
  
  /**
-diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/asm/boot.h
---- linux-3.0.4/arch/x86/include/asm/boot.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/boot.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/boot.h linux-3.1.1/arch/x86/include/asm/boot.h
+--- linux-3.1.1/arch/x86/include/asm/boot.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/boot.h    2011-11-16 18:39:07.000000000 -0500
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6868,9 +7013,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2  PMD_SHIFT
-diff -urNp linux-3.0.4/arch/x86/include/asm/cacheflush.h linux-3.0.4/arch/x86/include/asm/cacheflush.h
---- linux-3.0.4/arch/x86/include/asm/cacheflush.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/cacheflush.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/cacheflush.h linux-3.1.1/arch/x86/include/asm/cacheflush.h
+--- linux-3.1.1/arch/x86/include/asm/cacheflush.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cacheflush.h      2011-11-16 18:39:07.000000000 -0500
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
        unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -6880,9 +7025,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/cacheflush.h linux-3.0.4/arch/x86/in
        else if (pg_flags == _PGMT_WC)
                return _PAGE_CACHE_WC;
        else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-3.0.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include/asm/cache.h
---- linux-3.0.4/arch/x86/include/asm/cache.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/cache.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/cache.h linux-3.1.1/arch/x86/include/asm/cache.h
+--- linux-3.1.1/arch/x86/include/asm/cache.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cache.h   2011-11-16 18:39:07.000000000 -0500
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -6899,9 +7044,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/include/asm/checksum_32.h
---- linux-3.0.4/arch/x86/include/asm/checksum_32.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/checksum_32.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/checksum_32.h linux-3.1.1/arch/x86/include/asm/checksum_32.h
+--- linux-3.1.1/arch/x86/include/asm/checksum_32.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/checksum_32.h     2011-11-16 18:39:07.000000000 -0500
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
                                            int len, __wsum sum,
                                            int *src_err_ptr, int *dst_err_ptr);
@@ -6935,9 +7080,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/i
                                                 len, sum, NULL, err_ptr);
  
        if (len)
-diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/include/asm/cpufeature.h
---- linux-3.0.4/arch/x86/include/asm/cpufeature.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/cpufeature.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/cpufeature.h linux-3.1.1/arch/x86/include/asm/cpufeature.h
+--- linux-3.1.1/arch/x86/include/asm/cpufeature.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/cpufeature.h      2011-11-16 18:39:07.000000000 -0500
 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
                             ".section .discard,\"aw\",@progbits\n"
                             " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -6947,9 +7092,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/in
                             "3: movb $1,%0\n"
                             "4:\n"
                             ".previous\n"
-diff -urNp linux-3.0.4/arch/x86/include/asm/desc_defs.h linux-3.0.4/arch/x86/include/asm/desc_defs.h
---- linux-3.0.4/arch/x86/include/asm/desc_defs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/desc_defs.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/desc_defs.h linux-3.1.1/arch/x86/include/asm/desc_defs.h
+--- linux-3.1.1/arch/x86/include/asm/desc_defs.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/desc_defs.h       2011-11-16 18:39:07.000000000 -0500
 @@ -31,6 +31,12 @@ struct desc_struct {
                        unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
                        unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -6963,9 +7108,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/desc_defs.h linux-3.0.4/arch/x86/inc
        };
  } __attribute__((packed));
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/asm/desc.h
---- linux-3.0.4/arch/x86/include/asm/desc.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/desc.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/desc.h linux-3.1.1/arch/x86/include/asm/desc.h
+--- linux-3.1.1/arch/x86/include/asm/desc.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/desc.h    2011-11-16 18:39:07.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7144,9 +7289,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/asm/e820.h
---- linux-3.0.4/arch/x86/include/asm/e820.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/e820.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/e820.h linux-3.1.1/arch/x86/include/asm/e820.h
+--- linux-3.1.1/arch/x86/include/asm/e820.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/e820.h    2011-11-16 18:39:07.000000000 -0500
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS     0xa0000
  #define ISA_END_ADDRESS               0x100000
@@ -7156,9 +7301,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/
  #define BIOS_END              0x00100000
  
  #define BIOS_ROM_BASE         0xffe00000
-diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/asm/elf.h
---- linux-3.0.4/arch/x86/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/elf.h linux-3.1.1/arch/x86/include/asm/elf.h
+--- linux-3.1.1/arch/x86/include/asm/elf.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/elf.h     2011-11-16 18:39:07.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.  */
@@ -7213,9 +7358,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/a
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch/x86/include/asm/emergency-restart.h
---- linux-3.0.4/arch/x86/include/asm/emergency-restart.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/emergency-restart.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/emergency-restart.h linux-3.1.1/arch/x86/include/asm/emergency-restart.h
+--- linux-3.1.1/arch/x86/include/asm/emergency-restart.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/emergency-restart.h       2011-11-16 18:39:07.000000000 -0500
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -7224,14 +7369,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include/asm/futex.h
---- linux-3.0.4/arch/x86/include/asm/futex.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/futex.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/futex.h linux-3.1.1/arch/x86/include/asm/futex.h
+--- linux-3.1.1/arch/x86/include/asm/futex.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/futex.h   2011-11-16 18:39:07.000000000 -0500
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
  #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
-+      typecheck(u32 *, uaddr);                                \
++      typecheck(u32 __user *, uaddr);                         \
        asm volatile("1:\t" insn "\n"                           \
                     "2:\t.section .fixup,\"ax\"\n"             \
                     "3:\tmov\t%3, %1\n"                        \
@@ -7239,11 +7384,11 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include
                     "\t.previous\n"                            \
                     _ASM_EXTABLE(1b, 3b)                       \
 -                   : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
-+                   : "=r" (oldval), "=r" (ret), "+m" (*(u32 *)____m(uaddr))\
++                   : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
                     : "i" (-EFAULT), "0" (oparg), "1" (0))
  
  #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg)   \
-+      typecheck(u32 *, uaddr);                                \
++      typecheck(u32 __user *, uaddr);                         \
        asm volatile("1:\tmovl  %2, %0\n"                       \
                     "\tmovl\t%0, %3\n"                         \
                     "\t" insn "\n"                             \
@@ -7252,7 +7397,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include
                     _ASM_EXTABLE(2b, 4b)                       \
                     : "=&a" (oldval), "=&r" (ret),             \
 -                     "+m" (*uaddr), "=&r" (tem)               \
-+                     "+m" (*(u32 *)____m(uaddr)), "=&r" (tem) \
++                     "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem)  \
                     : "r" (oparg), "i" (-EFAULT), "1" (0))
  
  static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
@@ -7281,14 +7426,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include
                     "\t.previous\n"
                     _ASM_EXTABLE(1b, 3b)
 -                   : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
-+                   : "+r" (ret), "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
++                   : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
                     : "i" (-EFAULT), "r" (newval), "1" (oldval)
                     : "memory"
        );
-diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/include/asm/hw_irq.h
---- linux-3.0.4/arch/x86/include/asm/hw_irq.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/hw_irq.h  2011-08-23 21:47:55.000000000 -0400
-@@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
+diff -urNp linux-3.1.1/arch/x86/include/asm/hw_irq.h linux-3.1.1/arch/x86/include/asm/hw_irq.h
+--- linux-3.1.1/arch/x86/include/asm/hw_irq.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/hw_irq.h  2011-11-16 18:39:07.000000000 -0500
+@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
  /* Statistics */
@@ -7299,16 +7444,16 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/includ
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/asm/i387.h
---- linux-3.0.4/arch/x86/include/asm/i387.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/i387.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/i387.h linux-3.1.1/arch/x86/include/asm/i387.h
+--- linux-3.1.1/arch/x86/include/asm/i387.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/i387.h    2011-11-16 18:39:07.000000000 -0500
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
        int err;
  
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +      if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
-+              fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
++              fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
 +#endif
 +
        /* See comment in fxsave() below. */
@@ -7351,10 +7496,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/
        else
                clts();
  }
-diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/asm/io.h
---- linux-3.0.4/arch/x86/include/asm/io.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/io.h      2011-08-23 21:47:55.000000000 -0400
-@@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
+diff -urNp linux-3.1.1/arch/x86/include/asm/io.h linux-3.1.1/arch/x86/include/asm/io.h
+--- linux-3.1.1/arch/x86/include/asm/io.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/io.h      2011-11-16 18:39:07.000000000 -0500
+@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
  
@@ -7372,10 +7517,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/as
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/include/asm/irqflags.h
---- linux-3.0.4/arch/x86/include/asm/irqflags.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/irqflags.h        2011-08-23 21:47:55.000000000 -0400
-@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
+diff -urNp linux-3.1.1/arch/x86/include/asm/irqflags.h linux-3.1.1/arch/x86/include/asm/irqflags.h
+--- linux-3.1.1/arch/x86/include/asm/irqflags.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/irqflags.h        2011-11-16 18:39:07.000000000 -0500
+@@ -141,6 +141,11 @@ static inline notrace unsigned long arch
        sti;                                    \
        sysexit
  
@@ -7387,9 +7532,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/incl
  #else
  #define INTERRUPT_RETURN              iret
  #define ENABLE_INTERRUPTS_SYSEXIT     sti; sysexit
-diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/include/asm/kprobes.h
---- linux-3.0.4/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/kprobes.h linux-3.1.1/arch/x86/include/asm/kprobes.h
+--- linux-3.1.1/arch/x86/include/asm/kprobes.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/kprobes.h 2011-11-16 18:39:07.000000000 -0500
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -7406,19 +7551,19 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/inclu
  
  #define flush_insn_slot(p)    do { } while (0)
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/include/asm/kvm_host.h
---- linux-3.0.4/arch/x86/include/asm/kvm_host.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/kvm_host.h        2011-08-26 19:49:56.000000000 -0400
-@@ -441,7 +441,7 @@ struct kvm_arch {
-       unsigned int n_used_mmu_pages;
+diff -urNp linux-3.1.1/arch/x86/include/asm/kvm_host.h linux-3.1.1/arch/x86/include/asm/kvm_host.h
+--- linux-3.1.1/arch/x86/include/asm/kvm_host.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/kvm_host.h        2011-11-16 18:39:07.000000000 -0500
+@@ -456,7 +456,7 @@ struct kvm_arch {
        unsigned int n_requested_mmu_pages;
        unsigned int n_max_mmu_pages;
+       unsigned int indirect_shadow_pages;
 -      atomic_t invlpg_counter;
 +      atomic_unchecked_t invlpg_counter;
        struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
        /*
         * Hash table of struct kvm_mmu_page.
-@@ -619,7 +619,7 @@ struct kvm_x86_ops {
+@@ -636,7 +636,7 @@ struct kvm_x86_ops {
                               enum x86_intercept_stage stage);
  
        const struct trace_print_flags *exit_reasons_str;
@@ -7427,9 +7572,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/incl
  
  struct kvm_arch_async_pf {
        u32 token;
-diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include/asm/local.h
---- linux-3.0.4/arch/x86/include/asm/local.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/local.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/local.h linux-3.1.1/arch/x86/include/asm/local.h
+--- linux-3.1.1/arch/x86/include/asm/local.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/local.h   2011-11-16 18:39:07.000000000 -0500
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7582,9 +7727,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include
                     : "+r" (i), "+m" (l->a.counter)
                     : : "memory");
        return i + __i;
-diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/asm/mman.h
---- linux-3.0.4/arch/x86/include/asm/mman.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/mman.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/mman.h linux-3.1.1/arch/x86/include/asm/mman.h
+--- linux-3.1.1/arch/x86/include/asm/mman.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mman.h    2011-11-16 18:39:07.000000000 -0500
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7600,9 +7745,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/include/asm/mmu_context.h
---- linux-3.0.4/arch/x86/include/asm/mmu_context.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/mmu_context.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/mmu_context.h linux-3.1.1/arch/x86/include/asm/mmu_context.h
+--- linux-3.1.1/arch/x86/include/asm/mmu_context.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mmu_context.h     2011-11-16 18:39:07.000000000 -0500
 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7723,9 +7868,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/i
  }
  
  #define activate_mm(prev, next)                       \
-diff -urNp linux-3.0.4/arch/x86/include/asm/mmu.h linux-3.0.4/arch/x86/include/asm/mmu.h
---- linux-3.0.4/arch/x86/include/asm/mmu.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/mmu.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/mmu.h linux-3.1.1/arch/x86/include/asm/mmu.h
+--- linux-3.1.1/arch/x86/include/asm/mmu.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/mmu.h     2011-11-16 18:39:07.000000000 -0500
 @@ -9,7 +9,7 @@
   * we put the segment information here.
   */
@@ -7756,9 +7901,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/mmu.h linux-3.0.4/arch/x86/include/a
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/include/asm/module.h
---- linux-3.0.4/arch/x86/include/asm/module.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/module.h  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/module.h linux-3.1.1/arch/x86/include/asm/module.h
+--- linux-3.1.1/arch/x86/include/asm/module.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/module.h  2011-11-16 18:39:07.000000000 -0500
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -7767,42 +7912,30 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/includ
  #elif defined CONFIG_M386
  #define MODULE_PROC_FAMILY "386 "
  #elif defined CONFIG_M486
-@@ -59,8 +60,30 @@
+@@ -59,8 +60,18 @@
  #error unknown processor family
  #endif
  
 -#ifdef CONFIG_X86_32
 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+#define MODULE_PAX_UDEREF "UDEREF "
-+#else
-+#define MODULE_PAX_UDEREF ""
-+#endif
-+
 +#ifdef CONFIG_PAX_KERNEXEC
 +#define MODULE_PAX_KERNEXEC "KERNEXEC "
 +#else
 +#define MODULE_PAX_KERNEXEC ""
  #endif
  
-+#ifdef CONFIG_PAX_REFCOUNT
-+#define MODULE_PAX_REFCOUNT "REFCOUNT "
-+#else
-+#define MODULE_PAX_REFCOUNT ""
-+#endif
-+
-+#ifdef CONFIG_GRKERNSEC
-+#define MODULE_GRSEC "GRSECURITY "
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++#define MODULE_PAX_UDEREF "UDEREF "
 +#else
-+#define MODULE_GRSEC ""
++#define MODULE_PAX_UDEREF ""
 +#endif
 +
-+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86/include/asm/page_64_types.h
---- linux-3.0.4/arch/x86/include/asm/page_64_types.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/page_64_types.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/page_64_types.h linux-3.1.1/arch/x86/include/asm/page_64_types.h
+--- linux-3.1.1/arch/x86/include/asm/page_64_types.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/page_64_types.h   2011-11-16 18:39:07.000000000 -0500
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -7812,10 +7945,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)  (x)
-diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/include/asm/paravirt.h
---- linux-3.0.4/arch/x86/include/asm/paravirt.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/paravirt.h        2011-08-23 21:47:55.000000000 -0400
-@@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, 
+diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt.h linux-3.1.1/arch/x86/include/asm/paravirt.h
+--- linux-3.1.1/arch/x86/include/asm/paravirt.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/paravirt.h        2011-11-16 18:39:07.000000000 -0500
+@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, 
                            val);
  }
  
@@ -7834,7 +7967,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/incl
  static inline void pgd_clear(pgd_t *pgdp)
  {
        set_pgd(pgdp, __pgd(0));
-@@ -739,6 +751,21 @@ static inline void __set_fixmap(unsigned
+@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned
        pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
@@ -7856,7 +7989,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/incl
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
  static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -955,7 +982,7 @@ extern void default_banner(void);
+@@ -964,7 +991,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)
@@ -7865,7 +7998,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/incl
  #endif
  
  #define INTERRUPT_RETURN                                              \
-@@ -1032,6 +1059,21 @@ extern void default_banner(void);
+@@ -1041,6 +1068,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))
@@ -7887,10 +8020,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/incl
  #endif        /* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x86/include/asm/paravirt_types.h
---- linux-3.0.4/arch/x86/include/asm/paravirt_types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/paravirt_types.h  2011-08-23 21:47:55.000000000 -0400
-@@ -78,19 +78,19 @@ struct pv_init_ops {
+diff -urNp linux-3.1.1/arch/x86/include/asm/paravirt_types.h linux-3.1.1/arch/x86/include/asm/paravirt_types.h
+--- linux-3.1.1/arch/x86/include/asm/paravirt_types.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/paravirt_types.h  2011-11-16 18:39:07.000000000 -0500
+@@ -84,20 +84,20 @@ struct pv_init_ops {
         */
        unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
                          unsigned long addr, unsigned len);
@@ -7907,13 +8040,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  
  struct pv_time_ops {
        unsigned long long (*sched_clock)(void);
+       unsigned long long (*steal_clock)(int cpu);
        unsigned long (*get_tsc_khz)(void);
 -};
 +} __no_const;
  
  struct pv_cpu_ops {
        /* hooks for various privileged instructions */
-@@ -186,7 +186,7 @@ struct pv_cpu_ops {
+@@ -193,7 +193,7 @@ struct pv_cpu_ops {
  
        void (*start_context_switch)(struct task_struct *prev);
        void (*end_context_switch)(struct task_struct *next);
@@ -7922,7 +8056,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  
  struct pv_irq_ops {
        /*
-@@ -217,7 +217,7 @@ struct pv_apic_ops {
+@@ -224,7 +224,7 @@ struct pv_apic_ops {
                                 unsigned long start_eip,
                                 unsigned long start_esp);
  #endif
@@ -7931,7 +8065,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  
  struct pv_mmu_ops {
        unsigned long (*read_cr2)(void);
-@@ -306,6 +306,7 @@ struct pv_mmu_ops {
+@@ -313,6 +313,7 @@ struct pv_mmu_ops {
        struct paravirt_callee_save make_pud;
  
        void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
@@ -7939,7 +8073,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  #endif        /* PAGETABLE_LEVELS == 4 */
  #endif        /* PAGETABLE_LEVELS >= 3 */
  
-@@ -317,6 +318,12 @@ struct pv_mmu_ops {
+@@ -324,6 +325,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);
@@ -7952,7 +8086,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  };
  
  struct arch_spinlock;
-@@ -327,7 +334,7 @@ struct pv_lock_ops {
+@@ -334,7 +341,7 @@ struct pv_lock_ops {
        void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
        int (*spin_trylock)(struct arch_spinlock *lock);
        void (*spin_unlock)(struct arch_spinlock *lock);
@@ -7961,9 +8095,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  
  /* This contains all the paravirt structures: we get a convenient
   * number for each function using the offset which we use to indicate
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/include/asm/pgalloc.h
---- linux-3.0.4/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgalloc.h linux-3.1.1/arch/x86/include/asm/pgalloc.h
+--- linux-3.1.1/arch/x86/include/asm/pgalloc.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgalloc.h 2011-11-16 18:39:07.000000000 -0500
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
                                       pmd_t *pmd, pte_t *pte)
  {
@@ -7978,9 +8112,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/inclu
        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x86/include/asm/pgtable-2level.h
---- linux-3.0.4/arch/x86/include/asm/pgtable-2level.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable-2level.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-2level.h linux-3.1.1/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable-2level.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable-2level.h  2011-11-16 18:39:07.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)
@@ -7991,9 +8125,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x8
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32.h linux-3.0.4/arch/x86/include/asm/pgtable_32.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_32.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_32.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32.h linux-3.1.1/arch/x86/include/asm/pgtable_32.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_32.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_32.h      2011-11-16 18:39:07.000000000 -0500
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -8037,9 +8171,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32.h linux-3.0.4/arch/x86/in
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_32_types.h        2011-11-16 18:39:07.000000000 -0500
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8069,9 +8203,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h linux-3.0.4/arch/
  #define MODULES_VADDR VMALLOC_START
  #define MODULES_END   VMALLOC_END
  #define MODULES_LEN   (MODULES_VADDR - MODULES_END)
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x86/include/asm/pgtable-3level.h
---- linux-3.0.4/arch/x86/include/asm/pgtable-3level.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable-3level.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable-3level.h linux-3.1.1/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable-3level.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable-3level.h  2011-11-16 18:39:07.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)
@@ -8089,9 +8223,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x8
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64.h linux-3.0.4/arch/x86/include/asm/pgtable_64.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_64.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_64.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64.h linux-3.1.1/arch/x86/include/asm/pgtable_64.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_64.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_64.h      2011-11-16 18:39:07.000000000 -0500
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8132,9 +8266,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64.h linux-3.0.4/arch/x86/in
        *pgdp = pgd;
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_64_types.h        2011-11-16 18:39:07.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)
@@ -8146,9 +8280,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h linux-3.0.4/arch/
 +#define ktva_ktla(addr)               (addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/include/asm/pgtable.h
---- linux-3.0.4/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable.h linux-3.1.1/arch/x86/include/asm/pgtable.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable.h 2011-11-16 18:39:07.000000000 -0500
 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
  
  #ifndef __PAGETABLE_PUD_FOLDED
@@ -8326,9 +8460,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/inclu
  
  #include <asm-generic/pgtable.h>
  #endif        /* __ASSEMBLY__ */
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86/include/asm/pgtable_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_types.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_types.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/pgtable_types.h linux-3.1.1/arch/x86/include/asm/pgtable_types.h
+--- linux-3.1.1/arch/x86/include/asm/pgtable_types.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/pgtable_types.h   2011-11-16 18:39:07.000000000 -0500
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE         7       /* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT         7       /* on 4KB pages */
@@ -8376,18 +8510,16 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  #define __PAGE_KERNEL_EXEC                                            \
        (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
  #define __PAGE_KERNEL         (__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -106,8 +109,8 @@
+@@ -106,7 +109,7 @@
  #define __PAGE_KERNEL_WC              (__PAGE_KERNEL | _PAGE_CACHE_WC)
  #define __PAGE_KERNEL_NOCACHE         (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_UC_MINUS                (__PAGE_KERNEL | _PAGE_PCD)
 -#define __PAGE_KERNEL_VSYSCALL                (__PAGE_KERNEL_RX | _PAGE_USER)
--#define __PAGE_KERNEL_VSYSCALL_NOCACHE        (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)
 +#define __PAGE_KERNEL_VSYSCALL                (__PAGE_KERNEL_RO | _PAGE_USER)
-+#define __PAGE_KERNEL_VSYSCALL_NOCACHE        (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER)
+ #define __PAGE_KERNEL_VVAR            (__PAGE_KERNEL_RO | _PAGE_USER)
+ #define __PAGE_KERNEL_VVAR_NOCACHE    (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_LARGE           (__PAGE_KERNEL | _PAGE_PSE)
- #define __PAGE_KERNEL_LARGE_NOCACHE   (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
- #define __PAGE_KERNEL_LARGE_EXEC      (__PAGE_KERNEL_EXEC | _PAGE_PSE)
-@@ -166,8 +169,8 @@
+@@ -168,8 +171,8 @@
   * bits are combined, this will alow user to access the high address mapped
   * VDSO in the presence of CONFIG_COMPAT_VDSO
   */
@@ -8398,7 +8530,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  #define PGD_IDENT_ATTR         0x001          /* PRESENT (no other attributes) */
  #endif
  
-@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t p
+@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t p
  {
        return native_pgd_val(pgd) & PTE_FLAGS_MASK;
  }
@@ -8416,7 +8548,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  #if PAGETABLE_LEVELS > 3
  typedef struct { pudval_t pud; } pud_t;
  
-@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pu
+@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pu
        return pud.pud;
  }
  #else
@@ -8425,7 +8557,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  static inline pudval_t native_pud_val(pud_t pud)
  {
        return native_pgd_val(pud.pgd);
-@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pm
+@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pm
        return pmd.pmd;
  }
  #else
@@ -8434,7 +8566,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  static inline pmdval_t native_pmd_val(pmd_t pmd)
  {
        return native_pgd_val(pmd.pud.pgd);
-@@ -281,7 +290,6 @@ typedef struct page *pgtable_t;
+@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
  
  extern pteval_t __supported_pte_mask;
  extern void set_nx(void);
@@ -8442,9 +8574,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  
  #define pgprot_writecombine   pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/include/asm/processor.h
---- linux-3.0.4/arch/x86/include/asm/processor.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/processor.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/processor.h linux-3.1.1/arch/x86/include/asm/processor.h
+--- linux-3.1.1/arch/x86/include/asm/processor.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/processor.h       2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -8454,7 +8586,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(co
+@@ -858,11 +858,18 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE             PAGE_OFFSET
  #define TASK_SIZE_MAX         TASK_SIZE
@@ -8475,7 +8607,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
        .vm86_info              = NULL,                                   \
        .sysenter_cs            = __KERNEL_CS,                            \
        .io_bitmap_ptr          = NULL,                                   \
-@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(co
+@@ -876,7 +883,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {                                                     \
        .x86_tss = {                                                      \
@@ -8484,7 +8616,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
                .ss0            = __KERNEL_DS,                            \
                .ss1            = __KERNEL_CS,                            \
                .io_bitmap_base = INVALID_IO_BITMAP_OFFSET,               \
-@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(co
+@@ -887,11 +894,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))
@@ -8497,7 +8629,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(str
+@@ -906,7 +909,7 @@ extern unsigned long thread_saved_pc(str
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -8506,7 +8638,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
         __regs__ - 1;                                                   \
  })
  
-@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(str
+@@ -916,13 +919,13 @@ extern unsigned long thread_saved_pc(str
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -8522,7 +8654,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  
  #define TASK_SIZE             (test_thread_flag(TIF_IA32) ? \
                                        IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(str
+@@ -933,11 +936,11 @@ extern unsigned long thread_saved_pc(str
  #define STACK_TOP_MAX         TASK_SIZE_MAX
  
  #define INIT_THREAD  { \
@@ -8536,7 +8668,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  }
  
  /*
-@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs 
+@@ -959,6 +962,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE    (PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -8547,10 +8679,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  #define KSTK_EIP(task)                (task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/include/asm/ptrace.h
---- linux-3.0.4/arch/x86/include/asm/ptrace.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/ptrace.h  2011-08-23 21:47:55.000000000 -0400
-@@ -153,28 +153,29 @@ static inline unsigned long regs_return_
+diff -urNp linux-3.1.1/arch/x86/include/asm/ptrace.h linux-3.1.1/arch/x86/include/asm/ptrace.h
+--- linux-3.1.1/arch/x86/include/asm/ptrace.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/ptrace.h  2011-11-16 18:39:07.000000000 -0500
+@@ -156,28 +156,29 @@ static inline unsigned long regs_return_
  }
  
  /*
@@ -8586,9 +8718,28 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/includ
  #endif
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/include/asm/reboot.h
---- linux-3.0.4/arch/x86/include/asm/reboot.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/reboot.h  2011-08-23 21:47:55.000000000 -0400
+@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_r
+ #ifdef CONFIG_X86_64
+ static inline bool user_64bit_mode(struct pt_regs *regs)
+ {
++      unsigned long cs = regs->cs & 0xffff;
+ #ifndef CONFIG_PARAVIRT
+       /*
+        * On non-paravirt systems, this is the only long mode CPL 3
+        * selector.  We do not allow long mode selectors in the LDT.
+        */
+-      return regs->cs == __USER_CS;
++      return cs == __USER_CS;
+ #else
+       /* Headers are too twisted for this to go in paravirt.h. */
+-      return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
++      return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
+ #endif
+ }
+ #endif
+diff -urNp linux-3.1.1/arch/x86/include/asm/reboot.h linux-3.1.1/arch/x86/include/asm/reboot.h
+--- linux-3.1.1/arch/x86/include/asm/reboot.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/reboot.h  2011-11-16 18:39:07.000000000 -0500
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -8615,9 +8766,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/includ
  /* These must match dispatch_table in reboot_32.S */
  #define MRR_BIOS      0
  #define MRR_APM               1
-diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include/asm/rwsem.h
---- linux-3.0.4/arch/x86/include/asm/rwsem.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/rwsem.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/rwsem.h linux-3.1.1/arch/x86/include/asm/rwsem.h
+--- linux-3.1.1/arch/x86/include/asm/rwsem.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/rwsem.h   2011-11-16 18:39:07.000000000 -0500
 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
        asm volatile("# beginning down_read\n\t"
@@ -8742,9 +8893,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include
                     : "+r" (tmp), "+m" (sem->count)
                     : : "memory");
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/include/asm/segment.h
---- linux-3.0.4/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/segment.h 2011-09-17 00:53:42.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/segment.h linux-3.1.1/arch/x86/include/asm/segment.h
+--- linux-3.1.1/arch/x86/include/asm/segment.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/segment.h 2011-11-16 18:39:07.000000000 -0500
 @@ -64,10 +64,15 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu                      [ offset to per-cpu data area ]
@@ -8795,7 +8946,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/inclu
  
  #else
 @@ -165,6 +178,8 @@
- #define __USER32_CS   (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
+ #define __USER32_CS   (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
  #define __USER32_DS   __USER_DS
  
 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
@@ -8811,9 +8962,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/inclu
  #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-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/asm/smp.h
---- linux-3.0.4/arch/x86/include/asm/smp.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/smp.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/smp.h linux-3.1.1/arch/x86/include/asm/smp.h
+--- linux-3.1.1/arch/x86/include/asm/smp.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/smp.h     2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
  /* cpus sharing the last level cache: */
  DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
@@ -8849,17 +9000,17 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/a
  #define safe_smp_processor_id()               smp_processor_id()
  
  #endif
-diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/include/asm/spinlock.h
---- linux-3.0.4/arch/x86/include/asm/spinlock.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/spinlock.h        2011-08-23 21:47:55.000000000 -0400
-@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
+diff -urNp linux-3.1.1/arch/x86/include/asm/spinlock.h linux-3.1.1/arch/x86/include/asm/spinlock.h
+--- linux-3.1.1/arch/x86/include/asm/spinlock.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/spinlock.h        2011-11-16 18:39:07.000000000 -0500
+@@ -248,6 +248,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"
+       asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
-+                   LOCK_PREFIX " addl $1,(%0)\n"
++                   LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
 +                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
@@ -8867,14 +9018,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/incl
                     "jns 1f\n"
                     "call __read_lock_failed\n\t"
                     "1:\n"
-@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_r
+@@ -257,6 +265,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"
+       asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
-+                   LOCK_PREFIX " addl %1,(%0)\n"
++                   LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
 +                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
@@ -8882,41 +9033,41 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/incl
                     "jz 1f\n"
                     "call __write_lock_failed\n\t"
                     "1:\n"
-@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arc
+@@ -286,13 +302,29 @@ static inline int arch_write_trylock(arc
  
  static inline void arch_read_unlock(arch_rwlock_t *rw)
  {
--      asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
-+      asm volatile(LOCK_PREFIX "incl %0\n"
+-      asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
++      asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
-+                   LOCK_PREFIX "decl %0\n"
++                   LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
 +                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-+                   :"+m" (rw->lock) : : "memory");
+                    :"+m" (rw->lock) : : "memory");
  }
  
  static inline void arch_write_unlock(arch_rwlock_t *rw)
  {
--      asm volatile(LOCK_PREFIX "addl %1, %0"
-+      asm volatile(LOCK_PREFIX "addl %1, %0\n"
+-      asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
++      asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                   "jno 0f\n"
-+                   LOCK_PREFIX "subl %1, %0\n"
++                   LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
 +                   "int $4\n0:\n"
 +                   _ASM_EXTABLE(0b, 0b)
 +#endif
 +
-                    : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
+                    : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x86/include/asm/stackprotector.h
---- linux-3.0.4/arch/x86/include/asm/stackprotector.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/stackprotector.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/stackprotector.h linux-3.1.1/arch/x86/include/asm/stackprotector.h
+--- linux-3.1.1/arch/x86/include/asm/stackprotector.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/stackprotector.h  2011-11-16 18:39:07.000000000 -0500
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -8935,9 +9086,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x8
        asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/include/asm/stacktrace.h
---- linux-3.0.4/arch/x86/include/asm/stacktrace.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/stacktrace.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/stacktrace.h linux-3.1.1/arch/x86/include/asm/stacktrace.h
+--- linux-3.1.1/arch/x86/include/asm/stacktrace.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/stacktrace.h      2011-11-16 18:39:07.000000000 -0500
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -8988,9 +9139,21 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/in
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/include/asm/system.h
---- linux-3.0.4/arch/x86/include/asm/system.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/system.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/sys_ia32.h linux-3.1.1/arch/x86/include/asm/sys_ia32.h
+--- linux-3.1.1/arch/x86/include/asm/sys_ia32.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/sys_ia32.h        2011-11-16 18:39:07.000000000 -0500
+@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
+                                    compat_sigset_t __user *, unsigned int);
+ asmlinkage long sys32_alarm(unsigned int);
+ 
+-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
++asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
+ asmlinkage long sys32_sysfs(int, u32, u32);
+ 
+ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
+diff -urNp linux-3.1.1/arch/x86/include/asm/system.h linux-3.1.1/arch/x86/include/asm/system.h
+--- linux-3.1.1/arch/x86/include/asm/system.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/system.h  2011-11-16 18:39:07.000000000 -0500
 @@ -129,7 +129,7 @@ do {                                                                       \
             "call __switch_to\n\t"                                       \
             "movq "__percpu_arg([current_task])",%%rsi\n\t"              \
@@ -9033,9 +9196,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/includ
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/include/asm/thread_info.h
---- linux-3.0.4/arch/x86/include/asm/thread_info.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/thread_info.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/thread_info.h linux-3.1.1/arch/x86/include/asm/thread_info.h
+--- linux-3.1.1/arch/x86/include/asm/thread_info.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/thread_info.h     2011-11-16 18:39:07.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9045,7 +9208,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/i
  /*
   * low level task data that entry.S needs immediate access to
 @@ -24,7 +25,6 @@ struct exec_domain;
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct thread_info {
 -      struct task_struct      *task;          /* main task structure */
@@ -9183,9 +9346,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/i
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/include/asm/uaccess_32.h
---- linux-3.0.4/arch/x86/include/asm/uaccess_32.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess_32.h      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_32.h linux-3.1.1/arch/x86/include/asm/uaccess_32.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess_32.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess_32.h      2011-11-16 18:40:08.000000000 -0500
 @@ -43,6 +43,11 @@ 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)
@@ -9353,9 +9516,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/in
        return n;
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/include/asm/uaccess_64.h
---- linux-3.0.4/arch/x86/include/asm/uaccess_64.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess_64.h      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess_64.h linux-3.1.1/arch/x86/include/asm/uaccess_64.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess_64.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess_64.h      2011-11-16 18:40:08.000000000 -0500
 @@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9453,7 +9616,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +                      src += PAX_USER_SHADOW_BASE;
 +#endif
 +
-+              return copy_user_generic(dst, (__force const void *)src, size);
++              return copy_user_generic(dst, (__force_kernel const void *)src, size);
 +      }
        switch (size) {
 -      case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
@@ -9502,7 +9665,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +                      src += PAX_USER_SHADOW_BASE;
 +#endif
 +
-+              return copy_user_generic(dst, (__force const void *)src, size);
++              return copy_user_generic(dst, (__force_kernel const void *)src, size);
        }
  }
  
@@ -9516,6 +9679,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
  
        might_fault();
 -      if (!__builtin_constant_p(size))
+-              return copy_user_generic((__force void *)dst, src, size);
 +
 +      pax_track_stack();
 +
@@ -9542,7 +9706,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +                      dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-               return copy_user_generic((__force void *)dst, src, size);
++              return copy_user_generic((__force_kernel void *)dst, src, size);
 +      }
        switch (size) {
 -      case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
@@ -9584,13 +9748,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
                               ret, "q", "", "er", 8);
                return ret;
        default:
+-              return copy_user_generic((__force void *)dst, src, size);
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +                      dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-               return copy_user_generic((__force void *)dst, src, size);
++              return copy_user_generic((__force_kernel void *)dst, src, size);
        }
  }
  
@@ -9603,6 +9768,8 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
  
        might_fault();
 -      if (!__builtin_constant_p(size))
+-              return copy_user_generic((__force void *)dst,
+-                                       (__force void *)src, size);
 +
 +      if ((int)size < 0)
 +              return size;
@@ -9623,9 +9790,8 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +                      dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-               return copy_user_generic((__force void *)dst,
--                                       (__force void *)src, size);
-+                                       (__force const void *)src, size);
++              return copy_user_generic((__force_kernel void *)dst,
++                                       (__force_kernel const void *)src, size);
 +      }
        switch (size) {
        case 1: {
@@ -9666,6 +9832,8 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
                return ret;
        }
        default:
+-              return copy_user_generic((__force void *)dst,
+-                                       (__force void *)src, size);
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
@@ -9674,9 +9842,8 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +                      dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-               return copy_user_generic((__force void *)dst,
--                                       (__force void *)src, size);
-+                                       (__force const void *)src, size);
++              return copy_user_generic((__force_kernel void *)dst,
++                                       (__force_kernel const void *)src, size);
        }
  }
  
@@ -9684,6 +9851,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
  static __must_check __always_inline int
  __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
  {
+-      return copy_user_generic(dst, (__force const void *)src, size);
 +      pax_track_stack();
 +
 +      if ((int)size < 0)
@@ -9697,13 +9865,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +              src += PAX_USER_SHADOW_BASE;
 +#endif
 +
-       return copy_user_generic(dst, (__force const void *)src, size);
++      return copy_user_generic(dst, (__force_kernel const void *)src, size);
  }
  
 -static __must_check __always_inline int
 +static __must_check __always_inline unsigned long
  __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
  {
+-      return copy_user_generic((__force void *)dst, src, size);
 +      if ((int)size < 0)
 +              return size;
 +
@@ -9715,7 +9884,7 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +              dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-       return copy_user_generic((__force void *)dst, src, size);
++      return copy_user_generic((__force_kernel void *)dst, src, size);
  }
  
 -extern long __copy_user_nocache(void *dst, const void __user *src,
@@ -9756,13 +9925,14 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
  }
  
 -unsigned long
+-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
 +extern unsigned long
- copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
++copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/include/asm/uaccess.h
---- linux-3.0.4/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/uaccess.h linux-3.1.1/arch/x86/include/asm/uaccess.h
+--- linux-3.1.1/arch/x86/include/asm/uaccess.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/uaccess.h 2011-11-16 18:39:07.000000000 -0500
 @@ -7,12 +7,15 @@
  #include <linux/compiler.h>
  #include <linux/thread_info.h>
@@ -9862,6 +10032,15 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/inclu
                     "3:\n"                                             \
                     _ASM_EXTABLE(1b, 2b - 1b)                          \
                     _ASM_EXTABLE(2b, 3b - 2b)                          \
+@@ -252,7 +294,7 @@ extern void __put_user_8(void);
+       __typeof__(*(ptr)) __pu_val;                            \
+       __chk_user_ptr(ptr);                                    \
+       might_fault();                                          \
+-      __pu_val = x;                                           \
++      __pu_val = (x);                                         \
+       switch (sizeof(*(ptr))) {                               \
+       case 1:                                                 \
+               __put_user_x(1, __pu_val, ptr, __ret_pu);       \
 @@ -373,7 +415,7 @@ do {                                                                       \
  } while (0)
  
@@ -9973,9 +10152,21 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/inclu
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/include/asm/x86_init.h
---- linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/vdso.h linux-3.1.1/arch/x86/include/asm/vdso.h
+--- linux-3.1.1/arch/x86/include/asm/vdso.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/vdso.h    2011-11-16 18:39:07.000000000 -0500
+@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
+ #define VDSO32_SYMBOL(base, name)                                     \
+ ({                                                                    \
+       extern const char VDSO32_##name[];                              \
+-      (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
++      (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
+ })
+ #endif
+ 
+diff -urNp linux-3.1.1/arch/x86/include/asm/x86_init.h linux-3.1.1/arch/x86/include/asm/x86_init.h
+--- linux-3.1.1/arch/x86/include/asm/x86_init.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/x86_init.h        2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
        void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
        void (*find_smp_config)(void);
@@ -10093,9 +10284,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/incl
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include/asm/xsave.h
---- linux-3.0.4/arch/x86/include/asm/xsave.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/xsave.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/include/asm/xsave.h linux-3.1.1/arch/x86/include/asm/xsave.h
+--- linux-3.1.1/arch/x86/include/asm/xsave.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/include/asm/xsave.h   2011-11-16 18:39:07.000000000 -0500
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
        int err;
@@ -10108,7 +10299,12 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include
        /*
         * Clear the xsave header first, so that reserved fields are
         * initialized to zero.
-@@ -100,6 +105,11 @@ static inline int xrestore_user(struct x
+@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsav
+ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
+ {
+       int err;
+-      struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
++      struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
        u32 lmask = mask;
        u32 hmask = mask >> 32;
  
@@ -10120,10 +10316,10 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include
        __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
                             "2:\n"
                             ".section .fixup,\"ax\"\n"
-diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
---- linux-3.0.4/arch/x86/Kconfig       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/Kconfig       2011-09-17 00:58:36.000000000 -0400
-@@ -229,7 +229,7 @@ config X86_HT
+diff -urNp linux-3.1.1/arch/x86/Kconfig linux-3.1.1/arch/x86/Kconfig
+--- linux-3.1.1/arch/x86/Kconfig       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig       2011-11-16 18:40:08.000000000 -0500
+@@ -236,7 +236,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
        def_bool y
@@ -10132,7 +10328,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
  
  config ARCH_HWEIGHT_CFLAGS
        string
-@@ -1018,7 +1018,7 @@ choice
+@@ -1019,7 +1019,7 @@ choice
  
  config NOHIGHMEM
        bool "off"
@@ -10141,7 +10337,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/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
-@@ -1055,7 +1055,7 @@ config NOHIGHMEM
+@@ -1056,7 +1056,7 @@ config NOHIGHMEM
  
  config HIGHMEM4G
        bool "4GB"
@@ -10150,7 +10346,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        ---help---
          Select this if you have a 32-bit processor and between 1 and 4
          gigabytes of physical RAM.
-@@ -1109,7 +1109,7 @@ config PAGE_OFFSET
+@@ -1110,7 +1110,7 @@ config PAGE_OFFSET
        hex
        default 0xB0000000 if VMSPLIT_3G_OPT
        default 0x80000000 if VMSPLIT_2G
@@ -10159,7 +10355,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        default 0x40000000 if VMSPLIT_1G
        default 0xC0000000
        depends on X86_32
-@@ -1483,6 +1483,7 @@ config SECCOMP
+@@ -1484,6 +1484,7 @@ config SECCOMP
  
  config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
@@ -10167,7 +10363,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        ---help---
          This option turns on the -fstack-protector GCC feature. This
          feature puts, at the beginning of functions, a canary value on
-@@ -1540,6 +1541,7 @@ config KEXEC_JUMP
+@@ -1541,6 +1542,7 @@ config KEXEC_JUMP
  config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
        default "0x1000000"
@@ -10175,7 +10371,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        ---help---
          This gives the physical address where the kernel is loaded.
  
-@@ -1603,6 +1605,7 @@ config X86_NEED_RELOCS
+@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS
  config PHYSICAL_ALIGN
        hex "Alignment value to which kernel should be aligned" if X86_32
        default "0x1000000"
@@ -10183,7 +10379,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        range 0x2000 0x1000000
        ---help---
          This value puts the alignment restrictions on physical address
-@@ -1634,9 +1637,10 @@ config HOTPLUG_CPU
+@@ -1635,9 +1638,10 @@ config HOTPLUG_CPU
          Say N if you want to disable CPU hotplug.
  
  config COMPAT_VDSO
@@ -10195,10 +10391,10 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
---- linux-3.0.4/arch/x86/Kconfig.cpu   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/Kconfig.cpu   2011-08-23 21:47:55.000000000 -0400
-@@ -338,7 +338,7 @@ config X86_PPRO_FENCE
+diff -urNp linux-3.1.1/arch/x86/Kconfig.cpu linux-3.1.1/arch/x86/Kconfig.cpu
+--- linux-3.1.1/arch/x86/Kconfig.cpu   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig.cpu   2011-11-16 18:39:07.000000000 -0500
+@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
        def_bool y
@@ -10207,7 +10403,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
  
  config X86_INVD_BUG
        def_bool y
-@@ -362,7 +362,7 @@ config X86_POPAD_OK
+@@ -365,7 +365,7 @@ config X86_POPAD_OK
  
  config X86_ALIGNMENT_16
        def_bool y
@@ -10216,7 +10412,7 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
  
  config X86_INTEL_USERCOPY
        def_bool y
-@@ -408,7 +408,7 @@ config X86_CMPXCHG64
+@@ -411,7 +411,7 @@ config X86_CMPXCHG64
  # generates cmov.
  config X86_CMOV
        def_bool y
@@ -10225,9 +10421,9 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
  
  config X86_MINIMUM_CPU_FAMILY
        int
-diff -urNp linux-3.0.4/arch/x86/Kconfig.debug linux-3.0.4/arch/x86/Kconfig.debug
---- linux-3.0.4/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/Kconfig.debug linux-3.1.1/arch/x86/Kconfig.debug
+--- linux-3.1.1/arch/x86/Kconfig.debug 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Kconfig.debug 2011-11-16 18:39:07.000000000 -0500
 @@ -81,7 +81,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
        bool "Write protect kernel read-only data structures"
@@ -10246,9 +10442,9 @@ diff -urNp linux-3.0.4/arch/x86/Kconfig.debug linux-3.0.4/arch/x86/Kconfig.debug
        ---help---
          This option helps catch unintended modifications to loadable
          kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/realmode/Makefile 2011-11-16 18:39:07.000000000 -0500
 @@ -41,6 +41,9 @@ KBUILD_CFLAGS        := $(LINUXINCLUDE) -g -Os 
                   $(call cc-option, -fno-stack-protector) \
                   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -10259,9 +10455,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x
  KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-16 18:40:08.000000000 -0500
 @@ -108,6 +108,9 @@ wakeup_code:
        /* Do any other stuff... */
  
@@ -10280,9 +10476,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x
  #else
        pushw   $0
        pushw   trampoline_segment
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/acpi/sleep.c
---- linux-3.0.4/arch/x86/kernel/acpi/sleep.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/sleep.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/sleep.c linux-3.1.1/arch/x86/kernel/acpi/sleep.c
+--- linux-3.1.1/arch/x86/kernel/acpi/sleep.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/sleep.c   2011-11-16 18:39:07.000000000 -0500
 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
        header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
@@ -10296,9 +10492,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/
        initial_gs = per_cpu_offset(smp_processor_id());
  #endif
        initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/acpi/wakeup_32.S       2011-11-16 18:39:07.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
@@ -10315,10 +10511,33 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/ker
  
  bogus_magic:
        jmp     bogus_magic
-diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel/alternative.c
---- linux-3.0.4/arch/x86/kernel/alternative.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/alternative.c  2011-08-23 21:47:55.000000000 -0400
-@@ -313,7 +313,7 @@ static void alternatives_smp_lock(const 
+diff -urNp linux-3.1.1/arch/x86/kernel/alternative.c linux-3.1.1/arch/x86/kernel/alternative.c
+--- linux-3.1.1/arch/x86/kernel/alternative.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/alternative.c  2011-11-16 18:39:07.000000000 -0500
+@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives
+        */
+       for (a = start; a < end; a++) {
+               instr = (u8 *)&a->instr_offset + a->instr_offset;
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++              instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++              if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
++                      instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
+               replacement = (u8 *)&a->repl_offset + a->repl_offset;
+               BUG_ON(a->replacementlen > a->instrlen);
+               BUG_ON(a->instrlen > sizeof(insnbuf));
+@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const 
+       for (poff = start; poff < end; poff++) {
+               u8 *ptr = (u8 *)poff + *poff;
+ 
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++              ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++              if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
++                      ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
                if (!*poff || ptr < text || ptr >= text_end)
                        continue;
                /* turn DS segment override prefix into lock prefix */
@@ -10327,7 +10546,16 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
                        text_poke(ptr, ((unsigned char []){0xf0}), 1);
        };
        mutex_unlock(&text_mutex);
-@@ -334,7 +334,7 @@ static void alternatives_smp_unlock(cons
+@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(cons
+       for (poff = start; poff < end; poff++) {
+               u8 *ptr = (u8 *)poff + *poff;
+ 
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++              ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++              if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
++                      ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
++#endif
++
                if (!*poff || ptr < text || ptr >= text_end)
                        continue;
                /* turn lock prefix into DS segment override prefix */
@@ -10336,7 +10564,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
                        text_poke(ptr, ((unsigned char []){0x3E}), 1);
        };
        mutex_unlock(&text_mutex);
-@@ -503,7 +503,7 @@ void __init_or_module apply_paravirt(str
+@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(str
  
                BUG_ON(p->len > MAX_PATCH_LEN);
                /* prep the buffer with the original instructions */
@@ -10345,7 +10573,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
                used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
                                         (unsigned long)p->instr, p->len);
  
-@@ -571,7 +571,7 @@ void __init alternative_instructions(voi
+@@ -568,7 +587,7 @@ void __init alternative_instructions(voi
        if (smp_alt_once)
                free_init_pages("SMP alternatives",
                                (unsigned long)__smp_locks,
@@ -10354,7 +10582,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
  
        restart_nmi();
  }
-@@ -588,13 +588,17 @@ void __init alternative_instructions(voi
+@@ -585,13 +604,17 @@ void __init alternative_instructions(voi
   * instructions. And on the local CPU you need to be protected again NMI or MCE
   * handlers seeing an inconsistent instruction while you patch.
   */
@@ -10374,7 +10602,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
        local_irq_restore(flags);
        /* Could also do a CLFLUSH here to speed up CPU recovery; but
           that causes hangs on some VIA CPUs. */
-@@ -616,36 +620,22 @@ void *__init_or_module text_poke_early(v
+@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(v
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -10419,10 +10647,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
        return addr;
  }
  
-diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/apic/apic.c
---- linux-3.0.4/arch/x86/kernel/apic/apic.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apic/apic.c    2011-08-23 21:48:14.000000000 -0400
-@@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
+diff -urNp linux-3.1.1/arch/x86/kernel/apic/apic.c linux-3.1.1/arch/x86/kernel/apic/apic.c
+--- linux-3.1.1/arch/x86/kernel/apic/apic.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apic/apic.c    2011-11-16 18:40:08.000000000 -0500
+@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
   */
@@ -10431,7 +10659,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/a
  
  int pic_mode;
  
-@@ -1834,7 +1834,7 @@ void smp_error_interrupt(struct pt_regs 
+@@ -1835,7 +1835,7 @@ void smp_error_interrupt(struct pt_regs 
        apic_write(APIC_ESR, 0);
        v1 = apic_read(APIC_ESR);
        ack_APIC_irq();
@@ -10440,7 +10668,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/a
  
        apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
                    smp_processor_id(), v0 , v1);
-@@ -2190,6 +2190,8 @@ static int __cpuinit apic_cluster_num(vo
+@@ -2209,6 +2209,8 @@ static int __cpuinit apic_cluster_num(vo
        u16 *bios_cpu_apicid;
        DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
  
@@ -10449,9 +10677,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/a
        bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kernel/apic/io_apic.c
---- linux-3.0.4/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/apic/io_apic.c linux-3.1.1/arch/x86/kernel/apic/io_apic.c
+--- linux-3.1.1/arch/x86/kernel/apic/io_apic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apic/io_apic.c 2011-11-16 18:39:07.000000000 -0500
 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10470,7 +10698,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kerne
  {
        raw_spin_unlock(&vector_lock);
  }
-@@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_dat
+@@ -2405,7 +2405,7 @@ static void ack_apic_edge(struct irq_dat
        ack_APIC_irq();
  }
  
@@ -10479,7 +10707,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kerne
  
  /*
   * IO-APIC versions below 0x20 don't support EOI register.
-@@ -2472,7 +2472,7 @@ static void ack_apic_level(struct irq_da
+@@ -2513,7 +2513,7 @@ static void ack_apic_level(struct irq_da
         * at the cpu.
         */
        if (!(v & (1 << (i & 0x1f)))) {
@@ -10488,9 +10716,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kerne
  
                eoi_ioapic_irq(irq, cfg);
        }
-diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_32.c
---- linux-3.0.4/arch/x86/kernel/apm_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apm_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/apm_32.c linux-3.1.1/arch/x86/kernel/apm_32.c
+--- linux-3.1.1/arch/x86/kernel/apm_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/apm_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -413,7 +413,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.
@@ -10562,9 +10790,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_
  
        proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets_64.c linux-3.0.4/arch/x86/kernel/asm-offsets_64.c
---- linux-3.0.4/arch/x86/kernel/asm-offsets_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/asm-offsets_64.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets_64.c linux-3.1.1/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.1.1/arch/x86/kernel/asm-offsets_64.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/asm-offsets_64.c       2011-11-16 18:39:07.000000000 -0500
 @@ -69,6 +69,7 @@ int main(void)
        BLANK();
  #undef ENTRY
@@ -10573,9 +10801,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets_64.c linux-3.0.4/arch/x86/ker
        OFFSET(TSS_ist, tss_struct, x86_tss.ist);
        BLANK();
  
-diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel/asm-offsets.c
---- linux-3.0.4/arch/x86/kernel/asm-offsets.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/asm-offsets.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/asm-offsets.c linux-3.1.1/arch/x86/kernel/asm-offsets.c
+--- linux-3.1.1/arch/x86/kernel/asm-offsets.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/asm-offsets.c  2011-11-16 18:39:07.000000000 -0500
 @@ -33,6 +33,8 @@ void common(void) {
        OFFSET(TI_status, thread_info, status);
        OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10612,9 +10840,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel
  #ifdef CONFIG_XEN
        BLANK();
        OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu/amd.c
---- linux-3.0.4/arch/x86/kernel/cpu/amd.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/amd.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/amd.c linux-3.1.1/arch/x86/kernel/cpu/amd.c
+--- linux-3.1.1/arch/x86/kernel/cpu/amd.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/amd.c      2011-11-16 18:39:07.000000000 -0500
 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
                                                        unsigned int size)
  {
@@ -10624,9 +10852,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu
                /* Duron Rev A0 */
                if (c->x86_model == 3 && c->x86_mask == 0)
                        size = 64;
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/cpu/common.c
---- linux-3.0.4/arch/x86/kernel/cpu/common.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/common.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/common.c linux-3.1.1/arch/x86/kernel/cpu/common.c
+--- linux-3.1.1/arch/x86/kernel/cpu/common.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/common.c   2011-11-16 18:39:07.000000000 -0500
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10771,9 +10999,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/
        struct thread_struct *thread = &curr->thread;
  
        if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/cpu/intel.c
---- linux-3.0.4/arch/x86/kernel/cpu/intel.c    2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/intel.c    2011-08-29 23:30:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/intel.c linux-3.1.1/arch/x86/kernel/cpu/intel.c
+--- linux-3.1.1/arch/x86/kernel/cpu/intel.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/intel.c    2011-11-16 18:39:07.000000000 -0500
 @@ -172,7 +172,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.
@@ -10783,9 +11011,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/c
        load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/Makefile linux-3.0.4/arch/x86/kernel/cpu/Makefile
---- linux-3.0.4/arch/x86/kernel/cpu/Makefile   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/Makefile   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/Makefile linux-3.1.1/arch/x86/kernel/cpu/Makefile
+--- linux-3.1.1/arch/x86/kernel/cpu/Makefile   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/Makefile   2011-11-16 18:39:07.000000000 -0500
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -10797,18 +11025,18 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/Makefile linux-3.0.4/arch/x86/kernel/
  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-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c       2011-08-23 21:47:55.000000000 -0400
-@@ -46,6 +46,7 @@
- #include <asm/ipi.h>
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce.c       2011-11-16 18:39:07.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <asm/processor.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
 +#include <asm/local.h>
  
  #include "mce-internal.h"
  
-@@ -208,7 +209,7 @@ static void print_mce(struct mce *m)
+@@ -205,7 +206,7 @@ static void print_mce(struct mce *m)
                        !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
                                m->cs, m->ip);
  
@@ -10817,7 +11045,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
                        print_symbol("{%s}", m->ip);
                pr_cont("\n");
        }
-@@ -236,10 +237,10 @@ static void print_mce(struct mce *m)
+@@ -233,10 +234,10 @@ static void print_mce(struct mce *m)
  
  #define PANIC_TIMEOUT 5 /* 5 seconds */
  
@@ -10830,7 +11058,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
  
  /* Panic in progress. Enable interrupts and wait for final IPI */
  static void wait_for_panic(void)
-@@ -263,7 +264,7 @@ static void mce_panic(char *msg, struct 
+@@ -260,7 +261,7 @@ static void mce_panic(char *msg, struct 
                /*
                 * Make sure only one CPU runs in machine check panic
                 */
@@ -10839,7 +11067,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
                        wait_for_panic();
                barrier();
  
-@@ -271,7 +272,7 @@ static void mce_panic(char *msg, struct 
+@@ -268,7 +269,7 @@ static void mce_panic(char *msg, struct 
                console_verbose();
        } else {
                /* Don't log too much for fake panic */
@@ -10848,7 +11076,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
                        return;
        }
        /* First print corrected ones that are still unlogged */
-@@ -638,7 +639,7 @@ static int mce_timed_out(u64 *t)
+@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
         * might have been modified by someone else.
         */
        rmb();
@@ -10857,42 +11085,43 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
                wait_for_panic();
        if (!monarch_timeout)
                goto out;
-@@ -1452,14 +1453,14 @@ void __cpuinit mcheck_cpu_init(struct cp
+@@ -1429,7 +1430,7 @@ void __cpuinit mcheck_cpu_init(struct cp
   */
  
- static DEFINE_SPINLOCK(mce_state_lock);
--static int            open_count;             /* #times opened */
-+static local_t                open_count;             /* #times opened */
- static int            open_exclu;             /* already open exclusive? */
+ static DEFINE_SPINLOCK(mce_chrdev_state_lock);
+-static int mce_chrdev_open_count;     /* #times opened */
++static local_t mce_chrdev_open_count; /* #times opened */
+ static int mce_chrdev_open_exclu;     /* already open exclusive? */
  
- static int mce_open(struct inode *inode, struct file *file)
- {
-       spin_lock(&mce_state_lock);
+ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1437,7 +1438,7 @@ static int mce_chrdev_open(struct inode 
+       spin_lock(&mce_chrdev_state_lock);
  
--      if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
-+      if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) {
-               spin_unlock(&mce_state_lock);
+       if (mce_chrdev_open_exclu ||
+-          (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
++          (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
+               spin_unlock(&mce_chrdev_state_lock);
  
                return -EBUSY;
-@@ -1467,7 +1468,7 @@ static int mce_open(struct inode *inode,
+@@ -1445,7 +1446,7 @@ static int mce_chrdev_open(struct inode 
  
        if (file->f_flags & O_EXCL)
-               open_exclu = 1;
--      open_count++;
-+      local_inc(&open_count);
+               mce_chrdev_open_exclu = 1;
+-      mce_chrdev_open_count++;
++      local_inc(&mce_chrdev_open_count);
  
-       spin_unlock(&mce_state_lock);
+       spin_unlock(&mce_chrdev_state_lock);
  
-@@ -1478,7 +1479,7 @@ static int mce_release(struct inode *ino
+@@ -1456,7 +1457,7 @@ static int mce_chrdev_release(struct ino
  {
-       spin_lock(&mce_state_lock);
+       spin_lock(&mce_chrdev_state_lock);
  
--      open_count--;
-+      local_dec(&open_count);
-       open_exclu = 0;
+-      mce_chrdev_open_count--;
++      local_dec(&mce_chrdev_open_count);
+       mce_chrdev_open_exclu = 0;
  
-       spin_unlock(&mce_state_lock);
-@@ -2163,7 +2164,7 @@ struct dentry *mce_get_debugfs_dir(void)
+       spin_unlock(&mce_chrdev_state_lock);
+@@ -2147,7 +2148,7 @@ struct dentry *mce_get_debugfs_dir(void)
  static void mce_reset(void)
  {
        cpu_missing = 0;
@@ -10901,9 +11130,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
        atomic_set(&mce_executing, 0);
        atomic_set(&mce_callin, 0);
        atomic_set(&global_nwo, 0);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-11-16 18:39:07.000000000 -0500
 @@ -215,7 +215,9 @@ static int inject_init(void)
        if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
                return -ENOMEM;
@@ -10915,9 +11144,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.4/arch/
        register_die_notifier(&mce_raise_nb);
        return 0;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c        2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c        2011-08-29 23:26:21.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/main.c        2011-11-16 18:39:07.000000000 -0500
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -10927,9 +11156,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kern
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-11-16 18:39:07.000000000 -0500
 @@ -25,7 +25,7 @@ struct mtrr_ops {
        int     (*validate_add_page)(unsigned long base, unsigned long size,
                                     unsigned int type);
@@ -10939,10 +11168,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kern
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
                                   int replace_reg);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/kernel/cpu/perf_event.c
---- linux-3.0.4/arch/x86/kernel/cpu/perf_event.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/perf_event.c       2011-08-23 21:48:14.000000000 -0400
-@@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
+diff -urNp linux-3.1.1/arch/x86/kernel/cpu/perf_event.c linux-3.1.1/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.1.1/arch/x86/kernel/cpu/perf_event.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/cpu/perf_event.c       2011-11-16 18:40:08.000000000 -0500
+@@ -795,6 +795,8 @@ static int x86_schedule_events(struct cp
        int i, j, w, wmax, num = 0;
        struct hw_perf_event *hwc;
  
@@ -10951,18 +11180,18 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/ker
        bitmap_zero(used_mask, X86_PMC_IDX_MAX);
  
        for (i = 0; i < n; i++) {
-@@ -1872,7 +1874,7 @@ perf_callchain_user(struct perf_callchai
+@@ -1919,7 +1921,7 @@ perf_callchain_user(struct perf_callchai
                        break;
  
                perf_callchain_store(entry, frame.return_address);
 -              fp = frame.next_frame;
-+              fp = (__force const void __user *)frame.next_frame;
++              fp = (const void __force_user *)frame.next_frame;
        }
  }
  
-diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash.c
---- linux-3.0.4/arch/x86/kernel/crash.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/crash.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/crash.c linux-3.1.1/arch/x86/kernel/crash.c
+--- linux-3.1.1/arch/x86/kernel/crash.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/crash.c        2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
        regs = args->regs;
  
@@ -10972,9 +11201,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash
                crash_fixup_ss_esp(&fixed_regs, regs);
                regs = &fixed_regs;
        }
-diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/kernel/doublefault_32.c
---- linux-3.0.4/arch/x86/kernel/doublefault_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/doublefault_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/doublefault_32.c linux-3.1.1/arch/x86/kernel/doublefault_32.c
+--- linux-3.1.1/arch/x86/kernel/doublefault_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/doublefault_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -11006,9 +11235,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/ker
                .fs             = __KERNEL_PERCPU,
  
                .__cr3          = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_32.c linux-3.0.4/arch/x86/kernel/dumpstack_32.c
---- linux-3.0.4/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_32.c linux-3.1.1/arch/x86/kernel/dumpstack_32.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack_32.c 2011-11-16 18:39:07.000000000 -0500
 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
                bp = stack_frame(task, regs);
  
@@ -11072,10 +11301,26 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_32.c linux-3.0.4/arch/x86/kerne
        if (ip < PAGE_OFFSET)
                return 0;
        if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kernel/dumpstack_64.c
---- linux-3.0.4/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400
-@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
+@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
+ 
+       return ud2 == 0x0b0f;
+ }
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++void pax_check_alloca(unsigned long size)
++{
++      unsigned long sp = (unsigned long)&sp, stack_left;
++
++      /* all kernel stacks are of the same size */
++      stack_left = sp & (THREAD_SIZE - 1);
++      BUG_ON(stack_left < 256 || size >= stack_left - 256);
++}
++EXPORT_SYMBOL(pax_check_alloca);
++#endif
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack_64.c linux-3.1.1/arch/x86/kernel/dumpstack_64.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack_64.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack_64.c 2011-11-16 18:39:07.000000000 -0500
+@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task
        unsigned long *irq_stack_end =
                (unsigned long *)per_cpu(irq_stack_ptr, cpu);
        unsigned used = 0;
@@ -11086,7 +11331,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kerne
  
        if (!task)
                task = current;
-@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task
+@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task
         * current stack address. If the stacks consist of nested
         * exceptions
         */
@@ -11098,7 +11343,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kerne
                estack_end = in_exception_stack(cpu, (unsigned long)stack,
                                                &used, &id);
  
-@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task
+@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task
                        if (ops->stack(data, id) < 0)
                                break;
  
@@ -11107,7 +11352,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kerne
                                             data, estack_end, &graph);
                        ops->stack(data, "<EOE>");
                        /*
-@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task
+@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task
                        if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
                                if (ops->stack(data, "IRQ") < 0)
                                        break;
@@ -11116,7 +11361,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kerne
                                        ops, data, irq_stack_end, &graph);
                                /*
                                 * We link to the next stack (which would be
-@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task
+@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task
        /*
         * This handles the process stack:
         */
@@ -11126,9 +11371,60 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kerne
        put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/dumpstack.c
---- linux-3.0.4/arch/x86/kernel/dumpstack.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/dumpstack.c    2011-08-23 21:48:14.000000000 -0400
+@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
+ 
+       return ud2 == 0x0b0f;
+ }
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++void pax_check_alloca(unsigned long size)
++{
++      unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
++      unsigned cpu, used;
++      char *id;
++
++      /* check the process stack first */
++      stack_start = (unsigned long)task_stack_page(current);
++      stack_end = stack_start + THREAD_SIZE;
++      if (likely(stack_start <= sp && sp < stack_end)) {
++              unsigned long stack_left = sp & (THREAD_SIZE - 1);
++              BUG_ON(stack_left < 256 || size >= stack_left - 256);
++              return;
++      }
++
++      cpu = get_cpu();
++
++      /* check the irq stacks */
++      stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
++      stack_start = stack_end - IRQ_STACK_SIZE;
++      if (stack_start <= sp && sp < stack_end) {
++              unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
++              put_cpu();
++              BUG_ON(stack_left < 256 || size >= stack_left - 256);
++              return;
++      }
++
++      /* check the exception stacks */
++      used = 0;
++      stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
++      stack_start = stack_end - EXCEPTION_STKSZ;
++      if (stack_end && stack_start <= sp && sp < stack_end) {
++              unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
++              put_cpu();
++              BUG_ON(stack_left < 256 || size >= stack_left - 256);
++              return;
++      }
++
++      put_cpu();
++
++      /* unknown stack */
++      BUG();
++}
++EXPORT_SYMBOL(pax_check_alloca);
++#endif
+diff -urNp linux-3.1.1/arch/x86/kernel/dumpstack.c linux-3.1.1/arch/x86/kernel/dumpstack.c
+--- linux-3.1.1/arch/x86/kernel/dumpstack.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/dumpstack.c    2011-11-16 18:40:08.000000000 -0500
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11272,9 +11568,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/d
                report_bug(regs->ip, regs);
  
        if (__die(str, regs, err))
-diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kernel/early_printk.c
---- linux-3.0.4/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/early_printk.c linux-3.1.1/arch/x86/kernel/early_printk.c
+--- linux-3.1.1/arch/x86/kernel/early_printk.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/early_printk.c 2011-11-16 18:40:08.000000000 -0500
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -11292,10 +11588,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kerne
        va_start(ap, fmt);
        n = vscnprintf(buf, sizeof(buf), fmt, ap);
        early_console->write(early_console, buf, n);
-diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/entry_32.S
---- linux-3.0.4/arch/x86/kernel/entry_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/entry_32.S     2011-08-30 18:23:52.000000000 -0400
-@@ -185,13 +185,146 @@
+diff -urNp linux-3.1.1/arch/x86/kernel/entry_32.S linux-3.1.1/arch/x86/kernel/entry_32.S
+--- linux-3.1.1/arch/x86/kernel/entry_32.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/entry_32.S     2011-11-16 18:40:08.000000000 -0500
+@@ -186,13 +186,146 @@
        /*CFI_REL_OFFSET gs, PT_GS*/
  .endm
  .macro SET_KERNEL_GS reg
@@ -11443,7 +11739,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        cld
        PUSH_GS
        pushl_cfi %fs
-@@ -214,7 +347,7 @@
+@@ -215,7 +348,7 @@
        CFI_REL_OFFSET ecx, 0
        pushl_cfi %ebx
        CFI_REL_OFFSET ebx, 0
@@ -11452,7 +11748,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        movl %edx, %ds
        movl %edx, %es
        movl $(__KERNEL_PERCPU), %edx
-@@ -222,6 +355,15 @@
+@@ -223,6 +356,15 @@
        SET_KERNEL_GS %edx
  .endm
  
@@ -11468,7 +11764,16 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  .macro RESTORE_INT_REGS
        popl_cfi %ebx
        CFI_RESTORE ebx
-@@ -332,7 +474,15 @@ check_userspace:
+@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
+       popfl_cfi
+       jmp syscall_exit
+       CFI_ENDPROC
+-END(ret_from_fork)
++ENDPROC(ret_from_fork)
+ 
+ /*
+  * Interrupt exit functions should be protected against kprobes
+@@ -333,7 +475,15 @@ check_userspace:
        movb PT_CS(%esp), %al
        andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
        cmpl $USER_RPL, %eax
@@ -11484,16 +11789,27 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  
  ENTRY(resume_userspace)
        LOCKDEP_SYS_EXIT
-@@ -344,7 +494,7 @@ ENTRY(resume_userspace)
+@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
        andl $_TIF_WORK_MASK, %ecx      # is there any work to be done on
                                        # int/exception return?
        jne work_pending
 -      jmp restore_all
+-END(ret_from_exception)
 +      jmp restore_all_pax
- END(ret_from_exception)
++ENDPROC(ret_from_exception)
  
  #ifdef CONFIG_PREEMPT
-@@ -394,23 +544,34 @@ sysenter_past_esp:
+ ENTRY(resume_kernel)
+@@ -361,7 +511,7 @@ need_resched:
+       jz restore_all
+       call preempt_schedule_irq
+       jmp need_resched
+-END(resume_kernel)
++ENDPROC(resume_kernel)
+ #endif
+       CFI_ENDPROC
+ /*
+@@ -395,23 +545,34 @@ sysenter_past_esp:
        /*CFI_REL_OFFSET cs, 0*/
        /*
         * Push current_thread_info()->sysenter_return to the stack.
@@ -11531,7 +11847,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
        .align 4
-@@ -433,12 +594,24 @@ sysenter_do_call:
+@@ -434,12 +595,24 @@ sysenter_do_call:
        testl $_TIF_ALLWORK_MASK, %ecx
        jne sysexit_audit
  sysenter_exit:
@@ -11556,7 +11872,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        PTGS_TO_GS
        ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -455,6 +628,9 @@ sysenter_audit:
+@@ -456,6 +629,9 @@ sysenter_audit:
        movl %eax,%edx                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_I386,%eax      /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -11566,7 +11882,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        pushl_cfi %ebx
        movl PT_EAX(%esp),%eax          /* reload syscall number */
        jmp sysenter_do_call
-@@ -481,11 +657,17 @@ sysexit_audit:
+@@ -482,11 +658,17 @@ sysexit_audit:
  
        CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -11586,7 +11902,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  .popsection
        PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -518,6 +700,15 @@ syscall_exit:
+@@ -519,6 +701,15 @@ syscall_exit:
        testl $_TIF_ALLWORK_MASK, %ecx  # current->work
        jne syscall_exit_work
  
@@ -11602,7 +11918,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  restore_all:
        TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -577,14 +768,34 @@ ldt_ss:
+@@ -578,14 +769,34 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -11640,7 +11956,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        pushl_cfi $__ESPFIX_SS
        pushl_cfi %eax                  /* new kernel esp */
        /* Disable interrupts, but do not irqtrace this section: we
-@@ -613,29 +824,23 @@ work_resched:
+@@ -614,34 +825,28 @@ work_resched:
        movl TI_flags(%ebp), %ecx
        andl $_TIF_WORK_MASK, %ecx      # is there any work to be done other
                                        # than syscall tracing?
@@ -11674,7 +11990,13 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  #endif
        xorl %edx, %edx
        call do_notify_resume
-@@ -648,6 +853,9 @@ syscall_trace_entry:
+       jmp resume_userspace_sig
+-END(work_pending)
++ENDPROC(work_pending)
+ 
+       # perform syscall exit tracing
+       ALIGN
+@@ -649,11 +854,14 @@ syscall_trace_entry:
        movl $-ENOSYS,PT_EAX(%esp)
        movl %esp, %eax
        call syscall_trace_enter
@@ -11684,7 +12006,19 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        /* What it returned is what we'll actually use.  */
        cmpl $(nr_syscalls), %eax
        jnae syscall_call
-@@ -670,6 +878,10 @@ END(syscall_exit_work)
+       jmp syscall_exit
+-END(syscall_trace_entry)
++ENDPROC(syscall_trace_entry)
+ 
+       # perform syscall exit tracing
+       ALIGN
+@@ -666,20 +874,24 @@ syscall_exit_work:
+       movl %esp, %eax
+       call syscall_trace_leave
+       jmp resume_userspace
+-END(syscall_exit_work)
++ENDPROC(syscall_exit_work)
+       CFI_ENDPROC
  
        RING0_INT_FRAME                 # can't unwind into user space anyway
  syscall_fault:
@@ -11695,7 +12029,18 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        GET_THREAD_INFO(%ebp)
        movl $-EFAULT,PT_EAX(%esp)
        jmp resume_userspace
-@@ -752,6 +964,36 @@ ptregs_clone:
+-END(syscall_fault)
++ENDPROC(syscall_fault)
+ 
+ syscall_badsys:
+       movl $-ENOSYS,PT_EAX(%esp)
+       jmp resume_userspace
+-END(syscall_badsys)
++ENDPROC(syscall_badsys)
+       CFI_ENDPROC
+ /*
+  * End of kprobes section
+@@ -753,6 +965,36 @@ ptregs_clone:
        CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -11732,7 +12077,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -761,8 +1003,15 @@ ENDPROC(ptregs_clone)
+@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
        /* fixup the stack */
@@ -11750,7 +12095,189 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        shl $16, %eax
        addl %esp, %eax                 /* the adjusted stack pointer */
        pushl_cfi $__KERNEL_DS
-@@ -1213,7 +1462,6 @@ return_to_handler:
+@@ -816,7 +1065,7 @@ vector=vector+1
+   .endr
+ 2:    jmp common_interrupt
+ .endr
+-END(irq_entries_start)
++ENDPROC(irq_entries_start)
+ 
+ .previous
+ END(interrupt)
+@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
+       pushl_cfi $do_coprocessor_error
+       jmp error_code
+       CFI_ENDPROC
+-END(coprocessor_error)
++ENDPROC(coprocessor_error)
+ 
+ ENTRY(simd_coprocessor_error)
+       RING0_INT_FRAME
+@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
+ #endif
+       jmp error_code
+       CFI_ENDPROC
+-END(simd_coprocessor_error)
++ENDPROC(simd_coprocessor_error)
+ 
+ ENTRY(device_not_available)
+       RING0_INT_FRAME
+@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
+       pushl_cfi $do_device_not_available
+       jmp error_code
+       CFI_ENDPROC
+-END(device_not_available)
++ENDPROC(device_not_available)
+ 
+ #ifdef CONFIG_PARAVIRT
+ ENTRY(native_iret)
+@@ -902,12 +1151,12 @@ ENTRY(native_iret)
+       .align 4
+       .long native_iret, iret_exc
+ .previous
+-END(native_iret)
++ENDPROC(native_iret)
+ 
+ ENTRY(native_irq_enable_sysexit)
+       sti
+       sysexit
+-END(native_irq_enable_sysexit)
++ENDPROC(native_irq_enable_sysexit)
+ #endif
+ 
+ ENTRY(overflow)
+@@ -916,7 +1165,7 @@ ENTRY(overflow)
+       pushl_cfi $do_overflow
+       jmp error_code
+       CFI_ENDPROC
+-END(overflow)
++ENDPROC(overflow)
+ 
+ ENTRY(bounds)
+       RING0_INT_FRAME
+@@ -924,7 +1173,7 @@ ENTRY(bounds)
+       pushl_cfi $do_bounds
+       jmp error_code
+       CFI_ENDPROC
+-END(bounds)
++ENDPROC(bounds)
+ 
+ ENTRY(invalid_op)
+       RING0_INT_FRAME
+@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
+       pushl_cfi $do_invalid_op
+       jmp error_code
+       CFI_ENDPROC
+-END(invalid_op)
++ENDPROC(invalid_op)
+ 
+ ENTRY(coprocessor_segment_overrun)
+       RING0_INT_FRAME
+@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
+       pushl_cfi $do_coprocessor_segment_overrun
+       jmp error_code
+       CFI_ENDPROC
+-END(coprocessor_segment_overrun)
++ENDPROC(coprocessor_segment_overrun)
+ 
+ ENTRY(invalid_TSS)
+       RING0_EC_FRAME
+       pushl_cfi $do_invalid_TSS
+       jmp error_code
+       CFI_ENDPROC
+-END(invalid_TSS)
++ENDPROC(invalid_TSS)
+ 
+ ENTRY(segment_not_present)
+       RING0_EC_FRAME
+       pushl_cfi $do_segment_not_present
+       jmp error_code
+       CFI_ENDPROC
+-END(segment_not_present)
++ENDPROC(segment_not_present)
+ 
+ ENTRY(stack_segment)
+       RING0_EC_FRAME
+       pushl_cfi $do_stack_segment
+       jmp error_code
+       CFI_ENDPROC
+-END(stack_segment)
++ENDPROC(stack_segment)
+ 
+ ENTRY(alignment_check)
+       RING0_EC_FRAME
+       pushl_cfi $do_alignment_check
+       jmp error_code
+       CFI_ENDPROC
+-END(alignment_check)
++ENDPROC(alignment_check)
+ 
+ ENTRY(divide_error)
+       RING0_INT_FRAME
+@@ -976,7 +1225,7 @@ ENTRY(divide_error)
+       pushl_cfi $do_divide_error
+       jmp error_code
+       CFI_ENDPROC
+-END(divide_error)
++ENDPROC(divide_error)
+ 
+ #ifdef CONFIG_X86_MCE
+ ENTRY(machine_check)
+@@ -985,7 +1234,7 @@ ENTRY(machine_check)
+       pushl_cfi machine_check_vector
+       jmp error_code
+       CFI_ENDPROC
+-END(machine_check)
++ENDPROC(machine_check)
+ #endif
+ 
+ ENTRY(spurious_interrupt_bug)
+@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
+       pushl_cfi $do_spurious_interrupt_bug
+       jmp error_code
+       CFI_ENDPROC
+-END(spurious_interrupt_bug)
++ENDPROC(spurious_interrupt_bug)
+ /*
+  * End of kprobes section
+  */
+@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector
+ 
+ ENTRY(mcount)
+       ret
+-END(mcount)
++ENDPROC(mcount)
+ 
+ ENTRY(ftrace_caller)
+       cmpl $0, function_trace_stop
+@@ -1138,7 +1387,7 @@ ftrace_graph_call:
+ .globl ftrace_stub
+ ftrace_stub:
+       ret
+-END(ftrace_caller)
++ENDPROC(ftrace_caller)
+ 
+ #else /* ! CONFIG_DYNAMIC_FTRACE */
+ 
+@@ -1174,7 +1423,7 @@ trace:
+       popl %ecx
+       popl %eax
+       jmp ftrace_stub
+-END(mcount)
++ENDPROC(mcount)
+ #endif /* CONFIG_DYNAMIC_FTRACE */
+ #endif /* CONFIG_FUNCTION_TRACER */
+ 
+@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
+       popl %ecx
+       popl %eax
+       ret
+-END(ftrace_graph_caller)
++ENDPROC(ftrace_graph_caller)
+ 
+ .globl return_to_handler
+ return_to_handler:
+@@ -1209,7 +1458,6 @@ return_to_handler:
        jmp *%ecx
  #endif
  
@@ -11758,7 +12285,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1259,9 +1507,12 @@ error_code:
+@@ -1255,15 +1503,18 @@ error_code:
        movl $-1, PT_ORIG_EAX(%esp)     # no syscall to restart
        REG_TO_PTGS %ecx
        SET_KERNEL_GS %ecx
@@ -11772,7 +12299,23 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        TRACE_IRQS_OFF
        movl %esp,%eax                  # pt_regs pointer
        call *%edi
-@@ -1346,6 +1597,9 @@ nmi_stack_correct:
+       jmp ret_from_exception
+       CFI_ENDPROC
+-END(page_fault)
++ENDPROC(page_fault)
+ 
+ /*
+  * Debug traps and NMI can happen at the one SYSENTER instruction
+@@ -1305,7 +1556,7 @@ debug_stack_correct:
+       call do_debug
+       jmp ret_from_exception
+       CFI_ENDPROC
+-END(debug)
++ENDPROC(debug)
+ 
+ /*
+  * NMI is doubly nasty. It can happen _while_ we're handling
+@@ -1342,6 +1593,9 @@ nmi_stack_correct:
        xorl %edx,%edx          # zero error code
        movl %esp,%eax          # pt_regs pointer
        call do_nmi
@@ -11782,7 +12325,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        jmp restore_all_notrace
        CFI_ENDPROC
  
-@@ -1382,6 +1636,9 @@ nmi_espfix_stack:
+@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
        FIXUP_ESPFIX_STACK              # %eax == %esp
        xorl %edx,%edx                  # zero error code
        call do_nmi
@@ -11792,18 +12335,116 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
        RESTORE_REGS
        lss 12+4(%esp), %esp            # back to espfix stack
        CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/entry_64.S
---- linux-3.0.4/arch/x86/kernel/entry_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/entry_64.S     2011-09-17 18:31:51.000000000 -0400
-@@ -53,6 +53,7 @@
+       jmp irq_return
+       CFI_ENDPROC
+-END(nmi)
++ENDPROC(nmi)
+ 
+ ENTRY(int3)
+       RING0_INT_FRAME
+@@ -1395,14 +1652,14 @@ ENTRY(int3)
+       call do_int3
+       jmp ret_from_exception
+       CFI_ENDPROC
+-END(int3)
++ENDPROC(int3)
+ 
+ ENTRY(general_protection)
+       RING0_EC_FRAME
+       pushl_cfi $do_general_protection
+       jmp error_code
+       CFI_ENDPROC
+-END(general_protection)
++ENDPROC(general_protection)
+ 
+ #ifdef CONFIG_KVM_GUEST
+ ENTRY(async_page_fault)
+@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
+       pushl_cfi $do_async_page_fault
+       jmp error_code
+       CFI_ENDPROC
+-END(async_page_fault)
++ENDPROC(async_page_fault)
+ #endif
+ 
+ /*
+diff -urNp linux-3.1.1/arch/x86/kernel/entry_64.S linux-3.1.1/arch/x86/kernel/entry_64.S
+--- linux-3.1.1/arch/x86/kernel/entry_64.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/entry_64.S     2011-11-17 18:28:56.000000000 -0500
+@@ -55,6 +55,8 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
  #include <asm/percpu.h>
 +#include <asm/pgtable.h>
++#include <asm/alternative-asm.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -176,6 +177,264 @@ ENTRY(native_usergs_sysret64)
+@@ -68,8 +70,9 @@
+ #ifdef CONFIG_FUNCTION_TRACER
+ #ifdef CONFIG_DYNAMIC_FTRACE
+ ENTRY(mcount)
++      pax_force_retaddr
+       retq
+-END(mcount)
++ENDPROC(mcount)
+ 
+ ENTRY(ftrace_caller)
+       cmpl $0, function_trace_stop
+@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
+ #endif
+ 
+ GLOBAL(ftrace_stub)
++      pax_force_retaddr
+       retq
+-END(ftrace_caller)
++ENDPROC(ftrace_caller)
+ 
+ #else /* ! CONFIG_DYNAMIC_FTRACE */
+ ENTRY(mcount)
+@@ -112,6 +116,7 @@ ENTRY(mcount)
+ #endif
+ 
+ GLOBAL(ftrace_stub)
++      pax_force_retaddr
+       retq
+ 
+ trace:
+@@ -121,12 +126,13 @@ trace:
+       movq 8(%rbp), %rsi
+       subq $MCOUNT_INSN_SIZE, %rdi
+ 
++      pax_force_fptr ftrace_trace_function
+       call   *ftrace_trace_function
+ 
+       MCOUNT_RESTORE_FRAME
+ 
+       jmp ftrace_stub
+-END(mcount)
++ENDPROC(mcount)
+ #endif /* CONFIG_DYNAMIC_FTRACE */
+ #endif /* CONFIG_FUNCTION_TRACER */
+ 
+@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
+ 
+       MCOUNT_RESTORE_FRAME
+ 
++      pax_force_retaddr
+       retq
+-END(ftrace_graph_caller)
++ENDPROC(ftrace_graph_caller)
+ 
+ GLOBAL(return_to_handler)
+       subq  $24, %rsp
+@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
+       movq 8(%rsp), %rdx
+       movq (%rsp), %rax
+       addq $24, %rsp
++      pax_force_fptr %rdi
+       jmp *%rdi
+ #endif
+ 
+@@ -178,6 +186,269 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
@@ -11857,6 +12498,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +#endif
 +
 +      popq %rdi
++      pax_force_retaddr
 +      retq
 +ENDPROC(pax_enter_kernel)
 +
@@ -11881,6 +12523,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +#endif
 +
 +      popq %rdi
++      pax_force_retaddr
 +      retq
 +ENDPROC(pax_exit_kernel)
 +#endif
@@ -11955,6 +12598,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +
 +      popq %rbx
 +      popq %rdi
++      pax_force_retaddr
 +      retq
 +ENDPROC(pax_enter_kernel_user)
 +
@@ -12004,15 +12648,16 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +#endif
 +
 +      popq %rdi
++      pax_force_retaddr
 +      retq
 +ENDPROC(pax_exit_kernel_user)
 +#endif
 +
-+      .macro pax_erase_kstack
++.macro pax_erase_kstack
 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
 +      call pax_erase_kstack
 +#endif
-+      .endm
++.endm
 +
 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
 +/*
@@ -12062,22 +12707,48 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +      popq %r10
 +      popq %rax
 +      popq %rdi
++      pax_force_retaddr
 +      ret
 +ENDPROC(pax_erase_kstack)
 +#endif
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -318,7 +577,7 @@ ENTRY(save_args)
-       leaq -RBP+8(%rsp),%rdi  /* arg1 for handler */
-       movq_cfi rbp, 8         /* push %rbp */
-       leaq 8(%rsp), %rbp              /* mov %rsp, %ebp */
+@@ -319,7 +590,7 @@ ENDPROC(native_usergs_sysret64)
+       movq %rsp, %rsi
+ 
+       leaq -RBP(%rsp),%rdi    /* arg1 for handler */
 -      testl $3, CS(%rdi)
 +      testb $3, CS(%rdi)
        je 1f
        SWAPGS
        /*
-@@ -409,7 +668,7 @@ ENTRY(ret_from_fork)
+@@ -350,9 +621,10 @@ ENTRY(save_rest)
+       movq_cfi r15, R15+16
+       movq %r11, 8(%rsp)      /* return address */
+       FIXUP_TOP_OF_STACK %r11, 16
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+-END(save_rest)
++ENDPROC(save_rest)
+ 
+ /* save complete stack frame */
+       .pushsection .kprobes.text, "ax"
+@@ -381,9 +653,10 @@ ENTRY(save_paranoid)
+       js 1f   /* negative -> in kernel */
+       SWAPGS
+       xorl %ebx,%ebx
+-1:    ret
++1:    pax_force_retaddr
++      ret
+       CFI_ENDPROC
+-END(save_paranoid)
++ENDPROC(save_paranoid)
+       .popsection
+ 
+ /*
+@@ -405,7 +678,7 @@ ENTRY(ret_from_fork)
  
        RESTORE_REST
  
@@ -12086,7 +12757,16 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        je   int_ret_from_sys_call
  
        testl $_TIF_IA32, TI_flags(%rcx)        # 32-bit compat task needs IRET
-@@ -455,7 +714,7 @@ END(ret_from_fork)
+@@ -415,7 +688,7 @@ ENTRY(ret_from_fork)
+       jmp ret_from_sys_call                   # go to the SYSRET fastpath
+ 
+       CFI_ENDPROC
+-END(ret_from_fork)
++ENDPROC(ret_from_fork)
+ 
+ /*
+  * System call entry. Up to 6 arguments in registers are supported.
+@@ -451,7 +724,7 @@ END(ret_from_fork)
  ENTRY(system_call)
        CFI_STARTPROC   simple
        CFI_SIGNAL_FRAME
@@ -12095,7 +12775,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        CFI_REGISTER    rip,rcx
        /*CFI_REGISTER  rflags,r11*/
        SWAPGS_UNSAFE_STACK
-@@ -468,12 +727,13 @@ ENTRY(system_call_after_swapgs)
+@@ -464,12 +737,13 @@ ENTRY(system_call_after_swapgs)
  
        movq    %rsp,PER_CPU_VAR(old_rsp)
        movq    PER_CPU_VAR(kernel_stack),%rsp
@@ -12105,12 +12785,12 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
         * and short:
         */
        ENABLE_INTERRUPTS(CLBR_NONE)
--      SAVE_ARGS 8,1
-+      SAVE_ARGS 8*6,1
+-      SAVE_ARGS 8,0
++      SAVE_ARGS 8*6,0
        movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
        movq  %rcx,RIP-ARGOFFSET(%rsp)
        CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -502,6 +762,8 @@ sysret_check:
+@@ -498,6 +772,8 @@ sysret_check:
        andl %edi,%edx
        jnz  sysret_careful
        CFI_REMEMBER_STATE
@@ -12119,7 +12799,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        /*
         * sysretq will re-enable interrupts:
         */
-@@ -560,6 +822,9 @@ auditsys:
+@@ -556,6 +832,9 @@ auditsys:
        movq %rax,%rsi                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_X86_64,%edi    /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -12129,7 +12809,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        LOAD_ARGS 0             /* reload call-clobbered registers */
        jmp system_call_fastpath
  
-@@ -590,6 +855,9 @@ tracesys:
+@@ -586,6 +865,9 @@ tracesys:
        FIXUP_TOP_OF_STACK %rdi
        movq %rsp,%rdi
        call syscall_trace_enter
@@ -12139,7 +12819,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        /*
         * Reload arg registers from stack in case ptrace changed them.
         * We don't reload %rax because syscall_trace_enter() returned
-@@ -611,7 +879,7 @@ tracesys:
+@@ -607,7 +889,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
        DISABLE_INTERRUPTS(CLBR_NONE)
        TRACE_IRQS_OFF
@@ -12148,9 +12828,66 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        je retint_restore_args
        movl $_TIF_ALLWORK_MASK,%edi
        /* edi: mask to check */
-@@ -793,6 +1061,16 @@ END(interrupt)
+@@ -664,7 +946,7 @@ int_restore_rest:
+       TRACE_IRQS_OFF
+       jmp int_with_check
+       CFI_ENDPROC
+-END(system_call)
++ENDPROC(system_call)
+ 
+ /*
+  * Certain special system calls that need to save a complete full stack frame.
+@@ -680,7 +962,7 @@ ENTRY(\label)
+       call \func
+       jmp ptregscall_common
+       CFI_ENDPROC
+-END(\label)
++ENDPROC(\label)
+       .endm
+ 
+       PTREGSCALL stub_clone, sys_clone, %r8
+@@ -698,9 +980,10 @@ ENTRY(ptregscall_common)
+       movq_cfi_restore R12+8, r12
+       movq_cfi_restore RBP+8, rbp
+       movq_cfi_restore RBX+8, rbx
++      pax_force_retaddr
+       ret $REST_SKIP          /* pop extended registers */
+       CFI_ENDPROC
+-END(ptregscall_common)
++ENDPROC(ptregscall_common)
+ 
+ ENTRY(stub_execve)
+       CFI_STARTPROC
+@@ -715,7 +998,7 @@ ENTRY(stub_execve)
+       RESTORE_REST
+       jmp int_ret_from_sys_call
+       CFI_ENDPROC
+-END(stub_execve)
++ENDPROC(stub_execve)
+ 
+ /*
+  * sigreturn is special because it needs to restore all registers on return.
+@@ -733,7 +1016,7 @@ ENTRY(stub_rt_sigreturn)
+       RESTORE_REST
+       jmp int_ret_from_sys_call
+       CFI_ENDPROC
+-END(stub_rt_sigreturn)
++ENDPROC(stub_rt_sigreturn)
+ 
+ /*
+  * Build the entry stubs and pointer table with some assembler magic.
+@@ -768,7 +1051,7 @@ vector=vector+1
+ 2:    jmp common_interrupt
+ .endr
+       CFI_ENDPROC
+-END(irq_entries_start)
++ENDPROC(irq_entries_start)
+ 
+ .previous
+ END(interrupt)
+@@ -789,6 +1072,16 @@ END(interrupt)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
-       call save_args
+       SAVE_ARGS_IRQ
        PARTIAL_FRAME 0
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +      testb $3, CS(%rdi)
@@ -12165,8 +12902,8 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        call \func
        .endm
  
-@@ -825,7 +1103,7 @@ ret_from_intr:
-       CFI_ADJUST_CFA_OFFSET   -8
+@@ -820,7 +1113,7 @@ ret_from_intr:
+ 
  exit_intr:
        GET_THREAD_INFO(%rcx)
 -      testl $3,CS-ARGOFFSET(%rsp)
@@ -12174,7 +12911,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        je retint_kernel
  
        /* Interrupt came from user space */
-@@ -847,12 +1125,18 @@ retint_swapgs:          /* return to user-space 
+@@ -842,12 +1135,16 @@ retint_swapgs:          /* return to user-space 
         * The iretq could re-enable interrupts:
         */
        DISABLE_INTERRUPTS(CLBR_ANY)
@@ -12187,13 +12924,29 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  retint_restore_args:  /* return to kernel space */
        DISABLE_INTERRUPTS(CLBR_ANY)
 +      pax_exit_kernel
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80,0x7+RIP-ARGOFFSET(%rsp)
-+#endif
++      pax_force_retaddr RIP-ARGOFFSET
        /*
         * The iretq could re-enable interrupts:
         */
-@@ -1027,6 +1311,16 @@ ENTRY(\sym)
+@@ -936,7 +1233,7 @@ ENTRY(retint_kernel)
+ #endif
+ 
+       CFI_ENDPROC
+-END(common_interrupt)
++ENDPROC(common_interrupt)
+ /*
+  * End of kprobes section
+  */
+@@ -952,7 +1249,7 @@ ENTRY(\sym)
+       interrupt \do_sym
+       jmp ret_from_intr
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
+ .endm
+ 
+ #ifdef CONFIG_SMP
+@@ -1017,12 +1314,22 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
@@ -12210,7 +12963,14 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1044,6 +1338,16 @@ ENTRY(\sym)
+       jmp error_exit          /* %ebx: no swapgs flag */
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
+ .endm
+ 
+ .macro paranoidzeroentry sym do_sym
+@@ -1034,15 +1341,25 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
@@ -12227,8 +12987,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1052,7 +1356,7 @@ ENTRY(\sym)
- END(\sym)
+       jmp paranoid_exit       /* %ebx: no swapgs flag */
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
  .endm
  
 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
@@ -12236,7 +12998,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
        INTR_FRAME
-@@ -1062,8 +1366,24 @@ ENTRY(\sym)
+@@ -1052,14 +1369,30 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
@@ -12261,7 +13023,14 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
        call \do_sym
        addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1080,6 +1400,16 @@ ENTRY(\sym)
+       jmp paranoid_exit       /* %ebx: no swapgs flag */
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
+ .endm
+ 
+ .macro errorentry sym do_sym
+@@ -1070,13 +1403,23 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
@@ -12278,7 +13047,15 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1099,6 +1429,16 @@ ENTRY(\sym)
+       call \do_sym
+       jmp error_exit                  /* %ebx: no swapgs flag */
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
+ .endm
+ 
+       /* error code is on the stack already */
+@@ -1089,13 +1432,23 @@ ENTRY(\sym)
        call save_paranoid
        DEFAULT_FRAME 0
        TRACE_IRQS_OFF
@@ -12295,7 +13072,85 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1361,16 +1701,35 @@ ENTRY(paranoid_exit)
+       call \do_sym
+       jmp paranoid_exit               /* %ebx: no swapgs flag */
+       CFI_ENDPROC
+-END(\sym)
++ENDPROC(\sym)
+ .endm
+ 
+ zeroentry divide_error do_divide_error
+@@ -1125,9 +1478,10 @@ gs_change:
+ 2:    mfence          /* workaround */
+       SWAPGS
+       popfq_cfi
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+-END(native_load_gs_index)
++ENDPROC(native_load_gs_index)
+ 
+       .section __ex_table,"a"
+       .align 8
+@@ -1149,13 +1503,14 @@ ENTRY(kernel_thread_helper)
+        * Here we are in the child and the registers are set as they were
+        * at kernel_thread() invocation in the parent.
+        */
++      pax_force_fptr %rsi
+       call *%rsi
+       # exit
+       mov %eax, %edi
+       call do_exit
+       ud2                     # padding for call trace
+       CFI_ENDPROC
+-END(kernel_thread_helper)
++ENDPROC(kernel_thread_helper)
+ 
+ /*
+  * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
+@@ -1184,9 +1539,10 @@ ENTRY(kernel_execve)
+       je int_ret_from_sys_call
+       RESTORE_ARGS
+       UNFAKE_STACK_FRAME
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+-END(kernel_execve)
++ENDPROC(kernel_execve)
+ 
+ /* Call softirq on interrupt stack. Interrupts are off. */
+ ENTRY(call_softirq)
+@@ -1204,9 +1560,10 @@ ENTRY(call_softirq)
+       CFI_DEF_CFA_REGISTER    rsp
+       CFI_ADJUST_CFA_OFFSET   -8
+       decl PER_CPU_VAR(irq_count)
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+-END(call_softirq)
++ENDPROC(call_softirq)
+ 
+ #ifdef CONFIG_XEN
+ zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
+@@ -1244,7 +1601,7 @@ ENTRY(xen_do_hypervisor_callback)   # do
+       decl PER_CPU_VAR(irq_count)
+       jmp  error_exit
+       CFI_ENDPROC
+-END(xen_do_hypervisor_callback)
++ENDPROC(xen_do_hypervisor_callback)
+ 
+ /*
+  * Hypervisor uses this for application faults while it executes.
+@@ -1303,7 +1660,7 @@ ENTRY(xen_failsafe_callback)
+       SAVE_ALL
+       jmp error_exit
+       CFI_ENDPROC
+-END(xen_failsafe_callback)
++ENDPROC(xen_failsafe_callback)
+ 
+ apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
+       xen_hvm_callback_vector xen_evtchn_do_upcall
+@@ -1352,16 +1709,31 @@ ENTRY(paranoid_exit)
        TRACE_IRQS_OFF
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz paranoid_restore
@@ -12307,9 +13162,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +      TRACE_IRQS_IRETQ 0
 +      SWAPGS_UNSAFE_STACK
 +      RESTORE_ALL 8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80,0x7(%rsp)
-+#endif
++      pax_force_retaddr
 +      jmp irq_return
 +#endif
  paranoid_swapgs:
@@ -12326,13 +13179,20 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +      pax_exit_kernel
        TRACE_IRQS_IRETQ 0
        RESTORE_ALL 8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80,0x7(%rsp)
-+#endif
++      pax_force_retaddr
        jmp irq_return
  paranoid_userspace:
        GET_THREAD_INFO(%rcx)
-@@ -1426,7 +1785,7 @@ ENTRY(error_entry)
+@@ -1390,7 +1762,7 @@ paranoid_schedule:
+       TRACE_IRQS_OFF
+       jmp paranoid_userspace
+       CFI_ENDPROC
+-END(paranoid_exit)
++ENDPROC(paranoid_exit)
+ 
+ /*
+  * Exception entry point. This expects an error code/orig_rax on the stack.
+@@ -1417,12 +1789,13 @@ ENTRY(error_entry)
        movq_cfi r14, R14+8
        movq_cfi r15, R15+8
        xorl %ebx,%ebx
@@ -12341,7 +13201,31 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        je error_kernelspace
  error_swapgs:
        SWAPGS
-@@ -1490,6 +1849,16 @@ ENTRY(nmi)
+ error_sti:
+       TRACE_IRQS_OFF
++      pax_force_retaddr
+       ret
+ 
+ /*
+@@ -1449,7 +1822,7 @@ bstep_iret:
+       movq %rcx,RIP+8(%rsp)
+       jmp error_swapgs
+       CFI_ENDPROC
+-END(error_entry)
++ENDPROC(error_entry)
+ 
+ 
+ /* ebx:       no swapgs flag (1: don't need swapgs, 0: need it) */
+@@ -1469,7 +1842,7 @@ ENTRY(error_exit)
+       jnz retint_careful
+       jmp retint_swapgs
+       CFI_ENDPROC
+-END(error_exit)
++ENDPROC(error_exit)
+ 
+ 
+       /* runs on exception stack */
+@@ -1481,6 +1854,16 @@ ENTRY(nmi)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        DEFAULT_FRAME 0
@@ -12358,7 +13242,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
        /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
        movq %rsp,%rdi
        movq $-1,%rsi
-@@ -1500,12 +1869,32 @@ ENTRY(nmi)
+@@ -1491,12 +1874,28 @@ ENTRY(nmi)
        DISABLE_INTERRUPTS(CLBR_NONE)
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz nmi_restore
@@ -12369,9 +13253,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
 +      pax_exit_kernel
 +      SWAPGS_UNSAFE_STACK
 +      RESTORE_ALL 8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80,0x7(%rsp)
-+#endif
++      pax_force_retaddr
 +      jmp irq_return
 +#endif
  nmi_swapgs:
@@ -12386,15 +13268,30 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  nmi_restore:
 +      pax_exit_kernel
        RESTORE_ALL 8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80,0x7(%rsp)
-+#endif
++      pax_force_retaddr
        jmp irq_return
  nmi_userspace:
        GET_THREAD_INFO(%rcx)
-diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftrace.c
---- linux-3.0.4/arch/x86/kernel/ftrace.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ftrace.c       2011-08-23 21:47:55.000000000 -0400
+@@ -1525,14 +1924,14 @@ nmi_schedule:
+       jmp paranoid_exit
+       CFI_ENDPROC
+ #endif
+-END(nmi)
++ENDPROC(nmi)
+ 
+ ENTRY(ignore_sysret)
+       CFI_STARTPROC
+       mov $-ENOSYS,%eax
+       sysret
+       CFI_ENDPROC
+-END(ignore_sysret)
++ENDPROC(ignore_sysret)
+ 
+ /*
+  * End of kprobes section
+diff -urNp linux-3.1.1/arch/x86/kernel/ftrace.c linux-3.1.1/arch/x86/kernel/ftrace.c
+--- linux-3.1.1/arch/x86/kernel/ftrace.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ftrace.c       2011-11-16 18:39:07.000000000 -0500
 @@ -126,7 +126,7 @@ static void *mod_code_ip;          /* holds the 
  static const void *mod_code_newcode;  /* holds the text to write to the IP */
  
@@ -12452,9 +13349,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftra
        if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
                return -EFAULT;
  
-diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head32.c
---- linux-3.0.4/arch/x86/kernel/head32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/head32.c linux-3.1.1/arch/x86/kernel/head32.c
+--- linux-3.1.1/arch/x86/kernel/head32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -12472,9 +13369,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head
  
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Reserve INITRD */
-diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/head_32.S
---- linux-3.0.4/arch/x86/kernel/head_32.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head_32.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/head_32.S linux-3.1.1/arch/x86/kernel/head_32.S
+--- linux-3.1.1/arch/x86/kernel/head_32.S      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head_32.S      2011-11-16 18:39:07.000000000 -0500
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -12909,9 +13806,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/hea
 +      /* Be sure this is zeroed to avoid false validations in Xen */
 +      .fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +      .endr
-diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/head_64.S
---- linux-3.0.4/arch/x86/kernel/head_64.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head_64.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/head_64.S linux-3.1.1/arch/x86/kernel/head_64.S
+--- linux-3.1.1/arch/x86/kernel/head_64.S      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/head_64.S      2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -13181,9 +14078,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/hea
  
        __PAGE_ALIGNED_BSS
        .align PAGE_SIZE
-diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/i386_ksyms_32.c        2011-11-16 18:39:07.000000000 -0500
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -13205,9 +14102,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kern
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259.c
---- linux-3.0.4/arch/x86/kernel/i8259.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/i8259.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/i8259.c linux-3.1.1/arch/x86/kernel/i8259.c
+--- linux-3.1.1/arch/x86/kernel/i8259.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/i8259.c        2011-11-16 18:39:07.000000000 -0500
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
                               "spurious 8259A interrupt: IRQ%d.\n", irq);
                        spurious_irq_mask |= irqmask;
@@ -13217,9 +14114,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259
                /*
                 * Theoretically we do not have to handle this IRQ,
                 * but in Linux this does not cause problems and is
-diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/init_task.c
---- linux-3.0.4/arch/x86/kernel/init_task.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/init_task.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/init_task.c linux-3.1.1/arch/x86/kernel/init_task.c
+--- linux-3.1.1/arch/x86/kernel/init_task.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/init_task.c    2011-11-16 18:39:07.000000000 -0500
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -13238,9 +14135,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/i
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/ioport.c
---- linux-3.0.4/arch/x86/kernel/ioport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ioport.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/ioport.c linux-3.1.1/arch/x86/kernel/ioport.c
+--- linux-3.1.1/arch/x86/kernel/ioport.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ioport.c       2011-11-16 18:40:08.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -13284,9 +14181,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/iopo
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
        }
-diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_32.c
---- linux-3.0.4/arch/x86/kernel/irq_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/irq_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/irq_32.c linux-3.1.1/arch/x86/kernel/irq_32.c
+--- linux-3.1.1/arch/x86/kernel/irq_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/irq_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
        __asm__ __volatile__("andl %%esp,%0" :
                             "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -13426,9 +14323,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_
                /*
                 * Shouldn't happen, we returned above if in_interrupt():
                 */
-diff -urNp linux-3.0.4/arch/x86/kernel/irq.c linux-3.0.4/arch/x86/kernel/irq.c
---- linux-3.0.4/arch/x86/kernel/irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/irq.c linux-3.1.1/arch/x86/kernel/irq.c
+--- linux-3.1.1/arch/x86/kernel/irq.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/irq.c  2011-11-16 18:39:07.000000000 -0500
 @@ -17,7 +17,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -13463,9 +14360,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/irq.c linux-3.0.4/arch/x86/kernel/irq.c
  #endif
        return sum;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
---- linux-3.0.4/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/kgdb.c linux-3.1.1/arch/x86/kernel/kgdb.c
+--- linux-3.1.1/arch/x86/kernel/kgdb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kgdb.c 2011-11-16 18:39:07.000000000 -0500
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
        switch (regno) {
@@ -13504,10 +14401,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
                        if (user_mode(regs))
                                return single_step_cont(regs, args);
                        break;
-diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kprobes.c
---- linux-3.0.4/arch/x86/kernel/kprobes.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kprobes.c      2011-08-23 21:47:55.000000000 -0400
-@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
+diff -urNp linux-3.1.1/arch/x86/kernel/kprobes.c linux-3.1.1/arch/x86/kernel/kprobes.c
+--- linux-3.1.1/arch/x86/kernel/kprobes.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kprobes.c      2011-11-16 18:39:07.000000000 -0500
+@@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat
        } __attribute__((packed)) *insn;
  
        insn = (struct __arch_relative_insn *)from;
@@ -13519,7 +14416,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  }
  
  /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_op
+@@ -155,7 +158,7 @@ static int __kprobes can_boost(kprobe_op
        kprobe_opcode_t opcode;
        kprobe_opcode_t *orig_opcodes = opcodes;
  
@@ -13528,7 +14425,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
                return 0;       /* Page fault may occur on this address. */
  
  retry:
-@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction(
+@@ -316,7 +319,9 @@ static int __kprobes __copy_instruction(
                }
        }
        insn_get_length(&insn);
@@ -13538,7 +14435,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  
  #ifdef CONFIG_X86_64
        if (insn_rip_relative(&insn)) {
-@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction(
+@@ -340,7 +345,9 @@ static int __kprobes __copy_instruction(
                          (u8 *) dest;
                BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
                disp = (u8 *) dest + insn_offset_displacement(&insn);
@@ -13548,7 +14445,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
        }
  #endif
        return insn.length;
-@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(s
+@@ -354,12 +361,12 @@ static void __kprobes arch_copy_kprobe(s
         */
        __copy_instruction(p->ainsn.insn, p->addr, 0);
  
@@ -13563,7 +14460,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  }
  
  int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(s
+@@ -476,7 +483,7 @@ static void __kprobes setup_singlestep(s
                 * nor set current_kprobe, because it doesn't use single
                 * stepping.
                 */
@@ -13572,7 +14469,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
                preempt_enable_no_resched();
                return;
        }
-@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(s
+@@ -495,7 +502,7 @@ static void __kprobes setup_singlestep(s
        if (p->opcode == BREAKPOINT_INSTRUCTION)
                regs->ip = (unsigned long)p->addr;
        else
@@ -13581,7 +14478,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  }
  
  /*
-@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(stru
+@@ -574,7 +581,7 @@ static int __kprobes kprobe_handler(stru
                                setup_singlestep(p, regs, kcb, 0);
                        return 1;
                }
@@ -13590,7 +14487,17 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
                /*
                 * The breakpoint instruction was removed right
                 * after we hit it.  Another cpu has removed
-@@ -817,7 +824,7 @@ static void __kprobes resume_execution(s
+@@ -682,6 +689,9 @@ static void __used __kprobes kretprobe_t
+                       "       movq %rax, 152(%rsp)\n"
+                       RESTORE_REGS_STRING
+                       "       popfq\n"
++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++                      "       btsq $63,(%rsp)\n"
++#endif
+ #else
+                       "       pushf\n"
+                       SAVE_REGS_STRING
+@@ -819,7 +829,7 @@ static void __kprobes resume_execution(s
                struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
        unsigned long *tos = stack_addr(regs);
@@ -13599,7 +14506,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
        unsigned long orig_ip = (unsigned long)p->addr;
        kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -1001,7 +1011,7 @@ int __kprobes kprobe_exceptions_notify(s
        struct die_args *args = data;
        int ret = NOTIFY_DONE;
  
@@ -13608,7 +14515,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
                return ret;
  
        switch (val) {
-@@ -1381,7 +1388,7 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1383,7 +1393,7 @@ int __kprobes arch_prepare_optimized_kpr
         * Verify if the address gap is in 2GB range, because this uses
         * a relative jump.
         */
@@ -13617,7 +14524,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
        if (abs(rel) > 0x7fffffff)
                return -ERANGE;
  
-@@ -1402,11 +1409,11 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1404,11 +1414,11 @@ int __kprobes arch_prepare_optimized_kpr
        synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
  
        /* Set probe function call */
@@ -13631,7 +14538,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  
        flush_icache_range((unsigned long) buf,
                           (unsigned long) buf + TMPL_END_IDX +
-@@ -1428,7 +1435,7 @@ static void __kprobes setup_optimize_kpr
+@@ -1430,7 +1440,7 @@ static void __kprobes setup_optimize_kpr
                        ((long)op->kp.addr + RELATIVEJUMP_SIZE));
  
        /* Backup instructions which will be replaced by jump address */
@@ -13640,10 +14547,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
               RELATIVE_ADDR_SIZE);
  
        insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
---- linux-3.0.4/arch/x86/kernel/kvm.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kvm.c  2011-08-24 18:10:12.000000000 -0400
-@@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
+diff -urNp linux-3.1.1/arch/x86/kernel/kvm.c linux-3.1.1/arch/x86/kernel/kvm.c
+--- linux-3.1.1/arch/x86/kernel/kvm.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/kvm.c  2011-11-16 18:39:07.000000000 -0500
+@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(vo
                pv_mmu_ops.set_pud = kvm_set_pud;
  #if PAGETABLE_LEVELS == 4
                pv_mmu_ops.set_pgd = kvm_set_pgd;
@@ -13651,9 +14558,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
  #endif
  #endif
                pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
---- linux-3.0.4/arch/x86/kernel/ldt.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ldt.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/ldt.c linux-3.1.1/arch/x86/kernel/ldt.c
+--- linux-3.1.1/arch/x86/kernel/ldt.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ldt.c  2011-11-16 18:39:07.000000000 -0500
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
        if (reload) {
  #ifdef CONFIG_SMP
@@ -13718,9 +14625,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
        fill_ldt(&ldt, &ldt_info);
        if (oldmode)
                ldt.avl = 0;
-diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/kernel/machine_kexec_32.c
---- linux-3.0.4/arch/x86/kernel/machine_kexec_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/machine_kexec_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/machine_kexec_32.c linux-3.1.1/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.1.1/arch/x86/kernel/machine_kexec_32.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/machine_kexec_32.c     2011-11-16 18:39:07.000000000 -0500
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -13748,29 +14655,29 @@ diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/k
  
        relocate_kernel_ptr = control_page;
        page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.0.4/arch/x86/kernel/microcode_intel.c linux-3.0.4/arch/x86/kernel/microcode_intel.c
---- linux-3.0.4/arch/x86/kernel/microcode_intel.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/microcode_intel.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/microcode_intel.c linux-3.1.1/arch/x86/kernel/microcode_intel.c
+--- linux-3.1.1/arch/x86/kernel/microcode_intel.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/microcode_intel.c      2011-11-16 18:39:07.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)
  {
 -      return copy_from_user(to, from, n);
-+      return copy_from_user(to, (__force const void __user *)from, n);
++      return copy_from_user(to, (const void __force_user *)from, n);
  }
  
  static enum ucode_state
  request_microcode_user(int cpu, const void __user *buf, size_t size)
  {
 -      return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
-+      return generic_load_microcode(cpu, (__force void *)buf, size, &get_ucode_user);
++      return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
  }
  
  static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/module.c
---- linux-3.0.4/arch/x86/kernel/module.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/module.c       2011-08-23 21:47:55.000000000 -0400
-@@ -36,21 +36,66 @@
+diff -urNp linux-3.1.1/arch/x86/kernel/module.c linux-3.1.1/arch/x86/kernel/module.c
+--- linux-3.1.1/arch/x86/kernel/module.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/module.c       2011-11-16 18:39:07.000000000 -0500
+@@ -36,15 +36,60 @@
  #define DEBUGP(fmt...)
  #endif
  
@@ -13796,12 +14703,6 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
 +
 +}
 +
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
-       vfree(module_region);
- }
- 
 +#ifdef CONFIG_PAX_KERNEXEC
 +#ifdef CONFIG_X86_32
 +void *module_alloc_exec(unsigned long size)
@@ -13836,10 +14737,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
 +#endif
 +#endif
 +
- /* We don't need anything special. */
- int module_frob_arch_sections(Elf_Ehdr *hdr,
-                             Elf_Shdr *sechdrs,
-@@ -70,14 +115,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+ #ifdef CONFIG_X86_32
+ int apply_relocate(Elf32_Shdr *sechdrs,
+                  const char *strtab,
+@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
        unsigned int i;
        Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
        Elf32_Sym *sym;
@@ -13859,7 +14760,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
                /* This is the symbol it is referring to.  Note that all
                   undefined symbols have been resolved.  */
                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -86,11 +133,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
                switch (ELF32_R_TYPE(rel[i].r_info)) {
                case R_386_32:
                        /* We add the value into the location given */
@@ -13877,7 +14778,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
                        break;
                default:
                        printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-@@ -146,21 +197,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
+@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
                case R_X86_64_NONE:
                        break;
                case R_X86_64_64:
@@ -13908,9 +14809,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
  #if 0
                        if ((s64)val != *(s32 *)loc)
                                goto overflow;
-diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/paravirt.c
---- linux-3.0.4/arch/x86/kernel/paravirt.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/paravirt.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/paravirt.c linux-3.1.1/arch/x86/kernel/paravirt.c
+--- linux-3.1.1/arch/x86/kernel/paravirt.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/paravirt.c     2011-11-17 18:29:42.000000000 -0500
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
        return x;
@@ -13921,15 +14822,6 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  
  void __init default_banner(void)
  {
-@@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbu
-  * corresponding structure. */
- static void *get_call_destination(u8 type)
- {
--      struct paravirt_patch_template tmpl = {
-+      const struct paravirt_patch_template tmpl = {
-               .pv_init_ops = pv_init_ops,
-               .pv_time_ops = pv_time_ops,
-               .pv_cpu_ops = pv_cpu_ops,
 @@ -133,6 +136,9 @@ static void *get_call_destination(u8 typ
                .pv_lock_ops = pv_lock_ops,
  #endif
@@ -13972,7 +14864,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  
        return insn_len;
  }
-@@ -294,22 +304,22 @@ void arch_flush_lazy_mmu_mode(void)
+@@ -302,7 +312,7 @@ void arch_flush_lazy_mmu_mode(void)
        preempt_enable();
  }
  
@@ -13981,7 +14873,8 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
        .name = "bare hardware",
        .paravirt_enabled = 0,
        .kernel_rpl = 0,
-       .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
+@@ -313,16 +323,16 @@ struct pv_info pv_info = {
+ #endif
  };
  
 -struct pv_init_ops pv_init_ops = {
@@ -13992,6 +14885,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
 -struct pv_time_ops pv_time_ops = {
 +struct pv_time_ops pv_time_ops __read_only = {
        .sched_clock = native_sched_clock,
+       .steal_clock = native_steal_clock,
  };
  
 -struct pv_irq_ops pv_irq_ops = {
@@ -13999,7 +14893,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
        .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
        .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
        .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -321,7 +331,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -334,7 +344,7 @@ struct pv_irq_ops pv_irq_ops = {
  #endif
  };
  
@@ -14008,7 +14902,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
        .cpuid = native_cpuid,
        .get_debugreg = native_get_debugreg,
        .set_debugreg = native_set_debugreg,
-@@ -382,21 +392,26 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -395,21 +405,26 @@ struct pv_cpu_ops pv_cpu_ops = {
        .end_context_switch = paravirt_nop,
  };
  
@@ -14038,7 +14932,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  
        .read_cr2 = native_read_cr2,
        .write_cr2 = native_write_cr2,
-@@ -446,6 +461,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -459,6 +474,7 @@ struct pv_mmu_ops pv_mmu_ops = {
        .make_pud = PTE_IDENT,
  
        .set_pgd = native_set_pgd,
@@ -14046,7 +14940,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  #endif
  #endif /* PAGETABLE_LEVELS >= 3 */
  
-@@ -465,6 +481,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -478,6 +494,12 @@ struct pv_mmu_ops pv_mmu_ops = {
        },
  
        .set_fixmap = native_set_fixmap,
@@ -14059,9 +14953,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/paravirt-spinlocks.c   2011-11-16 18:39:07.000000000 -0500
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
        arch_spin_lock(lock);
  }
@@ -14071,9 +14965,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.4/arch/x86
  #ifdef CONFIG_SMP
        .spin_is_locked = __ticket_spin_is_locked,
        .spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-3.0.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/kernel/pci-iommu_table.c
---- linux-3.0.4/arch/x86/kernel/pci-iommu_table.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/pci-iommu_table.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/pci-iommu_table.c linux-3.1.1/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.1.1/arch/x86/kernel/pci-iommu_table.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/pci-iommu_table.c      2011-11-16 18:40:08.000000000 -0500
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -14092,10 +14986,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/ke
        /* Simple cyclic dependency checker. */
        for (p = start; p < finish; p++) {
                q = find_dependents_of(start, finish, p);
-diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/process_32.c
---- linux-3.0.4/arch/x86/kernel/process_32.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process_32.c   2011-08-23 21:47:55.000000000 -0400
-@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
+diff -urNp linux-3.1.1/arch/x86/kernel/process_32.c linux-3.1.1/arch/x86/kernel/process_32.c
+--- linux-3.1.1/arch/x86/kernel/process_32.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process_32.c   2011-11-16 18:39:07.000000000 -0500
+@@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
        return ((unsigned long *)tsk->thread.sp)[3];
@@ -14103,7 +14997,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
  }
  
  #ifndef CONFIG_SMP
-@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, i
+@@ -128,15 +129,14 @@ void __show_regs(struct pt_regs *regs, i
        unsigned long sp;
        unsigned short ss, gs;
  
@@ -14121,7 +15015,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
  
        show_regs_common();
  
-@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flag
+@@ -198,13 +198,14 @@ int copy_thread(unsigned long clone_flag
        struct task_struct *tsk;
        int err;
  
@@ -14137,7 +15031,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
  
        p->thread.ip = (unsigned long) ret_from_fork;
  
-@@ -292,7 +293,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -294,7 +295,7 @@ __switch_to(struct task_struct *prev_p, 
        struct thread_struct *prev = &prev_p->thread,
                                 *next = &next_p->thread;
        int cpu = smp_processor_id();
@@ -14146,7 +15040,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
        bool preload_fpu;
  
        /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -327,6 +328,10 @@ __switch_to(struct task_struct *prev_p, 
+@@ -329,6 +330,10 @@ __switch_to(struct task_struct *prev_p, 
         */
        lazy_save_gs(prev->gs);
  
@@ -14157,7 +15051,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
        /*
         * Load the per-thread Thread-Local Storage descriptor.
         */
-@@ -362,6 +367,9 @@ __switch_to(struct task_struct *prev_p, 
+@@ -364,6 +369,9 @@ __switch_to(struct task_struct *prev_p, 
         */
        arch_end_context_switch(next_p);
  
@@ -14167,7 +15061,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
        if (preload_fpu)
                __math_state_restore();
  
-@@ -371,8 +379,6 @@ __switch_to(struct task_struct *prev_p, 
+@@ -373,8 +381,6 @@ __switch_to(struct task_struct *prev_p, 
        if (prev->gs | next->gs)
                lazy_load_gs(next->gs);
  
@@ -14176,15 +15070,15 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
        return prev_p;
  }
  
-@@ -402,4 +408,3 @@ unsigned long get_wchan(struct task_stru
+@@ -404,4 +410,3 @@ unsigned long get_wchan(struct task_stru
        } while (count++ < 16);
        return 0;
  }
 -
-diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/process_64.c
---- linux-3.0.4/arch/x86/kernel/process_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process_64.c   2011-08-23 21:47:55.000000000 -0400
-@@ -87,7 +87,7 @@ static void __exit_idle(void)
+diff -urNp linux-3.1.1/arch/x86/kernel/process_64.c linux-3.1.1/arch/x86/kernel/process_64.c
+--- linux-3.1.1/arch/x86/kernel/process_64.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process_64.c   2011-11-16 18:39:07.000000000 -0500
+@@ -88,7 +88,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
        /* idle loop has pid 0 */
@@ -14193,7 +15087,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
                return;
        __exit_idle();
  }
-@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flag
+@@ -262,8 +262,7 @@ int copy_thread(unsigned long clone_flag
        struct pt_regs *childregs;
        struct task_struct *me = current;
  
@@ -14203,7 +15097,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
        *childregs = *regs;
  
        childregs->ax = 0;
-@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag
+@@ -275,6 +274,7 @@ int copy_thread(unsigned long clone_flag
        p->thread.sp = (unsigned long) childregs;
        p->thread.sp0 = (unsigned long) (childregs+1);
        p->thread.usersp = me->thread.usersp;
@@ -14211,7 +15105,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
  
        set_tsk_thread_flag(p, TIF_FORK);
  
-@@ -375,7 +375,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -377,7 +377,7 @@ __switch_to(struct task_struct *prev_p, 
        struct thread_struct *prev = &prev_p->thread;
        struct thread_struct *next = &next_p->thread;
        int cpu = smp_processor_id();
@@ -14220,7 +15114,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
        unsigned fsindex, gsindex;
        bool preload_fpu;
  
-@@ -471,10 +471,9 @@ __switch_to(struct task_struct *prev_p, 
+@@ -473,10 +473,9 @@ __switch_to(struct task_struct *prev_p, 
        prev->usersp = percpu_read(old_rsp);
        percpu_write(old_rsp, next->usersp);
        percpu_write(current_task, next_p);
@@ -14233,7 +15127,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
  
        /*
         * Now maybe reload the debug registers and handle I/O bitmaps
-@@ -536,12 +535,11 @@ unsigned long get_wchan(struct task_stru
+@@ -538,12 +537,11 @@ unsigned long get_wchan(struct task_stru
        if (!p || p == current || p->state == TASK_RUNNING)
                return 0;
        stack = (unsigned long)task_stack_page(p);
@@ -14248,9 +15142,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
                        return 0;
                ip = *(u64 *)(fp+8);
                if (!in_sched_functions(ip))
-diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/process.c
---- linux-3.0.4/arch/x86/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process.c      2011-08-30 18:23:52.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/process.c linux-3.1.1/arch/x86/kernel/process.c
+--- linux-3.1.1/arch/x86/kernel/process.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/process.c      2011-11-16 18:39:07.000000000 -0500
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14340,7 +15234,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/pro
  {
        local_irq_disable();
        /*
-@@ -668,16 +688,37 @@ static int __init idle_setup(char *str)
+@@ -645,16 +665,37 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
@@ -14388,10 +15282,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/pro
 +#endif
 +}
 +#endif
-diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptrace.c
---- linux-3.0.4/arch/x86/kernel/ptrace.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ptrace.c       2011-08-23 21:47:55.000000000 -0400
-@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
+diff -urNp linux-3.1.1/arch/x86/kernel/ptrace.c linux-3.1.1/arch/x86/kernel/ptrace.c
+--- linux-3.1.1/arch/x86/kernel/ptrace.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/ptrace.c       2011-11-16 18:39:07.000000000 -0500
+@@ -822,7 +822,7 @@ long arch_ptrace(struct task_struct *chi
                 unsigned long addr, unsigned long data)
  {
        int ret;
@@ -14400,7 +15294,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptra
  
        switch (request) {
        /* read the word at location addr in the USER area. */
-@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi
+@@ -907,14 +907,14 @@ long arch_ptrace(struct task_struct *chi
                if ((int) addr < 0)
                        return -EIO;
                ret = do_get_thread_area(child, addr,
@@ -14417,7 +15311,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptra
                break;
  #endif
  
-@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas
+@@ -1331,7 +1331,7 @@ static void fill_sigtrap_info(struct tas
        memset(info, 0, sizeof(*info));
        info->si_signo = SIGTRAP;
        info->si_code = si_code;
@@ -14426,9 +15320,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptra
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvclock.c
---- linux-3.0.4/arch/x86/kernel/pvclock.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/pvclock.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/pvclock.c linux-3.1.1/arch/x86/kernel/pvclock.c
+--- linux-3.1.1/arch/x86/kernel/pvclock.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/pvclock.c      2011-11-16 18:39:07.000000000 -0500
 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
        return pv_tsc_khz;
  }
@@ -14457,9 +15351,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvc
        } while (unlikely(last != ret));
  
        return ret;
-diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/reboot.c
---- linux-3.0.4/arch/x86/kernel/reboot.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/reboot.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/reboot.c linux-3.1.1/arch/x86/kernel/reboot.c
+--- linux-3.1.1/arch/x86/kernel/reboot.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/reboot.c       2011-11-16 18:39:07.000000000 -0500
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -14591,9 +15485,18 @@ diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/rebo
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup.c
---- linux-3.0.4/arch/x86/kernel/setup.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/setup.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/setup.c linux-3.1.1/arch/x86/kernel/setup.c
+--- linux-3.1.1/arch/x86/kernel/setup.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/setup.c        2011-11-16 18:39:07.000000000 -0500
+@@ -447,7 +447,7 @@ static void __init parse_setup_data(void
+ 
+               switch (data->type) {
+               case SETUP_E820_EXT:
+-                      parse_e820_ext(data);
++                      parse_e820_ext((struct setup_data __force_kernel *)data);
+                       break;
+               case SETUP_DTB:
+                       add_dtb(pa_data);
 @@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
         * area (640->1Mb) as ram even though it is not.
         * take them out.
@@ -14623,9 +15526,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup
        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-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kernel/setup_percpu.c
---- linux-3.0.4/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/setup_percpu.c linux-3.1.1/arch/x86/kernel/setup_percpu.c
+--- linux-3.1.1/arch/x86/kernel/setup_percpu.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/setup_percpu.c 2011-11-16 18:39:07.000000000 -0500
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -14689,9 +15592,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kerne
                /*
                 * Up to this point, the boot CPU has been using .init.data
                 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/signal.c
---- linux-3.0.4/arch/x86/kernel/signal.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/signal.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/signal.c linux-3.1.1/arch/x86/kernel/signal.c
+--- linux-3.1.1/arch/x86/kernel/signal.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/signal.c       2011-11-16 19:39:49.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.
@@ -14757,16 +15660,16 @@ diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/sign
        } put_user_catch(err);
  
        if (err)
-@@ -769,6 +772,8 @@ static void do_signal(struct pt_regs *re
+@@ -762,6 +765,8 @@ static void do_signal(struct pt_regs *re
+       siginfo_t info;
        int signr;
-       sigset_t *oldset;
  
 +      pax_track_stack();
 +
        /*
         * We want the common case to go fast, which is why we may in certain
         * cases get here from kernel mode. Just return without doing anything
-@@ -776,7 +781,7 @@ static void do_signal(struct pt_regs *re
+@@ -769,7 +774,7 @@ static void do_signal(struct pt_regs *re
         * X86_32: vm86 regs switched out by assembly code before reaching
         * here, so testing against kernel CS suffices.
         */
@@ -14774,10 +15677,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/sign
 +      if (!user_mode_novm(regs))
                return;
  
-       if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smpboot.c
---- linux-3.0.4/arch/x86/kernel/smpboot.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/smpboot.c      2011-08-23 21:47:55.000000000 -0400
+       signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+diff -urNp linux-3.1.1/arch/x86/kernel/smpboot.c linux-3.1.1/arch/x86/kernel/smpboot.c
+--- linux-3.1.1/arch/x86/kernel/smpboot.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/smpboot.c      2011-11-16 18:39:07.000000000 -0500
 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
        set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -14815,9 +15718,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smp
        err = do_boot_cpu(apicid, cpu);
        if (err) {
                pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
---- linux-3.0.4/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/step.c linux-3.1.1/arch/x86/kernel/step.c
+--- linux-3.1.1/arch/x86/kernel/step.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/step.c 2011-11-16 18:39:07.000000000 -0500
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
                struct desc_struct *desc;
                unsigned long base;
@@ -14851,26 +15754,17 @@ diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
        copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
        for (i = 0; i < copied; i++) {
                switch (opcode[i]) {
-@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
- 
- #ifdef CONFIG_X86_64
-               case 0x40 ... 0x4f:
--                      if (regs->cs != __USER_CS)
-+                      if ((regs->cs & 0xffff) != __USER_CS)
-                               /* 32-bit mode: register increment */
-                               return 0;
-                       /* 64-bit mode: REX prefix */
-diff -urNp linux-3.0.4/arch/x86/kernel/syscall_table_32.S linux-3.0.4/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.4/arch/x86/kernel/syscall_table_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/syscall_table_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/syscall_table_32.S linux-3.1.1/arch/x86/kernel/syscall_table_32.S
+--- linux-3.1.1/arch/x86/kernel/syscall_table_32.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/syscall_table_32.S     2011-11-16 18:39:07.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-3.0.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel/sys_i386_32.c
---- linux-3.0.4/arch/x86/kernel/sys_i386_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/sys_i386_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/sys_i386_32.c linux-3.1.1/arch/x86/kernel/sys_i386_32.c
+--- linux-3.1.1/arch/x86/kernel/sys_i386_32.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/sys_i386_32.c  2011-11-16 18:39:07.000000000 -0500
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15108,9 +16002,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel
 +
 +      return addr;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/sys_x86_64.c
---- linux-3.0.4/arch/x86/kernel/sys_x86_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/sys_x86_64.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/sys_x86_64.c linux-3.1.1/arch/x86/kernel/sys_x86_64.c
+--- linux-3.1.1/arch/x86/kernel/sys_x86_64.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/sys_x86_64.c   2011-11-16 18:39:07.000000000 -0500
 @@ -32,8 +32,8 @@ out:
        return error;
  }
@@ -15248,10 +16142,10 @@ diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/
        mm->cached_hole_size = ~0UL;
  
        return addr;
-diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot.c
---- linux-3.0.4/arch/x86/kernel/tboot.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/tboot.c        2011-08-23 21:47:55.000000000 -0400
-@@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
+diff -urNp linux-3.1.1/arch/x86/kernel/tboot.c linux-3.1.1/arch/x86/kernel/tboot.c
+--- linux-3.1.1/arch/x86/kernel/tboot.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/tboot.c        2011-11-16 18:39:07.000000000 -0500
+@@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
  {
@@ -15260,7 +16154,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
  
        if (!tboot_enabled())
                return;
-@@ -239,7 +239,7 @@ void tboot_shutdown(u32 shutdown_type)
+@@ -240,7 +240,7 @@ void tboot_shutdown(u32 shutdown_type)
  
        switch_to_tboot_pt();
  
@@ -15269,7 +16163,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
        shutdown();
  
        /* should not reach here */
-@@ -296,7 +296,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
+@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
        tboot_shutdown(acpi_shutdown_map[sleep_state]);
  }
  
@@ -15278,7 +16172,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
  
  static int tboot_wait_for_aps(int num_aps)
  {
-@@ -320,9 +320,9 @@ static int __cpuinit tboot_cpu_callback(
+@@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback(
  {
        switch (action) {
        case CPU_DYING:
@@ -15290,7 +16184,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
                                return NOTIFY_BAD;
                break;
        }
-@@ -341,7 +341,7 @@ static __init int tboot_late_init(void)
+@@ -342,7 +342,7 @@ static __init int tboot_late_init(void)
  
        tboot_create_trampoline();
  
@@ -15299,9 +16193,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
        register_hotcpu_notifier(&tboot_cpu_notifier);
        return 0;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
---- linux-3.0.4/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/time.c linux-3.1.1/arch/x86/kernel/time.c
+--- linux-3.1.1/arch/x86/kernel/time.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/time.c 2011-11-16 18:39:07.000000000 -0500
 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs 
  {
        unsigned long pc = instruction_pointer(regs);
@@ -15332,9 +16226,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
        }
        return pc;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
---- linux-3.0.4/arch/x86/kernel/tls.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/tls.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/tls.c linux-3.1.1/arch/x86/kernel/tls.c
+--- linux-3.1.1/arch/x86/kernel/tls.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/tls.c  2011-11-16 18:39:07.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;
@@ -15347,9 +16241,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
        set_tls_desc(p, idx, &info, 1);
  
        return 0;
-diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kernel/trampoline_32.S
---- linux-3.0.4/arch/x86/kernel/trampoline_32.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/trampoline_32.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_32.S linux-3.1.1/arch/x86/kernel/trampoline_32.S
+--- linux-3.1.1/arch/x86/kernel/trampoline_32.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/trampoline_32.S        2011-11-16 18:39:07.000000000 -0500
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -15372,9 +16266,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kern
  
        # 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-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kernel/trampoline_64.S
---- linux-3.0.4/arch/x86/kernel/trampoline_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/trampoline_64.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/trampoline_64.S linux-3.1.1/arch/x86/kernel/trampoline_64.S
+--- linux-3.1.1/arch/x86/kernel/trampoline_64.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/trampoline_64.S        2011-11-16 18:39:07.000000000 -0500
 @@ -90,7 +90,7 @@ startup_32:
        movl    $__KERNEL_DS, %eax      # Initialize the %ds segment register
        movl    %eax, %ds
@@ -15393,9 +16287,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kern
        .long   tgdt - r_base
        .short 0
        .quad   0x00cf9b000000ffff      # __KERNEL32_CS
-diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps.c
---- linux-3.0.4/arch/x86/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/traps.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/traps.c linux-3.1.1/arch/x86/kernel/traps.c
+--- linux-3.1.1/arch/x86/kernel/traps.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/traps.c        2011-11-16 18:39:07.000000000 -0500
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -15575,9 +16469,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps
  
        if (!tsk_used_math(tsk)) {
                local_irq_enable();
-diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/verify_cpu.S
---- linux-3.0.4/arch/x86/kernel/verify_cpu.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/verify_cpu.S   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/verify_cpu.S linux-3.1.1/arch/x86/kernel/verify_cpu.S
+--- linux-3.1.1/arch/x86/kernel/verify_cpu.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/verify_cpu.S   2011-11-16 18:40:08.000000000 -0500
 @@ -20,6 +20,7 @@
   *    arch/x86/boot/compressed/head_64.S: Boot cpu verification
   *    arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -15586,9 +16480,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/
   *
   *    verify_cpu, returns the status of longmode and SSE in register %eax.
   *            0: Success    1: Failure
-diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm86_32.c
---- linux-3.0.4/arch/x86/kernel/vm86_32.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vm86_32.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/vm86_32.c linux-3.1.1/arch/x86/kernel/vm86_32.c
+--- linux-3.1.1/arch/x86/kernel/vm86_32.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vm86_32.c      2011-11-16 18:40:08.000000000 -0500
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -15653,9 +16547,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm8
        if (get_user(segoffs, intr_ptr))
                goto cannot_handle;
        if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel/vmlinux.lds.S
---- linux-3.0.4/arch/x86/kernel/vmlinux.lds.S  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vmlinux.lds.S  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/vmlinux.lds.S linux-3.1.1/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.1.1/arch/x86/kernel/vmlinux.lds.S  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vmlinux.lds.S  2011-11-16 18:39:07.000000000 -0500
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -15670,7 +16564,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
  
  #undef i386     /* in case the preprocessor is a 32bit one */
  
-@@ -69,31 +76,46 @@ jiffies_64 = jiffies;
+@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
  
  PHDRS {
        text PT_LOAD FLAGS(5);          /* R_E */
@@ -15683,9 +16577,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
 +      rodata PT_LOAD FLAGS(4);        /* R__ */
 +#endif
        data PT_LOAD FLAGS(6);          /* RW_ */
- #ifdef CONFIG_X86_64
-       user PT_LOAD FLAGS(5);          /* R_E */
-+#endif
+-#ifdef CONFIG_X86_64
 +      init.begin PT_LOAD FLAGS(6);    /* RW_ */
  #ifdef CONFIG_SMP
        percpu PT_LOAD FLAGS(6);        /* RW_ */
@@ -15724,7 +16616,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
                HEAD_TEXT
  #ifdef CONFIG_X86_32
                . = ALIGN(PAGE_SIZE);
-@@ -109,13 +131,47 @@ SECTIONS
+@@ -108,13 +128,47 @@ SECTIONS
                IRQENTRY_TEXT
                *(.fixup)
                *(.gnu.warning)
@@ -15776,7 +16668,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
  
  #if defined(CONFIG_DEBUG_RODATA)
        /* .text should occupy whole number of pages */
-@@ -127,16 +183,20 @@ SECTIONS
+@@ -126,16 +180,20 @@ SECTIONS
  
        /* Data */
        .data : AT(ADDR(.data) - LOAD_OFFSET) {
@@ -15800,7 +16692,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
  
                PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -208,12 +268,19 @@ SECTIONS
+@@ -176,12 +234,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
        /* Init code and data - will be freed after init */
@@ -15823,7 +16715,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
        /*
         * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
         * output PHDR, so the next output section - .init.text - should
-@@ -222,12 +289,27 @@ SECTIONS
+@@ -190,12 +255,27 @@ SECTIONS
        PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
  #endif
  
@@ -15856,7 +16748,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
  
        /*
         * Code and data for a variety of lowlevel trampolines, to be
-@@ -301,19 +383,12 @@ SECTIONS
+@@ -269,19 +349,12 @@ SECTIONS
        }
  
        . = ALIGN(8);
@@ -15877,7 +16769,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
        PERCPU_SECTION(INTERNODE_CACHE_BYTES)
  #endif
  
-@@ -332,16 +407,10 @@ SECTIONS
+@@ -300,16 +373,10 @@ SECTIONS
        .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
                __smp_locks = .;
                *(.smp_locks)
@@ -15895,7 +16787,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
        /* BSS */
        . = ALIGN(PAGE_SIZE);
        .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -357,6 +426,7 @@ SECTIONS
+@@ -325,6 +392,7 @@ SECTIONS
                __brk_base = .;
                . += 64 * 1024;         /* 64k alignment slop space */
                *(.brk_reservation)     /* areas brk users have reserved */
@@ -15903,7 +16795,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
                __brk_limit = .;
        }
  
-@@ -383,13 +453,12 @@ SECTIONS
+@@ -351,13 +419,12 @@ SECTIONS
   * for the boot processor.
   */
  #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -15918,30 +16810,60 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
           "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.4/arch/x86/kernel/vsyscall_64.c linux-3.0.4/arch/x86/kernel/vsyscall_64.c
---- linux-3.0.4/arch/x86/kernel/vsyscall_64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vsyscall_64.c  2011-08-23 21:47:55.000000000 -0400
-@@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
- DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
- {
+diff -urNp linux-3.1.1/arch/x86/kernel/vsyscall_64.c linux-3.1.1/arch/x86/kernel/vsyscall_64.c
+--- linux-3.1.1/arch/x86/kernel/vsyscall_64.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/vsyscall_64.c  2011-11-16 18:39:07.000000000 -0500
+@@ -56,15 +56,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, v
        .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
--      .sysctl_enabled = 1,
-+      .sysctl_enabled = 0,
  };
  
- void update_vsyscall_tz(void)
-@@ -231,7 +231,7 @@ static long __vsyscall(3) venosys_1(void
- static ctl_table kernel_table2[] = {
-       { .procname = "vsyscall64",
-         .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
--        .mode = 0644,
-+        .mode = 0444,
-         .proc_handler = proc_dointvec },
-       {}
- };
-diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c       2011-08-23 21:47:55.000000000 -0400
+-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
++static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
+ 
+ static int __init vsyscall_setup(char *str)
+ {
+       if (str) {
+               if (!strcmp("emulate", str))
+                       vsyscall_mode = EMULATE;
+-              else if (!strcmp("native", str))
+-                      vsyscall_mode = NATIVE;
+               else if (!strcmp("none", str))
+                       vsyscall_mode = NONE;
+               else
+@@ -177,7 +175,7 @@ bool emulate_vsyscall(struct pt_regs *re
+ 
+       tsk = current;
+       if (seccomp_mode(&tsk->seccomp))
+-              do_exit(SIGKILL);
++              do_group_exit(SIGKILL);
+ 
+       switch (vsyscall_nr) {
+       case 0:
+@@ -219,8 +217,7 @@ bool emulate_vsyscall(struct pt_regs *re
+       return true;
+ 
+ sigsegv:
+-      force_sig(SIGSEGV, current);
+-      return true;
++      do_group_exit(SIGKILL);
+ }
+ 
+ /*
+@@ -273,10 +270,7 @@ void __init map_vsyscall(void)
+       extern char __vvar_page;
+       unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
+ 
+-      __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
+-                   vsyscall_mode == NATIVE
+-                   ? PAGE_KERNEL_VSYSCALL
+-                   : PAGE_KERNEL_VVAR);
++      __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
+       BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
+                    (unsigned long)VSYSCALL_START);
+ 
+diff -urNp linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/x8664_ksyms_64.c       2011-11-16 18:39:07.000000000 -0500
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -15951,9 +16873,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/ker
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave.c
---- linux-3.0.4/arch/x86/kernel/xsave.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/xsave.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kernel/xsave.c linux-3.1.1/arch/x86/kernel/xsave.c
+--- linux-3.1.1/arch/x86/kernel/xsave.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kernel/xsave.c        2011-11-16 18:39:07.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;
@@ -15968,7 +16890,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave
         */
        xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
 -      return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
-+      return fxrstor_checking((struct i387_fxsave_struct __user *)buf);
++      return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
  }
  
  /*
@@ -15977,13 +16899,13 @@ diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave
                err = restore_user_xstate(buf);
        else
 -              err = fxrstor_checking((__force struct i387_fxsave_struct *)
-+              err = fxrstor_checking((struct i387_fxsave_struct __user *)
++              err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
                                       buf);
        if (unlikely(err)) {
                /*
-diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
---- linux-3.0.4/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kvm/emulate.c linux-3.1.1/arch/x86/kvm/emulate.c
+--- linux-3.1.1/arch/x86/kvm/emulate.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/emulate.c 2011-11-16 18:39:07.000000000 -0500
 @@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -16018,9 +16940,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
                        ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
---- linux-3.0.4/arch/x86/kvm/lapic.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/lapic.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/kvm/lapic.c linux-3.1.1/arch/x86/kvm/lapic.c
+--- linux-3.1.1/arch/x86/kvm/lapic.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/lapic.c   2011-11-16 18:39:07.000000000 -0500
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -16030,10 +16952,10 @@ diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
  
  #define APIC_LVT_NUM                  6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
---- linux-3.0.4/arch/x86/kvm/mmu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/mmu.c     2011-08-23 21:47:55.000000000 -0400
-@@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+diff -urNp linux-3.1.1/arch/x86/kvm/mmu.c linux-3.1.1/arch/x86/kvm/mmu.c
+--- linux-3.1.1/arch/x86/kvm/mmu.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/mmu.c     2011-11-16 18:39:07.000000000 -0500
+@@ -3552,7 +3552,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
        pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
  
@@ -16042,7 +16964,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
  
        /*
         * Assume that the pte write on a page table of the same type
-@@ -3270,7 +3270,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+@@ -3584,7 +3584,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
        }
  
        spin_lock(&vcpu->kvm->mmu_lock);
@@ -16051,10 +16973,19 @@ diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
                gentry = 0;
        kvm_mmu_free_some_pages(vcpu);
        ++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/paging_tmpl.h
---- linux-3.0.4/arch/x86/kvm/paging_tmpl.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/paging_tmpl.h     2011-08-23 21:48:14.000000000 -0400
-@@ -583,6 +583,8 @@ static int FNAME(page_fault)(struct kvm_
+diff -urNp linux-3.1.1/arch/x86/kvm/paging_tmpl.h linux-3.1.1/arch/x86/kvm/paging_tmpl.h
+--- linux-3.1.1/arch/x86/kvm/paging_tmpl.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/paging_tmpl.h     2011-11-16 19:40:44.000000000 -0500
+@@ -197,7 +197,7 @@ retry_walk:
+               if (unlikely(kvm_is_error_hva(host_addr)))
+                       goto error;
+ 
+-              ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
++              ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
+               if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
+                       goto error;
+ 
+@@ -575,6 +575,8 @@ static int FNAME(page_fault)(struct kvm_
        unsigned long mmu_seq;
        bool map_writable;
  
@@ -16062,8 +16993,8 @@ diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/pagin
 +
        pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
  
-       r = mmu_topup_memory_caches(vcpu);
-@@ -703,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcp
+       if (unlikely(error_code & PFERR_RSVD_MASK))
+@@ -701,7 +703,7 @@ static void FNAME(invlpg)(struct kvm_vcp
        if (need_flush)
                kvm_flush_remote_tlbs(vcpu->kvm);
  
@@ -16072,10 +17003,10 @@ diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/pagin
  
        spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
---- linux-3.0.4/arch/x86/kvm/svm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/svm.c     2011-08-23 21:47:55.000000000 -0400
-@@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-3.1.1/arch/x86/kvm/svm.c linux-3.1.1/arch/x86/kvm/svm.c
+--- linux-3.1.1/arch/x86/kvm/svm.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/svm.c     2011-11-16 18:39:07.000000000 -0500
+@@ -3381,7 +3381,11 @@ static void reload_tss(struct kvm_vcpu *
        int cpu = raw_smp_processor_id();
  
        struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -16087,7 +17018,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
        load_TR_desc();
  }
  
-@@ -3755,6 +3759,10 @@ static void svm_vcpu_run(struct kvm_vcpu
+@@ -3759,6 +3763,10 @@ static void svm_vcpu_run(struct kvm_vcpu
  #endif
  #endif
  
@@ -16098,10 +17029,10 @@ diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
        reload_tss(vcpu);
  
        local_irq_disable();
-diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
---- linux-3.0.4/arch/x86/kvm/vmx.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/vmx.c     2011-08-23 21:47:55.000000000 -0400
-@@ -797,7 +797,11 @@ static void reload_tss(void)
+diff -urNp linux-3.1.1/arch/x86/kvm/vmx.c linux-3.1.1/arch/x86/kvm/vmx.c
+--- linux-3.1.1/arch/x86/kvm/vmx.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/vmx.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1251,7 +1251,11 @@ static void reload_tss(void)
        struct desc_struct *descs;
  
        descs = (void *)gdt->address;
@@ -16113,7 +17044,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
        load_TR_desc();
  }
  
-@@ -1747,8 +1751,11 @@ static __init int hardware_setup(void)
+@@ -2520,8 +2524,11 @@ static __init int hardware_setup(void)
        if (!cpu_has_vmx_flexpriority())
                flexpriority_enabled = 0;
  
@@ -16127,16 +17058,16 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
  
        if (enable_ept && !cpu_has_vmx_ept_2m_page())
                kvm_disable_largepages();
-@@ -2814,7 +2821,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -3535,7 +3542,7 @@ static void vmx_set_constant_host_state(
        vmcs_writel(HOST_IDTR_BASE, dt.address);   /* 22.2.4 */
  
-       asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
--      vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
-+      vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */
-       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));
-@@ -4211,6 +4218,12 @@ static void __noclone vmx_vcpu_run(struc
+       asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
+-      vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
++      vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
+ 
+       rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
+       vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
+@@ -6021,6 +6028,12 @@ static void __noclone vmx_vcpu_run(struc
                "jmp .Lkvm_vmx_return \n\t"
                ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
                ".Lkvm_vmx_return: "
@@ -16149,7 +17080,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
                /* Save guest registers, load host registers, keep flags */
                "mov %0, %c[wordsize](%%"R"sp) \n\t"
                "pop %0 \n\t"
-@@ -4259,6 +4272,11 @@ static void __noclone vmx_vcpu_run(struc
+@@ -6069,6 +6082,11 @@ static void __noclone vmx_vcpu_run(struc
  #endif
                [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
                [wordsize]"i"(sizeof(ulong))
@@ -16161,9 +17092,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
              : "cc", "memory"
                , R"ax", R"bx", R"di", R"si"
  #ifdef CONFIG_X86_64
-@@ -4276,7 +4294,16 @@ static void __noclone vmx_vcpu_run(struc
- 
-       vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
+@@ -6097,7 +6115,16 @@ static void __noclone vmx_vcpu_run(struc
+               }
+       }
  
 -      asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 +      asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
@@ -16176,13 +17107,24 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
 +      __set_fs(current_thread_info()->addr_limit);
 +#endif
 +
-       vmx->launched = 1;
+       vmx->loaded_vmcs->launched = 1;
  
        vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
---- linux-3.0.4/arch/x86/kvm/x86.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/x86.c     2011-08-23 21:47:55.000000000 -0400
-@@ -2057,6 +2057,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+diff -urNp linux-3.1.1/arch/x86/kvm/x86.c linux-3.1.1/arch/x86/kvm/x86.c
+--- linux-3.1.1/arch/x86/kvm/x86.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/kvm/x86.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1334,8 +1334,8 @@ static int xen_hvm_config(struct kvm_vcp
+ {
+       struct kvm *kvm = vcpu->kvm;
+       int lm = is_long_mode(vcpu);
+-      u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
+-              : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
++      u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
++              : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
+       u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
+               : kvm->arch.xen_hvm_config.blob_size_32;
+       u32 page_num = data & ~PAGE_MASK;
+@@ -2137,6 +2137,8 @@ long kvm_arch_dev_ioctl(struct file *fil
                if (n < msr_list.nmsrs)
                        goto out;
                r = -EFAULT;
@@ -16191,7 +17133,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
                if (copy_to_user(user_msr_list->indices, &msrs_to_save,
                                 num_msrs_to_save * sizeof(u32)))
                        goto out;
-@@ -2229,15 +2231,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
+@@ -2312,15 +2314,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
                                     struct kvm_cpuid2 *cpuid,
                                     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -16215,7 +17157,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
        vcpu->arch.cpuid_nent = cpuid->nent;
        kvm_apic_set_version(vcpu);
        kvm_x86_ops->cpuid_update(vcpu);
-@@ -2252,15 +2259,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
+@@ -2335,15 +2342,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
                                     struct kvm_cpuid2 *cpuid,
                                     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -16238,7 +17180,7 @@ diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
        return 0;
  
  out:
-@@ -2579,7 +2590,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -2718,7 +2729,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
                                    struct kvm_interrupt *irq)
  {
@@ -16247,19 +17189,19 @@ diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
                return -EINVAL;
        if (irqchip_in_kernel(vcpu->kvm))
                return -ENXIO;
-@@ -4878,7 +4889,7 @@ void kvm_after_handle_nmi(struct kvm_vcp
+@@ -5089,7 +5100,7 @@ static void kvm_set_mmio_spte_mask(void)
+       kvm_mmu_set_mmio_spte_mask(mask);
  }
- EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
 -int kvm_arch_init(void *opaque)
 +int kvm_arch_init(const void *opaque)
  {
        int r;
        struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
---- linux-3.0.4/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400
-@@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
+diff -urNp linux-3.1.1/arch/x86/lguest/boot.c linux-3.1.1/arch/x86/lguest/boot.c
+--- linux-3.1.1/arch/x86/lguest/boot.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lguest/boot.c 2011-11-16 18:39:07.000000000 -0500
+@@ -1184,9 +1184,10 @@ static __init int early_put_chars(u32 vt
   * Rebooting also tells the Host we're finished, but the RESTART flag tells the
   * Launcher to reboot us.
   */
@@ -16271,9 +17213,9 @@ diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
  }
  
  /*G:050
-diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomic64_32.c
---- linux-3.0.4/arch/x86/lib/atomic64_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_32.c linux-3.1.1/arch/x86/lib/atomic64_32.c
+--- linux-3.1.1/arch/x86/lib/atomic64_32.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_32.c     2011-11-16 18:39:07.000000000 -0500
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -16352,9 +17294,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomi
  long long atomic64_dec_if_positive_386(atomic64_t *v);
  EXPORT_SYMBOL(atomic64_dec_if_positive_386);
  int atomic64_inc_not_zero_386(atomic64_t *v);
-diff -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/atomic64_386_32.S
---- linux-3.0.4/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_386_32.S linux-3.1.1/arch/x86/lib/atomic64_386_32.S
+--- linux-3.1.1/arch/x86/lib/atomic64_386_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_386_32.S 2011-11-16 18:39:07.000000000 -0500
 @@ -48,6 +48,10 @@ BEGIN(read)
        movl  (v), %eax
        movl 4(v), %edx
@@ -16610,16 +17552,14 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/a
        js 1f
        movl %eax,  (v)
        movl %edx, 4(v)
-diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S 2011-09-17 18:31:51.000000000 -0400
-@@ -35,10 +35,24 @@ ENTRY(atomic64_read_cx8)
+diff -urNp linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/atomic64_cx8_32.S 2011-11-16 18:39:07.000000000 -0500
+@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
        CFI_STARTPROC
  
        read64 %ecx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
@@ -16628,9 +17568,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
 +      CFI_STARTPROC
 +
 +      read64 %ecx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
 +      ret
 +      CFI_ENDPROC
 +ENDPROC(atomic64_read_unchecked_cx8)
@@ -16638,13 +17576,11 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
  ENTRY(atomic64_set_cx8)
        CFI_STARTPROC
  
-@@ -48,10 +62,29 @@ ENTRY(atomic64_set_cx8)
+@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
        cmpxchg8b (%esi)
        jne 1b
  
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(atomic64_set_cx8)
@@ -16658,9 +17594,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
 +      cmpxchg8b (%esi)
 +      jne 1b
 +
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
 +      ret
 +      CFI_ENDPROC
 +ENDPROC(atomic64_set_unchecked_cx8)
@@ -16668,13 +17602,11 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
  ENTRY(atomic64_xchg_cx8)
        CFI_STARTPROC
  
-@@ -62,12 +95,15 @@ ENTRY(atomic64_xchg_cx8)
+@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
        cmpxchg8b (%esi)
        jne 1b
  
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(atomic64_xchg_cx8)
@@ -16686,7 +17618,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        CFI_STARTPROC
        SAVE ebp
        SAVE ebx
-@@ -84,27 +120,46 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
        movl %edx, %ecx
        \ins\()l %esi, %ebx
        \insc\()l %edi, %ecx
@@ -16717,9 +17649,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        RESTORE esi
        RESTORE ebx
        RESTORE ebp
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
 -ENDPROC(atomic64_\func\()_return_cx8)
@@ -16738,7 +17668,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        CFI_STARTPROC
        SAVE ebx
  
-@@ -114,21 +169,41 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
        movl %edx, %ecx
        \ins\()l $1, %ebx
        \insc\()l $0, %ecx
@@ -16766,9 +17696,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
 +.endif
 +
        RESTORE ebx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
 -ENDPROC(atomic64_\func\()_return_cx8)
@@ -16782,7 +17710,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
  
  ENTRY(atomic64_dec_if_positive_cx8)
        CFI_STARTPROC
-@@ -140,6 +215,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
+@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
        movl %edx, %ecx
        subl $1, %ebx
        sbb $0, %ecx
@@ -16796,17 +17724,15 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        js 2f
        LOCK_PREFIX
        cmpxchg8b (%esi)
-@@ -149,6 +231,9 @@ ENTRY(atomic64_dec_if_positive_cx8)
+@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
        movl %ebx, %eax
        movl %ecx, %edx
        RESTORE ebx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(atomic64_dec_if_positive_cx8)
-@@ -174,6 +259,13 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
        movl %edx, %ecx
        addl %esi, %ebx
        adcl %edi, %ecx
@@ -16820,17 +17746,15 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        LOCK_PREFIX
        cmpxchg8b (%ebp)
        jne 1b
-@@ -184,6 +276,9 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
        CFI_ADJUST_CFA_OFFSET -8
        RESTORE ebx
        RESTORE ebp
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  4:
        cmpl %edx, 4(%esp)
-@@ -206,6 +301,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
+@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
        movl %edx, %ecx
        addl $1, %ebx
        adcl $0, %ecx
@@ -16844,19 +17768,17 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
        LOCK_PREFIX
        cmpxchg8b (%esi)
        jne 1b
-@@ -213,6 +315,9 @@ ENTRY(atomic64_inc_not_zero_cx8)
+@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
        movl $1, %eax
  3:
        RESTORE ebx
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  4:
        testl %edx, %edx
-diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/checksum_32.S
---- linux-3.0.4/arch/x86/lib/checksum_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/checksum_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/checksum_32.S linux-3.1.1/arch/x86/lib/checksum_32.S
+--- linux-3.1.1/arch/x86/lib/checksum_32.S     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/checksum_32.S     2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -17101,40 +18023,34 @@ diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/check
                                
  #undef ROUND
  #undef ROUND1         
-diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/clear_page_64.S
---- linux-3.0.4/arch/x86/lib/clear_page_64.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/clear_page_64.S   2011-09-17 18:31:51.000000000 -0400
-@@ -11,6 +11,9 @@ ENTRY(clear_page_c)
+diff -urNp linux-3.1.1/arch/x86/lib/clear_page_64.S linux-3.1.1/arch/x86/lib/clear_page_64.S
+--- linux-3.1.1/arch/x86/lib/clear_page_64.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/clear_page_64.S   2011-11-16 18:39:07.000000000 -0500
+@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
        movl $4096/8,%ecx
        xorl %eax,%eax
        rep stosq
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(clear_page_c)
-@@ -20,6 +23,9 @@ ENTRY(clear_page_c_e)
+@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
        movl $4096,%ecx
        xorl %eax,%eax
        rep stosb
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(clear_page_c_e)
-@@ -43,6 +49,9 @@ ENTRY(clear_page)
+@@ -43,6 +45,7 @@ ENTRY(clear_page)
        leaq    64(%rdi),%rdi
        jnz     .Lloop
        nop
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  .Lclear_page_end:
-@@ -58,7 +67,7 @@ ENDPROC(clear_page)
+@@ -58,7 +61,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
  
@@ -17143,30 +18059,43 @@ diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/cle
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (clear_page_c - clear_page) - (2f - 1b)   /* offset */
  2:    .byte 0xeb                                      /* jmp <disp8> */
-diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy_page_64.S
---- linux-3.0.4/arch/x86/lib/copy_page_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_page_64.S    2011-09-17 18:31:51.000000000 -0400
-@@ -8,6 +8,9 @@ copy_page_c:
+diff -urNp linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S
+--- linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/cmpxchg16b_emu.S  2011-11-16 18:39:07.000000000 -0500
+@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
+ 
+       popf
+       mov $1, %al
++      pax_force_retaddr
+       ret
+ 
+  not_same:
+       popf
+       xor %al,%al
++      pax_force_retaddr
+       ret
+ 
+ CFI_ENDPROC
+diff -urNp linux-3.1.1/arch/x86/lib/copy_page_64.S linux-3.1.1/arch/x86/lib/copy_page_64.S
+--- linux-3.1.1/arch/x86/lib/copy_page_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_page_64.S    2011-11-16 18:39:07.000000000 -0500
+@@ -9,6 +9,7 @@ copy_page_c:
        CFI_STARTPROC
        movl $4096/8,%ecx
        rep movsq
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(copy_page_c)
-@@ -94,6 +97,9 @@ ENTRY(copy_page)
+@@ -95,6 +96,7 @@ ENTRY(copy_page)
        CFI_RESTORE r13
        addq    $3*8,%rsp
        CFI_ADJUST_CFA_OFFSET -3*8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  .Lcopy_page_end:
        CFI_ENDPROC
-@@ -104,7 +110,7 @@ ENDPROC(copy_page)
+@@ -105,7 +107,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
  
@@ -17175,9 +18104,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (copy_page_c - copy_page) - (2f - 1b)     /* offset */
  2:
-diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy_user_64.S
---- linux-3.0.4/arch/x86/lib/copy_user_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_user_64.S    2011-09-17 18:31:51.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/copy_user_64.S linux-3.1.1/arch/x86/lib/copy_user_64.S
+--- linux-3.1.1/arch/x86/lib/copy_user_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_user_64.S    2011-11-16 18:39:07.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
@@ -17195,7 +18124,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy
  2:    .byte 0xe9                      /* near jump with 32bit immediate */
        .long \alt1-1b /* offset */   /* or alternatively to alt1 */
  3:    .byte 0xe9                      /* near jump with 32bit immediate */
-@@ -71,47 +72,22 @@
+@@ -71,47 +72,20 @@
  #endif
        .endm
  
@@ -17242,46 +18171,45 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy
        stosb
  bad_to_user:
        movl %edx,%eax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(bad_from_user)
-@@ -179,6 +155,9 @@ ENTRY(copy_user_generic_unrolled)
+@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
        decl %ecx
        jnz 21b
  23:   xor %eax,%eax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
        .section .fixup,"ax"
-@@ -251,6 +230,9 @@ ENTRY(copy_user_generic_string)
+@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
  3:    rep
        movsb
  4:    xorl %eax,%eax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
        .section .fixup,"ax"
-@@ -287,6 +269,9 @@ ENTRY(copy_user_enhanced_fast_string)
+@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
  1:    rep
        movsb
  2:    xorl %eax,%eax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
        .section .fixup,"ax"
-diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S    2011-09-17 18:31:51.000000000 -0400
-@@ -14,6 +14,7 @@
+diff -urNp linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/copy_user_nocache_64.S    2011-11-16 18:39:07.000000000 -0500
+@@ -8,12 +8,14 @@
+ 
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
++#include <asm/alternative-asm.h>
+ 
+ #define FIX_ALIGNMENT 1
+ 
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17289,7 +18217,7 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/
  
        .macro ALIGN_DESTINATION
  #ifdef FIX_ALIGNMENT
-@@ -50,6 +51,15 @@
+@@ -50,6 +52,15 @@
   */
  ENTRY(__copy_user_nocache)
        CFI_STARTPROC
@@ -17305,67 +18233,76 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/
        cmpl $8,%edx
        jb 20f          /* less then 8 bytes, go to byte copy loop */
        ALIGN_DESTINATION
-@@ -98,6 +108,9 @@ ENTRY(__copy_user_nocache)
+@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
        jnz 21b
  23:   xorl %eax,%eax
        sfence
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
        .section .fixup,"ax"
-diff -urNp linux-3.0.4/arch/x86/lib/csum-copy_64.S linux-3.0.4/arch/x86/lib/csum-copy_64.S
---- linux-3.0.4/arch/x86/lib/csum-copy_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/csum-copy_64.S    2011-09-17 18:31:51.000000000 -0400
-@@ -228,6 +228,9 @@ ENTRY(csum_partial_copy_generic)
+diff -urNp linux-3.1.1/arch/x86/lib/csum-copy_64.S linux-3.1.1/arch/x86/lib/csum-copy_64.S
+--- linux-3.1.1/arch/x86/lib/csum-copy_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/csum-copy_64.S    2011-11-16 18:39:07.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
+ #include <asm/errno.h>
++#include <asm/alternative-asm.h>
+ 
+ /*
+  * Checksum copy with exception handling.
+@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
        CFI_RESTORE rbp
        addq $7*8, %rsp
        CFI_ADJUST_CFA_OFFSET -7*8
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_RESTORE_STATE
  
-diff -urNp linux-3.0.4/arch/x86/lib/csum-wrappers_64.c linux-3.0.4/arch/x86/lib/csum-wrappers_64.c
---- linux-3.0.4/arch/x86/lib/csum-wrappers_64.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/csum-wrappers_64.c        2011-08-23 21:47:55.000000000 -0400
-@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
+diff -urNp linux-3.1.1/arch/x86/lib/csum-wrappers_64.c linux-3.1.1/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.1.1/arch/x86/lib/csum-wrappers_64.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/csum-wrappers_64.c        2011-11-16 18:39:07.000000000 -0500
+@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
                        len -= 2;
                }
        }
+-      isum = csum_partial_copy_generic((__force const void *)src,
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +      if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +              src += PAX_USER_SHADOW_BASE;
 +#endif
 +
-       isum = csum_partial_copy_generic((__force const void *)src,
++      isum = csum_partial_copy_generic((const void __force_kernel *)src,
                                dst, len, isum, errp, NULL);
        if (unlikely(*errp))
-@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr
+               goto out_err;
+@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *sr
        }
  
        *errp = 0;
+-      return csum_partial_copy_generic(src, (void __force *)dst,
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +      if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +              dst += PAX_USER_SHADOW_BASE;
 +#endif
 +
-       return csum_partial_copy_generic(src, (void __force *)dst,
++      return csum_partial_copy_generic(src, (void __force_kernel *)dst,
                                         len, isum, NULL, errp);
  }
-diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
---- linux-3.0.4/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/getuser.S 2011-08-23 21:47:55.000000000 -0400
-@@ -33,14 +33,35 @@
+ EXPORT_SYMBOL(csum_partial_copy_to_user);
+diff -urNp linux-3.1.1/arch/x86/lib/getuser.S linux-3.1.1/arch/x86/lib/getuser.S
+--- linux-3.1.1/arch/x86/lib/getuser.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/getuser.S 2011-11-16 18:39:07.000000000 -0500
+@@ -33,15 +33,38 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
  #include <asm/asm.h>
 +#include <asm/segment.h>
 +#include <asm/pgtable.h>
++#include <asm/alternative-asm.h>
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +#define __copyuser_seg gs;
@@ -17395,9 +18332,11 @@ diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
 +
 +1:    __copyuser_seg movzb (%_ASM_AX),%edx
        xor %eax,%eax
++      pax_force_retaddr
        ret
        CFI_ENDPROC
-@@ -49,11 +70,24 @@ ENDPROC(__get_user_1)
+ ENDPROC(__get_user_1)
+@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
  ENTRY(__get_user_2)
        CFI_STARTPROC
        add $1,%_ASM_AX
@@ -17421,9 +18360,11 @@ diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
 +
 +2:    __copyuser_seg movzwl -1(%_ASM_AX),%edx
        xor %eax,%eax
++      pax_force_retaddr
        ret
        CFI_ENDPROC
-@@ -62,11 +96,24 @@ ENDPROC(__get_user_2)
+ ENDPROC(__get_user_2)
+@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
  ENTRY(__get_user_4)
        CFI_STARTPROC
        add $3,%_ASM_AX
@@ -17447,9 +18388,11 @@ diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
 +
 +3:    __copyuser_seg mov -3(%_ASM_AX),%edx
        xor %eax,%eax
++      pax_force_retaddr
        ret
        CFI_ENDPROC
-@@ -80,6 +127,15 @@ ENTRY(__get_user_8)
+ ENDPROC(__get_user_4)
+@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae     bad_get_user
@@ -17464,10 +18407,21 @@ diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
 +
  4:    movq -7(%_ASM_AX),%_ASM_DX
        xor %eax,%eax
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+ ENDPROC(__get_user_8)
+@@ -91,6 +152,7 @@ bad_get_user:
+       CFI_STARTPROC
+       xor %edx,%edx
+       mov $(-EFAULT),%_ASM_AX
++      pax_force_retaddr
        ret
-diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
---- linux-3.0.4/arch/x86/lib/insn.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/insn.c    2011-08-23 21:47:55.000000000 -0400
+       CFI_ENDPROC
+ END(bad_get_user)
+diff -urNp linux-3.1.1/arch/x86/lib/insn.c linux-3.1.1/arch/x86/lib/insn.c
+--- linux-3.1.1/arch/x86/lib/insn.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/insn.c    2011-11-16 18:39:07.000000000 -0500
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -17491,141 +18445,125 @@ diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
        insn->x86_64 = x86_64 ? 1 : 0;
        insn->opnd_bytes = 4;
        if (x86_64)
-diff -urNp linux-3.0.4/arch/x86/lib/iomap_copy_64.S linux-3.0.4/arch/x86/lib/iomap_copy_64.S
---- linux-3.0.4/arch/x86/lib/iomap_copy_64.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/iomap_copy_64.S   2011-09-17 18:31:51.000000000 -0400
-@@ -25,6 +25,9 @@ ENTRY(__iowrite32_copy)
+diff -urNp linux-3.1.1/arch/x86/lib/iomap_copy_64.S linux-3.1.1/arch/x86/lib/iomap_copy_64.S
+--- linux-3.1.1/arch/x86/lib/iomap_copy_64.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/iomap_copy_64.S   2011-11-16 18:39:07.000000000 -0500
+@@ -17,6 +17,7 @@
+ 
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
++#include <asm/alternative-asm.h>
+ 
+ /*
+  * override generic version in lib/iomap_copy.c
+@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
        CFI_STARTPROC
        movl %edx,%ecx
        rep movsd
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(__iowrite32_copy)
-diff -urNp linux-3.0.4/arch/x86/lib/memcpy_64.S linux-3.0.4/arch/x86/lib/memcpy_64.S
---- linux-3.0.4/arch/x86/lib/memcpy_64.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memcpy_64.S       2011-09-17 18:31:51.000000000 -0400
-@@ -34,6 +34,9 @@
+diff -urNp linux-3.1.1/arch/x86/lib/memcpy_64.S linux-3.1.1/arch/x86/lib/memcpy_64.S
+--- linux-3.1.1/arch/x86/lib/memcpy_64.S       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memcpy_64.S       2011-11-16 18:39:07.000000000 -0500
+@@ -34,6 +34,7 @@
        rep movsq
        movl %edx, %ecx
        rep movsb
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  .Lmemcpy_e:
        .previous
-@@ -51,6 +54,9 @@
+@@ -51,6 +52,7 @@
  
        movl %edx, %ecx
        rep movsb
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  .Lmemcpy_e_e:
        .previous
-@@ -141,6 +147,9 @@ ENTRY(memcpy)
+@@ -141,6 +143,7 @@ ENTRY(memcpy)
        movq %r9,       1*8(%rdi)
        movq %r10,      -2*8(%rdi, %rdx)
        movq %r11,      -1*8(%rdi, %rdx)
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
        .p2align 4
  .Lless_16bytes:
-@@ -153,6 +162,9 @@ ENTRY(memcpy)
+@@ -153,6 +156,7 @@ ENTRY(memcpy)
        movq -1*8(%rsi, %rdx),  %r9
        movq %r8,       0*8(%rdi)
        movq %r9,       -1*8(%rdi, %rdx)
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
        .p2align 4
  .Lless_8bytes:
-@@ -166,6 +178,9 @@ ENTRY(memcpy)
+@@ -166,6 +170,7 @@ ENTRY(memcpy)
        movl -4(%rsi, %rdx), %r8d
        movl %ecx, (%rdi)
        movl %r8d, -4(%rdi, %rdx)
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
        .p2align 4
  .Lless_3bytes:
-@@ -183,6 +198,9 @@ ENTRY(memcpy)
+@@ -183,6 +188,7 @@ ENTRY(memcpy)
        jnz .Lloop_1
  
  .Lend:
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
        CFI_ENDPROC
  ENDPROC(memcpy)
-diff -urNp linux-3.0.4/arch/x86/lib/memmove_64.S linux-3.0.4/arch/x86/lib/memmove_64.S
---- linux-3.0.4/arch/x86/lib/memmove_64.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memmove_64.S      2011-09-17 18:31:51.000000000 -0400
-@@ -201,6 +201,9 @@ ENTRY(memmove)
+diff -urNp linux-3.1.1/arch/x86/lib/memmove_64.S linux-3.1.1/arch/x86/lib/memmove_64.S
+--- linux-3.1.1/arch/x86/lib/memmove_64.S      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memmove_64.S      2011-11-16 18:39:07.000000000 -0500
+@@ -202,6 +202,7 @@ ENTRY(memmove)
        movb (%rsi), %r11b
        movb %r11b, (%rdi)
  13:
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
        CFI_ENDPROC
  
-@@ -209,6 +212,9 @@ ENTRY(memmove)
+@@ -210,6 +211,7 @@ ENTRY(memmove)
        /* Forward moving data. */
        movq %rdx, %rcx
        rep movsb
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        retq
  .Lmemmove_end_forward_efs:
        .previous
-diff -urNp linux-3.0.4/arch/x86/lib/memset_64.S linux-3.0.4/arch/x86/lib/memset_64.S
---- linux-3.0.4/arch/x86/lib/memset_64.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memset_64.S       2011-09-17 18:31:51.000000000 -0400
-@@ -31,6 +31,9 @@
+diff -urNp linux-3.1.1/arch/x86/lib/memset_64.S linux-3.1.1/arch/x86/lib/memset_64.S
+--- linux-3.1.1/arch/x86/lib/memset_64.S       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/memset_64.S       2011-11-16 18:39:07.000000000 -0500
+@@ -31,6 +31,7 @@
        movl %r8d,%ecx
        rep stosb
        movq %r9,%rax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  .Lmemset_e:
        .previous
-@@ -53,6 +56,9 @@
+@@ -53,6 +54,7 @@
        movl %edx,%ecx
        rep stosb
        movq %r9,%rax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  .Lmemset_e_e:
        .previous
-@@ -121,6 +127,9 @@ ENTRY(__memset)
+@@ -121,6 +123,7 @@ ENTRY(__memset)
  
  .Lende:
        movq    %r10,%rax
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  
        CFI_RESTORE_STATE
-diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
---- linux-3.0.4/arch/x86/lib/mmx_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/mmx_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/mmx_32.c linux-3.1.1/arch/x86/lib/mmx_32.c
+--- linux-3.1.1/arch/x86/lib/mmx_32.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/mmx_32.c  2011-11-16 18:39:07.000000000 -0500
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
        void *p;
@@ -17941,27 +18879,48 @@ diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
  
                from += 64;
                to += 64;
-diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
---- linux-3.0.4/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/putuser.S 2011-08-23 21:47:55.000000000 -0400
-@@ -15,7 +15,8 @@
+diff -urNp linux-3.1.1/arch/x86/lib/msr-reg.S linux-3.1.1/arch/x86/lib/msr-reg.S
+--- linux-3.1.1/arch/x86/lib/msr-reg.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/msr-reg.S 2011-11-16 18:39:07.000000000 -0500
+@@ -3,6 +3,7 @@
+ #include <asm/dwarf2.h>
+ #include <asm/asm.h>
+ #include <asm/msr.h>
++#include <asm/alternative-asm.h>
+ 
+ #ifdef CONFIG_X86_64
+ /*
+@@ -37,6 +38,7 @@ ENTRY(native_\op\()_safe_regs)
+       movl    %edi, 28(%r10)
+       popq_cfi %rbp
+       popq_cfi %rbx
++      pax_force_retaddr
+       ret
+ 3:
+       CFI_RESTORE_STATE
+diff -urNp linux-3.1.1/arch/x86/lib/putuser.S linux-3.1.1/arch/x86/lib/putuser.S
+--- linux-3.1.1/arch/x86/lib/putuser.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/putuser.S 2011-11-16 18:39:07.000000000 -0500
+@@ -15,7 +15,9 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
  #include <asm/asm.h>
 -
 +#include <asm/segment.h>
 +#include <asm/pgtable.h>
++#include <asm/alternative-asm.h>
  
  /*
   * __put_user_X
-@@ -29,52 +30,119 @@
+@@ -29,52 +31,119 @@
   * as they get called from within inline assembly.
   */
  
 -#define ENTER CFI_STARTPROC ; \
 -              GET_THREAD_INFO(%_ASM_BX)
+-#define EXIT  ret ; \
 +#define ENTER CFI_STARTPROC
- #define EXIT  ret ; \
++#define EXIT  pax_force_retaddr; ret ; \
                CFI_ENDPROC
  
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -18081,87 +19040,83 @@ diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
  #endif
        xor %eax,%eax
        EXIT
-diff -urNp linux-3.0.4/arch/x86/lib/rwlock_64.S linux-3.0.4/arch/x86/lib/rwlock_64.S
---- linux-3.0.4/arch/x86/lib/rwlock_64.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/rwlock_64.S       2011-09-17 18:31:51.000000000 -0400
-@@ -17,6 +17,9 @@ ENTRY(__write_lock_failed)
-       LOCK_PREFIX
-       subl $RW_LOCK_BIAS,(%rdi)
-       jnz  __write_lock_failed
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
+diff -urNp linux-3.1.1/arch/x86/lib/rwlock.S linux-3.1.1/arch/x86/lib/rwlock.S
+--- linux-3.1.1/arch/x86/lib/rwlock.S  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/rwlock.S  2011-11-16 18:39:07.000000000 -0500
+@@ -23,6 +23,7 @@ ENTRY(__write_lock_failed)
+       WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
+       jnz     0b
+       ENDFRAME
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  END(__write_lock_failed)
-@@ -33,6 +36,9 @@ ENTRY(__read_lock_failed)
-       LOCK_PREFIX
-       decl (%rdi)
-       js __read_lock_failed
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
+@@ -39,6 +40,7 @@ ENTRY(__read_lock_failed)
+       READ_LOCK_SIZE(dec) (%__lock_ptr)
+       js      0b
+       ENDFRAME
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  END(__read_lock_failed)
-diff -urNp linux-3.0.4/arch/x86/lib/rwsem_64.S linux-3.0.4/arch/x86/lib/rwsem_64.S
---- linux-3.0.4/arch/x86/lib/rwsem_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/rwsem_64.S        2011-09-17 18:31:51.000000000 -0400
-@@ -51,6 +51,9 @@ ENTRY(call_rwsem_down_read_failed)
-       popq_cfi %rdx
-       CFI_RESTORE rdx
+diff -urNp linux-3.1.1/arch/x86/lib/rwsem.S linux-3.1.1/arch/x86/lib/rwsem.S
+--- linux-3.1.1/arch/x86/lib/rwsem.S   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/rwsem.S   2011-11-16 18:39:07.000000000 -0500
+@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
+       __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
+       CFI_RESTORE __ASM_REG(dx)
        restore_common_regs
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(call_rwsem_down_read_failed)
-@@ -61,6 +64,9 @@ ENTRY(call_rwsem_down_write_failed)
+@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
        movq %rax,%rdi
        call rwsem_down_write_failed
        restore_common_regs
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(call_rwsem_down_write_failed)
-@@ -73,6 +79,9 @@ ENTRY(call_rwsem_wake)
+@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
        movq %rax,%rdi
        call rwsem_wake
        restore_common_regs
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
- 1:    ret
+-1:    ret
++1:    pax_force_retaddr
++      ret
        CFI_ENDPROC
  ENDPROC(call_rwsem_wake)
-@@ -88,6 +97,9 @@ ENTRY(call_rwsem_downgrade_wake)
-       popq_cfi %rdx
-       CFI_RESTORE rdx
+ 
+@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
+       __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
+       CFI_RESTORE __ASM_REG(dx)
        restore_common_regs
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
        CFI_ENDPROC
  ENDPROC(call_rwsem_downgrade_wake)
-diff -urNp linux-3.0.4/arch/x86/lib/thunk_64.S linux-3.0.4/arch/x86/lib/thunk_64.S
---- linux-3.0.4/arch/x86/lib/thunk_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/thunk_64.S        2011-09-17 18:31:51.000000000 -0400
-@@ -50,5 +50,8 @@
+diff -urNp linux-3.1.1/arch/x86/lib/thunk_64.S linux-3.1.1/arch/x86/lib/thunk_64.S
+--- linux-3.1.1/arch/x86/lib/thunk_64.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/thunk_64.S        2011-11-16 18:39:07.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
+ #include <asm/calling.h>
++#include <asm/alternative-asm.h>
+ 
+       /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
+       .macro THUNK name, func, put_ret_addr_in_rdi=0
+@@ -41,5 +42,6 @@
        SAVE_ARGS
  restore:
        RESTORE_ARGS
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
-       ret     
++      pax_force_retaddr
+       ret
        CFI_ENDPROC
-diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/usercopy_32.c
---- linux-3.0.4/arch/x86/lib/usercopy_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/usercopy_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/usercopy_32.c linux-3.1.1/arch/x86/lib/usercopy_32.c
+--- linux-3.1.1/arch/x86/lib/usercopy_32.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/usercopy_32.c     2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@ do {                                                                    \
        __asm__ __volatile__(                                              \
                "       testl %1,%1\n"                                     \
@@ -18782,9 +19737,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/userc
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/usercopy_64.c
---- linux-3.0.4/arch/x86/lib/usercopy_64.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/usercopy_64.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/lib/usercopy_64.c linux-3.1.1/arch/x86/lib/usercopy_64.c
+--- linux-3.1.1/arch/x86/lib/usercopy_64.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/lib/usercopy_64.c     2011-11-16 18:39:07.000000000 -0500
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -18816,6 +19771,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/userc
  unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
  {
 -      if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) { 
+-              return copy_user_generic((__force void *)to, (__force void *)from, len);
+-      } 
+-      return len;             
 +      if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -18825,25 +19783,32 @@ diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/userc
 +                      from += PAX_USER_SHADOW_BASE;
 +#endif
 +
-               return copy_user_generic((__force void *)to, (__force void *)from, len);
--      } 
--      return len;             
++              return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
 +      }
 +      return len;
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.4/arch/x86/Makefile linux-3.0.4/arch/x86/Makefile
---- linux-3.0.4/arch/x86/Makefile      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/Makefile      2011-08-23 21:48:14.000000000 -0400
-@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
- else
-         BITS := 64
+@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
+  * it is not necessary to optimize tail handling.
+  */
+ unsigned long
+-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
++copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest)
+ {
+       char c;
+       unsigned zero_len;
+diff -urNp linux-3.1.1/arch/x86/Makefile linux-3.1.1/arch/x86/Makefile
+--- linux-3.1.1/arch/x86/Makefile      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/Makefile      2011-11-17 18:30:30.000000000 -0500
+@@ -46,6 +46,7 @@ else
          UTS_MACHINE := x86_64
-+        biarch := $(call cc-option,-m64)
          CHECKFLAGS += -D__x86_64__ -m64
  
++        biarch := $(call cc-option,-m64)
          KBUILD_AFLAGS += -m64
+         KBUILD_CFLAGS += -m64
+ 
 @@ -195,3 +196,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
@@ -18857,9 +19822,9 @@ diff -urNp linux-3.0.4/arch/x86/Makefile linux-3.0.4/arch/x86/Makefile
 +
 +archprepare:
 +      $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/arch/x86/mm/extable.c
---- linux-3.0.4/arch/x86/mm/extable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/extable.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/extable.c linux-3.1.1/arch/x86/mm/extable.c
+--- linux-3.1.1/arch/x86/mm/extable.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/extable.c  2011-11-16 18:39:07.000000000 -0500
 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
        const struct exception_table_entry *fixup;
  
@@ -18869,10 +19834,10 @@ diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/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-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
---- linux-3.0.4/arch/x86/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/fault.c    2011-08-23 21:48:14.000000000 -0400
-@@ -13,10 +13,18 @@
+diff -urNp linux-3.1.1/arch/x86/mm/fault.c linux-3.1.1/arch/x86/mm/fault.c
+--- linux-3.1.1/arch/x86/mm/fault.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/fault.c    2011-11-16 20:43:50.000000000 -0500
+@@ -13,11 +13,18 @@
  #include <linux/perf_event.h>         /* perf_sw_event                */
  #include <linux/hugetlb.h>            /* hstate_index_to_shift        */
  #include <linux/prefetch.h>           /* prefetchw                    */
@@ -18882,7 +19847,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  #include <asm/traps.h>                        /* dotraplinkage, ...           */
  #include <asm/pgalloc.h>              /* pgd_*(), ...                 */
  #include <asm/kmemcheck.h>            /* kmemcheck_*(), ...           */
-+#include <asm/vsyscall.h>
+ #include <asm/vsyscall.h>
 +#include <asm/tlbflush.h>
 +
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -18891,7 +19856,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  
  /*
   * Page fault error code bits:
-@@ -54,7 +62,7 @@ static inline int __kprobes notify_page_
+@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_
        int ret = 0;
  
        /* kprobe_running() needs smp_processor_id() */
@@ -18900,34 +19865,38 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
                preempt_disable();
                if (kprobe_running() && kprobe_fault_handler(regs, 14))
                        ret = 1;
-@@ -115,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *re
+@@ -116,7 +123,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))
++                      if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
 +                              return 0;
 +              } else if (probe_kernel_address(instr, opcode))
                        return 0;
  
                *prefetch = (instr_lo == 0xF) &&
-@@ -149,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsign
+@@ -150,7 +160,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))
++                      if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
 +                              break;
 +              } else if (probe_kernel_address(instr, opcode))
                        break;
  
                instr++;
-@@ -180,6 +194,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int s
        force_sig_info(si_signo, &info, tsk);
  }
  
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
++#endif
++
 +#ifdef CONFIG_PAX_EMUTRAMP
 +static int pax_handle_fetch_fault(struct pt_regs *regs);
 +#endif
@@ -18955,7 +19924,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -230,10 +268,22 @@ void vmalloc_sync_all(void)
+@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
        for (address = VMALLOC_START & PMD_MASK;
             address >= TASK_SIZE && address < FIXADDR_TOP;
             address += PMD_SIZE) {
@@ -18978,7 +19947,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
                        spinlock_t *pgt_lock;
                        pmd_t *ret;
  
-@@ -241,8 +291,13 @@ void vmalloc_sync_all(void)
+@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
                        pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
  
                        spin_lock(pgt_lock);
@@ -18993,7 +19962,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  
                        if (!ret)
                                break;
-@@ -276,6 +331,11 @@ static noinline __kprobes int vmalloc_fa
+@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fa
         * an interrupt in the middle of a task switch..
         */
        pgd_paddr = read_cr3();
@@ -19005,7 +19974,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
        pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
        if (!pmd_k)
                return -1;
-@@ -371,7 +431,14 @@ static noinline __kprobes int vmalloc_fa
+@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fa
         * happen within a race in page table update. In the later
         * case just flush:
         */
@@ -19020,7 +19989,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
        pgd_ref = pgd_offset_k(address);
        if (pgd_none(*pgd_ref))
                return -1;
-@@ -533,7 +600,7 @@ static int is_errata93(struct pt_regs *r
+@@ -534,7 +604,7 @@ static int is_errata93(struct pt_regs *r
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -19029,7 +19998,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
                return 1;
  #endif
        return 0;
-@@ -560,7 +627,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -561,7 +631,7 @@ static int is_f00f_bug(struct pt_regs *r
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -19038,7 +20007,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -569,14 +636,25 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -570,14 +640,25 @@ show_fault_oops(struct pt_regs *regs, un
        if (!oops_may_print())
                return;
  
@@ -19066,55 +20035,12 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  
        printk(KERN_ALERT "BUG: unable to handle kernel ");
        if (address < PAGE_SIZE)
-@@ -702,6 +780,66 @@ __bad_area_nosemaphore(struct pt_regs *r
-                      unsigned long address, int si_code)
- {
-       struct task_struct *tsk = current;
-+#if defined(CONFIG_X86_64) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+      struct mm_struct *mm = tsk->mm;
-+#endif
-+
-+#ifdef CONFIG_X86_64
-+      if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
-+              if (regs->ip == VSYSCALL_ADDR(__NR_vgettimeofday) ||
-+                  regs->ip == VSYSCALL_ADDR(__NR_vtime) ||
-+                  regs->ip == VSYSCALL_ADDR(__NR_vgetcpu)) {
-+                      regs->ip += mm->context.vdso - PAGE_SIZE - VSYSCALL_START;
-+                      return;
-+              }
-+      }
-+#endif
-+
+@@ -733,6 +814,21 @@ __bad_area_nosemaphore(struct pt_regs *r
+               }
+ #endif
+ 
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+      if (mm && (error_code & PF_USER)) {
-+              unsigned long ip = regs->ip;
-+
-+              if (v8086_mode(regs))
-+                      ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
-+
-+              /*
-+               * It's possible to have interrupts off here:
-+               */
-+              local_irq_enable();
-+
-+#ifdef CONFIG_PAX_PAGEEXEC
-+              if ((mm->pax_flags & MF_PAX_PAGEEXEC) &&
-+                  (((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) {
-+
-+#ifdef CONFIG_PAX_EMUTRAMP
-+                      switch (pax_handle_fetch_fault(regs)) {
-+                      case 2:
-+                              return;
-+                      }
-+#endif
-+
-+                      pax_report_fault(regs, (void *)ip, (void *)regs->sp);
-+                      do_group_exit(SIGKILL);
-+              }
-+#endif
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+              if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) {
++              if (pax_is_fetch_fault(regs, error_code, address)) {
 +
 +#ifdef CONFIG_PAX_EMUTRAMP
 +                      switch (pax_handle_fetch_fault(regs)) {
@@ -19123,17 +20049,24 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
 +                      }
 +#endif
 +
-+                      pax_report_fault(regs, (void *)ip, (void *)regs->sp);
++                      pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
 +                      do_group_exit(SIGKILL);
 +              }
 +#endif
 +
-+      }
-+#endif
+               if (unlikely(show_unhandled_signals))
+                       show_signal_msg(regs, error_code, address, tsk);
  
-       /* User mode accesses just cause a SIGSEGV */
-       if (error_code & PF_USER) {
-@@ -871,6 +1009,99 @@ static int spurious_fault_check(unsigned
+@@ -829,7 +925,7 @@ do_sigbus(struct pt_regs *regs, unsigned
+       if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
+               printk(KERN_ERR
+       "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
+-                      tsk->comm, tsk->pid, address);
++                      tsk->comm, task_pid_nr(tsk), address);
+               code = BUS_MCEERR_AR;
+       }
+ #endif
+@@ -884,6 +980,99 @@ static int spurious_fault_check(unsigned
        return 1;
  }
  
@@ -19233,7 +20166,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -943,6 +1174,9 @@ int show_unhandled_signals = 1;
+@@ -956,6 +1145,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, struct vm_area_struct *vma)
  {
@@ -19243,7 +20176,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
        if (error_code & PF_WRITE) {
                /* write, present and write, not present: */
                if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -976,19 +1210,33 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -989,19 +1181,33 @@ do_page_fault(struct pt_regs *regs, unsi
  {
        struct vm_area_struct *vma;
        struct task_struct *tsk;
@@ -19265,7 +20198,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/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: %pA\n", (void *)regs->ip);
++                      printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
 +                      show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
 +              } else
 +                      address -= PAX_USER_SHADOW_BASE;
@@ -19281,7 +20214,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/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.
-@@ -1048,7 +1296,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1061,7 +1267,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:
         */
@@ -19290,7 +20223,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
                local_irq_enable();
                error_code |= PF_USER;
        } else {
-@@ -1103,6 +1351,11 @@ retry:
+@@ -1116,6 +1322,11 @@ retry:
                might_sleep();
        }
  
@@ -19302,7 +20235,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
        vma = find_vma(mm, address);
        if (unlikely(!vma)) {
                bad_area(regs, error_code, address);
-@@ -1114,18 +1367,24 @@ retry:
+@@ -1127,18 +1338,24 @@ retry:
                bad_area(regs, error_code, address);
                return;
        }
@@ -19338,11 +20271,42 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
        if (unlikely(expand_stack(vma, address))) {
                bad_area(regs, error_code, address);
                return;
-@@ -1180,3 +1439,199 @@ good_area:
+@@ -1193,3 +1410,240 @@ good_area:
  
        up_read(&mm->mmap_sem);
  }
 +
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
++{
++      struct mm_struct *mm = current->mm;
++      unsigned long ip = regs->ip;
++
++      if (v8086_mode(regs))
++              ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
++
++#ifdef CONFIG_PAX_PAGEEXEC
++      if (mm->pax_flags & MF_PAX_PAGEEXEC) {
++              if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
++                      return true;
++              if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
++                      return true;
++              return false;
++      }
++#endif
++
++#ifdef CONFIG_PAX_SEGMEXEC
++      if (mm->pax_flags & MF_PAX_SEGMEXEC) {
++              if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
++                      return true;
++              return false;
++      }
++#endif
++
++      return false;
++}
++#endif
++
 +#ifdef CONFIG_PAX_EMUTRAMP
 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
 +{
@@ -19484,14 +20448,14 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
 +#endif
 +
 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+void pax_report_insns(void *pc, void *sp)
++void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
 +{
 +      long i;
 +
 +      printk(KERN_ERR "PAX: bytes at PC: ");
 +      for (i = 0; i < 20; i++) {
 +              unsigned char c;
-+              if (get_user(c, (__force unsigned char __user *)pc+i))
++              if (get_user(c, (unsigned char __force_user *)pc+i))
 +                      printk(KERN_CONT "?? ");
 +              else
 +                      printk(KERN_CONT "%02x ", c);
@@ -19501,14 +20465,24 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
 +      printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
 +      for (i = -1; i < 80 / (long)sizeof(long); i++) {
 +              unsigned long c;
-+              if (get_user(c, (__force unsigned long __user *)sp+i))
++              if (get_user(c, (unsigned long __force_user *)sp+i)) {
 +#ifdef CONFIG_X86_32
 +                      printk(KERN_CONT "???????? ");
 +#else
-+                      printk(KERN_CONT "???????????????? ");
++                      if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
++                              printk(KERN_CONT "???????? ???????? ");
++                      else
++                              printk(KERN_CONT "???????????????? ");
 +#endif
-+              else
-+                      printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
++              } else {
++#ifdef CONFIG_X86_64
++                      if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
++                              printk(KERN_CONT "%08x ", (unsigned int)c);
++                              printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
++                      } else
++#endif
++                              printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
++              }
 +      }
 +      printk("\n");
 +}
@@ -19531,17 +20505,17 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
 +      set_fs(KERNEL_DS);
 +      pagefault_disable();
 +      pax_open_kernel();
-+      ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
++      ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
 +      pax_close_kernel();
 +      pagefault_enable();
 +      set_fs(old_fs);
 +
 +      return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
---- linux-3.0.4/arch/x86/mm/gup.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/gup.c      2011-08-23 21:47:55.000000000 -0400
-@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
+diff -urNp linux-3.1.1/arch/x86/mm/gup.c linux-3.1.1/arch/x86/mm/gup.c
+--- linux-3.1.1/arch/x86/mm/gup.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/gup.c      2011-11-16 18:39:07.000000000 -0500
+@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long 
        addr = start;
        len = (unsigned long) nr_pages << PAGE_SHIFT;
        end = start + len;
@@ -19550,9 +20524,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
                                        (void __user *)start, len)))
                return 0;
  
-diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_32.c
---- linux-3.0.4/arch/x86/mm/highmem_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/highmem_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/highmem_32.c linux-3.1.1/arch/x86/mm/highmem_32.c
+--- linux-3.1.1/arch/x86/mm/highmem_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/highmem_32.c       2011-11-16 18:39:07.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);
@@ -19564,9 +20538,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_
  
        return (void *)vaddr;
  }
-diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlbpage.c
---- linux-3.0.4/arch/x86/mm/hugetlbpage.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/hugetlbpage.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/hugetlbpage.c linux-3.1.1/arch/x86/mm/hugetlbpage.c
+--- linux-3.1.1/arch/x86/mm/hugetlbpage.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/hugetlbpage.c      2011-11-16 18:39:07.000000000 -0500
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
@@ -19774,9 +20748,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlb
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/arch/x86/mm/init_32.c
---- linux-3.0.4/arch/x86/mm/init_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/init_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/init_32.c linux-3.1.1/arch/x86/mm/init_32.c
+--- linux-3.1.1/arch/x86/mm/init_32.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init_32.c  2011-11-16 18:39:07.000000000 -0500
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -20051,9 +21025,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/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-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
---- linux-3.0.4/arch/x86/mm/init_64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/init_64.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/init_64.c linux-3.1.1/arch/x86/mm/init_64.c
+--- linux-3.1.1/arch/x86/mm/init_64.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init_64.c  2011-11-16 18:39:07.000000000 -0500
 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -20132,6 +21106,24 @@ diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
                }
                pmd = pmd_offset(pud, phys);
                BUG_ON(!pmd_none(*pmd));
+@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsign
+       if (pfn >= pgt_buf_top)
+               panic("alloc_low_page: ran out of memory");
+ 
+-      adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
++      adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
+       clear_page(adr);
+       *phys  = pfn * PAGE_SIZE;
+       return adr;
+@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *vi
+ 
+       phys = __pa(virt);
+       left = phys & (PAGE_SIZE - 1);
+-      adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
++      adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
+       adr = (void *)(((unsigned long)adr) | left);
+ 
+       return adr;
 @@ -693,6 +707,12 @@ void __init mem_init(void)
  
        pci_iommu_alloc();
@@ -20165,9 +21157,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
                return "[vdso]";
        if (vma == &gate_vma)
                return "[vsyscall]";
-diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
---- linux-3.0.4/arch/x86/mm/init.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/init.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/init.c linux-3.1.1/arch/x86/mm/init.c
+--- linux-3.1.1/arch/x86/mm/init.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/init.c     2011-11-17 18:31:28.000000000 -0500
 @@ -31,7 +31,7 @@ int direct_gbpages
  static void __init find_early_table_space(unsigned long end, int use_pse,
                                          int use_gbpages)
@@ -20177,7 +21169,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
        phys_addr_t base;
  
        puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
-@@ -313,12 +313,34 @@ unsigned long __init_refok init_memory_m
+@@ -312,8 +312,29 @@ unsigned long __init_refok init_memory_m
   */
  int devmem_is_allowed(unsigned long pagenr)
  {
@@ -20208,12 +21200,7 @@ diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
                return 0;
        if (!page_is_ram(pagenr))
-               return 1;
-+
-       return 0;
- }
- 
-@@ -373,6 +395,86 @@ void free_init_pages(char *what, unsigne
+@@ -372,6 +393,86 @@ void free_init_pages(char *what, unsigne
  
  void free_initmem(void)
  {
@@ -20300,9 +21287,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
        free_init_pages("unused kernel memory",
                        (unsigned long)(&__init_begin),
                        (unsigned long)(&__init_end));
-diff -urNp linux-3.0.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
---- linux-3.0.4/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/iomap_32.c linux-3.1.1/arch/x86/mm/iomap_32.c
+--- linux-3.1.1/arch/x86/mm/iomap_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/iomap_32.c 2011-11-16 18:39:07.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();
@@ -20315,9 +21302,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
        arch_flush_lazy_mmu_mode();
  
        return (void *)vaddr;
-diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
---- linux-3.0.4/arch/x86/mm/ioremap.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/ioremap.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/ioremap.c linux-3.1.1/arch/x86/mm/ioremap.c
+--- linux-3.1.1/arch/x86/mm/ioremap.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/ioremap.c  2011-11-16 18:39:07.000000000 -0500
 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
        for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
                int is_ram = page_is_ram(pfn);
@@ -20346,9 +21333,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
  
        /*
         * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/kmemcheck/kmemcheck.c      2011-11-16 18:39:07.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.
@@ -20361,9 +21348,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm
                return false;
  
        pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
---- linux-3.0.4/arch/x86/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/mmap.c linux-3.1.1/arch/x86/mm/mmap.c
+--- linux-3.1.1/arch/x86/mm/mmap.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/mmap.c     2011-11-16 18:39:07.000000000 -0500
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -20445,9 +21432,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
---- linux-3.0.4/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/mmio-mod.c linux-3.1.1/arch/x86/mm/mmio-mod.c
+--- linux-3.1.1/arch/x86/mm/mmio-mod.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/mmio-mod.c 2011-11-16 18:39:07.000000000 -0500
 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
                break;
        default:
@@ -20475,9 +21462,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
        };
        map.map_id = trace->id;
  
-diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
---- linux-3.0.4/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pageattr.c linux-3.1.1/arch/x86/mm/pageattr.c
+--- linux-3.1.1/arch/x86/mm/pageattr.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pageattr.c 2011-11-16 18:39:07.000000000 -0500
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
         */
  #ifdef CONFIG_PCI_BIOS
@@ -20562,9 +21549,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
  }
  
  static int
-diff -urNp linux-3.0.4/arch/x86/mm/pageattr-test.c linux-3.0.4/arch/x86/mm/pageattr-test.c
---- linux-3.0.4/arch/x86/mm/pageattr-test.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pageattr-test.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pageattr-test.c linux-3.1.1/arch/x86/mm/pageattr-test.c
+--- linux-3.1.1/arch/x86/mm/pageattr-test.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pageattr-test.c    2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -20574,9 +21561,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pageattr-test.c linux-3.0.4/arch/x86/mm/pagea
  }
  
  struct split_state {
-diff -urNp linux-3.0.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
---- linux-3.0.4/arch/x86/mm/pat.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pat.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pat.c linux-3.1.1/arch/x86/mm/pat.c
+--- linux-3.1.1/arch/x86/mm/pat.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pat.c      2011-11-16 18:39:07.000000000 -0500
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
        if (!entry) {
@@ -20624,9 +21611,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
                                cattr_name(want_flags),
                                (unsigned long long)paddr,
                                (unsigned long long)(paddr + size),
-diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
---- linux-3.0.4/arch/x86/mm/pf_in.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pf_in.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pf_in.c linux-3.1.1/arch/x86/mm/pf_in.c
+--- linux-3.1.1/arch/x86/mm/pf_in.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pf_in.c    2011-11-16 18:39:07.000000000 -0500
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
        int i;
        enum reason_type rv = OTHERS;
@@ -20672,9 +21659,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
        p += skip_prefix(p, &prf);
        p += get_opcode(p, &opcode);
        for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-3.0.4/arch/x86/mm/pgtable_32.c linux-3.0.4/arch/x86/mm/pgtable_32.c
---- linux-3.0.4/arch/x86/mm/pgtable_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pgtable_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pgtable_32.c linux-3.1.1/arch/x86/mm/pgtable_32.c
+--- linux-3.1.1/arch/x86/mm/pgtable_32.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pgtable_32.c       2011-11-16 18:39:07.000000000 -0500
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
                return;
        }
@@ -20689,9 +21676,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pgtable_32.c linux-3.0.4/arch/x86/mm/pgtable_
  
        /*
         * It's enough to flush this one mapping.
-diff -urNp linux-3.0.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
---- linux-3.0.4/arch/x86/mm/pgtable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pgtable.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/pgtable.c linux-3.1.1/arch/x86/mm/pgtable.c
+--- linux-3.1.1/arch/x86/mm/pgtable.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/pgtable.c  2011-11-16 18:39:07.000000000 -0500
 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
        list_del(&page->lru);
  }
@@ -20937,9 +21924,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
        pgd_dtor(pgd);
        paravirt_pgd_free(mm, pgd);
        free_page((unsigned long)pgd);
-diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
---- linux-3.0.4/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/setup_nx.c linux-3.1.1/arch/x86/mm/setup_nx.c
+--- linux-3.1.1/arch/x86/mm/setup_nx.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/setup_nx.c 2011-11-16 18:39:07.000000000 -0500
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -20969,9 +21956,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
                __supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
---- linux-3.0.4/arch/x86/mm/tlb.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/tlb.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/mm/tlb.c linux-3.1.1/arch/x86/mm/tlb.c
+--- linux-3.1.1/arch/x86/mm/tlb.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/mm/tlb.c      2011-11-16 18:39:07.000000000 -0500
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
                BUG();
        cpumask_clear_cpu(cpu,
@@ -20984,9 +21971,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-3.0.4/arch/x86/net/bpf_jit_comp.c linux-3.0.4/arch/x86/net/bpf_jit_comp.c
---- linux-3.0.4/arch/x86/net/bpf_jit_comp.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/net/bpf_jit_comp.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/net/bpf_jit_comp.c linux-3.1.1/arch/x86/net/bpf_jit_comp.c
+--- linux-3.1.1/arch/x86/net/bpf_jit_comp.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/net/bpf_jit_comp.c    2011-11-16 18:39:07.000000000 -0500
 @@ -589,7 +589,9 @@ cond_branch:                       f_offset = addrs[i + filt
                                        module_free(NULL, image);
                                        return;
@@ -21006,10 +21993,113 @@ diff -urNp linux-3.0.4/arch/x86/net/bpf_jit_comp.c linux-3.0.4/arch/x86/net/bpf_
                                                   proglen,
                                                   sizeof(struct work_struct)));
                        if (!image)
-diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofile/backtrace.c
---- linux-3.0.4/arch/x86/oprofile/backtrace.c  2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/x86/oprofile/backtrace.c  2011-08-23 21:47:55.000000000 -0400
-@@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
+diff -urNp linux-3.1.1/arch/x86/net/bpf_jit.S linux-3.1.1/arch/x86/net/bpf_jit.S
+--- linux-3.1.1/arch/x86/net/bpf_jit.S 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/net/bpf_jit.S 2011-11-16 18:39:07.000000000 -0500
+@@ -9,6 +9,7 @@
+  */
+ #include <linux/linkage.h>
+ #include <asm/dwarf2.h>
++#include <asm/alternative-asm.h>
+ 
+ /*
+  * Calling convention :
+@@ -35,6 +36,7 @@ sk_load_word:
+       jle     bpf_slow_path_word
+       mov     (SKBDATA,%rsi),%eax
+       bswap   %eax                    /* ntohl() */
++      pax_force_retaddr
+       ret
+ 
+ 
+@@ -53,6 +55,7 @@ sk_load_half:
+       jle     bpf_slow_path_half
+       movzwl  (SKBDATA,%rsi),%eax
+       rol     $8,%ax                  # ntohs()
++      pax_force_retaddr
+       ret
+ 
+ sk_load_byte_ind:
+@@ -66,6 +69,7 @@ sk_load_byte:
+       cmp     %esi,%r9d   /* if (offset >= hlen) goto bpf_slow_path_byte */
+       jle     bpf_slow_path_byte
+       movzbl  (SKBDATA,%rsi),%eax
++      pax_force_retaddr
+       ret
+ 
+ /**
+@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
+       movzbl  (SKBDATA,%rsi),%ebx
+       and     $15,%bl
+       shl     $2,%bl
++      pax_force_retaddr
+       ret
+       CFI_ENDPROC
+ ENDPROC(sk_load_byte_msh)
+@@ -91,6 +96,7 @@ bpf_error:
+       xor             %eax,%eax
+       mov             -8(%rbp),%rbx
+       leaveq
++      pax_force_retaddr
+       ret
+ 
+ /* rsi contains offset and can be scratched */
+@@ -113,6 +119,7 @@ bpf_slow_path_word:
+       js      bpf_error
+       mov     -12(%rbp),%eax
+       bswap   %eax
++      pax_force_retaddr
+       ret
+ 
+ bpf_slow_path_half:
+@@ -121,12 +128,14 @@ bpf_slow_path_half:
+       mov     -12(%rbp),%ax
+       rol     $8,%ax
+       movzwl  %ax,%eax
++      pax_force_retaddr
+       ret
+ 
+ bpf_slow_path_byte:
+       bpf_slow_path_common(1)
+       js      bpf_error
+       movzbl  -12(%rbp),%eax
++      pax_force_retaddr
+       ret
+ 
+ bpf_slow_path_byte_msh:
+@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
+       and     $15,%al
+       shl     $2,%al
+       xchg    %eax,%ebx
++      pax_force_retaddr
+       ret
+diff -urNp linux-3.1.1/arch/x86/oprofile/backtrace.c linux-3.1.1/arch/x86/oprofile/backtrace.c
+--- linux-3.1.1/arch/x86/oprofile/backtrace.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/oprofile/backtrace.c  2011-11-16 18:39:07.000000000 -0500
+@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_fram
+       struct stack_frame_ia32 *fp;
+       unsigned long bytes;
+ 
+-      bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
++      bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
+       if (bytes != sizeof(bufhead))
+               return NULL;
+ 
+-      fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
++      fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
+ 
+       oprofile_add_trace(bufhead[0].return_address);
+ 
+@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_bac
+       struct stack_frame bufhead[2];
+       unsigned long bytes;
+ 
+-      bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
++      bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
+       if (bytes != sizeof(bufhead))
+               return NULL;
+ 
+@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const reg
  {
        struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
  
@@ -21018,9 +22108,9 @@ diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofi
                unsigned long stack = kernel_stack_pointer(regs);
                if (depth)
                        dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
---- linux-3.0.4/arch/x86/pci/mrst.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/pci/mrst.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/pci/mrst.c linux-3.1.1/arch/x86/pci/mrst.c
+--- linux-3.1.1/arch/x86/pci/mrst.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/pci/mrst.c    2011-11-16 18:39:07.000000000 -0500
 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
        printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
        pci_mmcfg_late_init();
@@ -21032,9 +22122,9 @@ diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
        /* Continue with standard init */
        return 1;
  }
-diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
---- linux-3.0.4/arch/x86/pci/pcbios.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/pci/pcbios.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/pci/pcbios.c linux-3.1.1/arch/x86/pci/pcbios.c
+--- linux-3.1.1/arch/x86/pci/pcbios.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/pci/pcbios.c  2011-11-16 18:39:07.000000000 -0500
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
        unsigned long address;
@@ -21170,7 +22260,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        : "memory");
                local_irq_restore(flags);
  
-@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int se
+@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int se
  
        switch (len) {
        case 1:
@@ -21182,7 +22272,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int se
+@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_BYTE),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21192,7 +22282,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                /*
                 * Zero-extend the result beyond 8 bits, do not trust the
                 * BIOS having done it:
-@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int se
+@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int se
                *value &= 0xff;
                break;
        case 2:
@@ -21204,7 +22294,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int se
+@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_WORD),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21214,7 +22304,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                /*
                 * Zero-extend the result beyond 16 bits, do not trust the
                 * BIOS having done it:
-@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int se
+@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int se
                *value &= 0xffff;
                break;
        case 4:
@@ -21226,7 +22316,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int se
+@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_DWORD),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21236,7 +22326,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                break;
        }
  
-@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int s
+@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int s
  
        switch (len) {
        case 1:
@@ -21248,7 +22338,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int s
+@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21265,7 +22355,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int s
+@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21282,7 +22372,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int s
+@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -21292,7 +22382,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                break;
        }
  
-@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_i
+@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_i
  
        DBG("PCI: Fetching IRQ routing table... ");
        __asm__("push %%es\n\t"
@@ -21307,7 +22397,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                "jc 1f\n\t"
                "xor %%ah, %%ah\n"
                "1:"
-@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_i
+@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_i
                  "1" (0),
                  "D" ((long) &opt),
                  "S" (&pci_indirect),
@@ -21317,7 +22407,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                : "memory");
        DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
        if (ret & 0xff00)
-@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_d
  {
        int ret;
  
@@ -21329,7 +22419,7 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
                "jc 1f\n\t"
                "xor %%ah, %%ah\n"
                "1:"
-@@ -438,7 +515,8 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_d
                : "0" (PCIBIOS_SET_PCI_HW_INT),
                  "b" ((dev->bus->number << 8) | dev->devfn),
                  "c" ((irq << 8) | (pin + 10)),
@@ -21339,9 +22429,9 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
        return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platform/efi/efi_32.c
---- linux-3.0.4/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_32.c 2011-09-19 09:16:58.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_32.c linux-3.1.1/arch/x86/platform/efi/efi_32.c
+--- linux-3.1.1/arch/x86/platform/efi/efi_32.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_32.c 2011-11-16 18:39:07.000000000 -0500
 @@ -38,70 +38,56 @@
   */
  
@@ -21396,9 +22486,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platf
  
 +#ifdef CONFIG_PAX_KERNEXEC
 +      pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
-+      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_EFI_CS, &d, DESCTYPE_S);
++      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
 +      pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
-+      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_EFI_DS, &d, DESCTYPE_S);
++      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
 +#endif
 +
        gdt_descr.address = __pa(get_cpu_gdt_table(0));
@@ -21416,8 +22506,8 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platf
 +      struct desc_struct d;
 +
 +      memset(&d, 0, sizeof d);
-+      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_EFI_CS, &d, DESCTYPE_S);
-+      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_EFI_DS, &d, DESCTYPE_S);
++      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
++      write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
 +#endif
 +
        gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
@@ -21439,9 +22529,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platf
  
        /*
         * After the lock is released, the original page table is restored.
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S    2011-09-19 09:16:58.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_stub_32.S    2011-11-16 18:39:07.000000000 -0500
 @@ -6,7 +6,9 @@
   */
  
@@ -21550,81 +22640,75 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/
  saved_return_addr:
        .long 0
  efi_rt_function_ptr:
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S
---- linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S    2011-09-17 18:31:51.000000000 -0400
-@@ -40,6 +40,9 @@ ENTRY(efi_call0)
+diff -urNp linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S
+--- linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/efi/efi_stub_64.S    2011-11-16 18:39:07.000000000 -0500
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <linux/linkage.h>
++#include <asm/alternative-asm.h>
+ 
+ #define SAVE_XMM                      \
+       mov %rsp, %rax;                 \
+@@ -40,6 +41,7 @@ ENTRY(efi_call0)
        call *%rdi
        addq $32, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call0)
  
-@@ -50,6 +53,9 @@ ENTRY(efi_call1)
+@@ -50,6 +52,7 @@ ENTRY(efi_call1)
        call *%rdi
        addq $32, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call1)
  
-@@ -60,6 +66,9 @@ ENTRY(efi_call2)
+@@ -60,6 +63,7 @@ ENTRY(efi_call2)
        call *%rdi
        addq $32, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call2)
  
-@@ -71,6 +80,9 @@ ENTRY(efi_call3)
+@@ -71,6 +75,7 @@ ENTRY(efi_call3)
        call *%rdi
        addq $32, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call3)
  
-@@ -83,6 +95,9 @@ ENTRY(efi_call4)
+@@ -83,6 +88,7 @@ ENTRY(efi_call4)
        call *%rdi
        addq $32, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call4)
  
-@@ -96,6 +111,9 @@ ENTRY(efi_call5)
+@@ -96,6 +102,7 @@ ENTRY(efi_call5)
        call *%rdi
        addq $48, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call5)
  
-@@ -112,5 +130,8 @@ ENTRY(efi_call6)
+@@ -112,5 +119,6 @@ ENTRY(efi_call6)
        call *%rdi
        addq $48, %rsp
        RESTORE_XMM
-+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+      orb $0x80, 0x7(%rsp)
-+#endif
++      pax_force_retaddr
        ret
  ENDPROC(efi_call6)
-diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platform/mrst/mrst.c
---- linux-3.0.4/arch/x86/platform/mrst/mrst.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/mrst/mrst.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/platform/mrst/mrst.c linux-3.1.1/arch/x86/platform/mrst/mrst.c
+--- linux-3.1.1/arch/x86/platform/mrst/mrst.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/mrst/mrst.c  2011-11-16 18:39:07.000000000 -0500
 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
  }
  
@@ -21644,21 +22728,21 @@ diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platform/uv/tlb_uv.c
---- linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-08-23 21:48:14.000000000 -0400
-@@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta
-       cpumask_t mask;
+diff -urNp linux-3.1.1/arch/x86/platform/uv/tlb_uv.c linux-3.1.1/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.1.1/arch/x86/platform/uv/tlb_uv.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/platform/uv/tlb_uv.c  2011-11-16 19:39:11.000000000 -0500
+@@ -377,6 +377,8 @@ static void reset_with_ipi(struct pnmask
+       struct bau_control *smaster = bcp->socket_master;
        struct reset_args reset_args;
  
 +      pax_track_stack();
 +
        reset_args.sender = sender;
-       cpus_clear(mask);
+       cpus_clear(*mask);
        /* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
---- linux-3.0.4/arch/x86/power/cpu.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/power/cpu.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/power/cpu.c linux-3.1.1/arch/x86/power/cpu.c
+--- linux-3.1.1/arch/x86/power/cpu.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/power/cpu.c   2011-11-16 18:39:07.000000000 -0500
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -21678,10 +22762,10 @@ diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
  
        syscall_init();                         /* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
---- linux-3.0.4/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400
-@@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO    $@
+diff -urNp linux-3.1.1/arch/x86/vdso/Makefile linux-3.1.1/arch/x86/vdso/Makefile
+--- linux-3.1.1/arch/x86/vdso/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/Makefile 2011-11-16 18:39:07.000000000 -0500
+@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO    $@
                       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
                 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
@@ -21690,9 +22774,9 @@ diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vdso32-setup.c
---- linux-3.0.4/arch/x86/vdso/vdso32-setup.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/vdso32-setup.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/vdso/vdso32-setup.c linux-3.1.1/arch/x86/vdso/vdso32-setup.c
+--- linux-3.1.1/arch/x86/vdso/vdso32-setup.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/vdso32-setup.c   2011-11-16 18:39:07.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -21775,100 +22859,58 @@ diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vd
                return &gate_vma;
        return NULL;
  }
-diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
---- linux-3.0.4/arch/x86/vdso/vma.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/vma.c    2011-08-23 21:47:55.000000000 -0400
-@@ -15,18 +15,19 @@
- #include <asm/proto.h>
+diff -urNp linux-3.1.1/arch/x86/vdso/vma.c linux-3.1.1/arch/x86/vdso/vma.c
+--- linux-3.1.1/arch/x86/vdso/vma.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/vdso/vma.c    2011-11-16 18:39:07.000000000 -0500
+@@ -16,8 +16,6 @@
  #include <asm/vdso.h>
+ #include <asm/page.h>
  
 -unsigned int __read_mostly vdso_enabled = 1;
 -
  extern char vdso_start[], vdso_end[];
  extern unsigned short vdso_sync_cpuid;
-+extern char __vsyscall_0;
  
- static struct page **vdso_pages;
-+static struct page *vsyscall_page;
- static unsigned vdso_size;
- 
- static int __init init_vdso_vars(void)
+@@ -97,13 +95,15 @@ static unsigned long vdso_addr(unsigned 
+ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  {
--      int npages = (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE;
--      int i;
-+      size_t nbytes = vdso_end - vdso_start;
-+      size_t npages = (nbytes + PAGE_SIZE - 1) / PAGE_SIZE;
-+      size_t i;
- 
-       vdso_size = npages << PAGE_SHIFT;
-       vdso_pages = kmalloc(sizeof(struct page *) * npages, GFP_KERNEL);
-@@ -34,19 +35,19 @@ static int __init init_vdso_vars(void)
-               goto oom;
-       for (i = 0; i < npages; i++) {
-               struct page *p;
--              p = alloc_page(GFP_KERNEL);
-+              p = alloc_page(GFP_KERNEL | __GFP_ZERO);
-               if (!p)
-                       goto oom;
-               vdso_pages[i] = p;
--              copy_page(page_address(p), vdso_start + i*PAGE_SIZE);
-+              memcpy(page_address(p), vdso_start + i*PAGE_SIZE, nbytes > PAGE_SIZE ? PAGE_SIZE : nbytes);
-+              nbytes -= PAGE_SIZE;
-       }
-+      vsyscall_page = pfn_to_page((__pa_symbol(&__vsyscall_0)) >> PAGE_SHIFT);
- 
-       return 0;
- 
-  oom:
--      printk("Cannot allocate vdso\n");
--      vdso_enabled = 0;
--      return -ENOMEM;
-+      panic("Cannot allocate vdso\n");
- }
- subsys_initcall(init_vdso_vars);
- 
-@@ -80,37 +81,35 @@ int arch_setup_additional_pages(struct l
-       unsigned long addr;
+       struct mm_struct *mm = current->mm;
+-      unsigned long addr;
++      unsigned long addr = 0;
        int ret;
  
 -      if (!vdso_enabled)
 -              return 0;
 -
        down_write(&mm->mmap_sem);
--      addr = vdso_addr(mm->start_stack, vdso_size);
--      addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
-+      addr = vdso_addr(mm->start_stack, vdso_size + PAGE_SIZE);
-+      addr = get_unmapped_area(NULL, addr, vdso_size + PAGE_SIZE, 0, 0);
++
++#ifdef CONFIG_PAX_RANDMMAP
++      if (!(mm->pax_flags & MF_PAX_RANDMMAP))
++#endif
++
+       addr = vdso_addr(mm->start_stack, vdso_size);
+       addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
        if (IS_ERR_VALUE(addr)) {
-               ret = addr;
+@@ -111,26 +111,18 @@ int arch_setup_additional_pages(struct l
                goto up_fail;
        }
  
 -      current->mm->context.vdso = (void *)addr;
-+      mm->context.vdso = addr + PAGE_SIZE;
++      mm->context.vdso = addr;
  
--      ret = install_special_mapping(mm, addr, vdso_size,
-+      ret = install_special_mapping(mm, addr, PAGE_SIZE,
+       ret = install_special_mapping(mm, addr, vdso_size,
                                      VM_READ|VM_EXEC|
--                                    VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
-+                                    VM_MAYREAD|VM_MAYEXEC|
+                                     VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
                                      VM_ALWAYSDUMP,
--                                    vdso_pages);
-+                                    &vsyscall_page);
-       if (ret) {
+                                     vdso_pages);
+-      if (ret) {
 -              current->mm->context.vdso = NULL;
-+              mm->context.vdso = 0;
-               goto up_fail;
-       }
- 
-+      ret = install_special_mapping(mm, addr + PAGE_SIZE, vdso_size,
-+                                    VM_READ|VM_EXEC|
-+                                    VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
-+                                    VM_ALWAYSDUMP,
-+                                    vdso_pages);
+-              goto up_fail;
+-      }
++
 +      if (ret)
 +              mm->context.vdso = 0;
-+
+ 
  up_fail:
        up_write(&mm->mmap_sem);
        return ret;
@@ -21880,9 +22922,9 @@ diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
 -      return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlighten.c
---- linux-3.0.4/arch/x86/xen/enlighten.c       2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/enlighten.c       2011-08-29 23:26:21.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/xen/enlighten.c linux-3.1.1/arch/x86/xen/enlighten.c
+--- linux-3.1.1/arch/x86/xen/enlighten.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/enlighten.c       2011-11-16 18:39:07.000000000 -0500
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -21892,7 +22934,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
  RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
  __read_mostly int xen_have_vector_callback;
  EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -1010,7 +1008,7 @@ static const struct pv_apic_ops xen_apic
+@@ -1028,7 +1026,7 @@ static const struct pv_apic_ops xen_apic
  #endif
  };
  
@@ -21901,7 +22943,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
  {
        struct sched_shutdown r = { .reason = reason };
  
-@@ -1018,17 +1016,17 @@ static void xen_reboot(int reason)
+@@ -1036,17 +1034,17 @@ static void xen_reboot(int reason)
                BUG();
  }
  
@@ -21922,7 +22964,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
  {
        xen_reboot(SHUTDOWN_poweroff);
  }
-@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(
+@@ -1152,7 +1150,17 @@ asmlinkage void __init xen_start_kernel(
        __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
        /* Work out if we support NX */
@@ -21941,7 +22983,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
  
        xen_setup_features();
  
-@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1183,13 +1191,6 @@ asmlinkage void __init xen_start_kernel(
  
        machine_ops = xen_machine_ops;
  
@@ -21955,10 +22997,10 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
        xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
---- linux-3.0.4/arch/x86/xen/mmu.c     2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/mmu.c     2011-08-29 23:26:21.000000000 -0400
-@@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
+diff -urNp linux-3.1.1/arch/x86/xen/mmu.c linux-3.1.1/arch/x86/xen/mmu.c
+--- linux-3.1.1/arch/x86/xen/mmu.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/mmu.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1768,6 +1768,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
        convert_pfn_mfn(init_level4_pgt);
        convert_pfn_mfn(level3_ident_pgt);
        convert_pfn_mfn(level3_kernel_pgt);
@@ -21967,7 +23009,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
  
        l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
        l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1701,7 +1703,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
+@@ -1786,7 +1788,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
        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);
@@ -21978,7 +23020,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
        set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
        set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-@@ -1913,6 +1918,7 @@ static void __init xen_post_allocator_in
+@@ -2000,6 +2005,7 @@ static void __init xen_post_allocator_in
        pv_mmu_ops.set_pud = xen_set_pud;
  #if PAGETABLE_LEVELS == 4
        pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -21986,7 +23028,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
  #endif
  
        /* This will work as long as patching hasn't happened yet
-@@ -1994,6 +2000,7 @@ static const struct pv_mmu_ops xen_mmu_o
+@@ -2081,6 +2087,7 @@ static const struct pv_mmu_ops xen_mmu_o
        .pud_val = PV_CALLEE_SAVE(xen_pud_val),
        .make_pud = PV_CALLEE_SAVE(xen_make_pud),
        .set_pgd = xen_set_pgd_hyper,
@@ -21994,10 +23036,10 @@ diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
  
        .alloc_pud = xen_alloc_pmd_init,
        .release_pud = xen_release_pmd_init,
-diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
---- linux-3.0.4/arch/x86/xen/smp.c     2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/smp.c     2011-08-29 23:26:21.000000000 -0400
-@@ -193,11 +193,6 @@ static void __init xen_smp_prepare_boot_
+diff -urNp linux-3.1.1/arch/x86/xen/smp.c linux-3.1.1/arch/x86/xen/smp.c
+--- linux-3.1.1/arch/x86/xen/smp.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/smp.c     2011-11-16 18:39:07.000000000 -0500
+@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
        BUG_ON(smp_processor_id() != 0);
        native_smp_prepare_boot_cpu();
@@ -22009,7 +23051,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
        xen_filter_cpu_maps();
        xen_setup_vcpu_info_placement();
  }
-@@ -265,12 +260,12 @@ cpu_initialize_context(unsigned int cpu,
+@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu,
        gdt = get_cpu_gdt_table(cpu);
  
        ctxt->flags = VGCF_IN_KERNEL;
@@ -22025,7 +23067,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
  #else
        ctxt->gs_base_kernel = per_cpu_offset(cpu);
  #endif
-@@ -321,13 +316,12 @@ static int __cpuinit xen_cpu_up(unsigned
+@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned
        int rc;
  
        per_cpu(current_task, cpu) = idle;
@@ -22041,9 +23083,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
  #endif
        xen_setup_runstate_info(cpu);
        xen_setup_timer(cpu);
-diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-asm_32.S
---- linux-3.0.4/arch/x86/xen/xen-asm_32.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-asm_32.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/xen/xen-asm_32.S linux-3.1.1/arch/x86/xen/xen-asm_32.S
+--- linux-3.1.1/arch/x86/xen/xen-asm_32.S      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-asm_32.S      2011-11-16 18:39:07.000000000 -0500
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
        ESP_OFFSET=4    # bytes pushed onto stack
  
@@ -22065,9 +23107,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-as
  #else
        movl xen_vcpu, %eax
  #endif
-diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head.S
---- linux-3.0.4/arch/x86/xen/xen-head.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-head.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/xen/xen-head.S linux-3.1.1/arch/x86/xen/xen-head.S
+--- linux-3.1.1/arch/x86/xen/xen-head.S        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-head.S        2011-11-16 18:39:07.000000000 -0500
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
        mov %esi,xen_start_info
@@ -22086,9 +23128,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head
  #else
        mov %rsi,xen_start_info
        mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
---- linux-3.0.4/arch/x86/xen/xen-ops.h 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/arch/x86/xen/xen-ops.h linux-3.1.1/arch/x86/xen/xen-ops.h
+--- linux-3.1.1/arch/x86/xen/xen-ops.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/arch/x86/xen/xen-ops.h 2011-11-16 18:39:07.000000000 -0500
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -22098,9 +23140,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
---- linux-3.0.4/block/blk-iopoll.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-iopoll.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/block/blk-iopoll.c linux-3.1.1/block/blk-iopoll.c
+--- linux-3.1.1/block/blk-iopoll.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-iopoll.c     2011-11-16 18:39:07.000000000 -0500
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -22110,9 +23152,9 @@ diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
  {
        struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
        int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
---- linux-3.0.4/block/blk-map.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-map.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/block/blk-map.c linux-3.1.1/block/blk-map.c
+--- linux-3.1.1/block/blk-map.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-map.c        2011-11-16 18:39:07.000000000 -0500
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
        if (!len || !kbuf)
                return -EINVAL;
@@ -22122,9 +23164,9 @@ diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
        if (do_copy)
                bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
        else
-diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
---- linux-3.0.4/block/blk-softirq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-softirq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/block/blk-softirq.c linux-3.1.1/block/blk-softirq.c
+--- linux-3.1.1/block/blk-softirq.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/blk-softirq.c    2011-11-16 18:39:07.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.
@@ -22134,9 +23176,9 @@ diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
  {
        struct list_head *cpu_list, local_list;
  
-diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
---- linux-3.0.4/block/bsg.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/bsg.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/block/bsg.c linux-3.1.1/block/bsg.c
+--- linux-3.1.1/block/bsg.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/bsg.c    2011-11-16 18:39:07.000000000 -0500
 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
                                struct sg_io_v4 *hdr, struct bsg_device *bd,
                                fmode_t has_write_perm)
@@ -22153,8 +23195,8 @@ diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
 +      } else
 +              cmdptr = tmpcmd;
  
--      if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,
-+      if (copy_from_user(cmdptr, (void *)(unsigned long)hdr->request,
+-      if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
++      if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
                           hdr->request_len))
                return -EFAULT;
  
@@ -22164,9 +23206,21 @@ diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
        if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
                if (blk_verify_command(rq->cmd, has_write_perm))
                        return -EPERM;
-diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
---- linux-3.0.4/block/scsi_ioctl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/scsi_ioctl.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/block/compat_ioctl.c linux-3.1.1/block/compat_ioctl.c
+--- linux-3.1.1/block/compat_ioctl.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/compat_ioctl.c   2011-11-16 18:39:07.000000000 -0500
+@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_
+               err |= __get_user(f->spec1, &uf->spec1);
+               err |= __get_user(f->fmt_gap, &uf->fmt_gap);
+               err |= __get_user(name, &uf->name);
+-              f->name = compat_ptr(name);
++              f->name = (void __force_kernel *)compat_ptr(name);
+               if (err) {
+                       err = -EFAULT;
+                       goto out;
+diff -urNp linux-3.1.1/block/scsi_ioctl.c linux-3.1.1/block/scsi_ioctl.c
+--- linux-3.1.1/block/scsi_ioctl.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/block/scsi_ioctl.c     2011-11-16 18:39:07.000000000 -0500
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
                             struct sg_io_hdr *hdr, fmode_t mode)
@@ -22218,9 +23272,9 @@ diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
        if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
                goto error;
  
-diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
---- linux-3.0.4/crypto/cryptd.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/cryptd.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/crypto/cryptd.c linux-3.1.1/crypto/cryptd.c
+--- linux-3.1.1/crypto/cryptd.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/crypto/cryptd.c        2011-11-16 18:39:07.000000000 -0500
 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -22239,30 +23293,9 @@ diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
  
  static void cryptd_queue_worker(struct work_struct *work);
  
-diff -urNp linux-3.0.4/crypto/gf128mul.c linux-3.0.4/crypto/gf128mul.c
---- linux-3.0.4/crypto/gf128mul.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/gf128mul.c      2011-08-23 21:47:55.000000000 -0400
-@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
-       for (i = 0; i < 7; ++i)
-               gf128mul_x_lle(&p[i + 1], &p[i]);
- 
--      memset(r, 0, sizeof(r));
-+      memset(r, 0, sizeof(*r));
-       for (i = 0;;) {
-               u8 ch = ((u8 *)b)[15 - i];
- 
-@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128 
-       for (i = 0; i < 7; ++i)
-               gf128mul_x_bbe(&p[i + 1], &p[i]);
- 
--      memset(r, 0, sizeof(r));
-+      memset(r, 0, sizeof(*r));
-       for (i = 0;;) {
-               u8 ch = ((u8 *)b)[i];
- 
-diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
---- linux-3.0.4/crypto/serpent.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/serpent.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/crypto/serpent.c linux-3.1.1/crypto/serpent.c
+--- linux-3.1.1/crypto/serpent.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/crypto/serpent.c       2011-11-16 18:40:10.000000000 -0500
 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
        u32 r0,r1,r2,r3,r4;
        int i;
@@ -22272,9 +23305,9 @@ diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
        /* Copy key, add padding */
  
        for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
---- linux-3.0.4/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/Documentation/dontdiff 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/Documentation/dontdiff linux-3.1.1/Documentation/dontdiff
+--- linux-3.1.1/Documentation/dontdiff 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Documentation/dontdiff 2011-11-16 18:39:07.000000000 -0500
 @@ -5,6 +5,7 @@
  *.cis
  *.cpio
@@ -22303,7 +23336,13 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  SCCS
  System.map*
  TAGS
-@@ -98,6 +102,8 @@ bzImage*
+@@ -93,19 +97,24 @@ bounds.h
+ bsetup
+ btfixupprep
+ build
++builtin-policy.h
+ bvmlinux
+ bzImage*
  capability_names.h
  capflags.c
  classlist.h*
@@ -22312,7 +23351,25 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  comp*.log
  compile.h*
  conf
-@@ -126,12 +132,14 @@ fore200e_pca_fw.c*
+ config
+ config-*
+ config_data.h*
++config.c
+ config.mak
+ config.mak.autogen
++config.tmp
+ conmakehash
+ consolemap_deftbl.c*
+ cpustr.h
+@@ -119,6 +128,7 @@ dslm
+ elf2ecoff
+ elfconfig.h*
+ evergreen_reg_safe.h
++exception_policy.conf
+ fixdep
+ flask.h
+ fore200e_mkfirm
+@@ -126,12 +136,14 @@ fore200e_pca_fw.c*
  gconf
  gconf.glade.h
  gen-devlist
@@ -22327,15 +23384,16 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  hpet_example
  hugepage-mmap
  hugepage-shm
-@@ -146,7 +154,6 @@ int32.c
+@@ -146,7 +158,7 @@ int32.c
  int4.c
  int8.c
  kallsyms
 -kconfig
++kern_constants.h
  keywords.c
  ksym.c*
  ksym.h*
-@@ -154,7 +161,6 @@ kxgettext
+@@ -154,7 +166,6 @@ kxgettext
  lkc_defs.h
  lex.c
  lex.*.c
@@ -22343,7 +23401,15 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  logo_*.c
  logo_*_clut224.c
  logo_*_mono.c
-@@ -174,6 +180,7 @@ mkboot
+@@ -166,7 +177,6 @@ machtypes.h
+ map
+ map_hugetlb
+ maui_boot.h
+-media
+ mconf
+ miboot*
+ mk_elfconfig
+@@ -174,6 +184,7 @@ mkboot
  mkbugboot
  mkcpustr
  mkdep
@@ -22351,7 +23417,7 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  mkprep
  mkregtable
  mktables
-@@ -209,6 +216,7 @@ r300_reg_safe.h
+@@ -209,6 +220,7 @@ r300_reg_safe.h
  r420_reg_safe.h
  r600_reg_safe.h
  recordmcount
@@ -22359,7 +23425,7 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  relocs
  rlim_names.h
  rn50_reg_safe.h
-@@ -219,6 +227,7 @@ setup
+@@ -219,6 +231,7 @@ setup
  setup.bin
  setup.elf
  sImage
@@ -22367,7 +23433,15 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  sm_tbl*
  split-include
  syscalltab.h
-@@ -246,7 +255,9 @@ vmlinux
+@@ -229,6 +242,7 @@ tftpboot.img
+ timeconst.h
+ times.h*
+ trix_boot.h
++user_constants.h
+ utsrelease.h*
+ vdso-syms.lds
+ vdso.lds
+@@ -246,7 +260,9 @@ vmlinux
  vmlinux-*
  vmlinux.aout
  vmlinux.bin.all
@@ -22377,7 +23451,7 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  vmlinuz
  voffset.h
  vsyscall.lds
-@@ -254,6 +265,7 @@ vsyscall_32.lds
+@@ -254,9 +270,11 @@ vsyscall_32.lds
  wanxlfw.inc
  uImage
  unifdef
@@ -22385,10 +23459,14 @@ diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-3.0.4/Documentation/kernel-parameters.txt linux-3.0.4/Documentation/kernel-parameters.txt
---- linux-3.0.4/Documentation/kernel-parameters.txt    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/Documentation/kernel-parameters.txt    2011-08-23 21:47:55.000000000 -0400
-@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
+ zImage*
+ zconf.hash.c
++zconf.lex.c
+ zoffset.h
+diff -urNp linux-3.1.1/Documentation/kernel-parameters.txt linux-3.1.1/Documentation/kernel-parameters.txt
+--- linux-3.1.1/Documentation/kernel-parameters.txt    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Documentation/kernel-parameters.txt    2011-11-16 18:39:07.000000000 -0500
+@@ -1898,6 +1898,13 @@ bytes respectively. Such letter suffixes
                        the specified number of seconds.  This is to be used if
                        your oopses keep scrolling off the screen.
  
@@ -22402,9 +23480,9 @@ diff -urNp linux-3.0.4/Documentation/kernel-parameters.txt linux-3.0.4/Documenta
        pcbit=          [HW,ISDN]
  
        pcd.            [PARIDE]
-diff -urNp linux-3.0.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cper.c
---- linux-3.0.4/drivers/acpi/apei/cper.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/apei/cper.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/acpi/apei/cper.c linux-3.1.1/drivers/acpi/apei/cper.c
+--- linux-3.1.1/drivers/acpi/apei/cper.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/apei/cper.c       2011-11-16 18:39:07.000000000 -0500
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -22422,9 +23500,9 @@ diff -urNp linux-3.0.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cp
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
---- linux-3.0.4/drivers/acpi/ec_sys.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/ec_sys.c  2011-08-24 19:06:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/acpi/ec_sys.c linux-3.1.1/drivers/acpi/ec_sys.c
+--- linux-3.1.1/drivers/acpi/ec_sys.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/ec_sys.c  2011-11-16 18:39:07.000000000 -0500
 @@ -11,6 +11,7 @@
  #include <linux/kernel.h>
  #include <linux/acpi.h>
@@ -22474,9 +23552,9 @@ diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
                err = ec_write(*off, byte_write);
                if (err)
                        return err;
-diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
---- linux-3.0.4/drivers/acpi/proc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/proc.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/acpi/proc.c linux-3.1.1/drivers/acpi/proc.c
+--- linux-3.1.1/drivers/acpi/proc.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/proc.c    2011-11-16 18:39:07.000000000 -0500
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
                                size_t count, loff_t * ppos)
  {
@@ -22511,9 +23589,9 @@ diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
                        if (device_can_wakeup(&dev->dev)) {
                                bool enable = !device_may_wakeup(&dev->dev);
                                device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/processor_driver.c
---- linux-3.0.4/drivers/acpi/processor_driver.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/processor_driver.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/acpi/processor_driver.c linux-3.1.1/drivers/acpi/processor_driver.c
+--- linux-3.1.1/drivers/acpi/processor_driver.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/acpi/processor_driver.c        2011-11-16 18:39:07.000000000 -0500
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
                return 0;
  #endif
@@ -22523,10 +23601,10 @@ diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/
  
        /*
         * Buggy BIOS check
-diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-core.c
---- linux-3.0.4/drivers/ata/libata-core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/libata-core.c      2011-08-23 21:47:55.000000000 -0400
-@@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
+diff -urNp linux-3.1.1/drivers/ata/libata-core.c linux-3.1.1/drivers/ata/libata-core.c
+--- linux-3.1.1/drivers/ata/libata-core.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/libata-core.c      2011-11-16 18:39:07.000000000 -0500
+@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *
        struct ata_port *ap;
        unsigned int tag;
  
@@ -22535,7 +23613,7 @@ diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-
        ap = qc->ap;
  
        qc->flags = 0;
-@@ -4769,7 +4769,7 @@ void __ata_qc_complete(struct ata_queued
+@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued
        struct ata_port *ap;
        struct ata_link *link;
  
@@ -22544,7 +23622,7 @@ diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-
        WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
        ap = qc->ap;
        link = qc->dev->link;
-@@ -5774,6 +5774,7 @@ static void ata_finalize_port_ops(struct
+@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct
                return;
  
        spin_lock(&lock);
@@ -22552,7 +23630,7 @@ diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-
  
        for (cur = ops->inherits; cur; cur = cur->inherits) {
                void **inherit = (void **)cur;
-@@ -5787,8 +5788,9 @@ static void ata_finalize_port_ops(struct
+@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct
                if (IS_ERR(*pp))
                        *pp = NULL;
  
@@ -22563,10 +23641,10 @@ diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-
        spin_unlock(&lock);
  }
  
-diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh.c
---- linux-3.0.4/drivers/ata/libata-eh.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/libata-eh.c        2011-08-23 21:48:14.000000000 -0400
-@@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
+diff -urNp linux-3.1.1/drivers/ata/libata-eh.c linux-3.1.1/drivers/ata/libata-eh.c
+--- linux-3.1.1/drivers/ata/libata-eh.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/libata-eh.c        2011-11-16 18:40:10.000000000 -0500
+@@ -2515,6 +2515,8 @@ void ata_eh_report(struct ata_port *ap)
  {
        struct ata_link *link;
  
@@ -22575,9 +23653,9 @@ diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh
        ata_for_each_link(link, ap, HOST_FIRST)
                ata_eh_link_report(link);
  }
-diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata_arasan_cf.c
---- linux-3.0.4/drivers/ata/pata_arasan_cf.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/pata_arasan_cf.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/ata/pata_arasan_cf.c linux-3.1.1/drivers/ata/pata_arasan_cf.c
+--- linux-3.1.1/drivers/ata/pata_arasan_cf.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ata/pata_arasan_cf.c   2011-11-16 18:39:07.000000000 -0500
 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
        /* Handle platform specific quirks */
        if (pdata->quirk) {
@@ -22589,9 +23667,9 @@ diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata
                        ap->pio_mask = 0;
                }
                if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
---- linux-3.0.4/drivers/atm/adummy.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/adummy.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/adummy.c linux-3.1.1/drivers/atm/adummy.c
+--- linux-3.1.1/drivers/atm/adummy.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/adummy.c   2011-11-16 18:39:07.000000000 -0500
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
                vcc->pop(vcc, skb);
        else
@@ -22601,9 +23679,9 @@ diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
  
        return 0;
  }
-diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassador.c
---- linux-3.0.4/drivers/atm/ambassador.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/ambassador.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/ambassador.c linux-3.1.1/drivers/atm/ambassador.c
+--- linux-3.1.1/drivers/atm/ambassador.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/ambassador.c       2011-11-16 18:39:07.000000000 -0500
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -22631,7 +23709,7 @@ diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassad
        }
        
      } else {
-@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * at
+@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * at
    }
    
    if (check_area (skb->data, skb->len)) {
@@ -22640,9 +23718,9 @@ diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassad
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
---- linux-3.0.4/drivers/atm/atmtcp.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/atmtcp.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/atmtcp.c linux-3.1.1/drivers/atm/atmtcp.c
+--- linux-3.1.1/drivers/atm/atmtcp.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/atmtcp.c   2011-11-16 18:39:07.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);
@@ -22692,9 +23770,9 @@ diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
  done:
        if (vcc->pop) vcc->pop(vcc,skb);
        else dev_kfree_skb(skb);
-diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
---- linux-3.0.4/drivers/atm/eni.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/eni.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/eni.c linux-3.1.1/drivers/atm/eni.c
+--- linux-3.1.1/drivers/atm/eni.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/eni.c      2011-11-16 18:39:07.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);
@@ -22740,10 +23818,19 @@ diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
                wake_up(&eni_dev->tx_wait);
  dma_complete++;
        }
-diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestream.c
---- linux-3.0.4/drivers/atm/firestream.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/firestream.c       2011-08-23 21:47:55.000000000 -0400
-@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
+@@ -1568,7 +1568,7 @@ tx_complete++;
+ /*--------------------------------- entries ---------------------------------*/
+ 
+ 
+-static const char *media_name[] __devinitdata = {
++static const char *media_name[] __devinitconst = {
+     "MMF", "SMF", "MMF", "03?", /*  0- 3 */
+     "UTP", "05?", "06?", "07?", /*  4- 7 */
+     "TAXI","09?", "10?", "11?", /*  8-11 */
+diff -urNp linux-3.1.1/drivers/atm/firestream.c linux-3.1.1/drivers/atm/firestream.c
+--- linux-3.1.1/drivers/atm/firestream.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/firestream.c       2011-11-16 18:39:07.000000000 -0500
+@@ -750,7 +750,7 @@ static void process_txdone_queue (struct
                                }
                        }
  
@@ -22752,7 +23839,7 @@ diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestre
  
                        fs_dprintk (FS_DEBUG_TXMEM, "i");
                        fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -816,7 +816,7 @@ static void process_incoming (struct fs_
+@@ -817,7 +817,7 @@ static void process_incoming (struct fs_
  #endif
                                skb_put (skb, qe->p1 & 0xffff); 
                                ATM_SKB(skb)->vcc = atm_vcc;
@@ -22761,7 +23848,7 @@ diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestre
                                __net_timestamp(skb);
                                fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
                                atm_vcc->push (atm_vcc, skb);
-@@ -837,12 +837,12 @@ static void process_incoming (struct fs_
+@@ -838,12 +838,12 @@ static void process_incoming (struct fs_
                                kfree (pe);
                        }
                        if (atm_vcc)
@@ -22776,9 +23863,9 @@ diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestre
                        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-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
---- linux-3.0.4/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/fore200e.c linux-3.1.1/drivers/atm/fore200e.c
+--- linux-3.1.1/drivers/atm/fore200e.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/fore200e.c 2011-11-16 18:39:07.000000000 -0500
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
                /* check error condition */
@@ -22835,9 +23922,9 @@ diff -urNp linux-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
  
            fore200e->tx_sat++;
            DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
---- linux-3.0.4/drivers/atm/he.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/he.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/he.c linux-3.1.1/drivers/atm/he.c
+--- linux-3.1.1/drivers/atm/he.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/he.c       2011-11-16 18:39:07.000000000 -0500
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
                if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22919,10 +24006,10 @@ diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
  
        return 0;
  }
-diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
---- linux-3.0.4/drivers/atm/horizon.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/horizon.c  2011-08-23 21:47:55.000000000 -0400
-@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
+diff -urNp linux-3.1.1/drivers/atm/horizon.c linux-3.1.1/drivers/atm/horizon.c
+--- linux-3.1.1/drivers/atm/horizon.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/horizon.c  2011-11-16 18:39:07.000000000 -0500
+@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, 
        {
          struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
          // VC layer stats
@@ -22931,7 +24018,7 @@ diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
          __net_timestamp(skb);
          // end of our responsibility
          vcc->push (vcc, skb);
-@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const
+@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const
        dev->tx_iovec = NULL;
        
        // VC layer stats
@@ -22940,10 +24027,10 @@ diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
        
        // free the skb
        hrz_kfree_skb (skb);
-diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
---- linux-3.0.4/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400
-@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
+diff -urNp linux-3.1.1/drivers/atm/idt77252.c linux-3.1.1/drivers/atm/idt77252.c
+--- linux-3.1.1/drivers/atm/idt77252.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/idt77252.c 2011-11-16 18:39:07.000000000 -0500
+@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, str
                else
                        dev_kfree_skb(skb);
  
@@ -22952,7 +24039,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
        }
  
        atomic_dec(&scq->used);
-@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, st
                        if ((sb = dev_alloc_skb(64)) == NULL) {
                                printk("%s: Can't allocate buffers for aal0.\n",
                                       card->name);
@@ -22968,7 +24055,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                                dev_kfree_skb(sb);
                                break;
                        }
-@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, st
                        ATM_SKB(sb)->vcc = vcc;
                        __net_timestamp(sb);
                        vcc->push(vcc, sb);
@@ -22977,7 +24064,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
  
                        cell += ATM_CELL_PAYLOAD;
                }
-@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, st
                                 "(CDC: %08x)\n",
                                 card->name, len, rpp->len, readl(SAR_REG_CDC));
                        recycle_rx_pool_skb(card, rpp);
@@ -22993,7 +24080,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                        return;
                }
                if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, st
                                RXPRINTK("%s: Can't alloc RX skb.\n",
                                         card->name);
                                recycle_rx_pool_skb(card, rpp);
@@ -23002,7 +24089,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                                return;
                        }
                        if (!atm_charge(vcc, skb->truesize)) {
-@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, st
                        __net_timestamp(skb);
  
                        vcc->push(vcc, skb);
@@ -23011,7 +24098,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
  
                        return;
                }
-@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, st
                __net_timestamp(skb);
  
                vcc->push(vcc, skb);
@@ -23020,7 +24107,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
  
                if (skb->truesize > SAR_FB_SIZE_3)
                        add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
-@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *car
+@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *car
                if (vcc->qos.aal != ATM_AAL0) {
                        RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
                                card->name, vpi, vci);
@@ -23037,7 +24124,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                        goto drop;
                }
  
-@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car
+@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *car
                ATM_SKB(sb)->vcc = vcc;
                __net_timestamp(sb);
                vcc->push(vcc, sb);
@@ -23046,7 +24133,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
  
  drop:
                skb_pull(queue, 64);
-@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
        if (vc == NULL) {
                printk("%s: NULL connection in send().\n", card->name);
@@ -23062,7 +24149,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                dev_kfree_skb(skb);
                return -EINVAL;
        }
-@@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s
                break;
        default:
                printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
@@ -23079,7 +24166,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                dev_kfree_skb(skb);
                return -EINVAL;
        }
-@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
+@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
        err = queue_skb(card, vc, skb, oam);
        if (err) {
@@ -23088,7 +24175,7 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                dev_kfree_skb(skb);
                return err;
        }
-@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
+@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
        skb = dev_alloc_skb(64);
        if (!skb) {
                printk("%s: Out of memory in send_oam().\n", card->name);
@@ -23097,10 +24184,10 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
                return -ENOMEM;
        }
        atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
---- linux-3.0.4/drivers/atm/iphase.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/iphase.c   2011-08-23 21:47:55.000000000 -0400
-@@ -1120,7 +1120,7 @@ static int rx_pkt(struct atm_dev *dev)  
+diff -urNp linux-3.1.1/drivers/atm/iphase.c linux-3.1.1/drivers/atm/iphase.c
+--- linux-3.1.1/drivers/atm/iphase.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/iphase.c   2011-11-16 18:39:07.000000000 -0500
+@@ -1121,7 +1121,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))  
        {  
@@ -23109,7 +24196,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
                IF_ERR(printk("IA: bad packet, dropping it");)  
                  if (status & RX_CER) { 
                      IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1143,7 +1143,7 @@ static int rx_pkt(struct atm_dev *dev)  
+@@ -1144,7 +1144,7 @@ static int rx_pkt(struct atm_dev *dev)  
        len = dma_addr - buf_addr;  
          if (len > iadev->rx_buf_sz) {
             printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
@@ -23118,7 +24205,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
           goto out_free_desc;
          }
                  
-@@ -1293,7 +1293,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1294,7 +1294,7 @@ static void rx_dle_intr(struct atm_dev *
            ia_vcc = INPH_IA_VCC(vcc);
            if (ia_vcc == NULL)
            {
@@ -23127,7 +24214,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
               dev_kfree_skb_any(skb);
               atm_return(vcc, atm_guess_pdu2truesize(len));
               goto INCR_DLE;
-@@ -1305,7 +1305,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1306,7 +1306,7 @@ static void rx_dle_intr(struct atm_dev *
            if ((length > iadev->rx_buf_sz) || (length > 
                                (skb->len - sizeof(struct cpcs_trailer))))
            {
@@ -23136,7 +24223,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
               IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", 
                                                              length, skb->len);)
               dev_kfree_skb_any(skb);
-@@ -1321,7 +1321,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1322,7 +1322,7 @@ static void rx_dle_intr(struct atm_dev *
  
          IF_RX(printk("rx_dle_intr: skb push");)  
          vcc->push(vcc,skb);  
@@ -23145,7 +24232,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2801,15 +2801,15 @@ static int ia_ioctl(struct atm_dev *dev,
+@@ -2802,15 +2802,15 @@ static int ia_ioctl(struct atm_dev *dev,
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -23170,7 +24257,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
           }
              ia_cmds.status = 0;
              break;
-@@ -2914,7 +2914,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -2915,7 +2915,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
        if ((desc == 0) || (desc > iadev->num_tx_desc))  
        {  
                IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) 
@@ -23179,7 +24266,7 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
                if (vcc->pop)   
                    vcc->pop(vcc, skb);   
                else  
-@@ -3019,14 +3019,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -3020,14 +3020,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -23196,9 +24283,9 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/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-3.0.4/drivers/atm/lanai.c linux-3.0.4/drivers/atm/lanai.c
---- linux-3.0.4/drivers/atm/lanai.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/lanai.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/lanai.c linux-3.1.1/drivers/atm/lanai.c
+--- linux-3.1.1/drivers/atm/lanai.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/lanai.c    2011-11-16 18:39:07.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);
@@ -23253,9 +24340,9 @@ diff -urNp linux-3.0.4/drivers/atm/lanai.c linux-3.0.4/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-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
---- linux-3.0.4/drivers/atm/nicstar.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/nicstar.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/nicstar.c linux-3.1.1/drivers/atm/nicstar.c
+--- linux-3.1.1/drivers/atm/nicstar.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/nicstar.c  2011-11-16 18:39:07.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",
@@ -23457,9 +24544,9 @@ diff -urNp linux-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
                        }
                }
  
-diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci.c
---- linux-3.0.4/drivers/atm/solos-pci.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/solos-pci.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/solos-pci.c linux-3.1.1/drivers/atm/solos-pci.c
+--- linux-3.1.1/drivers/atm/solos-pci.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/solos-pci.c        2011-11-16 18:40:10.000000000 -0500
 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
                                }
                                atm_charge(vcc, skb->truesize);
@@ -23487,9 +24574,9 @@ diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci
                                solos_pop(vcc, oldskb);
                        } else
                                dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
---- linux-3.0.4/drivers/atm/suni.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/suni.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/suni.c linux-3.1.1/drivers/atm/suni.c
+--- linux-3.1.1/drivers/atm/suni.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/suni.c     2011-11-16 18:39:07.000000000 -0500
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -23501,9 +24588,9 @@ diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
---- linux-3.0.4/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/atm/uPD98402.c linux-3.1.1/drivers/atm/uPD98402.c
+--- linux-3.1.1/drivers/atm/uPD98402.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/uPD98402.c 2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
        struct sonet_stats tmp;
        int error = 0;
@@ -23548,10 +24635,10 @@ diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
        return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
---- linux-3.0.4/drivers/atm/zatm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/zatm.c     2011-08-23 21:47:55.000000000 -0400
-@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+diff -urNp linux-3.1.1/drivers/atm/zatm.c linux-3.1.1/drivers/atm/zatm.c
+--- linux-3.1.1/drivers/atm/zatm.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/atm/zatm.c     2011-11-16 18:39:07.000000000 -0500
+@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                }
                if (!size) {
                        dev_kfree_skb_irq(skb);
@@ -23560,7 +24647,7 @@ diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
                        continue;
                }
                if (!atm_charge(vcc,skb->truesize)) {
-@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                skb->len = size;
                ATM_SKB(skb)->vcc = vcc;
                vcc->push(vcc,skb);
@@ -23569,7 +24656,7 @@ diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
        }
        zout(pos & 0xffff,MTA(mbx));
  #if 0 /* probably a stupid idea */
-@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
+@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
                        skb_queue_head(&zatm_vcc->backlog,skb);
                        break;
                }
@@ -23578,9 +24665,21 @@ diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
        wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/power/wakeup.c
---- linux-3.0.4/drivers/base/power/wakeup.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/base/power/wakeup.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/base/devtmpfs.c linux-3.1.1/drivers/base/devtmpfs.c
+--- linux-3.1.1/drivers/base/devtmpfs.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/base/devtmpfs.c        2011-11-16 18:39:07.000000000 -0500
+@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
+       if (!thread)
+               return 0;
+ 
+-      err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
++      err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
+       if (err)
+               printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
+       else
+diff -urNp linux-3.1.1/drivers/base/power/wakeup.c linux-3.1.1/drivers/base/power/wakeup.c
+--- linux-3.1.1/drivers/base/power/wakeup.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/base/power/wakeup.c    2011-11-16 18:39:07.000000000 -0500
 @@ -29,14 +29,14 @@ bool events_check_enabled;
   * They need to be modified together atomically, so it's better to use one
   * atomic variable to hold them both.
@@ -23616,9 +24715,9 @@ diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/powe
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
---- linux-3.0.4/drivers/block/cciss.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cciss.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/cciss.c linux-3.1.1/drivers/block/cciss.c
+--- linux-3.1.1/drivers/block/cciss.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cciss.c  2011-11-16 18:40:10.000000000 -0500
 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
        int err;
        u32 cp;
@@ -23694,7 +24793,7 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
  
        if (cciss_board_disabled(h)) {
                dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -5002,7 +5004,7 @@ reinit_after_soft_reset:
+@@ -5009,7 +5011,7 @@ reinit_after_soft_reset:
        }
  
        /* make sure the board interrupts are off */
@@ -23703,7 +24802,7 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
        rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
        if (rc)
                goto clean2;
-@@ -5054,7 +5056,7 @@ reinit_after_soft_reset:
+@@ -5061,7 +5063,7 @@ reinit_after_soft_reset:
                 * fake ones to scoop up any residual completions.
                 */
                spin_lock_irqsave(&h->lock, flags);
@@ -23712,7 +24811,7 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
                spin_unlock_irqrestore(&h->lock, flags);
                free_irq(h->intr[PERF_MODE_INT], h);
                rc = cciss_request_irq(h, cciss_msix_discard_completions,
-@@ -5074,9 +5076,9 @@ reinit_after_soft_reset:
+@@ -5081,9 +5083,9 @@ reinit_after_soft_reset:
                dev_info(&h->pdev->dev, "Board READY.\n");
                dev_info(&h->pdev->dev,
                        "Waiting for stale completions to drain.\n");
@@ -23724,7 +24823,7 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
  
                rc = controller_reset_failed(h->cfgtable);
                if (rc)
-@@ -5099,7 +5101,7 @@ reinit_after_soft_reset:
+@@ -5106,7 +5108,7 @@ reinit_after_soft_reset:
        cciss_scsi_setup(h);
  
        /* Turn the interrupts on so we can service requests */
@@ -23733,7 +24832,7 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
  
        /* Get the firmware version */
        inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-@@ -5171,7 +5173,7 @@ static void cciss_shutdown(struct pci_de
+@@ -5178,7 +5180,7 @@ static void cciss_shutdown(struct pci_de
        kfree(flush_buf);
        if (return_code != IO_OK)
                dev_warn(&h->pdev->dev, "Error flushing cache\n");
@@ -23742,9 +24841,9 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
        free_irq(h->intr[PERF_MODE_INT], h);
  }
  
-diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
---- linux-3.0.4/drivers/block/cciss.h  2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/block/cciss.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/cciss.h linux-3.1.1/drivers/block/cciss.h
+--- linux-3.1.1/drivers/block/cciss.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cciss.h  2011-11-16 18:39:07.000000000 -0500
 @@ -100,7 +100,7 @@ struct ctlr_info
        /* information about each logical volume */
        drive_info_struct *drv[CISS_MAX_LUN];
@@ -23754,9 +24853,9 @@ diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
  
        /* queue and queue Info */ 
        struct list_head reqQ;
-diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarray.c
---- linux-3.0.4/drivers/block/cpqarray.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cpqarray.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/cpqarray.c linux-3.1.1/drivers/block/cpqarray.c
+--- linux-3.1.1/drivers/block/cpqarray.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cpqarray.c       2011-11-16 18:40:10.000000000 -0500
 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
        if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
                goto Enomem4;
@@ -23882,9 +24981,9 @@ diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarr
                if (done == 0) {
                        udelay(10);     /* a short fixed delay */
                } else
-diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarray.h
---- linux-3.0.4/drivers/block/cpqarray.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cpqarray.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/cpqarray.h linux-3.1.1/drivers/block/cpqarray.h
+--- linux-3.1.1/drivers/block/cpqarray.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/cpqarray.h       2011-11-16 18:39:07.000000000 -0500
 @@ -99,7 +99,7 @@ struct ctlr_info {
        drv_info_t      drv[NWD];
        struct proc_dir_entry *proc;
@@ -23894,9 +24993,9 @@ diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarr
  
        cmdlist_t *reqQ;
        cmdlist_t *cmpQ;
-diff -urNp linux-3.0.4/drivers/block/DAC960.c linux-3.0.4/drivers/block/DAC960.c
---- linux-3.0.4/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/DAC960.c linux-3.1.1/drivers/block/DAC960.c
+--- linux-3.1.1/drivers/block/DAC960.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/DAC960.c 2011-11-16 18:40:10.000000000 -0500
 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -23906,9 +25005,9 @@ diff -urNp linux-3.0.4/drivers/block/DAC960.c linux-3.0.4/drivers/block/DAC960.c
    if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
                DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
                        sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/drbd/drbd_int.h
---- linux-3.0.4/drivers/block/drbd/drbd_int.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_int.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_int.h linux-3.1.1/drivers/block/drbd/drbd_int.h
+--- linux-3.1.1/drivers/block/drbd/drbd_int.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_int.h  2011-11-16 18:39:07.000000000 -0500
 @@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
        struct list_head list;
@@ -23927,9 +25026,48 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/d
        unsigned int peer_seq;
        spinlock_t peer_seq_lock;
        unsigned int minor;
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/drbd/drbd_main.c
---- linux-3.0.4/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400
+@@ -1618,30 +1618,30 @@ static inline int drbd_setsockopt(struct
+ 
+ static inline void drbd_tcp_cork(struct socket *sock)
+ {
+-      int __user val = 1;
++      int val = 1;
+       (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
+-                      (char __user *)&val, sizeof(val));
++                      (char __force_user *)&val, sizeof(val));
+ }
+ 
+ static inline void drbd_tcp_uncork(struct socket *sock)
+ {
+-      int __user val = 0;
++      int val = 0;
+       (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
+-                      (char __user *)&val, sizeof(val));
++                      (char __force_user *)&val, sizeof(val));
+ }
+ 
+ static inline void drbd_tcp_nodelay(struct socket *sock)
+ {
+-      int __user val = 1;
++      int val = 1;
+       (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
+-                      (char __user *)&val, sizeof(val));
++                      (char __force_user *)&val, sizeof(val));
+ }
+ 
+ static inline void drbd_tcp_quickack(struct socket *sock)
+ {
+-      int __user val = 2;
++      int val = 2;
+       (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
+-                      (char __user *)&val, sizeof(val));
++                      (char __force_user *)&val, sizeof(val));
+ }
+ 
+ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_main.c linux-3.1.1/drivers/block/drbd/drbd_main.c
+--- linux-3.1.1/drivers/block/drbd/drbd_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_main.c 2011-11-16 18:39:07.000000000 -0500
 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
        p.sector   = sector;
        p.block_id = block_id;
@@ -23968,9 +25106,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/
        mdev->al_writ_cnt  =
        mdev->bm_writ_cnt  =
        mdev->read_cnt     =
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/drbd/drbd_nl.c
---- linux-3.0.4/drivers/block/drbd/drbd_nl.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_nl.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_nl.c linux-3.1.1/drivers/block/drbd/drbd_nl.c
+--- linux-3.1.1/drivers/block/drbd/drbd_nl.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_nl.c   2011-11-16 18:39:07.000000000 -0500
 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
        module_put(THIS_MODULE);
  }
@@ -24016,9 +25154,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/dr
        cn_reply->ack = 0; /* not used here. */
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/block/drbd/drbd_receiver.c
---- linux-3.0.4/drivers/block/drbd/drbd_receiver.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_receiver.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/drbd/drbd_receiver.c linux-3.1.1/drivers/block/drbd/drbd_receiver.c
+--- linux-3.1.1/drivers/block/drbd/drbd_receiver.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/drbd/drbd_receiver.c     2011-11-16 18:39:07.000000000 -0500
 @@ -894,7 +894,7 @@ retry:
        sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
        sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -24104,9 +25242,21 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/bl
        D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
---- linux-3.0.4/drivers/block/nbd.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/nbd.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/block/loop.c linux-3.1.1/drivers/block/loop.c
+--- linux-3.1.1/drivers/block/loop.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/loop.c   2011-11-16 18:39:07.000000000 -0500
+@@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(get_ds());
+-      bw = file->f_op->write(file, buf, len, &pos);
++      bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
+       set_fs(old_fs);
+       if (likely(bw == len))
+               return 0;
+diff -urNp linux-3.1.1/drivers/block/nbd.c linux-3.1.1/drivers/block/nbd.c
+--- linux-3.1.1/drivers/block/nbd.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/block/nbd.c    2011-11-16 18:40:10.000000000 -0500
 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
        struct kvec iov;
        sigset_t blocked, oldset;
@@ -24125,9 +25275,9 @@ diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
        switch (cmd) {
        case NBD_DISCONNECT: {
                struct request sreq;
-diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/frontend.c
---- linux-3.0.4/drivers/char/agp/frontend.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/agp/frontend.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/agp/frontend.c linux-3.1.1/drivers/char/agp/frontend.c
+--- linux-3.1.1/drivers/char/agp/frontend.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/agp/frontend.c    2011-11-16 18:39:07.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;
@@ -24137,9 +25287,9 @@ diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/
                return -EFAULT;
  
        client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_panel.c
---- linux-3.0.4/drivers/char/briq_panel.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/briq_panel.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/briq_panel.c linux-3.1.1/drivers/char/briq_panel.c
+--- linux-3.1.1/drivers/char/briq_panel.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/briq_panel.c      2011-11-16 18:40:10.000000000 -0500
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -24181,9 +25331,9 @@ diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_p
  
        return len;
  }
-diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
---- linux-3.0.4/drivers/char/genrtc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/genrtc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/genrtc.c linux-3.1.1/drivers/char/genrtc.c
+--- linux-3.1.1/drivers/char/genrtc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/genrtc.c  2011-11-16 18:40:10.000000000 -0500
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
        switch (cmd) {
  
@@ -24192,9 +25342,9 @@ diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
            if (get_rtc_pll(&pll))
                    return -EINVAL;
            else
-diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
---- linux-3.0.4/drivers/char/hpet.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/hpet.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/hpet.c linux-3.1.1/drivers/char/hpet.c
+--- linux-3.1.1/drivers/char/hpet.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/hpet.c    2011-11-16 18:39:07.000000000 -0500
 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -24204,9 +25354,9 @@ diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
                  struct hpet_info *info)
  {
        struct hpet_timer __iomem *timer;
-diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/ipmi/ipmi_msghandler.c    2011-11-16 18:40:10.000000000 -0500
 @@ -415,7 +415,7 @@ struct ipmi_smi {
        struct proc_dir_entry *proc_dir;
        char                  proc_dir_name[10];
@@ -24246,9 +25396,9 @@ diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/c
        si = (struct ipmi_system_interface_addr *) &addr;
        si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
        si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/ipmi/ipmi_si_intf.c       2011-11-16 18:39:07.000000000 -0500
 @@ -277,7 +277,7 @@ struct smi_info {
        unsigned char slave_addr;
  
@@ -24279,9 +25429,9 @@ diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char
  
        new_smi->interrupt_disabled = 1;
        atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.0.4/drivers/char/Kconfig linux-3.0.4/drivers/char/Kconfig
---- linux-3.0.4/drivers/char/Kconfig   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/Kconfig   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/Kconfig linux-3.1.1/drivers/char/Kconfig
+--- linux-3.1.1/drivers/char/Kconfig   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/Kconfig   2011-11-16 18:40:10.000000000 -0500
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
  config DEVKMEM
@@ -24300,9 +25450,21 @@ diff -urNp linux-3.0.4/drivers/char/Kconfig linux-3.0.4/drivers/char/Kconfig
        default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
---- linux-3.0.4/drivers/char/mem.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/mem.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/mbcs.c linux-3.1.1/drivers/char/mbcs.c
+--- linux-3.1.1/drivers/char/mbcs.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/mbcs.c    2011-11-16 18:39:07.000000000 -0500
+@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
+       return 0;
+ }
+ 
+-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
++static const struct cx_device_id __devinitconst mbcs_id_table[] = {
+       {
+        .part_num = MBCS_PART_NUM,
+        .mfg_num = MBCS_MFG_NUM,
+diff -urNp linux-3.1.1/drivers/char/mem.c linux-3.1.1/drivers/char/mem.c
+--- linux-3.1.1/drivers/char/mem.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/mem.c     2011-11-17 18:31:56.000000000 -0500
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -24316,7 +25478,7 @@ diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
  #endif
  
 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
-+extern struct file_operations grsec_fops;
++extern const struct file_operations grsec_fops;
 +#endif
 +
  static inline unsigned long size_inside_page(unsigned long start,
@@ -24435,10 +25597,10 @@ diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
---- linux-3.0.4/drivers/char/nvram.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/nvram.c   2011-08-23 21:47:55.000000000 -0400
-@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
+diff -urNp linux-3.1.1/drivers/char/nvram.c linux-3.1.1/drivers/char/nvram.c
+--- linux-3.1.1/drivers/char/nvram.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/nvram.c   2011-11-16 18:39:07.000000000 -0500
+@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *f
  
        spin_unlock_irq(&rtc_lock);
  
@@ -24447,9 +25609,9 @@ diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
                return -EFAULT;
  
        *ppos = i;
-diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
---- linux-3.0.4/drivers/char/random.c  2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/char/random.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/random.c linux-3.1.1/drivers/char/random.c
+--- linux-3.1.1/drivers/char/random.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/random.c  2011-11-16 18:40:10.000000000 -0500
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -24500,9 +25662,9 @@ diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
---- linux-3.0.4/drivers/char/sonypi.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/sonypi.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/sonypi.c linux-3.1.1/drivers/char/sonypi.c
+--- linux-3.1.1/drivers/char/sonypi.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/sonypi.c  2011-11-16 18:39:07.000000000 -0500
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -24541,9 +25703,9 @@ diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
        mutex_unlock(&sonypi_device.lock);
  
        return 0;
-diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/tpm_bios.c
---- linux-3.0.4/drivers/char/tpm/tpm_bios.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/tpm/tpm_bios.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/tpm/tpm_bios.c linux-3.1.1/drivers/char/tpm/tpm_bios.c
+--- linux-3.1.1/drivers/char/tpm/tpm_bios.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/tpm/tpm_bios.c    2011-11-16 18:39:07.000000000 -0500
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
        event = addr;
  
@@ -24572,7 +25734,7 @@ diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/
  
        return 0;
  }
-@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log 
+@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log 
        log->bios_event_log_end = log->bios_event_log + len;
  
        virt = acpi_os_map_memory(start, len);
@@ -24582,12 +25744,15 @@ diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/
 +              return -EFAULT;
 +      }
  
-       memcpy(log->bios_event_log, virt, len);
+-      memcpy(log->bios_event_log, virt, len);
++      memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
  
-diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
---- linux-3.0.4/drivers/char/tpm/tpm.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/tpm/tpm.c 2011-08-23 21:48:14.000000000 -0400
-@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
+       acpi_os_unmap_memory(virt, len);
+       return 0;
+diff -urNp linux-3.1.1/drivers/char/tpm/tpm.c linux-3.1.1/drivers/char/tpm/tpm.c
+--- linux-3.1.1/drivers/char/tpm/tpm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/tpm/tpm.c 2011-11-16 18:40:10.000000000 -0500
+@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
                    chip->vendor.req_complete_val)
                        goto out_recv;
  
@@ -24596,7 +25761,7 @@ diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
                        dev_err(chip->dev, "Operation Canceled\n");
                        rc = -ECANCELED;
                        goto out;
-@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *de
+@@ -862,6 +862,8 @@ ssize_t tpm_show_pubek(struct device *de
  
        struct tpm_chip *chip = dev_get_drvdata(dev);
  
@@ -24605,9 +25770,30 @@ diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
        tpm_cmd.header.in = tpm_readpubek_header;
        err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
                        "attempting to read the PUBEK");
-diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hifn_795x.c
---- linux-3.0.4/drivers/crypto/hifn_795x.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/crypto/hifn_795x.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/char/virtio_console.c linux-3.1.1/drivers/char/virtio_console.c
+--- linux-3.1.1/drivers/char/virtio_console.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/char/virtio_console.c  2011-11-16 18:39:07.000000000 -0500
+@@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port 
+       if (to_user) {
+               ssize_t ret;
+ 
+-              ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
++              ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
+               if (ret)
+                       return -EFAULT;
+       } else {
+@@ -654,7 +654,7 @@ static ssize_t port_fops_read(struct fil
+       if (!port_has_data(port) && !port->host_connected)
+               return 0;
+ 
+-      return fill_readbuf(port, ubuf, count, true);
++      return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
+ }
+ 
+ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
+diff -urNp linux-3.1.1/drivers/crypto/hifn_795x.c linux-3.1.1/drivers/crypto/hifn_795x.c
+--- linux-3.1.1/drivers/crypto/hifn_795x.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/crypto/hifn_795x.c     2011-11-16 18:40:10.000000000 -0500
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
                0xCA, 0x34, 0x2B, 0x2E};
        struct scatterlist sg;
@@ -24617,9 +25803,9 @@ diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hif
        memset(src, 0, sizeof(src));
        memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/padlock-aes.c
---- linux-3.0.4/drivers/crypto/padlock-aes.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/crypto/padlock-aes.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/crypto/padlock-aes.c linux-3.1.1/drivers/crypto/padlock-aes.c
+--- linux-3.1.1/drivers/crypto/padlock-aes.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/crypto/padlock-aes.c   2011-11-16 18:40:10.000000000 -0500
 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
        struct crypto_aes_ctx gen_aes;
        int cpu;
@@ -24629,9 +25815,57 @@ diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/p
        if (key_len % 8) {
                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                return -EINVAL;
-diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/edac_pci_sysfs.c
---- linux-3.0.4/drivers/edac/edac_pci_sysfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/edac/edac_pci_sysfs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/edac/amd64_edac.c linux-3.1.1/drivers/edac/amd64_edac.c
+--- linux-3.1.1/drivers/edac/amd64_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/amd64_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i
+  * PCI core identifies what devices are on a system during boot, and then
+  * inquiry this table to see if this driver is for a given device found.
+  */
+-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
++static const struct pci_device_id amd64_pci_table[] __devinitconst = {
+       {
+               .vendor         = PCI_VENDOR_ID_AMD,
+               .device         = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
+diff -urNp linux-3.1.1/drivers/edac/amd76x_edac.c linux-3.1.1/drivers/edac/amd76x_edac.c
+--- linux-3.1.1/drivers/edac/amd76x_edac.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/amd76x_edac.c     2011-11-16 18:39:07.000000000 -0500
+@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        AMD762},
+diff -urNp linux-3.1.1/drivers/edac/e752x_edac.c linux-3.1.1/drivers/edac/e752x_edac.c
+--- linux-3.1.1/drivers/edac/e752x_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/e752x_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        E7520},
+diff -urNp linux-3.1.1/drivers/edac/e7xxx_edac.c linux-3.1.1/drivers/edac/e7xxx_edac.c
+--- linux-3.1.1/drivers/edac/e7xxx_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/e7xxx_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        E7205},
+diff -urNp linux-3.1.1/drivers/edac/edac_pci_sysfs.c linux-3.1.1/drivers/edac/edac_pci_sysfs.c
+--- linux-3.1.1/drivers/edac/edac_pci_sysfs.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/edac_pci_sysfs.c  2011-11-16 18:39:07.000000000 -0500
 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;              /* log 
  static int edac_pci_log_npe = 1;      /* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000; /* one second workq period */
@@ -24715,9 +25949,141 @@ diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/ed
                        panic("EDAC: PCI Parity Error");
        }
  }
-diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
---- linux-3.0.4/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/edac/i3000_edac.c linux-3.1.1/drivers/edac/i3000_edac.c
+--- linux-3.1.1/drivers/edac/i3000_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i3000_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        I3000},
+diff -urNp linux-3.1.1/drivers/edac/i3200_edac.c linux-3.1.1/drivers/edac/i3200_edac.c
+--- linux-3.1.1/drivers/edac/i3200_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i3200_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
+       {
+               PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               I3200},
+diff -urNp linux-3.1.1/drivers/edac/i5000_edac.c linux-3.1.1/drivers/edac/i5000_edac.c
+--- linux-3.1.1/drivers/edac/i5000_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5000_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
+  *
+  *    The "E500P" device is the first device supported.
+  */
+-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
+        .driver_data = I5000P},
+ 
+diff -urNp linux-3.1.1/drivers/edac/i5100_edac.c linux-3.1.1/drivers/edac/i5100_edac.c
+--- linux-3.1.1/drivers/edac/i5100_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5100_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
+       /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
+       { 0, }
+diff -urNp linux-3.1.1/drivers/edac/i5400_edac.c linux-3.1.1/drivers/edac/i5400_edac.c
+--- linux-3.1.1/drivers/edac/i5400_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i5400_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
+  *
+  *    The "E500P" device is the first device supported.
+  */
+-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
+       {0,}                    /* 0 terminated list. */
+ };
+diff -urNp linux-3.1.1/drivers/edac/i7300_edac.c linux-3.1.1/drivers/edac/i7300_edac.c
+--- linux-3.1.1/drivers/edac/i7300_edac.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i7300_edac.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
+  *
+  * Has only 8086:360c PCI ID
+  */
+-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
+       {0,}                    /* 0 terminated list. */
+ };
+diff -urNp linux-3.1.1/drivers/edac/i7core_edac.c linux-3.1.1/drivers/edac/i7core_edac.c
+--- linux-3.1.1/drivers/edac/i7core_edac.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i7core_edac.c     2011-11-16 18:39:07.000000000 -0500
+@@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
+ /*
+  *    pci_device_id   table for which devices we are looking for
+  */
+-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
+       {0,}                    /* 0 terminated list. */
+diff -urNp linux-3.1.1/drivers/edac/i82443bxgx_edac.c linux-3.1.1/drivers/edac/i82443bxgx_edac.c
+--- linux-3.1.1/drivers/edac/i82443bxgx_edac.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82443bxgx_edac.c 2011-11-16 18:39:07.000000000 -0500
+@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
+ 
+ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
+ 
+-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
+       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
+diff -urNp linux-3.1.1/drivers/edac/i82860_edac.c linux-3.1.1/drivers/edac/i82860_edac.c
+--- linux-3.1.1/drivers/edac/i82860_edac.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82860_edac.c     2011-11-16 18:39:07.000000000 -0500
+@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        I82860},
+diff -urNp linux-3.1.1/drivers/edac/i82875p_edac.c linux-3.1.1/drivers/edac/i82875p_edac.c
+--- linux-3.1.1/drivers/edac/i82875p_edac.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82875p_edac.c    2011-11-16 18:39:07.000000000 -0500
+@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        I82875P},
+diff -urNp linux-3.1.1/drivers/edac/i82975x_edac.c linux-3.1.1/drivers/edac/i82975x_edac.c
+--- linux-3.1.1/drivers/edac/i82975x_edac.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/i82975x_edac.c    2011-11-16 18:39:07.000000000 -0500
+@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
+       {
+               PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+               I82975X
+diff -urNp linux-3.1.1/drivers/edac/mce_amd.h linux-3.1.1/drivers/edac/mce_amd.h
+--- linux-3.1.1/drivers/edac/mce_amd.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/mce_amd.h 2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct amd_decoder_ops {
        bool (*dc_mce)(u16, u8);
        bool (*ic_mce)(u16, u8);
@@ -24727,9 +26093,33 @@ diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
  
  void amd_report_gart_errors(bool);
  void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
-diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire/core-card.c
---- linux-3.0.4/drivers/firewire/core-card.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-card.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/edac/r82600_edac.c linux-3.1.1/drivers/edac/r82600_edac.c
+--- linux-3.1.1/drivers/edac/r82600_edac.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/r82600_edac.c     2011-11-16 18:39:07.000000000 -0500
+@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
++static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
+       {
+        PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
+        },
+diff -urNp linux-3.1.1/drivers/edac/x38_edac.c linux-3.1.1/drivers/edac/x38_edac.c
+--- linux-3.1.1/drivers/edac/x38_edac.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/edac/x38_edac.c        2011-11-16 18:39:07.000000000 -0500
+@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
+       edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
++static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
+       {
+        PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+        X38},
+diff -urNp linux-3.1.1/drivers/firewire/core-card.c linux-3.1.1/drivers/firewire/core-card.c
+--- linux-3.1.1/drivers/firewire/core-card.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-card.c   2011-11-16 18:39:07.000000000 -0500
 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
  
  void fw_core_remove_card(struct fw_card *card)
@@ -24739,10 +26129,10 @@ diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire
  
        card->driver->update_phy_reg(card, 4,
                                     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire/core-cdev.c
---- linux-3.0.4/drivers/firewire/core-cdev.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-cdev.c   2011-08-23 21:47:55.000000000 -0400
-@@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
+diff -urNp linux-3.1.1/drivers/firewire/core-cdev.c linux-3.1.1/drivers/firewire/core-cdev.c
+--- linux-3.1.1/drivers/firewire/core-cdev.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-cdev.c   2011-11-16 18:39:07.000000000 -0500
+@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct clie
        int ret;
  
        if ((request->channels == 0 && request->bandwidth == 0) ||
@@ -24752,9 +26142,9 @@ diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire
                return -EINVAL;
  
        r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.0.4/drivers/firewire/core.h linux-3.0.4/drivers/firewire/core.h
---- linux-3.0.4/drivers/firewire/core.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/firewire/core.h linux-3.1.1/drivers/firewire/core.h
+--- linux-3.1.1/drivers/firewire/core.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core.h        2011-11-16 18:39:07.000000000 -0500
 @@ -101,6 +101,7 @@ struct fw_card_driver {
  
        int (*stop_iso)(struct fw_iso_context *ctx);
@@ -24763,9 +26153,9 @@ diff -urNp linux-3.0.4/drivers/firewire/core.h linux-3.0.4/drivers/firewire/core
  
  void fw_card_initialize(struct fw_card *card,
                const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-3.0.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/firewire/core-transaction.c
---- linux-3.0.4/drivers/firewire/core-transaction.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-transaction.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/firewire/core-transaction.c linux-3.1.1/drivers/firewire/core-transaction.c
+--- linux-3.1.1/drivers/firewire/core-transaction.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firewire/core-transaction.c    2011-11-16 18:40:10.000000000 -0500
 @@ -37,6 +37,7 @@
  #include <linux/timer.h>
  #include <linux/types.h>
@@ -24783,9 +26173,9 @@ diff -urNp linux-3.0.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/f
        init_timer_on_stack(&t.split_timeout_timer);
        init_completion(&d.done);
        d.payload = payload;
-diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/dmi_scan.c
---- linux-3.0.4/drivers/firmware/dmi_scan.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firmware/dmi_scan.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/firmware/dmi_scan.c linux-3.1.1/drivers/firmware/dmi_scan.c
+--- linux-3.1.1/drivers/firmware/dmi_scan.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/firmware/dmi_scan.c    2011-11-16 18:39:07.000000000 -0500
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
                }
        }
@@ -24798,9 +26188,18 @@ diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/
                p = dmi_ioremap(0xF0000, 0x10000);
                if (p == NULL)
                        goto error;
-diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx_giu.c
---- linux-3.0.4/drivers/gpio/vr41xx_giu.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpio/vr41xx_giu.c      2011-08-23 21:47:55.000000000 -0400
+@@ -725,7 +720,7 @@ int dmi_walk(void (*decode)(const struct
+       if (buf == NULL)
+               return -1;
+ 
+-      dmi_table(buf, dmi_len, dmi_num, decode, private_data);
++      dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
+ 
+       iounmap(buf);
+       return 0;
+diff -urNp linux-3.1.1/drivers/gpio/gpio-vr41xx.c linux-3.1.1/drivers/gpio/gpio-vr41xx.c
+--- linux-3.1.1/drivers/gpio/gpio-vr41xx.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpio/gpio-vr41xx.c     2011-11-16 18:39:07.000000000 -0500
 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
        printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
               maskl, pendl, maskh, pendh);
@@ -24810,9 +26209,104 @@ diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx
  
        return -EINVAL;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc.c linux-3.1.1/drivers/gpu/drm/drm_crtc.c
+--- linux-3.1.1/drivers/gpu/drm/drm_crtc.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_crtc.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1374,7 +1374,7 @@ int drm_mode_getconnector(struct drm_dev
+        */
+       if ((out_resp->count_modes >= mode_count) && mode_count) {
+               copied = 0;
+-              mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
++              mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
+               list_for_each_entry(mode, &connector->modes, head) {
+                       drm_crtc_convert_to_umode(&u_mode, mode);
+                       if (copy_to_user(mode_ptr + copied,
+@@ -1389,8 +1389,8 @@ int drm_mode_getconnector(struct drm_dev
+ 
+       if ((out_resp->count_props >= props_count) && props_count) {
+               copied = 0;
+-              prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
+-              prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
++              prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
++              prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
+               for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
+                       if (connector->property_ids[i] != 0) {
+                               if (put_user(connector->property_ids[i],
+@@ -1412,7 +1412,7 @@ int drm_mode_getconnector(struct drm_dev
+ 
+       if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
+               copied = 0;
+-              encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
++              encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
+               for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+                       if (connector->encoder_ids[i] != 0) {
+                               if (put_user(connector->encoder_ids[i],
+@@ -1571,7 +1571,7 @@ int drm_mode_setcrtc(struct drm_device *
+               }
+ 
+               for (i = 0; i < crtc_req->count_connectors; i++) {
+-                      set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
++                      set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
+                       if (get_user(out_id, &set_connectors_ptr[i])) {
+                               ret = -EFAULT;
+                               goto out;
+@@ -1852,7 +1852,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_de
+       fb = obj_to_fb(obj);
+ 
+       num_clips = r->num_clips;
+-      clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
++      clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
+ 
+       if (!num_clips != !clips_ptr) {
+               ret = -EINVAL;
+@@ -2272,7 +2272,7 @@ int drm_mode_getproperty_ioctl(struct dr
+       out_resp->flags = property->flags;
+ 
+       if ((out_resp->count_values >= value_count) && value_count) {
+-              values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
++              values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
+               for (i = 0; i < value_count; i++) {
+                       if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
+                               ret = -EFAULT;
+@@ -2285,7 +2285,7 @@ int drm_mode_getproperty_ioctl(struct dr
+       if (property->flags & DRM_MODE_PROP_ENUM) {
+               if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
+                       copied = 0;
+-                      enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
++                      enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
+                       list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
+ 
+                               if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
+@@ -2308,7 +2308,7 @@ int drm_mode_getproperty_ioctl(struct dr
+               if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
+                       copied = 0;
+                       blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
+-                      blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
++                      blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
+ 
+                       list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
+                               if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
+@@ -2369,7 +2369,7 @@ int drm_mode_getblob_ioctl(struct drm_de
+       struct drm_mode_get_blob *out_resp = data;
+       struct drm_property_blob *blob;
+       int ret = 0;
+-      void *blob_ptr;
++      void __user *blob_ptr;
+ 
+       if (!drm_core_check_feature(dev, DRIVER_MODESET))
+               return -EINVAL;
+@@ -2383,7 +2383,7 @@ int drm_mode_getblob_ioctl(struct drm_de
+       blob = obj_to_blob(obj);
+ 
+       if (out_resp->length == blob->length) {
+-              blob_ptr = (void *)(unsigned long)out_resp->data;
++              blob_ptr = (void __user *)(unsigned long)out_resp->data;
+               if (copy_to_user(blob_ptr, blob->data, blob->length)){
+                       ret = -EFAULT;
+                       goto done;
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_crtc_helper.c      2011-11-16 18:40:10.000000000 -0500
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
        struct drm_crtc *tmp;
        int crtc_mask = 1;
@@ -24831,9 +26325,18 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu
        crtc->enabled = drm_helper_crtc_in_use(crtc);
        if (!crtc->enabled)
                return true;
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm_drv.c
---- linux-3.0.4/drivers/gpu/drm/drm_drv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_drv.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_drv.c linux-3.1.1/drivers/gpu/drm/drm_drv.c
+--- linux-3.1.1/drivers/gpu/drm/drm_drv.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_drv.c      2011-11-16 18:39:07.000000000 -0500
+@@ -307,7 +307,7 @@ module_exit(drm_core_exit);
+ /**
+  * Copy and IOCTL return string to user space
+  */
+-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
++static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
+ {
+       int len;
+ 
 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
  
        dev = file_priv->minor->dev;
@@ -24843,9 +26346,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm
        ++file_priv->ioctl_count;
  
        DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/drm_fops.c
---- linux-3.0.4/drivers/gpu/drm/drm_fops.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_fops.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_fops.c linux-3.1.1/drivers/gpu/drm/drm_fops.c
+--- linux-3.1.1/drivers/gpu/drm/drm_fops.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_fops.c     2011-11-16 18:39:07.000000000 -0500
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
        }
  
@@ -24895,9 +26398,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/dr
                if (atomic_read(&dev->ioctl_count)) {
                        DRM_ERROR("Device busy: %d\n",
                                  atomic_read(&dev->ioctl_count));
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/drm_global.c
---- linux-3.0.4/drivers/gpu/drm/drm_global.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_global.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_global.c linux-3.1.1/drivers/gpu/drm/drm_global.c
+--- linux-3.1.1/drivers/gpu/drm/drm_global.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_global.c   2011-11-16 18:39:07.000000000 -0500
 @@ -36,7 +36,7 @@
  struct drm_global_item {
        struct mutex mutex;
@@ -24955,9 +26458,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/
                ref->release(ref);
                item->object = NULL;
        }
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/drm_info.c
---- linux-3.0.4/drivers/gpu/drm/drm_info.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_info.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_info.c linux-3.1.1/drivers/gpu/drm/drm_info.c
+--- linux-3.1.1/drivers/gpu/drm/drm_info.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_info.c     2011-11-16 18:40:10.000000000 -0500
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
        struct drm_local_map *map;
        struct drm_map_list *r_list;
@@ -24998,9 +26501,30 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/dr
  
  #if defined(__i386__)
                pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/drm_ioctl.c
---- linux-3.0.4/drivers/gpu/drm/drm_ioctl.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_ioctl.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioc32.c linux-3.1.1/drivers/gpu/drm/drm_ioc32.c
+--- linux-3.1.1/drivers/gpu/drm/drm_ioc32.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_ioc32.c    2011-11-16 18:39:07.000000000 -0500
+@@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
+       request = compat_alloc_user_space(nbytes);
+       if (!access_ok(VERIFY_WRITE, request, nbytes))
+               return -EFAULT;
+-      list = (struct drm_buf_desc *) (request + 1);
++      list = (struct drm_buf_desc __user *) (request + 1);
+ 
+       if (__put_user(count, &request->count)
+           || __put_user(list, &request->list))
+@@ -516,7 +516,7 @@ static int compat_drm_mapbufs(struct fil
+       request = compat_alloc_user_space(nbytes);
+       if (!access_ok(VERIFY_WRITE, request, nbytes))
+               return -EFAULT;
+-      list = (struct drm_buf_pub *) (request + 1);
++      list = (struct drm_buf_pub __user *) (request + 1);
+ 
+       if (__put_user(count, &request->count)
+           || __put_user(list, &request->list))
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_ioctl.c linux-3.1.1/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.1.1/drivers/gpu/drm/drm_ioctl.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_ioctl.c    2011-11-16 18:39:07.000000000 -0500
 @@ -256,7 +256,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);
@@ -25010,9 +26534,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/d
                stats->data[i].type = dev->types[i];
        }
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/drm_lock.c
---- linux-3.0.4/drivers/gpu/drm/drm_lock.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_lock.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/drm_lock.c linux-3.1.1/drivers/gpu/drm/drm_lock.c
+--- linux-3.1.1/drivers/gpu/drm/drm_lock.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/drm_lock.c     2011-11-16 18:39:07.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;
@@ -25031,9 +26555,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/dr
  
        if (drm_lock_free(&master->lock, lock->context)) {
                /* FIXME: Should really bail out here. */
-diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i810/i810_dma.c        2011-11-16 18:39:07.000000000 -0500
 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
                                 dma->buflist[vertex->idx],
                                 vertex->discard, vertex->used);
@@ -25056,9 +26580,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/d
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i810/i810_drv.h        2011-11-16 18:39:07.000000000 -0500
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
        int page_flipping;
  
@@ -25070,9 +26594,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/d
  
        int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_debugfs.c    2011-11-16 18:39:07.000000000 -0500
 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
                           I915_READ(GTIMR));
        }
@@ -25080,12 +26604,21 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/g
 -                 atomic_read(&dev_priv->irq_received));
 +                 atomic_read_unchecked(&dev_priv->irq_received));
        for (i = 0; i < I915_NUM_RINGS; i++) {
-               if (IS_GEN6(dev)) {
+               if (IS_GEN6(dev) || IS_GEN7(dev)) {
                        seq_printf(m, "Graphics Interrupt mask (%s):    %08x\n",
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c        2011-08-23 21:47:55.000000000 -0400
-@@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
+@@ -1185,7 +1185,7 @@ static int i915_opregion(struct seq_file
+               return ret;
+ 
+       if (opregion->header)
+-              seq_write(m, opregion->header, OPREGION_SIZE);
++              seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
+ 
+       mutex_unlock(&dev->struct_mutex);
+ 
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_dma.c        2011-11-16 18:39:07.000000000 -0500
+@@ -1171,7 +1171,7 @@ static bool i915_switcheroo_can_switch(s
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -25094,10 +26627,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/d
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h        2011-08-23 21:47:55.000000000 -0400
-@@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_drv.h        2011-11-16 18:39:07.000000000 -0500
+@@ -222,7 +222,7 @@ struct drm_i915_display_funcs {
        /* render clock increase/decrease */
        /* display clock increase/decrease */
        /* pll clock increase/decrease */
@@ -25106,7 +26639,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/d
  
  struct intel_device_info {
        u8 gen;
-@@ -300,7 +300,7 @@ typedef struct drm_i915_private {
+@@ -305,7 +305,7 @@ typedef struct drm_i915_private {
        int current_page;
        int page_flipping;
  
@@ -25115,7 +26648,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/d
  
        /* protects the irq masks */
        spinlock_t irq_lock;
-@@ -874,7 +874,7 @@ struct drm_i915_gem_object {
+@@ -882,7 +882,7 @@ struct drm_i915_gem_object {
         * will be page flipped away on the next vblank.  When it
         * reaches 0, dev_priv->pending_flip_queue will be woken up.
         */
@@ -25124,7 +26657,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/d
  };
  
  #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1247,7 +1247,7 @@ extern int intel_setup_gmbus(struct drm_
+@@ -1262,7 +1262,7 @@ extern int intel_setup_gmbus(struct drm_
  extern void intel_teardown_gmbus(struct drm_device *dev);
  extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
  extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
@@ -25133,9 +26666,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/d
  {
        return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-11-16 18:39:07.000000000 -0500
 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
                i915_gem_clflush_object(obj);
  
@@ -25145,10 +26678,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/dr
  
        /* The actual obj->write_domain will be updated with
         * pending_write_domain after we emit the accumulated flush for all
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c        2011-08-23 21:47:55.000000000 -0400
-@@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/i915_irq.c        2011-11-16 18:39:07.000000000 -0500
+@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler
        u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
        struct drm_i915_master_private *master_priv;
  
@@ -25157,7 +26690,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
        /* disable master interrupt before clearing iir  */
        de_ier = I915_READ(DEIER);
-@@ -563,7 +563,7 @@ static irqreturn_t ironlake_irq_handler(
+@@ -565,7 +565,7 @@ static irqreturn_t ironlake_irq_handler(
        struct drm_i915_master_private *master_priv;
        u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
  
@@ -25166,7 +26699,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
        if (IS_GEN6(dev))
                bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
-@@ -1226,7 +1226,7 @@ static irqreturn_t i915_driver_irq_handl
+@@ -1228,7 +1228,7 @@ static irqreturn_t i915_driver_irq_handl
        int ret = IRQ_NONE, pipe;
        bool blc_event = false;
  
@@ -25175,7 +26708,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
        iir = I915_READ(IIR);
  
-@@ -1735,7 +1735,7 @@ static void ironlake_irq_preinstall(stru
+@@ -1740,7 +1740,7 @@ static void ironlake_irq_preinstall(stru
  {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -25184,7 +26717,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
        INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
        INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-@@ -1899,7 +1899,7 @@ static void i915_driver_irq_preinstall(s
+@@ -1904,7 +1904,7 @@ static void i915_driver_irq_preinstall(s
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
        int pipe;
  
@@ -25193,10 +26726,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
        INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
        INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/gpu/drm/i915/intel_display.c
---- linux-3.0.4/drivers/gpu/drm/i915/intel_display.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/intel_display.c   2011-08-23 21:47:55.000000000 -0400
-@@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
+diff -urNp linux-3.1.1/drivers/gpu/drm/i915/intel_display.c linux-3.1.1/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.1.1/drivers/gpu/drm/i915/intel_display.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/i915/intel_display.c   2011-11-16 18:39:07.000000000 -0500
+@@ -2205,7 +2205,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
                wait_event(dev_priv->pending_flip_queue,
                           atomic_read(&dev_priv->mm.wedged) ||
@@ -25205,7 +26738,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
  
                /* Big Hammer, we also need to ensure that any pending
                 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2548,7 +2548,7 @@ static void intel_crtc_wait_for_pending_
+@@ -2824,7 +2824,7 @@ static void intel_crtc_wait_for_pending_
        obj = to_intel_framebuffer(crtc->fb)->obj;
        dev_priv = crtc->dev->dev_private;
        wait_event(dev_priv->pending_flip_queue,
@@ -25214,7 +26747,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
  }
  
  static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -6225,7 +6225,7 @@ static void do_intel_finish_page_flip(st
+@@ -6644,7 +6644,7 @@ static void do_intel_finish_page_flip(st
  
        atomic_clear_mask(1 << intel_crtc->plane,
                          &obj->pending_flip.counter);
@@ -25223,7 +26756,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
                wake_up(&dev_priv->pending_flip_queue);
  
        schedule_work(&work->work);
-@@ -6514,7 +6514,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6933,7 +6933,7 @@ static int intel_crtc_page_flip(struct d
        /* Block clients from rendering to the new back buffer until
         * the flip occurs and the object is no longer visible.
         */
@@ -25232,7 +26765,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
  
        ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
        if (ret)
-@@ -6527,7 +6527,7 @@ static int intel_crtc_page_flip(struct d
+@@ -6947,7 +6947,7 @@ static int intel_crtc_page_flip(struct d
        return 0;
  
  cleanup_pending:
@@ -25241,9 +26774,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
  cleanup_objs:
        drm_gem_object_unreference(&work->old_fb_obj->base);
        drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/mga/mga_drv.h  2011-11-16 18:39:07.000000000 -0500
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
        u32 clear_cmd;
        u32 maccess;
@@ -25256,9 +26789,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm
        u32 next_fence_to_post;
  
        unsigned int fb_cpp;
-diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/mga/mga_irq.c  2011-11-16 18:39:07.000000000 -0500
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
        if (crtc != 0)
                return 0;
@@ -25295,10 +26828,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm
                      - *sequence) <= (1 << 23)));
  
        *sequence = cur_fence;
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-26 19:49:56.000000000 -0400
-@@ -200,7 +200,7 @@ struct methods {
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-16 18:39:07.000000000 -0500
+@@ -201,7 +201,7 @@ struct methods {
        const char desc[8];
        void (*loadbios)(struct drm_device *, uint8_t *);
        const bool rw;
@@ -25307,7 +26840,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/driver
  
  static struct methods shadow_methods[] = {
        { "PRAMIN", load_vbios_pramin, true },
-@@ -5488,7 +5488,7 @@ parse_bit_displayport_tbl_entry(struct d
+@@ -5489,7 +5489,7 @@ parse_bit_displayport_tbl_entry(struct d
  struct bit_table {
        const char id;
        int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
@@ -25316,19 +26849,19 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/driver
  
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-08-23 21:47:55.000000000 -0400
-@@ -227,7 +227,7 @@ struct nouveau_channel {
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-11-16 18:39:07.000000000 -0500
+@@ -238,7 +238,7 @@ struct nouveau_channel {
                struct list_head pending;
                uint32_t sequence;
                uint32_t sequence_ack;
 -              atomic_t last_sequence_irq;
 +              atomic_unchecked_t last_sequence_irq;
+               struct nouveau_vma vma;
        } fence;
  
-       /* DMA push buffer */
-@@ -304,7 +304,7 @@ struct nouveau_exec_engine {
+@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
                           u32 handle, u16 class);
        void (*set_tile_region)(struct drm_device *dev, int i);
        void (*tlb_flush)(struct drm_device *, int engine);
@@ -25337,7 +26870,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers
  
  struct nouveau_instmem_engine {
        void    *priv;
-@@ -325,13 +325,13 @@ struct nouveau_instmem_engine {
+@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
  struct nouveau_mc_engine {
        int  (*init)(struct drm_device *dev);
        void (*takedown)(struct drm_device *dev);
@@ -25353,7 +26886,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers
  
  struct nouveau_fb_engine {
        int num_tiles;
-@@ -494,7 +494,7 @@ struct nouveau_vram_engine {
+@@ -513,7 +513,7 @@ struct nouveau_vram_engine {
        void (*put)(struct drm_device *, struct nouveau_mem **);
  
        bool (*flags_valid)(struct drm_device *, u32 tile_flags);
@@ -25362,7 +26895,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers
  
  struct nouveau_engine {
        struct nouveau_instmem_engine instmem;
-@@ -640,7 +640,7 @@ struct drm_nouveau_private {
+@@ -660,7 +660,7 @@ struct drm_nouveau_private {
                struct drm_global_reference mem_global_ref;
                struct ttm_bo_global_ref bo_global_ref;
                struct ttm_bo_device bdev;
@@ -25371,9 +26904,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers
        } ttm;
  
        struct {
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-11-16 18:39:07.000000000 -0500
 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
                if (USE_REFCNT(dev))
                        sequence = nvchan_rd32(chan, 0x48);
@@ -25383,7 +26916,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drive
  
                if (chan->fence.sequence_ack == sequence)
                        goto out;
-@@ -544,7 +544,7 @@ nouveau_fence_channel_init(struct nouvea
+@@ -541,7 +541,7 @@ nouveau_fence_channel_init(struct nouvea
  
        INIT_LIST_HEAD(&chan->fence.pending);
        spin_lock_init(&chan->fence.lock);
@@ -25392,10 +26925,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drive
        return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-08-23 21:47:55.000000000 -0400
-@@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-11-16 18:39:07.000000000 -0500
+@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *ch
        int trycnt = 0;
        int ret, i;
  
@@ -25404,10 +26937,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers
  retry:
        if (++trycnt > 100000) {
                NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c        2011-08-23 21:47:55.000000000 -0400
-@@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nouveau_state.c        2011-11-16 18:39:07.000000000 -0500
+@@ -496,7 +496,7 @@ static bool nouveau_switcheroo_can_switc
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -25416,10 +26949,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drive
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c   2011-08-23 21:47:55.000000000 -0400
-@@ -560,7 +560,7 @@ static int
+diff -urNp linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/nouveau/nv04_graph.c   2011-11-16 18:39:07.000000000 -0500
+@@ -554,7 +554,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
                        u32 class, u32 mthd, u32 data)
  {
@@ -25428,9 +26961,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/
        return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_cce.c        2011-11-16 18:39:07.000000000 -0500
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
        /* GH: Simple idle check.
@@ -25440,9 +26973,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/d
  
        /* We don't support anything other than bus-mastering ring mode,
         * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_drv.h        2011-11-16 18:39:07.000000000 -0500
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
        int is_pci;
        unsigned long cce_buffers_offset;
@@ -25460,9 +26993,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/d
  
        u32 color_fmt;
        unsigned int front_offset;
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_irq.c        2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
        if (crtc != 0)
                return 0;
@@ -25481,9 +27014,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/d
                drm_handle_vblank(dev, 0);
                return IRQ_HANDLED;
        }
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu/drm/r128/r128_state.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_state.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_state.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/r128/r128_state.c linux-3.1.1/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.1.1/drivers/gpu/drm/r128/r128_state.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/r128/r128_state.c      2011-11-16 18:39:07.000000000 -0500
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -25497,21 +27030,21 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu
  }
  
  #endif
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/atom.c linux-3.0.4/drivers/gpu/drm/radeon/atom.c
---- linux-3.0.4/drivers/gpu/drm/radeon/atom.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/atom.c  2011-08-23 21:48:14.000000000 -0400
-@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/atom.c linux-3.1.1/drivers/gpu/drm/radeon/atom.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/atom.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/atom.c  2011-11-16 19:09:42.000000000 -0500
+@@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c
        char name[512];
        int i;
  
 +      pax_track_stack();
 +
-       ctx->card = card;
-       ctx->bios = bios;
+       if (!ctx)
+               return NULL;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/mkregtable.c    2011-11-16 18:39:07.000000000 -0500
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
        regex_t mask_rex;
        regmatch_t match[4];
@@ -25529,9 +27062,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/g
  
        if (regcomp
            (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_atombios.c       2011-11-16 18:40:10.000000000 -0500
 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
        struct radeon_gpio_rec gpio;
        struct radeon_hpd hpd;
@@ -25541,10 +27074,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/driv
        if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
                return false;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400
-@@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_device.c 2011-11-16 18:39:07.000000000 -0500
+@@ -684,7 +684,7 @@ static bool radeon_switcheroo_can_switch
        bool can_switch;
  
        spin_lock(&dev->count_lock);
@@ -25553,10 +27086,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/driver
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c        2011-08-23 21:48:14.000000000 -0400
-@@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_display.c        2011-11-16 18:40:10.000000000 -0500
+@@ -925,6 +925,8 @@ void radeon_compute_pll_legacy(struct ra
        uint32_t post_div;
        u32 pll_out_min, pll_out_max;
  
@@ -25565,9 +27098,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drive
        DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
        freq = freq * 1000;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_drv.h    2011-11-16 18:39:07.000000000 -0500
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
        /* SW interrupt */
@@ -25577,9 +27110,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/g
        int vblank_crtc;
        uint32_t irq_enable_reg;
        uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_fence.c  2011-11-16 18:39:07.000000000 -0500
 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
                write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
                return 0;
@@ -25598,10 +27131,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers
        INIT_LIST_HEAD(&rdev->fence_drv.created);
        INIT_LIST_HEAD(&rdev->fence_drv.emited);
        INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/drm/radeon/radeon.h
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon.h        2011-08-23 21:47:55.000000000 -0400
-@@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon.h linux-3.1.1/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon.h        2011-11-16 18:39:07.000000000 -0500
+@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
        uint32_t                        scratch_reg;
@@ -25610,7 +27143,7 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/d
        uint32_t                        last_seq;
        unsigned long                   last_jiffies;
        unsigned long                   last_timeout;
-@@ -960,7 +960,7 @@ struct radeon_asic {
+@@ -962,7 +962,7 @@ struct radeon_asic {
        void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
        u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
        void (*post_page_flip)(struct radeon_device *rdev, int crtc);
@@ -25619,9 +27152,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/d
  
  /*
   * Asic structures
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-11-16 18:39:07.000000000 -0500
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
        request = compat_alloc_user_space(sizeof(*request));
        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -25631,9 +27164,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers
                          &request->value))
                return -EFAULT;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_irq.c    2011-11-16 18:39:07.000000000 -0500
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
        unsigned int ret;
        RING_LOCALS;
@@ -25654,9 +27187,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/g
        DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
        dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_state.c  2011-11-16 18:39:07.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;
@@ -25675,10 +27208,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers
  
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c    2011-08-23 21:47:55.000000000 -0400
-@@ -644,8 +644,10 @@ int radeon_mmap(struct file *filp, struc
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/radeon_ttm.c    2011-11-16 18:39:07.000000000 -0500
+@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struc
        }
        if (unlikely(ttm_vm_ops == NULL)) {
                ttm_vm_ops = vma->vm_ops;
@@ -25691,9 +27224,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/g
        }
        vma->vm_ops = &radeon_ttm_vm_ops;
        return 0;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/drm/radeon/rs690.c
---- linux-3.0.4/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/radeon/rs690.c linux-3.1.1/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.1.1/drivers/gpu/drm/radeon/rs690.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/radeon/rs690.c 2011-11-16 18:39:07.000000000 -0500
 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
                if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
                        rdev->pm.sideport_bandwidth.full)
@@ -25707,9 +27240,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/dr
        } else {
                if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
                        rdev->pm.k8_bandwidth.full)
-diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-11-16 18:39:07.000000000 -0500
 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
  static int ttm_pool_mm_shrink(struct shrinker *shrink,
                              struct shrink_control *sc)
@@ -25722,9 +27255,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/
        struct ttm_page_pool *pool;
        int shrink_pages = sc->nr_to_scan;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm/via/via_drv.h
---- linux-3.0.4/drivers/gpu/drm/via/via_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/via/via_drv.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_drv.h linux-3.1.1/drivers/gpu/drm/via/via_drv.h
+--- linux-3.1.1/drivers/gpu/drm/via/via_drv.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/via/via_drv.h  2011-11-16 18:39:07.000000000 -0500
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -25743,9 +27276,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm
        drm_via_state_t hc_state;
        char pci_buf[VIA_PCI_BUF_SIZE];
        const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm/via/via_irq.c
---- linux-3.0.4/drivers/gpu/drm/via/via_irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/via/via_irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/via/via_irq.c linux-3.1.1/drivers/gpu/drm/via/via_irq.c
+--- linux-3.1.1/drivers/gpu/drm/via/via_irq.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/via/via_irq.c  2011-11-16 18:39:07.000000000 -0500
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
        if (crtc != 0)
                return 0;
@@ -25816,9 +27349,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm
                irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
        case VIA_IRQ_ABSOLUTE:
                break;
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-11-16 18:39:07.000000000 -0500
 @@ -240,7 +240,7 @@ struct vmw_private {
         * Fencing and IRQs.
         */
@@ -25828,9 +27361,21 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/g
        wait_queue_head_t fence_queue;
        wait_queue_head_t fifo_queue;
        atomic_t fence_queue_waiters;
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c        2011-11-16 18:39:07.000000000 -0500
+@@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device 
+       struct drm_vmw_fence_rep fence_rep;
+       struct drm_vmw_fence_rep __user *user_fence_rep;
+       int ret;
+-      void *user_cmd;
++      void __user *user_cmd;
+       void *cmd;
+       uint32_t sequence;
+       struct vmw_sw_context *sw_context = &dev_priv->ctx;
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-11-16 18:39:07.000000000 -0500
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
        while (!vmw_lag_lt(queue, us)) {
                spin_lock(&queue->lock);
@@ -25840,9 +27385,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers
                else {
                        fence = list_first_entry(&queue->head,
                                                 struct vmw_fence, head);
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-11-16 18:39:07.000000000 -0500
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
                 (unsigned int) min,
                 (unsigned int) fifo->capabilities);
@@ -25852,6 +27397,15 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/
        iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE);
        vmw_fence_queue_init(&fifo->fence_queue);
        return vmw_fifo_send_fence(dev_priv, &dummy);
+@@ -356,7 +356,7 @@ void *vmw_fifo_reserve(struct vmw_privat
+                               if (reserveable)
+                                       iowrite32(bytes, fifo_mem +
+                                                 SVGA_FIFO_RESERVED);
+-                              return fifo_mem + (next_cmd >> 2);
++                              return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
+                       } else {
+                               need_bounce = true;
+                       }
 @@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_priva
  
        fm = vmw_fifo_reserve(dev_priv, bytes);
@@ -25870,9 +27424,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/
        } while (*sequence == 0);
  
        if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-11-16 18:39:07.000000000 -0500
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
         * emitted. Then the fence is stale and signaled.
         */
@@ -25891,10 +27445,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/g
        ret = 0;
  
        for (;;) {
-diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
---- linux-3.0.4/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400
-@@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device
+diff -urNp linux-3.1.1/drivers/hid/hid-core.c linux-3.1.1/drivers/hid/hid-core.c
+--- linux-3.1.1/drivers/hid/hid-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hid/hid-core.c 2011-11-16 18:39:07.000000000 -0500
+@@ -1951,7 +1951,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
  {
@@ -25903,7 +27457,7 @@ diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
        int ret;
  
        if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -1938,7 +1938,7 @@ int hid_add_device(struct hid_device *hd
+@@ -1966,7 +1966,7 @@ int hid_add_device(struct hid_device *hd
        /* XXX hack, any other cleaner solution after the driver core
         * is converted to allow more than 20 bytes as the device name? */
        dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
@@ -25912,9 +27466,9 @@ diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
  
        hid_debug_register(hdev, dev_name(&hdev->dev));
        ret = device_add(&hdev->dev);
-diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhid/hiddev.c
---- linux-3.0.4/drivers/hid/usbhid/hiddev.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hid/usbhid/hiddev.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/hid/usbhid/hiddev.c linux-3.1.1/drivers/hid/usbhid/hiddev.c
+--- linux-3.1.1/drivers/hid/usbhid/hiddev.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hid/usbhid/hiddev.c    2011-11-16 18:39:07.000000000 -0500
 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
                break;
  
@@ -25924,9 +27478,9 @@ diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhi
                        break;
  
                for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmon/acpi_power_meter.c
---- linux-3.0.4/drivers/hwmon/acpi_power_meter.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/acpi_power_meter.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/hwmon/acpi_power_meter.c linux-3.1.1/drivers/hwmon/acpi_power_meter.c
+--- linux-3.1.1/drivers/hwmon/acpi_power_meter.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hwmon/acpi_power_meter.c       2011-11-16 18:39:07.000000000 -0500
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
                return res;
  
@@ -25936,9 +27490,9 @@ diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmo
  
        mutex_lock(&resource->lock);
        resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
---- linux-3.0.4/drivers/hwmon/sht15.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/sht15.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/hwmon/sht15.c linux-3.1.1/drivers/hwmon/sht15.c
+--- linux-3.1.1/drivers/hwmon/sht15.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/hwmon/sht15.c  2011-11-16 18:39:07.000000000 -0500
 @@ -166,7 +166,7 @@ struct sht15_data {
        int                             supply_uV;
        bool                            supply_uV_valid;
@@ -25987,23 +27541,9 @@ diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
                        return;
        }
  
-diff -urNp linux-3.0.4/drivers/hwmon/w83791d.c linux-3.0.4/drivers/hwmon/w83791d.c
---- linux-3.0.4/drivers/hwmon/w83791d.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/w83791d.c        2011-08-23 21:47:55.000000000 -0400
-@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
-                         struct i2c_board_info *info);
- static int w83791d_remove(struct i2c_client *client);
- 
--static int w83791d_read(struct i2c_client *client, u8 register);
--static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
-+static int w83791d_read(struct i2c_client *client, u8 reg);
-+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
- static struct w83791d_data *w83791d_update_device(struct device *dev);
- 
- #ifdef DEBUG
-diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/busses/i2c-amd756-s4882.c  2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@
  extern struct i2c_adapter amd756_smbus;
  
@@ -26013,9 +27553,9 @@ diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-16 18:39:07.000000000 -0500
 @@ -41,7 +41,7 @@
  extern struct i2c_adapter *nforce2_smbus;
  
@@ -26025,9 +27565,9 @@ diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/driver
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
---- linux-3.0.4/drivers/i2c/i2c-mux.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/i2c-mux.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/i2c/i2c-mux.c linux-3.1.1/drivers/i2c/i2c-mux.c
+--- linux-3.1.1/drivers/i2c/i2c-mux.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/i2c/i2c-mux.c  2011-11-16 18:39:07.000000000 -0500
 @@ -28,7 +28,7 @@
  /* multiplexer per channel data */
  struct i2c_mux_priv {
@@ -26037,9 +27577,228 @@ diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
  
        struct i2c_adapter *parent;
        void *mux_dev;  /* the mux chip/device */
-diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
---- linux-3.0.4/drivers/ide/ide-cd.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/ide-cd.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/ide/aec62xx.c linux-3.1.1/drivers/ide/aec62xx.c
+--- linux-3.1.1/drivers/ide/aec62xx.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/aec62xx.c  2011-11-16 18:39:07.000000000 -0500
+@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
+       .cable_detect           = atp86x_cable_detect,
+ };
+ 
+-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
++static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
+       {       /* 0: AEC6210 */
+               .name           = DRV_NAME,
+               .init_chipset   = init_chipset_aec62xx,
+diff -urNp linux-3.1.1/drivers/ide/alim15x3.c linux-3.1.1/drivers/ide/alim15x3.c
+--- linux-3.1.1/drivers/ide/alim15x3.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/alim15x3.c 2011-11-16 18:39:07.000000000 -0500
+@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info ali15x3_chipset __devinitdata = {
++static const struct ide_port_info ali15x3_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_ali15x3,
+       .init_hwif      = init_hwif_ali15x3,
+diff -urNp linux-3.1.1/drivers/ide/amd74xx.c linux-3.1.1/drivers/ide/amd74xx.c
+--- linux-3.1.1/drivers/ide/amd74xx.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/amd74xx.c  2011-11-16 18:39:07.000000000 -0500
+@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
+               .udma_mask      = udma,                                 \
+       }
+ 
+-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
++static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
+       /* 0: AMD7401 */        DECLARE_AMD_DEV(0x00, ATA_UDMA2),
+       /* 1: AMD7409 */        DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
+       /* 2: AMD7411/7441 */   DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
+diff -urNp linux-3.1.1/drivers/ide/atiixp.c linux-3.1.1/drivers/ide/atiixp.c
+--- linux-3.1.1/drivers/ide/atiixp.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/atiixp.c   2011-11-16 18:39:07.000000000 -0500
+@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
+       .cable_detect           = atiixp_cable_detect,
+ };
+ 
+-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
++static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
+       {       /* 0: IXP200/300/400/700 */
+               .name           = DRV_NAME,
+               .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
+diff -urNp linux-3.1.1/drivers/ide/cmd64x.c linux-3.1.1/drivers/ide/cmd64x.c
+--- linux-3.1.1/drivers/ide/cmd64x.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cmd64x.c   2011-11-16 18:39:07.000000000 -0500
+@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
++static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
+       {       /* 0: CMD643 */
+               .name           = DRV_NAME,
+               .init_chipset   = init_chipset_cmd64x,
+diff -urNp linux-3.1.1/drivers/ide/cs5520.c linux-3.1.1/drivers/ide/cs5520.c
+--- linux-3.1.1/drivers/ide/cs5520.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5520.c   2011-11-16 18:39:07.000000000 -0500
+@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
+       .set_dma_mode           = cs5520_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info cyrix_chipset __devinitdata = {
++static const struct ide_port_info cyrix_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
+       .port_ops       = &cs5520_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/cs5530.c linux-3.1.1/drivers/ide/cs5530.c
+--- linux-3.1.1/drivers/ide/cs5530.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5530.c   2011-11-16 18:39:07.000000000 -0500
+@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
+       .udma_filter            = cs5530_udma_filter,
+ };
+ 
+-static const struct ide_port_info cs5530_chipset __devinitdata = {
++static const struct ide_port_info cs5530_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_cs5530,
+       .init_hwif      = init_hwif_cs5530,
+diff -urNp linux-3.1.1/drivers/ide/cs5535.c linux-3.1.1/drivers/ide/cs5535.c
+--- linux-3.1.1/drivers/ide/cs5535.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cs5535.c   2011-11-16 18:39:07.000000000 -0500
+@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
+       .cable_detect           = cs5535_cable_detect,
+ };
+ 
+-static const struct ide_port_info cs5535_chipset __devinitdata = {
++static const struct ide_port_info cs5535_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .port_ops       = &cs5535_port_ops,
+       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
+diff -urNp linux-3.1.1/drivers/ide/cy82c693.c linux-3.1.1/drivers/ide/cy82c693.c
+--- linux-3.1.1/drivers/ide/cy82c693.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/cy82c693.c 2011-11-16 18:39:07.000000000 -0500
+@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c69
+       .set_dma_mode           = cy82c693_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info cy82c693_chipset __devinitdata = {
++static const struct ide_port_info cy82c693_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_iops      = init_iops_cy82c693,
+       .port_ops       = &cy82c693_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/hpt366.c linux-3.1.1/drivers/ide/hpt366.c
+--- linux-3.1.1/drivers/ide/hpt366.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/hpt366.c   2011-11-16 18:39:07.000000000 -0500
+@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
+       }
+ };
+ 
+-static const struct hpt_info hpt36x __devinitdata = {
++static const struct hpt_info hpt36x __devinitconst = {
+       .chip_name      = "HPT36x",
+       .chip_type      = HPT36x,
+       .udma_mask      = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
+@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __de
+       .timings        = &hpt36x_timings
+ };
+ 
+-static const struct hpt_info hpt370 __devinitdata = {
++static const struct hpt_info hpt370 __devinitconst = {
+       .chip_name      = "HPT370",
+       .chip_type      = HPT370,
+       .udma_mask      = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
+@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __de
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt370a __devinitdata = {
++static const struct hpt_info hpt370a __devinitconst = {
+       .chip_name      = "HPT370A",
+       .chip_type      = HPT370A,
+       .udma_mask      = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
+@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __d
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt374 __devinitdata = {
++static const struct hpt_info hpt374 __devinitconst = {
+       .chip_name      = "HPT374",
+       .chip_type      = HPT374,
+       .udma_mask      = ATA_UDMA5,
+@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __de
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372 __devinitdata = {
++static const struct hpt_info hpt372 __devinitconst = {
+       .chip_name      = "HPT372",
+       .chip_type      = HPT372,
+       .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __de
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372a __devinitdata = {
++static const struct hpt_info hpt372a __devinitconst = {
+       .chip_name      = "HPT372A",
+       .chip_type      = HPT372A,
+       .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __d
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt302 __devinitdata = {
++static const struct hpt_info hpt302 __devinitconst = {
+       .chip_name      = "HPT302",
+       .chip_type      = HPT302,
+       .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __de
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt371 __devinitdata = {
++static const struct hpt_info hpt371 __devinitconst = {
+       .chip_name      = "HPT371",
+       .chip_type      = HPT371,
+       .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __de
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372n __devinitdata = {
++static const struct hpt_info hpt372n __devinitconst = {
+       .chip_name      = "HPT372N",
+       .chip_type      = HPT372N,
+       .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __d
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt302n __devinitdata = {
++static const struct hpt_info hpt302n __devinitconst = {
+       .chip_name      = "HPT302N",
+       .chip_type      = HPT302N,
+       .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __d
+       .timings        = &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt371n __devinitdata = {
++static const struct hpt_info hpt371n __devinitconst = {
+       .chip_name      = "HPT371N",
+       .chip_type      = HPT371N,
+       .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_d
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
++static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
+       {       /* 0: HPT36x */
+               .name           = DRV_NAME,
+               .init_chipset   = init_chipset_hpt366,
+diff -urNp linux-3.1.1/drivers/ide/ide-cd.c linux-3.1.1/drivers/ide/ide-cd.c
+--- linux-3.1.1/drivers/ide/ide-cd.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-cd.c   2011-11-16 18:39:07.000000000 -0500
 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
                alignment = queue_dma_alignment(q) | q->dma_pad_mask;
                if ((unsigned long)buf & alignment
@@ -26049,9 +27808,9 @@ diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
                        drive->dma = 0;
        }
  }
-diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-floppy.c
---- linux-3.0.4/drivers/ide/ide-floppy.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/ide-floppy.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/ide/ide-floppy.c linux-3.1.1/drivers/ide/ide-floppy.c
+--- linux-3.1.1/drivers/ide/ide-floppy.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-floppy.c       2011-11-16 18:40:10.000000000 -0500
 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
        u8 pc_buf[256], header_len, desc_cnt;
        int i, rc = 1, blocks, length;
@@ -26061,9 +27820,177 @@ diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-flop
        ide_debug_log(IDE_DBG_FUNC, "enter");
  
        drive->bios_cyl = 0;
-diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci.c
---- linux-3.0.4/drivers/ide/setup-pci.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/setup-pci.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/ide/ide-pci-generic.c linux-3.1.1/drivers/ide/ide-pci-generic.c
+--- linux-3.1.1/drivers/ide/ide-pci-generic.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ide-pci-generic.c  2011-11-16 18:39:07.000000000 -0500
+@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
+               .udma_mask      = ATA_UDMA6, \
+       }
+ 
+-static const struct ide_port_info generic_chipsets[] __devinitdata = {
++static const struct ide_port_info generic_chipsets[] __devinitconst = {
+       /*  0: Unknown */
+       DECLARE_GENERIC_PCI_DEV(0),
+ 
+diff -urNp linux-3.1.1/drivers/ide/it8172.c linux-3.1.1/drivers/ide/it8172.c
+--- linux-3.1.1/drivers/ide/it8172.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it8172.c   2011-11-16 18:39:07.000000000 -0500
+@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
+       .set_dma_mode   = it8172_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info it8172_port_info __devinitdata = {
++static const struct ide_port_info it8172_port_info __devinitconst = {
+       .name           = DRV_NAME,
+       .port_ops       = &it8172_port_ops,
+       .enablebits     = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
+diff -urNp linux-3.1.1/drivers/ide/it8213.c linux-3.1.1/drivers/ide/it8213.c
+--- linux-3.1.1/drivers/ide/it8213.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it8213.c   2011-11-16 18:39:07.000000000 -0500
+@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
+       .cable_detect           = it8213_cable_detect,
+ };
+ 
+-static const struct ide_port_info it8213_chipset __devinitdata = {
++static const struct ide_port_info it8213_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = { {0x41, 0x80, 0x80} },
+       .port_ops       = &it8213_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/it821x.c linux-3.1.1/drivers/ide/it821x.c
+--- linux-3.1.1/drivers/ide/it821x.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/it821x.c   2011-11-16 18:39:07.000000000 -0500
+@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
+       .cable_detect           = it821x_cable_detect,
+ };
+ 
+-static const struct ide_port_info it821x_chipset __devinitdata = {
++static const struct ide_port_info it821x_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_it821x,
+       .init_hwif      = init_hwif_it821x,
+diff -urNp linux-3.1.1/drivers/ide/jmicron.c linux-3.1.1/drivers/ide/jmicron.c
+--- linux-3.1.1/drivers/ide/jmicron.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/jmicron.c  2011-11-16 18:39:07.000000000 -0500
+@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
+       .cable_detect           = jmicron_cable_detect,
+ };
+ 
+-static const struct ide_port_info jmicron_chipset __devinitdata = {
++static const struct ide_port_info jmicron_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
+       .port_ops       = &jmicron_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/ns87415.c linux-3.1.1/drivers/ide/ns87415.c
+--- linux-3.1.1/drivers/ide/ns87415.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/ns87415.c  2011-11-16 18:39:07.000000000 -0500
+@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
+       .dma_sff_read_status    = superio_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info ns87415_chipset __devinitdata = {
++static const struct ide_port_info ns87415_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_hwif      = init_hwif_ns87415,
+       .tp_ops         = &ns87415_tp_ops,
+diff -urNp linux-3.1.1/drivers/ide/opti621.c linux-3.1.1/drivers/ide/opti621.c
+--- linux-3.1.1/drivers/ide/opti621.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/opti621.c  2011-11-16 18:39:07.000000000 -0500
+@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
+       .set_pio_mode           = opti621_set_pio_mode,
+ };
+ 
+-static const struct ide_port_info opti621_chipset __devinitdata = {
++static const struct ide_port_info opti621_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
+       .port_ops       = &opti621_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/pdc202xx_new.c linux-3.1.1/drivers/ide/pdc202xx_new.c
+--- linux-3.1.1/drivers/ide/pdc202xx_new.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/pdc202xx_new.c     2011-11-16 18:39:07.000000000 -0500
+@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
+               .udma_mask      = udma, \
+       }
+ 
+-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
++static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
+       /* 0: PDC202{68,70} */          DECLARE_PDCNEW_DEV(ATA_UDMA5),
+       /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
+ };
+diff -urNp linux-3.1.1/drivers/ide/pdc202xx_old.c linux-3.1.1/drivers/ide/pdc202xx_old.c
+--- linux-3.1.1/drivers/ide/pdc202xx_old.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/pdc202xx_old.c     2011-11-16 18:39:07.000000000 -0500
+@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
+               .max_sectors    = sectors, \
+       }
+ 
+-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
++static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
+       {       /* 0: PDC20246 */
+               .name           = DRV_NAME,
+               .init_chipset   = init_chipset_pdc202xx,
+diff -urNp linux-3.1.1/drivers/ide/piix.c linux-3.1.1/drivers/ide/piix.c
+--- linux-3.1.1/drivers/ide/piix.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/piix.c     2011-11-16 18:39:07.000000000 -0500
+@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
+               .udma_mask      = udma, \
+       }
+ 
+-static const struct ide_port_info piix_pci_info[] __devinitdata = {
++static const struct ide_port_info piix_pci_info[] __devinitconst = {
+       /* 0: MPIIX */
+       {       /*
+                * MPIIX actually has only a single IDE channel mapped to
+diff -urNp linux-3.1.1/drivers/ide/rz1000.c linux-3.1.1/drivers/ide/rz1000.c
+--- linux-3.1.1/drivers/ide/rz1000.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/rz1000.c   2011-11-16 18:39:07.000000000 -0500
+@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
+       }
+ }
+ 
+-static const struct ide_port_info rz1000_chipset __devinitdata = {
++static const struct ide_port_info rz1000_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .host_flags     = IDE_HFLAG_NO_DMA,
+ };
+diff -urNp linux-3.1.1/drivers/ide/sc1200.c linux-3.1.1/drivers/ide/sc1200.c
+--- linux-3.1.1/drivers/ide/sc1200.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sc1200.c   2011-11-16 18:39:07.000000000 -0500
+@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info sc1200_chipset __devinitdata = {
++static const struct ide_port_info sc1200_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .port_ops       = &sc1200_port_ops,
+       .dma_ops        = &sc1200_dma_ops,
+diff -urNp linux-3.1.1/drivers/ide/scc_pata.c linux-3.1.1/drivers/ide/scc_pata.c
+--- linux-3.1.1/drivers/ide/scc_pata.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/scc_pata.c 2011-11-16 18:39:07.000000000 -0500
+@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
+       .dma_sff_read_status    = scc_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info scc_chipset __devinitdata = {
++static const struct ide_port_info scc_chipset __devinitconst = {
+       .name           = "sccIDE",
+       .init_iops      = init_iops_scc,
+       .init_dma       = scc_init_dma,
+diff -urNp linux-3.1.1/drivers/ide/serverworks.c linux-3.1.1/drivers/ide/serverworks.c
+--- linux-3.1.1/drivers/ide/serverworks.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/serverworks.c      2011-11-16 18:39:07.000000000 -0500
+@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
+       .cable_detect           = svwks_cable_detect,
+ };
+ 
+-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
++static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
+       {       /* 0: OSB4 */
+               .name           = DRV_NAME,
+               .init_chipset   = init_chipset_svwks,
+diff -urNp linux-3.1.1/drivers/ide/setup-pci.c linux-3.1.1/drivers/ide/setup-pci.c
+--- linux-3.1.1/drivers/ide/setup-pci.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/setup-pci.c        2011-11-16 18:40:10.000000000 -0500
 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
        int ret, i, n_ports = dev2 ? 4 : 2;
        struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -26073,9 +28000,105 @@ diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci
        for (i = 0; i < n_ports / 2; i++) {
                ret = ide_setup_pci_controller(pdev[i], d, !i);
                if (ret < 0)
-diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniband/core/cm.c
---- linux-3.0.4/drivers/infiniband/core/cm.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/core/cm.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/ide/siimage.c linux-3.1.1/drivers/ide/siimage.c
+--- linux-3.1.1/drivers/ide/siimage.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/siimage.c  2011-11-16 18:39:07.000000000 -0500
+@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
+               .udma_mask      = ATA_UDMA6,            \
+       }
+ 
+-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
++static const struct ide_port_info siimage_chipsets[] __devinitconst = {
+       /* 0: SiI680 */  DECLARE_SII_DEV(&sil_pata_port_ops),
+       /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
+ };
+diff -urNp linux-3.1.1/drivers/ide/sis5513.c linux-3.1.1/drivers/ide/sis5513.c
+--- linux-3.1.1/drivers/ide/sis5513.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sis5513.c  2011-11-16 18:39:07.000000000 -0500
+@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
+       .cable_detect           = sis_cable_detect,
+ };
+ 
+-static const struct ide_port_info sis5513_chipset __devinitdata = {
++static const struct ide_port_info sis5513_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_sis5513,
+       .enablebits     = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
+diff -urNp linux-3.1.1/drivers/ide/sl82c105.c linux-3.1.1/drivers/ide/sl82c105.c
+--- linux-3.1.1/drivers/ide/sl82c105.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/sl82c105.c 2011-11-16 18:39:07.000000000 -0500
+@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info sl82c105_chipset __devinitdata = {
++static const struct ide_port_info sl82c105_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_sl82c105,
+       .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
+diff -urNp linux-3.1.1/drivers/ide/slc90e66.c linux-3.1.1/drivers/ide/slc90e66.c
+--- linux-3.1.1/drivers/ide/slc90e66.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/slc90e66.c 2011-11-16 18:39:07.000000000 -0500
+@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
+       .cable_detect           = slc90e66_cable_detect,
+ };
+ 
+-static const struct ide_port_info slc90e66_chipset __devinitdata = {
++static const struct ide_port_info slc90e66_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
+       .port_ops       = &slc90e66_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/tc86c001.c linux-3.1.1/drivers/ide/tc86c001.c
+--- linux-3.1.1/drivers/ide/tc86c001.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/tc86c001.c 2011-11-16 18:39:07.000000000 -0500
+@@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
+       .dma_sff_read_status    = ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info tc86c001_chipset __devinitdata = {
++static const struct ide_port_info tc86c001_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_hwif      = init_hwif_tc86c001,
+       .port_ops       = &tc86c001_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/triflex.c linux-3.1.1/drivers/ide/triflex.c
+--- linux-3.1.1/drivers/ide/triflex.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/triflex.c  2011-11-16 18:39:07.000000000 -0500
+@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
+       .set_dma_mode           = triflex_set_mode,
+ };
+ 
+-static const struct ide_port_info triflex_device __devinitdata = {
++static const struct ide_port_info triflex_device __devinitconst = {
+       .name           = DRV_NAME,
+       .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
+       .port_ops       = &triflex_port_ops,
+diff -urNp linux-3.1.1/drivers/ide/trm290.c linux-3.1.1/drivers/ide/trm290.c
+--- linux-3.1.1/drivers/ide/trm290.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/trm290.c   2011-11-16 18:39:07.000000000 -0500
+@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
+       .dma_check              = trm290_dma_check,
+ };
+ 
+-static const struct ide_port_info trm290_chipset __devinitdata = {
++static const struct ide_port_info trm290_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_hwif      = init_hwif_trm290,
+       .tp_ops         = &trm290_tp_ops,
+diff -urNp linux-3.1.1/drivers/ide/via82cxxx.c linux-3.1.1/drivers/ide/via82cxxx.c
+--- linux-3.1.1/drivers/ide/via82cxxx.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/ide/via82cxxx.c        2011-11-16 18:39:07.000000000 -0500
+@@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
+       .cable_detect           = via82cxxx_cable_detect,
+ };
+ 
+-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
++static const struct ide_port_info via82cxxx_chipset __devinitconst = {
+       .name           = DRV_NAME,
+       .init_chipset   = init_chipset_via82cxxx,
+       .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
+diff -urNp linux-3.1.1/drivers/infiniband/core/cm.c linux-3.1.1/drivers/infiniband/core/cm.c
+--- linux-3.1.1/drivers/infiniband/core/cm.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/core/cm.c   2011-11-16 18:39:07.000000000 -0500
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -26215,9 +28238,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniba
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/infiniband/core/fmr_pool.c
---- linux-3.0.4/drivers/infiniband/core/fmr_pool.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/core/fmr_pool.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/core/fmr_pool.c linux-3.1.1/drivers/infiniband/core/fmr_pool.c
+--- linux-3.1.1/drivers/infiniband/core/fmr_pool.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/core/fmr_pool.c     2011-11-16 18:39:07.000000000 -0500
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
        struct task_struct       *thread;
@@ -26285,9 +28308,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/in
                                wake_up_process(pool->thread);
                        }
                }
-diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/cxgb4/mem.c      2011-11-16 18:39:07.000000000 -0500
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
        int err;
        struct fw_ri_tpte tpt;
@@ -26306,9 +28329,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/inf
        }
        PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
             __func__, stag_state, type, pdid, stag_idx);
-diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-16 18:40:10.000000000 -0500
 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
        struct infinipath_counters counters;
        struct ipath_devdata *dd;
@@ -26318,9 +28341,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/driver
        dd = file->f_path.dentry->d_inode->i_private;
        dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-16 18:39:07.000000000 -0500
 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
                struct ib_atomic_eth *ateth;
                struct ipath_ack_entry *e;
@@ -26344,9 +28367,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/driver
                        (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
                                      be64_to_cpu(ateth->compare_data),
                                      sdata);
-diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
        unsigned long flags;
        struct ib_wc wc;
@@ -26370,9 +28393,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drive
                        (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
                                      sdata, wqe->wr.wr.atomic.swap);
                goto send_comp;
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infiniband/hw/nes/nes.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.c linux-3.1.1/drivers/infiniband/hw/nes/nes.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes.c        2011-11-16 18:39:07.000000000 -0500
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -26391,9 +28414,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infin
  
        /* Free the control structures */
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_cm.c     2011-11-16 18:39:07.000000000 -0500
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -26590,9 +28613,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/in
        nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
                        cm_node, cm_id, jiffies);
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.h linux-3.0.4/drivers/infiniband/hw/nes/nes.h
---- linux-3.0.4/drivers/infiniband/hw/nes/nes.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes.h linux-3.1.1/drivers/infiniband/hw/nes/nes.h
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes.h        2011-11-16 18:39:07.000000000 -0500
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -26644,9 +28667,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.h linux-3.0.4/drivers/infin
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_nic.c    2011-11-16 18:39:07.000000000 -0500
 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
        target_stat_values[++index] = mh_detected;
        target_stat_values[++index] = mh_pauses_sent;
@@ -26697,9 +28720,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/i
        target_stat_values[++index] = nesadapter->free_4kpbl;
        target_stat_values[++index] = nesadapter->free_256pbl;
        target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/nes/nes_verbs.c  2011-11-16 18:39:07.000000000 -0500
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -26713,7 +28736,7 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers
  
  static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
  
-@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struc
+@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struc
        if (init_attr->create_flags)
                return ERR_PTR(-EINVAL);
  
@@ -26722,7 +28745,7 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers
        switch (init_attr->qp_type) {
                case IB_QPT_RC:
                        if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp *
+@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *
        struct iw_cm_event cm_event;
        int ret;
  
@@ -26731,9 +28754,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers
        nesqp->destroyed = 1;
  
        /* Blow away the connection if it exists. */
-diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infiniband/hw/qib/qib.h
---- linux-3.0.4/drivers/infiniband/hw/qib/qib.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/qib/qib.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/infiniband/hw/qib/qib.h linux-3.1.1/drivers/infiniband/hw/qib/qib.h
+--- linux-3.1.1/drivers/infiniband/hw/qib/qib.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/infiniband/hw/qib/qib.h        2011-11-16 18:39:07.000000000 -0500
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -26742,9 +28765,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infin
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/input/gameport/gameport.c
---- linux-3.0.4/drivers/input/gameport/gameport.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/gameport/gameport.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/input/gameport/gameport.c linux-3.1.1/drivers/input/gameport/gameport.c
+--- linux-3.1.1/drivers/input/gameport/gameport.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/gameport/gameport.c      2011-11-16 18:39:07.000000000 -0500
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -26762,9 +28785,9 @@ diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/inp
        gameport->dev.bus = &gameport_bus;
        gameport->dev.release = gameport_release_port;
        if (gameport->parent)
-diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
---- linux-3.0.4/drivers/input/input.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/input.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/input/input.c linux-3.1.1/drivers/input/input.c
+--- linux-3.1.1/drivers/input/input.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/input.c  2011-11-16 18:39:07.000000000 -0500
 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -26783,9 +28806,9 @@ diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
  
        error = device_add(&dev->dev);
        if (error)
-diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/input/joystick/sidewinder.c
---- linux-3.0.4/drivers/input/joystick/sidewinder.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/joystick/sidewinder.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/input/joystick/sidewinder.c linux-3.1.1/drivers/input/joystick/sidewinder.c
+--- linux-3.1.1/drivers/input/joystick/sidewinder.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/joystick/sidewinder.c    2011-11-16 18:40:10.000000000 -0500
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -26803,10 +28826,10 @@ diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/i
        i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
        if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {             /* Broken packet, try to fix */
-diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/joystick/xpad.c
---- linux-3.0.4/drivers/input/joystick/xpad.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/joystick/xpad.c  2011-08-23 21:47:55.000000000 -0400
-@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
+diff -urNp linux-3.1.1/drivers/input/joystick/xpad.c linux-3.1.1/drivers/input/joystick/xpad.c
+--- linux-3.1.1/drivers/input/joystick/xpad.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/joystick/xpad.c  2011-11-16 18:39:07.000000000 -0500
+@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
  {
@@ -26815,7 +28838,7 @@ diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/j
        long led_no;
        struct xpad_led *led;
        struct led_classdev *led_cdev;
-@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpa
+@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpa
        if (!led)
                return -ENOMEM;
  
@@ -26824,9 +28847,9 @@ diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/j
  
        snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
        led->xpad = xpad;
-diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/mousedev.c
---- linux-3.0.4/drivers/input/mousedev.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/mousedev.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/input/mousedev.c linux-3.1.1/drivers/input/mousedev.c
+--- linux-3.1.1/drivers/input/mousedev.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/mousedev.c       2011-11-16 18:39:07.000000000 -0500
 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
  
        spin_unlock_irq(&client->packet_lock);
@@ -26836,9 +28859,9 @@ diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/moused
                return -EFAULT;
  
        return count;
-diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/serio/serio.c
---- linux-3.0.4/drivers/input/serio/serio.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/serio/serio.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/input/serio/serio.c linux-3.1.1/drivers/input/serio/serio.c
+--- linux-3.1.1/drivers/input/serio/serio.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/input/serio/serio.c    2011-11-16 18:39:07.000000000 -0500
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -26857,9 +28880,9 @@ diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/ser
        serio->dev.bus = &serio_bus;
        serio->dev.release = serio_release_port;
        serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/capi.c
---- linux-3.0.4/drivers/isdn/capi/capi.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/capi/capi.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/capi/capi.c linux-3.1.1/drivers/isdn/capi/capi.c
+--- linux-3.1.1/drivers/isdn/capi/capi.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/capi/capi.c       2011-11-16 18:39:07.000000000 -0500
 @@ -83,8 +83,8 @@ struct capiminor {
  
        struct capi20_appl      *ap;
@@ -26897,9 +28920,9 @@ diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/ca
                capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
                capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
                capimsg_setu16(skb->data, 16, len);     /* Data length */
-diff -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gigaset/common.c
---- linux-3.0.4/drivers/isdn/gigaset/common.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/common.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/common.c linux-3.1.1/drivers/isdn/gigaset/common.c
+--- linux-3.1.1/drivers/isdn/gigaset/common.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/common.c  2011-11-16 18:39:07.000000000 -0500
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
        cs->commands_pending = 0;
        cs->cur_at_seq = 0;
@@ -26909,13 +28932,13 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gi
        cs->dev = NULL;
        cs->tty = NULL;
        cs->tty_dev = NULL;
-diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/gigaset/gigaset.h
---- linux-3.0.4/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/gigaset.h linux-3.1.1/drivers/isdn/gigaset/gigaset.h
+--- linux-3.1.1/drivers/isdn/gigaset/gigaset.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/gigaset.h 2011-11-16 18:39:07.000000000 -0500
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
 +#include <asm/local.h>
  
  #define GIG_VERSION {0, 5, 0, 0}
@@ -26929,9 +28952,9 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/g
        struct tty_struct *tty;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;
-diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn/gigaset/interface.c
---- linux-3.0.4/drivers/isdn/gigaset/interface.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/interface.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/gigaset/interface.c linux-3.1.1/drivers/isdn/gigaset/interface.c
+--- linux-3.1.1/drivers/isdn/gigaset/interface.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/gigaset/interface.c       2011-11-16 18:39:07.000000000 -0500
 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
        }
        tty->driver_data = cs;
@@ -27019,9 +29042,9 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
                goto out;
        }
-diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/hardware/avm/b1.c
---- linux-3.0.4/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/avm/b1.c linux-3.1.1/drivers/isdn/hardware/avm/b1.c
+--- linux-3.1.1/drivers/isdn/hardware/avm/b1.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/avm/b1.c 2011-11-16 18:39:07.000000000 -0500
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
        }
        if (left) {
@@ -27040,9 +29063,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/h
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-16 18:40:10.000000000 -0500
 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
    byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
      short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -27051,9 +29074,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/driver
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/capifunc.c 2011-11-16 18:40:10.000000000 -0500
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -27063,9 +29086,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/driver
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-16 18:40:10.000000000 -0500
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -27075,9 +29098,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/driver
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/divasfunc.c        2011-11-16 18:40:10.000000000 -0500
 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -27087,9 +29110,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drive
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/divasync.h 2011-11-16 18:39:07.000000000 -0500
 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
  } diva_didd_add_adapter_t;
  typedef struct _diva_didd_remove_adapter {
@@ -27099,9 +29122,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/driver
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/idifunc.c  2011-11-16 18:40:10.000000000 -0500
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -27111,9 +29134,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers/isdn/hardware/eicon/message.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/message.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/message.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/message.c linux-3.1.1/drivers/isdn/hardware/eicon/message.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/message.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/message.c  2011-11-16 18:40:10.000000000 -0500
 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -27150,9 +29173,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/mntfunc.c  2011-11-16 18:40:10.000000000 -0500
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -27162,9 +29185,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-11-16 18:39:07.000000000 -0500
 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
  typedef struct _diva_os_idi_adapter_interface {
        diva_init_card_proc_t cleanup_adapter_proc;
@@ -27174,9 +29197,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/dri
  
  typedef struct _diva_os_xdi_adapter {
        struct list_head link;
-diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i4l/isdn_common.c
---- linux-3.0.4/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/i4l/isdn_common.c linux-3.1.1/drivers/isdn/i4l/isdn_common.c
+--- linux-3.1.1/drivers/isdn/i4l/isdn_common.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/i4l/isdn_common.c 2011-11-16 18:40:10.000000000 -0500
 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, 
        } iocpar;
        void __user *argp = (void __user *)arg;
@@ -27186,9 +29209,9 @@ diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
---- linux-3.0.4/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/isdn/icn/icn.c linux-3.1.1/drivers/isdn/icn/icn.c
+--- linux-3.1.1/drivers/isdn/icn/icn.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/isdn/icn/icn.c 2011-11-16 18:39:07.000000000 -0500
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
                if (count > len)
                        count = len;
@@ -27198,9 +29221,9 @@ diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
                                return -EFAULT;
                } else
                        memcpy(msg, buf, count);
-diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
---- linux-3.0.4/drivers/lguest/core.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/core.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/lguest/core.c linux-3.1.1/drivers/lguest/core.c
+--- linux-3.1.1/drivers/lguest/core.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/core.c  2011-11-16 18:39:07.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.
@@ -27221,16 +29244,16 @@ diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
                printk("lguest: could not map switcher pages high\n");
 @@ -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).
+        * Copy in the compiled-in Switcher code (from x86/switcher_32.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-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/core.c
---- linux-3.0.4/drivers/lguest/x86/core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/x86/core.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/lguest/x86/core.c linux-3.1.1/drivers/lguest/x86/core.c
+--- linux-3.1.1/drivers/lguest/x86/core.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/x86/core.c      2011-11-16 18:39:07.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)
@@ -27254,7 +29277,7 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/
        /*
         * 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)
+@@ -472,7 +478,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++)
@@ -27263,7 +29286,7 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/
  
        /*
         * Set up the Switcher's per-cpu areas.
-@@ -630,7 +636,7 @@ void __init lguest_arch_host_init(void)
+@@ -555,7 +561,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.
         */
@@ -27272,9 +29295,9 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/
        lguest_entry.segment = LGUEST_CS;
  
        /*
-diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lguest/x86/switcher_32.S
---- linux-3.0.4/drivers/lguest/x86/switcher_32.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/x86/switcher_32.S       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/lguest/x86/switcher_32.S linux-3.1.1/drivers/lguest/x86/switcher_32.S
+--- linux-3.1.1/drivers/lguest/x86/switcher_32.S       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/lguest/x86/switcher_32.S       2011-11-16 18:39:07.000000000 -0500
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -27333,10 +29356,22 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lgue
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
---- linux-3.0.4/drivers/md/dm.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm.c        2011-08-23 21:47:55.000000000 -0400
-@@ -164,9 +164,9 @@ struct mapped_device {
+diff -urNp linux-3.1.1/drivers/macintosh/macio_asic.c linux-3.1.1/drivers/macintosh/macio_asic.c
+--- linux-3.1.1/drivers/macintosh/macio_asic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/macintosh/macio_asic.c 2011-11-16 18:39:07.000000000 -0500
+@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s
+  * MacIO is matched against any Apple ID, it's probe() function
+  * will then decide wether it applies or not
+  */
+-static const struct pci_device_id __devinitdata pci_ids [] = { {
++static const struct pci_device_id __devinitconst pci_ids [] = { {
+       .vendor         = PCI_VENDOR_ID_APPLE,
+       .device         = PCI_ANY_ID,
+       .subvendor      = PCI_ANY_ID,
+diff -urNp linux-3.1.1/drivers/md/dm.c linux-3.1.1/drivers/md/dm.c
+--- linux-3.1.1/drivers/md/dm.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm.c        2011-11-16 18:39:07.000000000 -0500
+@@ -165,9 +165,9 @@ struct mapped_device {
        /*
         * Event handling.
         */
@@ -27348,7 +29383,7 @@ diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
        struct list_head uevent_list;
        spinlock_t uevent_lock; /* Protect access to uevent_list */
  
-@@ -1842,8 +1842,8 @@ static struct mapped_device *alloc_dev(i
+@@ -1843,8 +1843,8 @@ static struct mapped_device *alloc_dev(i
        rwlock_init(&md->map_lock);
        atomic_set(&md->holders, 1);
        atomic_set(&md->open_count, 0);
@@ -27359,7 +29394,7 @@ diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
        INIT_LIST_HEAD(&md->uevent_list);
        spin_lock_init(&md->uevent_lock);
  
-@@ -1977,7 +1977,7 @@ static void event_callback(void *context
+@@ -1978,7 +1978,7 @@ static void event_callback(void *context
  
        dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
  
@@ -27368,7 +29403,7 @@ diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
        wake_up(&md->eventq);
  }
  
-@@ -2553,18 +2553,18 @@ int dm_kobject_uevent(struct mapped_devi
+@@ -2614,18 +2614,18 @@ int dm_kobject_uevent(struct mapped_devi
  
  uint32_t dm_next_uevent_seq(struct mapped_device *md)
  {
@@ -27390,10 +29425,10 @@ diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
---- linux-3.0.4/drivers/md/dm-ioctl.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-ioctl.c  2011-08-23 21:47:55.000000000 -0400
-@@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
+diff -urNp linux-3.1.1/drivers/md/dm-ioctl.c linux-3.1.1/drivers/md/dm-ioctl.c
+--- linux-3.1.1/drivers/md/dm-ioctl.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-ioctl.c  2011-11-16 18:39:07.000000000 -0500
+@@ -1578,7 +1578,7 @@ static int validate_params(uint cmd, str
            cmd == DM_LIST_VERSIONS_CMD)
                return 0;
  
@@ -27402,9 +29437,9 @@ diff -urNp linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
                if (!*param->name) {
                        DMWARN("name not supplied when creating device");
                        return -EINVAL;
-diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
---- linux-3.0.4/drivers/md/dm-raid1.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-raid1.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/md/dm-raid1.c linux-3.1.1/drivers/md/dm-raid1.c
+--- linux-3.1.1/drivers/md/dm-raid1.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-raid1.c  2011-11-16 18:39:07.000000000 -0500
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -27477,9 +29512,9 @@ diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
                return 'A';
  
        return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
---- linux-3.0.4/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/md/dm-stripe.c linux-3.1.1/drivers/md/dm-stripe.c
+--- linux-3.1.1/drivers/md/dm-stripe.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-stripe.c 2011-11-16 18:39:07.000000000 -0500
 @@ -20,7 +20,7 @@ struct stripe {
        struct dm_dev *dev;
        sector_t physical_start;
@@ -27518,10 +29553,10 @@ diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
                            DM_IO_ERROR_THRESHOLD)
                                schedule_work(&sc->trigger_event);
                }
-diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/drivers/md/dm-table.c
---- linux-3.0.4/drivers/md/dm-table.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-table.c  2011-08-23 21:47:55.000000000 -0400
-@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
+diff -urNp linux-3.1.1/drivers/md/dm-table.c linux-3.1.1/drivers/md/dm-table.c
+--- linux-3.1.1/drivers/md/dm-table.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/dm-table.c  2011-11-16 18:39:07.000000000 -0500
+@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct
        if (!dev_size)
                return 0;
  
@@ -27530,10 +29565,10 @@ diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/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-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
---- linux-3.0.4/drivers/md/md.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/md.c        2011-08-23 21:47:55.000000000 -0400
-@@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
+diff -urNp linux-3.1.1/drivers/md/md.c linux-3.1.1/drivers/md/md.c
+--- linux-3.1.1/drivers/md/md.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/md.c        2011-11-16 18:39:07.000000000 -0500
+@@ -280,10 +280,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
   *  start build, activate spare
   */
  static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -27546,7 +29581,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
        wake_up(&md_event_waiters);
  }
  EXPORT_SYMBOL_GPL(md_new_event);
-@@ -239,7 +239,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
   */
  static void md_new_event_inintr(mddev_t *mddev)
  {
@@ -27555,7 +29590,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
        wake_up(&md_event_waiters);
  }
  
-@@ -1457,7 +1457,7 @@ static int super_1_load(mdk_rdev_t *rdev
+@@ -1531,7 +1531,7 @@ static int super_1_load(mdk_rdev_t *rdev
  
        rdev->preferred_minor = 0xffff;
        rdev->data_offset = le64_to_cpu(sb->data_offset);
@@ -27564,7 +29599,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
        rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
        bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1635,7 +1635,7 @@ static void super_1_sync(mddev_t *mddev,
+@@ -1748,7 +1748,7 @@ static void super_1_sync(mddev_t *mddev,
        else
                sb->resync_offset = cpu_to_le64(0);
  
@@ -27573,7 +29608,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
        sb->raid_disks = cpu_to_le32(mddev->raid_disks);
        sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2428,7 +2428,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
+@@ -2643,7 +2643,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
  static ssize_t
  errors_show(mdk_rdev_t *rdev, char *page)
  {
@@ -27582,7 +29617,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  }
  
  static ssize_t
-@@ -2437,7 +2437,7 @@ errors_store(mdk_rdev_t *rdev, const cha
+@@ -2652,7 +2652,7 @@ errors_store(mdk_rdev_t *rdev, const cha
        char *e;
        unsigned long n = simple_strtoul(buf, &e, 10);
        if (*buf && (*e == 0 || *e == '\n')) {
@@ -27591,9 +29626,9 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
                return len;
        }
        return -EINVAL;
-@@ -2793,8 +2793,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
-       rdev->last_read_error.tv_sec  = 0;
-       rdev->last_read_error.tv_nsec = 0;
+@@ -3042,8 +3042,8 @@ int md_rdev_init(mdk_rdev_t *rdev)
+       rdev->sb_loaded = 0;
+       rdev->bb_page = NULL;
        atomic_set(&rdev->nr_pending, 0);
 -      atomic_set(&rdev->read_errors, 0);
 -      atomic_set(&rdev->corrected_errors, 0);
@@ -27602,16 +29637,16 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
        INIT_LIST_HEAD(&rdev->same_set);
        init_waitqueue_head(&rdev->blocked_wait);
-@@ -6415,7 +6415,7 @@ static int md_seq_show(struct seq_file *
+@@ -6667,7 +6667,7 @@ static int md_seq_show(struct seq_file *
  
                spin_unlock(&pers_lock);
                seq_printf(seq, "\n");
--              mi->event = atomic_read(&md_event_count);
-+              mi->event = atomic_read_unchecked(&md_event_count);
+-              seq->poll_event = atomic_read(&md_event_count);
++              seq->poll_event = atomic_read_unchecked(&md_event_count);
                return 0;
        }
        if (v == (void*)2) {
-@@ -6504,7 +6504,7 @@ static int md_seq_show(struct seq_file *
+@@ -6756,7 +6756,7 @@ static int md_seq_show(struct seq_file *
                                chunk_kb ? "KB" : "B");
                        if (bitmap->file) {
                                seq_printf(seq, ", file: ");
@@ -27620,25 +29655,25 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
                        }
  
                        seq_printf(seq, "\n");
-@@ -6538,7 +6538,7 @@ static int md_seq_open(struct inode *ino
-       else {
-               struct seq_file *p = file->private_data;
-               p->private = mi;
--              mi->event = atomic_read(&md_event_count);
-+              mi->event = atomic_read_unchecked(&md_event_count);
-       }
+@@ -6787,7 +6787,7 @@ static int md_seq_open(struct inode *ino
+               return error;
+ 
+       seq = file->private_data;
+-      seq->poll_event = atomic_read(&md_event_count);
++      seq->poll_event = atomic_read_unchecked(&md_event_count);
        return error;
  }
-@@ -6554,7 +6554,7 @@ static unsigned int mdstat_poll(struct f
+ 
+@@ -6801,7 +6801,7 @@ static unsigned int mdstat_poll(struct f
        /* always allow read */
        mask = POLLIN | POLLRDNORM;
  
--      if (mi->event != atomic_read(&md_event_count))
-+      if (mi->event != atomic_read_unchecked(&md_event_count))
+-      if (seq->poll_event != atomic_read(&md_event_count))
++      if (seq->poll_event != atomic_read_unchecked(&md_event_count))
                mask |= POLLERR | POLLPRI;
        return mask;
  }
-@@ -6598,7 +6598,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6845,7 +6845,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]) -
@@ -27647,10 +29682,10 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/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-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
---- linux-3.0.4/drivers/md/md.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/md.h        2011-08-23 21:47:55.000000000 -0400
-@@ -97,13 +97,13 @@ struct mdk_rdev_s
+diff -urNp linux-3.1.1/drivers/md/md.h linux-3.1.1/drivers/md/md.h
+--- linux-3.1.1/drivers/md/md.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/md.h        2011-11-16 18:39:07.000000000 -0500
+@@ -124,13 +124,13 @@ struct mdk_rdev_s
                                         * only maintained for arrays that
                                         * support hot removal
                                         */
@@ -27666,7 +29701,7 @@ diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
                                           * for reporting to userspace and storing
                                           * in superblock.
                                           */
-@@ -344,7 +344,7 @@ static inline void rdev_dec_pending(mdk_
+@@ -415,7 +415,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -27675,19 +29710,19 @@ diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
---- linux-3.0.4/drivers/md/raid10.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/raid10.c    2011-08-23 21:47:55.000000000 -0400
-@@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi
-       if (test_bit(BIO_UPTODATE, &bio->bi_flags))
-               set_bit(R10BIO_Uptodate, &r10_bio->state);
-       else {
+diff -urNp linux-3.1.1/drivers/md/raid10.c linux-3.1.1/drivers/md/raid10.c
+--- linux-3.1.1/drivers/md/raid10.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid10.c    2011-11-16 18:39:07.000000000 -0500
+@@ -1423,7 +1423,7 @@ static void end_sync_read(struct bio *bi
+               /* The write handler will notice the lack of
+                * R10BIO_Uptodate and record any errors etc
+                */
 -              atomic_add(r10_bio->sectors,
 +              atomic_add_unchecked(r10_bio->sectors,
                           &conf->mirrors[d].rdev->corrected_errors);
-               if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
-                       md_error(r10_bio->mddev,
-@@ -1394,7 +1394,7 @@ static void check_decay_read_errors(mdde
+ 
+       /* for reconstruct, we always reschedule after a read.
+@@ -1723,7 +1723,7 @@ static void check_decay_read_errors(mdde
  {
        struct timespec cur_time_mon;
        unsigned long hours_since_last;
@@ -27696,7 +29731,7 @@ diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
  
        ktime_get_ts(&cur_time_mon);
  
-@@ -1416,9 +1416,9 @@ static void check_decay_read_errors(mdde
+@@ -1745,9 +1745,9 @@ static void check_decay_read_errors(mdde
         * overflowing the shift of read_errors by hours_since_last.
         */
        if (hours_since_last >= 8 * sizeof(read_errors))
@@ -27707,8 +29742,8 @@ diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
 +              atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
  }
  
- /*
-@@ -1448,8 +1448,8 @@ static void fix_read_error(conf_t *conf,
+ static int r10_sync_page_io(mdk_rdev_t *rdev, sector_t sector,
+@@ -1797,8 +1797,8 @@ static void fix_read_error(conf_t *conf,
                return;
  
        check_decay_read_errors(mddev, rdev);
@@ -27719,7 +29754,7 @@ diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
                char b[BDEVNAME_SIZE];
                bdevname(rdev->bdev, b);
  
-@@ -1457,7 +1457,7 @@ static void fix_read_error(conf_t *conf,
+@@ -1806,7 +1806,7 @@ static void fix_read_error(conf_t *conf,
                       "md/raid10:%s: %s: Raid device exceeded "
                       "read_error threshold [cur %d:max %d]\n",
                       mdname(mddev), b,
@@ -27728,49 +29763,45 @@ diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
                printk(KERN_NOTICE
                       "md/raid10:%s: %s: Failing raid device\n",
                       mdname(mddev), b);
-@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
-                           test_bit(In_sync, &rdev->flags)) {
-                               atomic_inc(&rdev->nr_pending);
-                               rcu_read_unlock();
+@@ -1951,7 +1951,7 @@ static void fix_read_error(conf_t *conf,
+                                      (unsigned long long)(
+                                              sect + rdev->data_offset),
+                                      bdevname(rdev->bdev, b));
 -                              atomic_add(s, &rdev->corrected_errors);
 +                              atomic_add_unchecked(s, &rdev->corrected_errors);
-                               if (sync_page_io(rdev,
-                                                r10_bio->devs[sl].addr +
-                                                sect,
-diff -urNp linux-3.0.4/drivers/md/raid1.c linux-3.0.4/drivers/md/raid1.c
---- linux-3.0.4/drivers/md/raid1.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/raid1.c     2011-08-23 21:47:55.000000000 -0400
-@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
-                               rdev_dec_pending(rdev, mddev);
-                               md_error(mddev, rdev);
-                       } else
+                       }
+ 
+                       rdev_dec_pending(rdev, mddev);
+diff -urNp linux-3.1.1/drivers/md/raid1.c linux-3.1.1/drivers/md/raid1.c
+--- linux-3.1.1/drivers/md/raid1.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid1.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1541,7 +1541,7 @@ static int fix_sync_read_error(r1bio_t *
+                       if (r1_sync_page_io(rdev, sect, s,
+                                           bio->bi_io_vec[idx].bv_page,
+                                           READ) != 0)
 -                              atomic_add(s, &rdev->corrected_errors);
 +                              atomic_add_unchecked(s, &rdev->corrected_errors);
                }
-               d = start;
-               while (d != r1_bio->read_disk) {
-@@ -1492,7 +1492,7 @@ static void fix_read_error(conf_t *conf,
-                                       /* Well, this device is dead */
-                                       md_error(mddev, rdev);
-                               else {
+               sectors -= s;
+               sect += s;
+@@ -1754,7 +1754,7 @@ static void fix_read_error(conf_t *conf,
+                           test_bit(In_sync, &rdev->flags)) {
+                               if (r1_sync_page_io(rdev, sect, s,
+                                                   conf->tmppage, READ)) {
 -                                      atomic_add(s, &rdev->corrected_errors);
 +                                      atomic_add_unchecked(s, &rdev->corrected_errors);
                                        printk(KERN_INFO
                                               "md/raid1:%s: read error corrected "
                                               "(%d sectors at %llu on %s)\n",
-diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
---- linux-3.0.4/drivers/md/raid5.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/raid5.c     2011-08-23 21:48:14.000000000 -0400
-@@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
-                       bi->bi_next = NULL;
-                       if ((rw & WRITE) &&
-                           test_bit(R5_ReWrite, &sh->dev[i].flags))
--                              atomic_add(STRIPE_SECTORS,
-+                              atomic_add_unchecked(STRIPE_SECTORS,
-                                       &rdev->corrected_errors);
-                       generic_make_request(bi);
-               } else {
-@@ -1596,15 +1596,15 @@ static void raid5_end_read_request(struc
+diff -urNp linux-3.1.1/drivers/md/raid5.c linux-3.1.1/drivers/md/raid5.c
+--- linux-3.1.1/drivers/md/raid5.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/md/raid5.c     2011-11-16 18:40:10.000000000 -0500
+@@ -1616,19 +1616,19 @@ static void raid5_end_read_request(struc
+                               (unsigned long long)(sh->sector
+                                                    + rdev->data_offset),
+                               bdevname(rdev->bdev, b));
+-                      atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
++                      atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
                        clear_bit(R5_ReadError, &sh->dev[i].flags);
                        clear_bit(R5_ReWrite, &sh->dev[i].flags);
                }
@@ -27787,18 +29818,18 @@ diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
 -              atomic_inc(&rdev->read_errors);
 +              atomic_inc_unchecked(&rdev->read_errors);
                if (conf->mddev->degraded >= conf->max_degraded)
-                       printk_rl(KERN_WARNING
-                                 "md/raid:%s: read error not correctable "
-@@ -1622,7 +1622,7 @@ static void raid5_end_read_request(struc
-                                 (unsigned long long)(sh->sector
-                                                      + rdev->data_offset),
-                                 bdn);
+                       printk_ratelimited(
+                               KERN_WARNING
+@@ -1648,7 +1648,7 @@ static void raid5_end_read_request(struc
+                               (unsigned long long)(sh->sector
+                                                    + rdev->data_offset),
+                               bdn);
 -              else if (atomic_read(&rdev->read_errors)
 +              else if (atomic_read_unchecked(&rdev->read_errors)
                         > conf->max_nr_stripes)
                        printk(KERN_WARNING
                               "md/raid:%s: Too many read errors, failing device %s.\n",
-@@ -1945,6 +1945,7 @@ static sector_t compute_blocknr(struct s
+@@ -1978,6 +1978,7 @@ static sector_t compute_blocknr(struct s
        sector_t r_sector;
        struct stripe_head sh2;
  
@@ -27806,9 +29837,9 @@ diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
  
        chunk_offset = sector_div(new_sector, sectors_per_chunk);
        stripe = new_sector;
-diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/media/common/saa7146_hlp.c
---- linux-3.0.4/drivers/media/common/saa7146_hlp.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/common/saa7146_hlp.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/common/saa7146_hlp.c linux-3.1.1/drivers/media/common/saa7146_hlp.c
+--- linux-3.1.1/drivers/media/common/saa7146_hlp.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/common/saa7146_hlp.c     2011-11-16 18:40:10.000000000 -0500
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
        int x[32], y[32], w[32], h[32];
@@ -27818,9 +29849,21 @@ diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/me
        /* clear out memory */
        memset(&line_list[0],  0x00, sizeof(u32)*32);
        memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c
+--- linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/ddbridge/ddbridge-core.c     2011-11-16 18:39:07.000000000 -0500
+@@ -1675,7 +1675,7 @@ static struct ddb_info ddb_v6 = {
+       .subvendor   = _subvend, .subdevice = _subdev, \
+       .driver_data = (unsigned long)&_driverdata }
+ 
+-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
++static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
+       DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
+       DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
+       DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-11-16 18:40:10.000000000 -0500
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
        u8 buf[HOST_LINK_BUF_SIZE];
        int i;
@@ -27839,16 +29882,10 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/d
        dprintk("%s\n", __func__);
  
        /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400
-@@ -68,12 +68,12 @@ struct dvb_demux_feed {
-       union {
-               struct dmx_ts_feed ts;
-               struct dmx_section_feed sec;
--      } feed;
-+      } __no_const feed;
- 
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-17 18:34:32.000000000 -0500
+@@ -73,7 +73,7 @@ struct dvb_demux_feed {
        union {
                dmx_ts_cb ts;
                dmx_section_cb sec;
@@ -27857,9 +29894,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/driver
  
        struct dvb_demux *demux;
        void *priv;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c    2011-08-24 18:24:19.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-core/dvbdev.c    2011-11-16 18:39:07.000000000 -0500
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
                        const struct dvb_device *template, void *priv, int type)
  {
@@ -27869,9 +29906,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/m
        struct device *clsdev;
        int minor;
        int id;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c      2011-08-24 18:26:33.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/cxusb.c      2011-11-16 18:39:07.000000000 -0500
 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
  struct dib0700_adapter_state {
        int (*set_param_save) (struct dvb_frontend *,
@@ -27881,10 +29918,10 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/med
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
                                      struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-08-23 21:48:14.000000000 -0400
-@@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-11-16 18:40:10.000000000 -0500
+@@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb
        if (!buf)
                return -ENOMEM;
  
@@ -27893,21 +29930,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/driv
        while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
                deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
                                hx.addr, hx.len, hx.chk);
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h     2011-08-24 18:27:27.000000000 -0400
-@@ -97,7 +97,7 @@
- #define DIBUSB_IOCTL_CMD_DISABLE_STREAM       0x02
- 
- struct dibusb_state {
--      struct dib_fe_xfer_ops ops;
-+      dib_fe_xfer_ops_no_const ops;
-       int mt2060_present;
-       u8 tuner_addr;
- };
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c     2011-08-24 18:27:45.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/dw2102.c     2011-11-16 18:39:07.000000000 -0500
 @@ -95,7 +95,7 @@ struct su3000_state {
  
  struct s6x0_state {
@@ -27917,9 +29942,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/me
  
  /* debug */
  static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/dvb-usb/lmedm04.c    2011-11-16 18:40:10.000000000 -0500
 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
        usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                        0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
@@ -27937,37 +29962,21 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/m
        data[0] = 0x0a;
        len_in = 1;
        info("FRM Firmware Cold Reset");
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000.h linux-3.0.4/drivers/media/dvb/frontends/dib3000.h
---- linux-3.0.4/drivers/media/dvb/frontends/dib3000.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/dib3000.h  2011-08-24 18:28:18.000000000 -0400
-@@ -40,10 +40,11 @@ struct dib_fe_xfer_ops
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/dib3000.h linux-3.1.1/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.1.1/drivers/media/dvb/frontends/dib3000.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/dib3000.h  2011-11-17 18:38:05.000000000 -0500
+@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
+       int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
        int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
        int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
- };
-+typedef struct dib_fe_xfer_ops __no_const dib_fe_xfer_ops_no_const;
+-};
++} __no_const;
  
  #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
  extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
--                                           struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops);
-+                                           struct i2c_adapter* i2c, dib_fe_xfer_ops_no_const *xfer_ops);
- #else
- static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
-                                            struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c
---- linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c        2011-08-24 18:28:42.000000000 -0400
-@@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
- static struct dvb_frontend_ops dib3000mb_ops;
- 
- struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
--                                    struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
-+                                    struct i2c_adapter* i2c, dib_fe_xfer_ops_no_const *xfer_ops)
- {
-       struct dib3000_state* state = NULL;
- 
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/mb86a16.c  2011-11-16 18:40:10.000000000 -0500
 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
        int ret = -1;
        int sync;
@@ -27977,9 +29986,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers
        dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
        fcp = 3000;
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers/media/dvb/frontends/or51211.c
---- linux-3.0.4/drivers/media/dvb/frontends/or51211.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/or51211.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/frontends/or51211.c linux-3.1.1/drivers/media/dvb/frontends/or51211.c
+--- linux-3.1.1/drivers/media/dvb/frontends/or51211.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/frontends/or51211.c  2011-11-16 18:40:10.000000000 -0500
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
        u8 tudata[585];
        int i;
@@ -27989,9 +29998,45 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers
        dprintk("Firmware is %zd bytes\n",fw->size);
  
        /* Get eprom data */
-diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/drivers/media/video/cx18/cx18-driver.c
---- linux-3.0.4/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c
+--- linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/dvb/ngene/ngene-cards.c  2011-11-16 18:39:07.000000000 -0500
+@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780
+ 
+ /****************************************************************************/
+ 
+-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
++static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
+       NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
+       NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
+       NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
+diff -urNp linux-3.1.1/drivers/media/radio/radio-cadet.c linux-3.1.1/drivers/media/radio/radio-cadet.c
+--- linux-3.1.1/drivers/media/radio/radio-cadet.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/radio/radio-cadet.c      2011-11-16 18:39:07.000000000 -0500
+@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *f
+       unsigned char readbuf[RDS_BUFFER];
+       int i = 0;
+ 
++      if (count > RDS_BUFFER)
++              return -EFAULT;
+       mutex_lock(&dev->lock);
+       if (dev->rdsstat == 0) {
+               dev->rdsstat = 1;
+diff -urNp linux-3.1.1/drivers/media/video/au0828/au0828.h linux-3.1.1/drivers/media/video/au0828/au0828.h
+--- linux-3.1.1/drivers/media/video/au0828/au0828.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/au0828/au0828.h    2011-11-16 18:39:07.000000000 -0500
+@@ -191,7 +191,7 @@ struct au0828_dev {
+ 
+       /* I2C */
+       struct i2c_adapter              i2c_adap;
+-      struct i2c_algorithm            i2c_algo;
++      i2c_algorithm_no_const          i2c_algo;
+       struct i2c_client               i2c_client;
+       u32                             i2c_rc;
+ 
+diff -urNp linux-3.1.1/drivers/media/video/cx18/cx18-driver.c linux-3.1.1/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.1.1/drivers/media/video/cx18/cx18-driver.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx18/cx18-driver.c 2011-11-16 18:40:10.000000000 -0500
 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
        struct i2c_client c;
        u8 eedata[256];
@@ -28001,9 +30046,9 @@ diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/driver
        memset(&c, 0, sizeof(c));
        strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
        c.adapter = &cx->i2c_adap[0];
-diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx23885/cx23885-input.c    2011-11-16 18:40:10.000000000 -0500
 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
        bool handle = false;
        struct ir_raw_event ir_core_event[64];
@@ -28013,9 +30058,21 @@ diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/d
        do {
                num = 0;
                v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c
+--- linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/cx88/cx88-alsa.c   2011-11-16 18:39:07.000000000 -0500
+@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_
+  * Only boards with eeprom and byte 1 at eeprom=1 have it
+  */
+ 
+-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
++static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
+       {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+       {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+       {0, }
+diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-11-16 18:40:10.000000000 -0500
 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
        u8 *eeprom;
        struct tveeprom tvdata;
@@ -28025,9 +30082,21 @@ diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/
        memset(&tvdata,0,sizeof(tvdata));
  
        eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+--- linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h     2011-11-16 18:39:07.000000000 -0500
+@@ -196,7 +196,7 @@ struct pvr2_hdw {
+ 
+       /* I2C stuff */
+       struct i2c_adapter i2c_adap;
+-      struct i2c_algorithm i2c_algo;
++      i2c_algorithm_no_const i2c_algo;
+       pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
+       int i2c_cx25840_hack_state;
+       int i2c_linked;
+diff -urNp linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/saa7134/saa6752hs.c        2011-11-16 18:40:10.000000000 -0500
 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
        unsigned char localPAT[256];
        unsigned char localPMT[256];
@@ -28037,9 +30106,9 @@ diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drive
        /* Set video format - must be done first as it resets other settings */
        set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/saa7164/saa7164-cmd.c      2011-11-16 18:40:10.000000000 -0500
 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
        u8 tmp[512];
        dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -28058,10 +30127,10 @@ diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/dri
        while (loop) {
  
                struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media/video/timblogiw.c
---- linux-3.0.4/drivers/media/video/timblogiw.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/timblogiw.c        2011-08-24 18:29:20.000000000 -0400
-@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
+diff -urNp linux-3.1.1/drivers/media/video/timblogiw.c linux-3.1.1/drivers/media/video/timblogiw.c
+--- linux-3.1.1/drivers/media/video/timblogiw.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/timblogiw.c        2011-11-17 18:36:32.000000000 -0500
+@@ -744,7 +744,7 @@ static int timblogiw_mmap(struct file *f
  
  /* Platform device functions */
  
@@ -28070,9 +30139,18 @@ diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media
        .vidioc_querycap                = timblogiw_querycap,
        .vidioc_enum_fmt_vid_cap        = timblogiw_enum_fmt,
        .vidioc_g_fmt_vid_cap           = timblogiw_g_fmt,
-diff -urNp linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400
+@@ -766,7 +766,7 @@ static __devinitconst struct v4l2_ioctl_
+       .vidioc_enum_framesizes         = timblogiw_enum_framesizes,
+ };
+ 
+-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
++static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
+       .owner          = THIS_MODULE,
+       .open           = timblogiw_open,
+       .release        = timblogiw_close,
+diff -urNp linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/usbvision/usbvision-core.c 2011-11-16 18:40:10.000000000 -0500
 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
        unsigned char rv, gv, bv;
        static unsigned char *Y, *U, *V;
@@ -28082,10 +30160,10 @@ diff -urNp linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.
        frame = usbvision->cur_frame;
        image_size = frame->frmwidth * frame->frmheight;
        if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers/media/video/videobuf-dma-sg.c
---- linux-3.0.4/drivers/media/video/videobuf-dma-sg.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/videobuf-dma-sg.c  2011-08-23 21:48:14.000000000 -0400
-@@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
+diff -urNp linux-3.1.1/drivers/media/video/videobuf-dma-sg.c linux-3.1.1/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.1.1/drivers/media/video/videobuf-dma-sg.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/media/video/videobuf-dma-sg.c  2011-11-16 18:40:10.000000000 -0500
+@@ -607,6 +607,8 @@ void *videobuf_sg_alloc(size_t size)
  {
        struct videobuf_queue q;
  
@@ -28094,9 +30172,9 @@ diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers
        /* Required to make generic handler to call __videobuf_alloc */
        q.int_ops = &sg_ops;
  
-diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/message/fusion/mptbase.c
---- linux-3.0.4/drivers/message/fusion/mptbase.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptbase.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/fusion/mptbase.c linux-3.1.1/drivers/message/fusion/mptbase.c
+--- linux-3.1.1/drivers/message/fusion/mptbase.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptbase.c       2011-11-16 18:40:10.000000000 -0500
 @@ -6681,8 +6681,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);
@@ -28111,9 +30189,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/mess
        /*
         *  Rounding UP to nearest 4-kB boundary here...
         */
-diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/message/fusion/mptsas.c
---- linux-3.0.4/drivers/message/fusion/mptsas.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptsas.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/fusion/mptsas.c linux-3.1.1/drivers/message/fusion/mptsas.c
+--- linux-3.1.1/drivers/message/fusion/mptsas.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptsas.c        2011-11-16 18:39:07.000000000 -0500
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
                return 0;
  }
@@ -28162,9 +30240,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/messa
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/message/fusion/mptscsih.c
---- linux-3.0.4/drivers/message/fusion/mptscsih.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptscsih.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/fusion/mptscsih.c linux-3.1.1/drivers/message/fusion/mptscsih.c
+--- linux-3.1.1/drivers/message/fusion/mptscsih.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/fusion/mptscsih.c      2011-11-16 18:39:07.000000000 -0500
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
        h = shost_priv(SChost);
@@ -28190,9 +30268,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/mes
  
        return h->info_kbuf;
  }
-diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/message/i2o/i2o_config.c
---- linux-3.0.4/drivers/message/i2o/i2o_config.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/i2o_config.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/i2o/i2o_config.c linux-3.1.1/drivers/message/i2o/i2o_config.c
+--- linux-3.1.1/drivers/message/i2o/i2o_config.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/i2o_config.c       2011-11-16 18:40:10.000000000 -0500
 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
        struct i2o_message *msg;
        unsigned int iop;
@@ -28202,9 +30280,9 @@ diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/mess
        if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
                return -EFAULT;
  
-diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/message/i2o/i2o_proc.c
---- linux-3.0.4/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/i2o/i2o_proc.c linux-3.1.1/drivers/message/i2o/i2o_proc.c
+--- linux-3.1.1/drivers/message/i2o/i2o_proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/i2o_proc.c 2011-11-16 18:39:07.000000000 -0500
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
        "Array Controller Device"
  };
@@ -28291,9 +30369,9 @@ diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/messag
  
        return 0;
  }
-diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o/iop.c
---- linux-3.0.4/drivers/message/i2o/iop.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/iop.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/message/i2o/iop.c linux-3.1.1/drivers/message/i2o/iop.c
+--- linux-3.1.1/drivers/message/i2o/iop.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/message/i2o/iop.c      2011-11-16 18:39:07.000000000 -0500
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
        spin_lock_irqsave(&c->context_list_lock, flags);
@@ -28317,9 +30395,21 @@ diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o
        INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-core.c
---- linux-3.0.4/drivers/mfd/abx500-core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/abx500-core.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mfd/ab3100-core.c linux-3.1.1/drivers/mfd/ab3100-core.c
+--- linux-3.1.1/drivers/mfd/ab3100-core.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/ab3100-core.c      2011-11-16 18:39:07.000000000 -0500
+@@ -809,7 +809,7 @@ struct ab_family_id {
+       char    *name;
+ };
+ 
+-static const struct ab_family_id ids[] __devinitdata = {
++static const struct ab_family_id ids[] __devinitconst = {
+       /* AB3100 */
+       {
+               .id = 0xc0,
+diff -urNp linux-3.1.1/drivers/mfd/abx500-core.c linux-3.1.1/drivers/mfd/abx500-core.c
+--- linux-3.1.1/drivers/mfd/abx500-core.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/abx500-core.c      2011-11-16 18:39:07.000000000 -0500
 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
  
  struct abx500_device_entry {
@@ -28329,9 +30419,9 @@ diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-
        struct device *dev;
  };
  
-diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cmodio.c
---- linux-3.0.4/drivers/mfd/janz-cmodio.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/janz-cmodio.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mfd/janz-cmodio.c linux-3.1.1/drivers/mfd/janz-cmodio.c
+--- linux-3.1.1/drivers/mfd/janz-cmodio.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/janz-cmodio.c      2011-11-16 18:39:07.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -28340,9 +30430,9 @@ diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cm
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i2c.c
---- linux-3.0.4/drivers/mfd/wm8350-i2c.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/wm8350-i2c.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mfd/wm8350-i2c.c linux-3.1.1/drivers/mfd/wm8350-i2c.c
+--- linux-3.1.1/drivers/mfd/wm8350-i2c.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mfd/wm8350-i2c.c       2011-11-16 18:40:10.000000000 -0500
 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
        u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
        int ret;
@@ -28352,10 +30442,10 @@ diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i
        if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
                return -EINVAL;
  
-diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c     2011-08-23 21:47:55.000000000 -0400
-@@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in
+diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.c     2011-11-16 18:39:07.000000000 -0500
+@@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in
         * the lid is closed. This leads to interrupts as soon as a little move
         * is done.
         */
@@ -28364,7 +30454,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
  
        wake_up_interruptible(&lis3_dev.misc_wait);
        kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
-@@ -518,7 +518,7 @@ static int lis3lv02d_misc_open(struct in
+@@ -520,7 +520,7 @@ static int lis3lv02d_misc_open(struct in
        if (lis3_dev.pm_dev)
                pm_runtime_get_sync(lis3_dev.pm_dev);
  
@@ -28373,7 +30463,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
        return 0;
  }
  
-@@ -545,7 +545,7 @@ static ssize_t lis3lv02d_misc_read(struc
+@@ -547,7 +547,7 @@ static ssize_t lis3lv02d_misc_read(struc
        add_wait_queue(&lis3_dev.misc_wait, &wait);
        while (true) {
                set_current_state(TASK_INTERRUPTIBLE);
@@ -28382,7 +30472,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
                if (data)
                        break;
  
-@@ -583,7 +583,7 @@ out:
+@@ -585,7 +585,7 @@ out:
  static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
  {
        poll_wait(file, &lis3_dev.misc_wait, wait);
@@ -28391,9 +30481,9 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
                return POLLIN | POLLRDNORM;
        return 0;
  }
-diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/lis3lv02d/lis3lv02d.h     2011-11-16 18:39:07.000000000 -0500
 @@ -265,7 +265,7 @@ struct lis3lv02d {
        struct input_polled_dev *idev;     /* input device */
        struct platform_device  *pdev;     /* platform device */
@@ -28403,9 +30493,9 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/mi
        union axis_conversion   ac;        /* hw -> logical axis */
        int                     mapped_btns[3];
  
-diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/gruhandles.c      2011-11-16 18:39:07.000000000 -0500
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
        unsigned long nsec;
  
@@ -28417,9 +30507,9 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/mis
        if (mcs_op_statistics[op].max < nsec)
                mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/gruprocfs.c       2011-11-16 18:39:07.000000000 -0500
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)               printstat_val(s, &gru_stats.f, #f)
@@ -28443,9 +30533,9 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc
                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-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc/sgi-gru/grutables.h
---- linux-3.0.4/drivers/misc/sgi-gru/grutables.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/grutables.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/misc/sgi-gru/grutables.h linux-3.1.1/drivers/misc/sgi-gru/grutables.h
+--- linux-3.1.1/drivers/misc/sgi-gru/grutables.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-gru/grutables.h       2011-11-16 18:39:07.000000000 -0500
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -28625,9 +30715,41 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc
                        } while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/xp.h
---- linux-3.0.4/drivers/misc/sgi-xp/xp.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-xp/xp.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc.h linux-3.1.1/drivers/misc/sgi-xp/xpc.h
+--- linux-3.1.1/drivers/misc/sgi-xp/xpc.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xpc.h      2011-11-16 18:39:07.000000000 -0500
+@@ -835,6 +835,7 @@ struct xpc_arch_operations {
+       void (*received_payload) (struct xpc_channel *, void *);
+       void (*notify_senders_of_disconnect) (struct xpc_channel *);
+ };
++typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
+ 
+ /* struct xpc_partition act_state values (for XPC HB) */
+ 
+@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_regis
+ /* found in xpc_main.c */
+ extern struct device *xpc_part;
+ extern struct device *xpc_chan;
+-extern struct xpc_arch_operations xpc_arch_ops;
++extern xpc_arch_operations_no_const xpc_arch_ops;
+ extern int xpc_disengage_timelimit;
+ extern int xpc_disengage_timedout;
+ extern int xpc_activate_IRQ_rcvd;
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c
+--- linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xpc_main.c 2011-11-16 18:39:07.000000000 -0500
+@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
+       .notifier_call = xpc_system_die,
+ };
+ 
+-struct xpc_arch_operations xpc_arch_ops;
++xpc_arch_operations_no_const xpc_arch_ops;
+ 
+ /*
+  * Timer function to enforce the timelimit on the partition disengage.
+diff -urNp linux-3.1.1/drivers/misc/sgi-xp/xp.h linux-3.1.1/drivers/misc/sgi-xp/xp.h
+--- linux-3.1.1/drivers/misc/sgi-xp/xp.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/misc/sgi-xp/xp.h       2011-11-16 18:39:07.000000000 -0500
 @@ -289,7 +289,7 @@ struct xpc_interface {
                                        xpc_notify_func, void *);
        void (*received) (short, int, void *);
@@ -28637,9 +30759,21 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mmc/host/sdhci-pci.c linux-3.1.1/drivers/mmc/host/sdhci-pci.c
+--- linux-3.1.1/drivers/mmc/host/sdhci-pci.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mmc/host/sdhci-pci.c   2011-11-16 18:39:07.000000000 -0500
+@@ -542,7 +542,7 @@ static const struct sdhci_pci_fixes sdhc
+       .probe          = via_probe,
+ };
+ 
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+       {
+               .vendor         = PCI_VENDOR_ID_RICOH,
+               .device         = PCI_DEVICE_ID_RICOH_R5C822,
+diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0001.c    2011-11-16 18:40:10.000000000 -0500
 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
        unsigned long timeo = jiffies + HZ;
@@ -28667,9 +30801,9 @@ diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/m
        adr += chip->start;
  
   retry:
-diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/chips/cfi_cmdset_0020.c    2011-11-16 18:40:10.000000000 -0500
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
        unsigned long cmd_addr;
        struct cfi_private *cfi = map->fldrv_priv;
@@ -28715,9 +30849,9 @@ diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/m
        adr += chip->start;
  
        /* Let's determine this according to the interleave only once */
-diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/devices/doc2000.c
---- linux-3.0.4/drivers/mtd/devices/doc2000.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/devices/doc2000.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/devices/doc2000.c linux-3.1.1/drivers/mtd/devices/doc2000.c
+--- linux-3.1.1/drivers/mtd/devices/doc2000.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/devices/doc2000.c  2011-11-16 18:39:07.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 */
@@ -28727,9 +30861,9 @@ diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/dev
                        printk(KERN_WARNING
                               "ECC needs a full sector write (adr: %lx size %lx)\n",
                               (long) to, (long) len);
-diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/devices/doc2001.c
---- linux-3.0.4/drivers/mtd/devices/doc2001.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/devices/doc2001.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/devices/doc2001.c linux-3.1.1/drivers/mtd/devices/doc2001.c
+--- linux-3.1.1/drivers/mtd/devices/doc2001.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/devices/doc2001.c  2011-11-16 18:39:07.000000000 -0500
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
        struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -28739,9 +30873,9 @@ diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/dev
                return -EINVAL;
  
        /* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
---- linux-3.0.4/drivers/mtd/ftl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/ftl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/ftl.c linux-3.1.1/drivers/mtd/ftl.c
+--- linux-3.1.1/drivers/mtd/ftl.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/ftl.c      2011-11-16 18:40:10.000000000 -0500
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -28751,9 +30885,9 @@ diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore.c
---- linux-3.0.4/drivers/mtd/inftlcore.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/inftlcore.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/inftlcore.c linux-3.1.1/drivers/mtd/inftlcore.c
+--- linux-3.1.1/drivers/mtd/inftlcore.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/inftlcore.c        2011-11-16 18:40:10.000000000 -0500
 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
        struct inftl_oob oob;
        size_t retlen;
@@ -28763,9 +30897,9 @@ diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore
        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
                "pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmount.c
---- linux-3.0.4/drivers/mtd/inftlmount.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/inftlmount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/inftlmount.c linux-3.1.1/drivers/mtd/inftlmount.c
+--- linux-3.1.1/drivers/mtd/inftlmount.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/inftlmount.c       2011-11-16 18:40:10.000000000 -0500
 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
        struct INFTLPartition *ip;
        size_t retlen;
@@ -28775,9 +30909,9 @@ diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmou
        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/lpddr/qinfo_probe.c        2011-11-16 18:40:10.000000000 -0500
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
        map_word pfow_val[4];
@@ -28787,10 +30921,10 @@ diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/l
        /* Check identification string */
        pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
        pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
---- linux-3.0.4/drivers/mtd/mtdchar.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/mtdchar.c  2011-08-23 21:48:14.000000000 -0400
-@@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, 
+diff -urNp linux-3.1.1/drivers/mtd/mtdchar.c linux-3.1.1/drivers/mtd/mtdchar.c
+--- linux-3.1.1/drivers/mtd/mtdchar.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/mtdchar.c  2011-11-16 18:40:10.000000000 -0500
+@@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file, 
        u_long size;
        struct mtd_info_user info;
  
@@ -28799,9 +30933,9 @@ diff -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
        DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
        size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/denali.c
---- linux-3.0.4/drivers/mtd/nand/denali.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nand/denali.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/nand/denali.c linux-3.1.1/drivers/mtd/nand/denali.c
+--- linux-3.1.1/drivers/mtd/nand/denali.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nand/denali.c      2011-11-16 18:39:07.000000000 -0500
 @@ -26,6 +26,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -28810,9 +30944,9 @@ diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/de
  
  #include "denali.h"
  
-diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
---- linux-3.0.4/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/nftlcore.c linux-3.1.1/drivers/mtd/nftlcore.c
+--- linux-3.1.1/drivers/mtd/nftlcore.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nftlcore.c 2011-11-16 18:40:10.000000000 -0500
 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
        int inplace = 1;
        size_t retlen;
@@ -28822,9 +30956,9 @@ diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
        memset(BlockMap, 0xff, sizeof(BlockMap));
        memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount.c
---- linux-3.0.4/drivers/mtd/nftlmount.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nftlmount.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/mtd/nftlmount.c linux-3.1.1/drivers/mtd/nftlmount.c
+--- linux-3.1.1/drivers/mtd/nftlmount.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/nftlmount.c        2011-11-16 18:40:10.000000000 -0500
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -28842,10 +30976,10 @@ diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount
          /* Assume logical EraseSize == physical erasesize for starting the scan.
           We'll sort it out later if we find a MediaHeader which says otherwise */
        /* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build.c
---- linux-3.0.4/drivers/mtd/ubi/build.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/ubi/build.c        2011-08-23 21:47:55.000000000 -0400
-@@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
+diff -urNp linux-3.1.1/drivers/mtd/ubi/build.c linux-3.1.1/drivers/mtd/ubi/build.c
+--- linux-3.1.1/drivers/mtd/ubi/build.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/mtd/ubi/build.c        2011-11-16 18:39:07.000000000 -0500
+@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
        char *endp;
@@ -28854,7 +30988,7 @@ diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build
  
        result = simple_strtoul(str, &endp, 0);
        if (str == endp || result >= INT_MAX) {
-@@ -1298,11 +1298,11 @@ static int __init bytes_str_to_int(const
+@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const
  
        switch (*endp) {
        case 'G':
@@ -28869,7 +31003,7 @@ diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build
                if (endp[1] == 'i' && endp[2] == 'B')
                        endp += 2;
        case '\0':
-@@ -1313,7 +1313,13 @@ static int __init bytes_str_to_int(const
+@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const
                return -EINVAL;
        }
  
@@ -28884,9 +31018,21 @@ diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/atlx/atl2.c linux-3.1.1/drivers/net/atlx/atl2.c
+--- linux-3.1.1/drivers/net/atlx/atl2.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/atlx/atl2.c        2011-11-16 18:39:07.000000000 -0500
+@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw
+  */
+ 
+ #define ATL2_PARAM(X, desc) \
+-    static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
++    static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
+     MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
+     MODULE_PARM_DESC(X, desc);
+ #else
+diff -urNp linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bna/bfa_ioc_ct.c   2011-11-16 18:39:07.000000000 -0500
 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
  static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
  static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
@@ -28931,10 +31077,10 @@ diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/
        ioc->ioc_hwif = &nw_hwif_ct;
  }
  
-diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
---- linux-3.0.4/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400
-@@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+diff -urNp linux-3.1.1/drivers/net/bna/bnad.c linux-3.1.1/drivers/net/bna/bnad.c
+--- linux-3.1.1/drivers/net/bna/bnad.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bna/bnad.c 2011-11-16 18:39:07.000000000 -0500
+@@ -1673,7 +1673,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
        struct bna_intr_info *intr_info =
                        &res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
        struct bna_tx_config *tx_config = &bnad->tx_config[tx_id];
@@ -28950,7 +31096,7 @@ diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
        struct bna_tx *tx;
        unsigned long flags;
  
-@@ -1690,13 +1697,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+@@ -1682,13 +1689,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
        tx_config->txq_depth = bnad->txq_depth;
        tx_config->tx_type = BNA_TX_T_REGULAR;
  
@@ -28964,7 +31110,7 @@ diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
        /* Get BNA's resource requirement for one tx object */
        spin_lock_irqsave(&bnad->bna_lock, flags);
        bna_tx_res_req(bnad->num_txq_per_tx,
-@@ -1827,21 +1827,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
+@@ -1819,21 +1819,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
        struct bna_intr_info *intr_info =
                        &res_info[BNA_RX_RES_T_INTR].res_u.intr_info;
        struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
@@ -28995,10 +31141,10 @@ diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
        /* Get BNA's resource requirement for one Rx object */
        spin_lock_irqsave(&bnad->bna_lock, flags);
        bna_rx_res_req(rx_config, res_info);
-diff -urNp linux-3.0.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
---- linux-3.0.4/drivers/net/bnx2.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bnx2.c     2011-08-23 21:48:14.000000000 -0400
-@@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
+diff -urNp linux-3.1.1/drivers/net/bnx2.c linux-3.1.1/drivers/net/bnx2.c
+--- linux-3.1.1/drivers/net/bnx2.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2.c     2011-11-16 18:40:11.000000000 -0500
+@@ -5877,6 +5877,8 @@ bnx2_test_nvram(struct bnx2 *bp)
        int rc = 0;
        u32 magic, csum;
  
@@ -29007,10 +31153,10 @@ diff -urNp linux-3.0.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
        if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
                goto test_nvram_done;
  
-diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c      2011-08-23 21:48:14.000000000 -0400
-@@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
+diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2x/bnx2x_ethtool.c      2011-11-16 18:40:11.000000000 -0500
+@@ -1943,6 +1943,8 @@ static int bnx2x_test_nvram(struct bnx2x
        int i, rc;
        u32 magic, crc;
  
@@ -29019,10 +31165,22 @@ diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net
        if (BP_NOMCP(bp))
                return 0;
  
-diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t.h
---- linux-3.0.4/drivers/net/cxgb3/l2t.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb3/l2t.h        2011-08-23 21:47:55.000000000 -0400
-@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
+diff -urNp linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h
+--- linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/bnx2x/bnx2x_sp.h   2011-11-16 18:39:07.000000000 -0500
+@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
+ 
+       int (*wait_comp)(struct bnx2x *bp,
+                        struct bnx2x_rx_mode_ramrod_params *p);
+-};
++} __no_const;
+ 
+ /********************** Set multicast group ***********************************/
+ 
+diff -urNp linux-3.1.1/drivers/net/cxgb3/l2t.h linux-3.1.1/drivers/net/cxgb3/l2t.h
+--- linux-3.1.1/drivers/net/cxgb3/l2t.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb3/l2t.h        2011-11-16 18:39:07.000000000 -0500
+@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
        arp_failure_handler_func arp_failure_handler;
@@ -29031,9 +31189,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb4/cxgb4_main.c 2011-11-16 18:40:22.000000000 -0500
 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct 
        unsigned int nchan = adap->params.nports;
        struct msix_entry entries[MAX_INGQ + 1];
@@ -29043,9 +31201,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cx
        for (i = 0; i < ARRAY_SIZE(entries); ++i)
                entries[i].entry = i;
  
-diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t4_hw.c
---- linux-3.0.4/drivers/net/cxgb4/t4_hw.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb4/t4_hw.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/cxgb4/t4_hw.c linux-3.1.1/drivers/net/cxgb4/t4_hw.c
+--- linux-3.1.1/drivers/net/cxgb4/t4_hw.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/cxgb4/t4_hw.c      2011-11-16 18:40:22.000000000 -0500
 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
        u8 vpd[VPD_LEN], csum;
        unsigned int vpdr_len, kw_offset, id_len;
@@ -29055,9 +31213,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t
        ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
        if (ret < 0)
                return ret;
-diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e/82571.c
---- linux-3.0.4/drivers/net/e1000e/82571.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/82571.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/e1000e/82571.c linux-3.1.1/drivers/net/e1000e/82571.c
+--- linux-3.1.1/drivers/net/e1000e/82571.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/82571.c     2011-11-16 18:39:07.000000000 -0500
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -29067,9 +31225,9 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e
        u32 swsm = 0;
        u32 swsm2 = 0;
        bool force_clear_smbi = false;
-diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000e/es2lan.c
---- linux-3.0.4/drivers/net/e1000e/es2lan.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/es2lan.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/e1000e/es2lan.c linux-3.1.1/drivers/net/e1000e/es2lan.c
+--- linux-3.1.1/drivers/net/e1000e/es2lan.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/es2lan.c    2011-11-16 18:39:07.000000000 -0500
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -29079,18 +31237,18 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000
  
        /* Set media type */
        switch (adapter->pdev->device) {
-diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw.h
---- linux-3.0.4/drivers/net/e1000e/hw.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/hw.h        2011-08-23 21:47:55.000000000 -0400
-@@ -776,6 +776,7 @@ struct e1000_mac_operations {
+diff -urNp linux-3.1.1/drivers/net/e1000e/hw.h linux-3.1.1/drivers/net/e1000e/hw.h
+--- linux-3.1.1/drivers/net/e1000e/hw.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/e1000e/hw.h        2011-11-16 18:39:07.000000000 -0500
+@@ -778,6 +778,7 @@ struct e1000_mac_operations {
        void (*write_vfta)(struct e1000_hw *, u32, u32);
        s32  (*read_mac_addr)(struct e1000_hw *);
  };
 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
- /* Function pointers for the PHY. */
- struct e1000_phy_operations {
-@@ -799,6 +800,7 @@ struct e1000_phy_operations {
+ /*
+  * When to use various PHY register access functions:
+@@ -818,6 +819,7 @@ struct e1000_phy_operations {
        void (*power_up)(struct e1000_hw *);
        void (*power_down)(struct e1000_hw *);
  };
@@ -29098,7 +31256,7 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
-@@ -810,9 +812,10 @@ struct e1000_nvm_operations {
+@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
        s32  (*validate)(struct e1000_hw *);
        s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
  };
@@ -29110,7 +31268,7 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw
        u8 addr[ETH_ALEN];
        u8 perm_addr[ETH_ALEN];
  
-@@ -853,7 +856,7 @@ struct e1000_mac_info {
+@@ -872,7 +875,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
@@ -29119,7 +31277,7 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw
  
        enum e1000_phy_type type;
  
-@@ -887,7 +890,7 @@ struct e1000_phy_info {
+@@ -906,7 +909,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -29128,9 +31286,21 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw
  
        enum e1000_nvm_type type;
        enum e1000_nvm_override override;
-diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamradio/6pack.c
---- linux-3.0.4/drivers/net/hamradio/6pack.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/hamradio/6pack.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/fealnx.c linux-3.1.1/drivers/net/fealnx.c
+--- linux-3.1.1/drivers/net/fealnx.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/fealnx.c   2011-11-16 18:39:07.000000000 -0500
+@@ -150,7 +150,7 @@ struct chip_info {
+       int flags;
+ };
+ 
+-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
++static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
+       { "100/10M Ethernet PCI Adapter",       HAS_MII_XCVR },
+       { "100/10M Ethernet PCI Adapter",       HAS_CHIP_XCVR },
+       { "1000/100/10M Ethernet PCI Adapter",  HAS_MII_XCVR },
+diff -urNp linux-3.1.1/drivers/net/hamradio/6pack.c linux-3.1.1/drivers/net/hamradio/6pack.c
+--- linux-3.1.1/drivers/net/hamradio/6pack.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/hamradio/6pack.c   2011-11-16 18:40:22.000000000 -0500
 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
        unsigned char buf[512];
        int count1;
@@ -29140,9 +31310,9 @@ diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamr
        if (!count)
                return;
  
-diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1000_hw.h
---- linux-3.0.4/drivers/net/igb/e1000_hw.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/igb/e1000_hw.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/igb/e1000_hw.h linux-3.1.1/drivers/net/igb/e1000_hw.h
+--- linux-3.1.1/drivers/net/igb/e1000_hw.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/igb/e1000_hw.h     2011-11-16 18:39:07.000000000 -0500
 @@ -314,6 +314,7 @@ struct e1000_mac_operations {
        s32  (*read_mac_addr)(struct e1000_hw *);
        s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -29211,9 +31381,9 @@ diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1
        struct e1000_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
---- linux-3.0.4/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/igbvf/vf.h linux-3.1.1/drivers/net/igbvf/vf.h
+--- linux-3.1.1/drivers/net/igbvf/vf.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/igbvf/vf.h 2011-11-16 18:39:07.000000000 -0500
 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
        s32  (*read_mac_addr)(struct e1000_hw *);
        s32  (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -29243,9 +31413,9 @@ diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
        struct e1000_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb/ixgb_main.c
---- linux-3.0.4/drivers/net/ixgb/ixgb_main.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgb/ixgb_main.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_main.c linux-3.1.1/drivers/net/ixgb/ixgb_main.c
+--- linux-3.1.1/drivers/net/ixgb/ixgb_main.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgb/ixgb_main.c   2011-11-16 18:40:22.000000000 -0500
 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
        u32 rctl;
        int i;
@@ -29255,9 +31425,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb
        /* Check for Promiscuous and All Multicast modes */
  
        rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixgb/ixgb_param.c
---- linux-3.0.4/drivers/net/ixgb/ixgb_param.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgb/ixgb_param.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/ixgb/ixgb_param.c linux-3.1.1/drivers/net/ixgb/ixgb_param.c
+--- linux-3.1.1/drivers/net/ixgb/ixgb_param.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgb/ixgb_param.c  2011-11-16 18:40:22.000000000 -0500
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -29268,10 +31438,10 @@ diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixg
        if (bd >= IXGB_MAX_NIC) {
                pr_notice("Warning: no configuration for board #%i\n", bd);
                pr_notice("Using defaults for all values\n");
-diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400
-@@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
+diff -urNp linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgbe/ixgbe_type.h 2011-11-16 18:39:07.000000000 -0500
+@@ -2642,6 +2642,7 @@ struct ixgbe_eeprom_operations {
        s32 (*update_checksum)(struct ixgbe_hw *);
        u16 (*calc_checksum)(struct ixgbe_hw *);
  };
@@ -29279,15 +31449,15 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
  
  struct ixgbe_mac_operations {
        s32 (*init_hw)(struct ixgbe_hw *);
-@@ -2639,6 +2640,7 @@ struct ixgbe_mac_operations {
-       /* Flow Control */
-       s32 (*fc_enable)(struct ixgbe_hw *, s32);
+@@ -2703,6 +2704,7 @@ struct ixgbe_mac_operations {
+       /* Manageability interface */
+       s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
  };
 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
  
  struct ixgbe_phy_operations {
        s32 (*identify)(struct ixgbe_hw *);
-@@ -2658,9 +2660,10 @@ struct ixgbe_phy_operations {
+@@ -2722,9 +2724,10 @@ struct ixgbe_phy_operations {
        s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
        s32 (*check_overtemp)(struct ixgbe_hw *);
  };
@@ -29299,7 +31469,7 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
        enum ixgbe_eeprom_type          type;
        u32                             semaphore_delay;
        u16                             word_size;
-@@ -2670,7 +2673,7 @@ struct ixgbe_eeprom_info {
+@@ -2734,7 +2737,7 @@ struct ixgbe_eeprom_info {
  
  #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED     0x01
  struct ixgbe_mac_info {
@@ -29308,7 +31478,7 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
        enum ixgbe_mac_type             type;
        u8                              addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
        u8                              perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
-@@ -2698,7 +2701,7 @@ struct ixgbe_mac_info {
+@@ -2762,7 +2765,7 @@ struct ixgbe_mac_info {
  };
  
  struct ixgbe_phy_info {
@@ -29317,7 +31487,7 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
        struct mdio_if_info             mdio;
        enum ixgbe_phy_type             type;
        u32                             id;
-@@ -2726,6 +2729,7 @@ struct ixgbe_mbx_operations {
+@@ -2790,6 +2793,7 @@ struct ixgbe_mbx_operations {
        s32 (*check_for_ack)(struct ixgbe_hw *, u16);
        s32 (*check_for_rst)(struct ixgbe_hw *, u16);
  };
@@ -29325,7 +31495,7 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
  
  struct ixgbe_mbx_stats {
        u32 msgs_tx;
-@@ -2737,7 +2741,7 @@ struct ixgbe_mbx_stats {
+@@ -2801,7 +2805,7 @@ struct ixgbe_mbx_stats {
  };
  
  struct ixgbe_mbx_info {
@@ -29334,9 +31504,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
        struct ixgbe_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/vf.h
---- linux-3.0.4/drivers/net/ixgbevf/vf.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgbevf/vf.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/ixgbevf/vf.h linux-3.1.1/drivers/net/ixgbevf/vf.h
+--- linux-3.1.1/drivers/net/ixgbevf/vf.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ixgbevf/vf.h       2011-11-16 18:39:07.000000000 -0500
 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
        s32 (*clear_vfta)(struct ixgbe_hw *);
        s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
@@ -29371,10 +31541,10 @@ diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/
        struct ixgbe_mbx_stats stats;
        u32 timeout;
        u32 udelay;
-diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
---- linux-3.0.4/drivers/net/ksz884x.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ksz884x.c  2011-08-23 21:48:14.000000000 -0400
-@@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
+diff -urNp linux-3.1.1/drivers/net/ksz884x.c linux-3.1.1/drivers/net/ksz884x.c
+--- linux-3.1.1/drivers/net/ksz884x.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ksz884x.c  2011-11-16 18:40:22.000000000 -0500
+@@ -6533,6 +6533,8 @@ static void netdev_get_ethtool_stats(str
        int rc;
        u64 counter[TOTAL_PORT_COUNTER_NUM];
  
@@ -29383,9 +31553,9 @@ diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
        mutex_lock(&hw_priv->lock);
        n = SWITCH_PORT_NUM;
        for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main.c
---- linux-3.0.4/drivers/net/mlx4/main.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/mlx4/main.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/mlx4/main.c linux-3.1.1/drivers/net/mlx4/main.c
+--- linux-3.1.1/drivers/net/mlx4/main.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/mlx4/main.c        2011-11-16 18:40:22.000000000 -0500
 @@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
@@ -29394,7 +31564,7 @@ diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main
  
  #include <linux/mlx4/device.h>
  #include <linux/mlx4/doorbell.h>
-@@ -764,6 +765,8 @@ static int mlx4_init_hca(struct mlx4_dev
+@@ -762,6 +763,8 @@ static int mlx4_init_hca(struct mlx4_dev
        u64 icm_size;
        int err;
  
@@ -29403,10 +31573,10 @@ diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main
        err = mlx4_QUERY_FW(dev);
        if (err) {
                if (err == -EACCES)
-diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
---- linux-3.0.4/drivers/net/niu.c      2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/niu.c      2011-08-23 21:48:14.000000000 -0400
-@@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
+diff -urNp linux-3.1.1/drivers/net/niu.c linux-3.1.1/drivers/net/niu.c
+--- linux-3.1.1/drivers/net/niu.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/niu.c      2011-11-16 18:40:22.000000000 -0500
+@@ -9061,6 +9061,8 @@ static void __devinit niu_try_msix(struc
        int i, num_irqs, err;
        u8 first_ldg;
  
@@ -29415,18 +31585,9 @@ diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
        first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
        for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
                ldg_num_map[i] = first_ldg + i;
-diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
---- linux-3.0.4/drivers/net/pcnet32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/pcnet32.c  2011-08-23 21:47:55.000000000 -0400
-@@ -82,7 +82,7 @@ static int cards_found;
- /*
-  * VLB I/O addresses
-  */
--static unsigned int pcnet32_portlist[] __initdata =
-+static unsigned int pcnet32_portlist[] __devinitdata =
-     { 0x300, 0x320, 0x340, 0x360, 0 };
- 
- static int pcnet32_debug;
+diff -urNp linux-3.1.1/drivers/net/pcnet32.c linux-3.1.1/drivers/net/pcnet32.c
+--- linux-3.1.1/drivers/net/pcnet32.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/pcnet32.c  2011-11-16 18:39:07.000000000 -0500
 @@ -270,7 +270,7 @@ struct pcnet32_private {
        struct sk_buff          **rx_skbuff;
        dma_addr_t              *tx_dma_addr;
@@ -29934,7 +32095,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
        spin_unlock_irqrestore(&lp->lock, flags);
  
        return &dev->stats;
-@@ -2578,10 +2578,10 @@ static void pcnet32_load_multicast(struc
+@@ -2577,10 +2577,10 @@ static void pcnet32_load_multicast(struc
        if (dev->flags & IFF_ALLMULTI) {
                ib->filter[0] = cpu_to_le32(~0U);
                ib->filter[1] = cpu_to_le32(~0U);
@@ -29949,7 +32110,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
                return;
        }
        /* clear the multicast filter */
-@@ -2601,7 +2601,7 @@ static void pcnet32_load_multicast(struc
+@@ -2594,7 +2594,7 @@ static void pcnet32_load_multicast(struc
                mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
        }
        for (i = 0; i < 4; i++)
@@ -29958,7 +32119,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
                                le16_to_cpu(mcast_table[i]));
  }
  
-@@ -2616,28 +2616,28 @@ static void pcnet32_set_multicast_list(s
+@@ -2609,28 +2609,28 @@ static void pcnet32_set_multicast_list(s
  
        spin_lock_irqsave(&lp->lock, flags);
        suspended = pcnet32_suspend(dev, &flags, 0);
@@ -29993,7 +32154,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
                pcnet32_restart(dev, CSR0_NORMAL);
                netif_wake_queue(dev);
        }
-@@ -2655,8 +2655,8 @@ static int mdio_read(struct net_device *
+@@ -2648,8 +2648,8 @@ static int mdio_read(struct net_device *
        if (!lp->mii)
                return 0;
  
@@ -30004,7 +32165,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
  
        return val_out;
  }
-@@ -2670,8 +2670,8 @@ static void mdio_write(struct net_device
+@@ -2663,8 +2663,8 @@ static void mdio_write(struct net_device
        if (!lp->mii)
                return;
  
@@ -30015,7 +32176,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
  }
  
  static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-@@ -2748,7 +2748,7 @@ static void pcnet32_check_media(struct n
+@@ -2741,7 +2741,7 @@ static void pcnet32_check_media(struct n
                curr_link = mii_link_ok(&lp->mii_if);
        } else {
                ulong ioaddr = dev->base_addr;  /* card base I/O address */
@@ -30024,7 +32185,7 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
        }
        if (!curr_link) {
                if (prev_link || verbose) {
-@@ -2771,13 +2771,13 @@ static void pcnet32_check_media(struct n
+@@ -2764,13 +2764,13 @@ static void pcnet32_check_media(struct n
                                            (ecmd.duplex == DUPLEX_FULL)
                                            ? "full" : "half");
                        }
@@ -30040,9 +32201,9 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
                        }
                } else {
                        netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_generic.c
---- linux-3.0.4/drivers/net/ppp_generic.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ppp_generic.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/ppp_generic.c linux-3.1.1/drivers/net/ppp_generic.c
+--- linux-3.1.1/drivers/net/ppp_generic.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/ppp_generic.c      2011-11-16 18:39:07.000000000 -0500
 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
        void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
        struct ppp_stats stats;
@@ -30061,10 +32222,10 @@ diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_gen
                        break;
                err = 0;
                break;
-diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
---- linux-3.0.4/drivers/net/r8169.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/r8169.c    2011-08-23 21:47:55.000000000 -0400
-@@ -645,12 +645,12 @@ struct rtl8169_private {
+diff -urNp linux-3.1.1/drivers/net/r8169.c linux-3.1.1/drivers/net/r8169.c
+--- linux-3.1.1/drivers/net/r8169.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/r8169.c    2011-11-16 18:39:07.000000000 -0500
+@@ -663,12 +663,12 @@ struct rtl8169_private {
        struct mdio_ops {
                void (*write)(void __iomem *, int, int);
                int (*read)(void __iomem *, int);
@@ -30079,9 +32240,33 @@ diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
  
        int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
        int (*get_settings)(struct net_device *, struct ethtool_cmd *);
-diff -urNp linux-3.0.4/drivers/net/tg3.h linux-3.0.4/drivers/net/tg3.h
---- linux-3.0.4/drivers/net/tg3.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tg3.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/sis190.c linux-3.1.1/drivers/net/sis190.c
+--- linux-3.1.1/drivers/net/sis190.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/sis190.c   2011-11-16 18:39:07.000000000 -0500
+@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr
+ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
+                                                 struct net_device *dev)
+ {
+-      static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
++      static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
+       struct sis190_private *tp = netdev_priv(dev);
+       struct pci_dev *isa_bridge;
+       u8 reg, tmp8;
+diff -urNp linux-3.1.1/drivers/net/sundance.c linux-3.1.1/drivers/net/sundance.c
+--- linux-3.1.1/drivers/net/sundance.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/sundance.c 2011-11-16 18:39:07.000000000 -0500
+@@ -218,7 +218,7 @@ enum {
+ struct pci_id_info {
+         const char *name;
+ };
+-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
++static const struct pci_id_info pci_id_tbl[] __devinitconst = {
+       {"D-Link DFE-550TX FAST Ethernet Adapter"},
+       {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
+       {"D-Link DFE-580TX 4 port Server Adapter"},
+diff -urNp linux-3.1.1/drivers/net/tg3.h linux-3.1.1/drivers/net/tg3.h
+--- linux-3.1.1/drivers/net/tg3.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tg3.h      2011-11-16 18:39:07.000000000 -0500
 @@ -134,6 +134,7 @@
  #define  CHIPREV_ID_5750_A0            0x4000
  #define  CHIPREV_ID_5750_A1            0x4001
@@ -30090,9 +32275,9 @@ diff -urNp linux-3.0.4/drivers/net/tg3.h linux-3.0.4/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-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tokenring/abyss.c
---- linux-3.0.4/drivers/net/tokenring/abyss.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/abyss.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/tokenring/abyss.c linux-3.1.1/drivers/net/tokenring/abyss.c
+--- linux-3.1.1/drivers/net/tokenring/abyss.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/abyss.c  2011-11-16 18:39:07.000000000 -0500
 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
  
  static int __init abyss_init (void)
@@ -30109,9 +32294,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tok
  
        return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/tokenring/madgemc.c
---- linux-3.0.4/drivers/net/tokenring/madgemc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/madgemc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/tokenring/madgemc.c linux-3.1.1/drivers/net/tokenring/madgemc.c
+--- linux-3.1.1/drivers/net/tokenring/madgemc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/madgemc.c        2011-11-16 18:39:07.000000000 -0500
 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
  
  static int __init madgemc_init (void)
@@ -30127,9 +32312,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/t
  
        return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/tokenring/proteon.c
---- linux-3.0.4/drivers/net/tokenring/proteon.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/proteon.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/tokenring/proteon.c linux-3.1.1/drivers/net/tokenring/proteon.c
+--- linux-3.1.1/drivers/net/tokenring/proteon.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/proteon.c        2011-11-16 18:39:07.000000000 -0500
 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
        struct platform_device *pdev;
        int i, num = 0, err = 0;
@@ -30145,9 +32330,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/t
  
        err = platform_driver_register(&proteon_driver);
        if (err)
-diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tokenring/skisa.c
---- linux-3.0.4/drivers/net/tokenring/skisa.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/skisa.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/tokenring/skisa.c linux-3.1.1/drivers/net/tokenring/skisa.c
+--- linux-3.1.1/drivers/net/tokenring/skisa.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tokenring/skisa.c  2011-11-16 18:39:07.000000000 -0500
 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
        struct platform_device *pdev;
        int i, num = 0, err = 0;
@@ -30163,10 +32348,10 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tok
  
        err = platform_driver_register(&sk_isa_driver);
        if (err)
-diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip/de2104x.c
---- linux-3.0.4/drivers/net/tulip/de2104x.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tulip/de2104x.c    2011-08-23 21:48:14.000000000 -0400
-@@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
+diff -urNp linux-3.1.1/drivers/net/tulip/de2104x.c linux-3.1.1/drivers/net/tulip/de2104x.c
+--- linux-3.1.1/drivers/net/tulip/de2104x.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/de2104x.c    2011-11-16 18:40:22.000000000 -0500
+@@ -1795,6 +1795,8 @@ static void __devinit de21041_get_srom_i
        struct de_srom_info_leaf *il;
        void *bufp;
  
@@ -30175,10 +32360,10 @@ diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip
        /* download entire eeprom */
        for (i = 0; i < DE_EEPROM_WORDS; i++)
                ((__le16 *)ee_data)[i] =
-diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/de4x5.c
---- linux-3.0.4/drivers/net/tulip/de4x5.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tulip/de4x5.c      2011-08-23 21:47:55.000000000 -0400
-@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
+diff -urNp linux-3.1.1/drivers/net/tulip/de4x5.c linux-3.1.1/drivers/net/tulip/de4x5.c
+--- linux-3.1.1/drivers/net/tulip/de4x5.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/de4x5.c      2011-11-16 18:39:07.000000000 -0500
+@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, stru
        for (i=0; i<ETH_ALEN; i++) {
            tmp.addr[i] = dev->dev_addr[i];
        }
@@ -30187,7 +32372,7 @@ diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/d
        break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
-@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, stru
+@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, stru
        spin_lock_irqsave(&lp->lock, flags);
        memcpy(&statbuf, &lp->pktStats, ioc->len);
        spin_unlock_irqrestore(&lp->lock, flags);
@@ -30196,9 +32381,33 @@ diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/d
                return -EFAULT;
        break;
      }
-diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/drivers/net/usb/hso.c
---- linux-3.0.4/drivers/net/usb/hso.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/usb/hso.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/tulip/eeprom.c linux-3.1.1/drivers/net/tulip/eeprom.c
+--- linux-3.1.1/drivers/net/tulip/eeprom.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/eeprom.c     2011-11-16 18:39:07.000000000 -0500
+@@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
+   {NULL}};
+ 
+ 
+-static const char *block_name[] __devinitdata = {
++static const char *block_name[] __devinitconst = {
+       "21140 non-MII",
+       "21140 MII PHY",
+       "21142 Serial PHY",
+diff -urNp linux-3.1.1/drivers/net/tulip/winbond-840.c linux-3.1.1/drivers/net/tulip/winbond-840.c
+--- linux-3.1.1/drivers/net/tulip/winbond-840.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/tulip/winbond-840.c        2011-11-16 18:39:07.000000000 -0500
+@@ -236,7 +236,7 @@ struct pci_id_info {
+         int drv_flags;                /* Driver use, intended as capability flags. */
+ };
+ 
+-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
++static const struct pci_id_info pci_id_tbl[] __devinitconst = {
+       {                               /* Sometime a Level-One switch card. */
+         "Winbond W89c840",    CanHaveMII | HasBrokenTx | FDXOnNoMII},
+       { "Winbond W89c840",    CanHaveMII | HasBrokenTx},
+diff -urNp linux-3.1.1/drivers/net/usb/hso.c linux-3.1.1/drivers/net/usb/hso.c
+--- linux-3.1.1/drivers/net/usb/hso.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/usb/hso.c  2011-11-16 18:39:07.000000000 -0500
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -30295,10 +32504,10 @@ diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/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-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-08-23 21:47:55.000000000 -0400
-@@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device 
+diff -urNp linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-11-16 18:39:07.000000000 -0500
+@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device 
                 * Return with error code if any of the queue indices
                 * is out of range
                 */
@@ -30308,10 +32517,10 @@ diff -urNp linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers
                        return -EINVAL;
        }
  
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vxge/vxge-config.h
---- linux-3.0.4/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400
-@@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs {
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-config.h linux-3.1.1/drivers/net/vxge/vxge-config.h
+--- linux-3.1.1/drivers/net/vxge/vxge-config.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-config.h 2011-11-16 18:39:07.000000000 -0500
+@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
        void (*link_down)(struct __vxge_hw_device *devh);
        void (*crit_err)(struct __vxge_hw_device *devh,
                        enum vxge_hw_event type, u64 ext_data);
@@ -30320,10 +32529,10 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vx
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge/vxge-main.c
---- linux-3.0.4/drivers/net/vxge/vxge-main.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-main.c   2011-08-23 21:48:14.000000000 -0400
-@@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-main.c linux-3.1.1/drivers/net/vxge/vxge-main.c
+--- linux-3.1.1/drivers/net/vxge/vxge-main.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-main.c   2011-11-16 18:40:22.000000000 -0500
+@@ -100,6 +100,8 @@ static inline void VXGE_COMPLETE_VPATH_T
        struct sk_buff *completed[NR_SKB_COMPLETED];
        int more;
  
@@ -30332,7 +32541,7 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge
        do {
                more = 0;
                skb_ptr = completed;
-@@ -1920,6 +1922,8 @@ static enum vxge_hw_status vxge_rth_conf
+@@ -1915,6 +1917,8 @@ static enum vxge_hw_status vxge_rth_conf
        u8 mtable[256] = {0}; /* CPU to vpath mapping  */
        int index;
  
@@ -30341,9 +32550,9 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge
        /*
         * Filling
         *      - itable with bucket numbers
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/vxge/vxge-traffic.h
---- linux-3.0.4/drivers/net/vxge/vxge-traffic.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-traffic.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/vxge/vxge-traffic.h linux-3.1.1/drivers/net/vxge/vxge-traffic.h
+--- linux-3.1.1/drivers/net/vxge/vxge-traffic.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/vxge/vxge-traffic.h        2011-11-16 18:39:07.000000000 -0500
 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
                        struct vxge_hw_mempool_dma      *dma_object,
                        u32                     index,
@@ -30353,22 +32562,10 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/v
  
  #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)                            \
                ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.0.4/drivers/net/wan/cycx_x25.c linux-3.0.4/drivers/net/wan/cycx_x25.c
---- linux-3.0.4/drivers/net/wan/cycx_x25.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wan/cycx_x25.c     2011-08-23 21:48:14.000000000 -0400
-@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
-       unsigned char hex[1024],
-               * phex = hex;
- 
-+      pax_track_stack();
-+
-       if (len >= (sizeof(hex) / 2))
-               len = (sizeof(hex) / 2) - 1;
- 
-diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hdlc_x25.c
---- linux-3.0.4/drivers/net/wan/hdlc_x25.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wan/hdlc_x25.c     2011-08-23 21:47:55.000000000 -0400
-@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
+diff -urNp linux-3.1.1/drivers/net/wan/hdlc_x25.c linux-3.1.1/drivers/net/wan/hdlc_x25.c
+--- linux-3.1.1/drivers/net/wan/hdlc_x25.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wan/hdlc_x25.c     2011-11-16 18:39:07.000000000 -0500
+@@ -134,16 +134,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
  
  static int x25_open(struct net_device *dev)
  {
@@ -30393,9 +32590,9 @@ diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hd
        result = lapb_register(dev, &cb);
        if (result != LAPB_OK)
                return result;
-diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wimax/i2400m/usb-fw.c      2011-11-16 18:40:22.000000000 -0500
 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
        int do_autopm = 1;
        DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -30405,9 +32602,9 @@ diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net
        d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
                  i2400m, ack, ack_size);
        BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wireless/airo.c
---- linux-3.0.4/drivers/net/wireless/airo.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/airo.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/airo.c linux-3.1.1/drivers/net/wireless/airo.c
+--- linux-3.1.1/drivers/net/wireless/airo.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/airo.c    2011-11-16 18:40:22.000000000 -0500
 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
        BSSListElement * loop_net;
        BSSListElement * tmp_net;
@@ -30462,76 +32659,67 @@ diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wirel
        /* Get stats out of the card */
        clear_bit(JOB_WSTATS, &local->jobs);
        if (local->power.event) {
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400
-@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath5k/debug.c 2011-11-16 19:08:21.000000000 -0500
+@@ -203,6 +203,8 @@ static ssize_t read_file_beacon(struct f
        unsigned int v;
        u64 tsf;
  
 +      pax_track_stack();
 +
-       v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
-       len += snprintf(buf+len, sizeof(buf)-len,
+       v = ath5k_hw_reg_read(ah, AR5K_BEACON);
+       len += snprintf(buf + len, sizeof(buf) - len,
                "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
-@@ -323,6 +325,8 @@ static ssize_t read_file_debug(struct fi
+@@ -321,6 +323,8 @@ static ssize_t read_file_debug(struct fi
        unsigned int len = 0;
        unsigned int i;
  
 +      pax_track_stack();
 +
-       len += snprintf(buf+len, sizeof(buf)-len,
-               "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
- 
-@@ -384,6 +388,8 @@ static ssize_t read_file_antenna(struct 
-       unsigned int i;
-       unsigned int v;
+       len += snprintf(buf + len, sizeof(buf) - len,
+               "DEBUG LEVEL: 0x%08x\n\n", ah->debug.level);
  
-+      pax_track_stack();
-+
-       len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n",
-               sc->ah->ah_ant_mode);
-       len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n",
-@@ -494,6 +500,8 @@ static ssize_t read_file_misc(struct fil
+@@ -492,6 +496,8 @@ static ssize_t read_file_misc(struct fil
        unsigned int len = 0;
-       u32 filt = ath5k_hw_get_rx_filter(sc->ah);
+       u32 filt = ath5k_hw_get_rx_filter(ah);
  
 +      pax_track_stack();
 +
-       len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
-                       sc->bssidmask);
-       len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ",
-@@ -550,6 +558,8 @@ static ssize_t read_file_frameerrors(str
+       len += snprintf(buf + len, sizeof(buf) - len, "bssid-mask: %pM\n",
+                       ah->bssidmask);
+       len += snprintf(buf + len, sizeof(buf) - len, "filter-flags: 0x%x ",
+@@ -548,6 +554,8 @@ static ssize_t read_file_frameerrors(str
        unsigned int len = 0;
        int i;
  
 +      pax_track_stack();
 +
-       len += snprintf(buf+len, sizeof(buf)-len,
+       len += snprintf(buf + len, sizeof(buf) - len,
                        "RX\n---------------------\n");
-       len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n",
-@@ -667,6 +677,8 @@ static ssize_t read_file_ani(struct file
+       len += snprintf(buf + len, sizeof(buf) - len, "CRC\t%u\t(%u%%)\n",
+@@ -665,6 +673,8 @@ static ssize_t read_file_ani(struct file
        char buf[700];
        unsigned int len = 0;
  
 +      pax_track_stack();
 +
-       len += snprintf(buf+len, sizeof(buf)-len,
+       len += snprintf(buf + len, sizeof(buf) - len,
                        "HW has PHY error counters:\t%s\n",
-                       sc->ah->ah_capabilities.cap_has_phyerr_counters ?
-@@ -827,6 +839,8 @@ static ssize_t read_file_queue(struct fi
+                       ah->ah_capabilities.cap_has_phyerr_counters ?
+@@ -829,6 +839,8 @@ static ssize_t read_file_queue(struct fi
        struct ath5k_buf *bf, *bf0;
        int i, n;
  
 +      pax_track_stack();
 +
-       len += snprintf(buf+len, sizeof(buf)-len,
-                       "available txbuffers: %d\n", sc->txbuf_len);
+       len += snprintf(buf + len, sizeof(buf) - len,
+                       "available txbuffers: %d\n", ah->txbuf_len);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-08-23 21:48:14.000000000 -0400
-@@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-11-16 18:40:22.000000000 -0500
+@@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
        int i, im, j;
        int nmeasurement;
  
@@ -30540,10 +32728,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4
        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
                if (ah->txchainmask & (1 << i))
                        num_chains++;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-08-23 21:48:14.000000000 -0400
-@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-11-16 18:40:22.000000000 -0500
+@@ -406,6 +406,8 @@ static bool create_pa_curve(u32 *data_L,
        int theta_low_bin = 0;
        int i;
  
@@ -30552,10 +32740,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4
        /* disregard any bin that contains <= 16 samples */
        thresh_accum_cnt = 16;
        scale_factor = 5;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400
-@@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/debug.c 2011-11-16 18:40:22.000000000 -0500
+@@ -387,6 +387,8 @@ static ssize_t read_file_interrupt(struc
        char buf[512];
        unsigned int len = 0;
  
@@ -30564,7 +32752,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/driver
        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
                len += snprintf(buf + len, sizeof(buf) - len,
                        "%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
-@@ -427,6 +429,8 @@ static ssize_t read_file_wiphy(struct fi
+@@ -477,6 +479,8 @@ static ssize_t read_file_wiphy(struct fi
        u8 addr[ETH_ALEN];
        u32 tmp;
  
@@ -30573,9 +32761,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/driver
        len += snprintf(buf + len, sizeof(buf) - len,
                        "%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
                        wiphy_name(sc->hw->wiphy),
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-16 18:40:22.000000000 -0500
 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
        unsigned int len = 0;
        int ret = 0;
@@ -30630,10 +32818,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.
        len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
                        "Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
  
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h    2011-08-23 21:47:55.000000000 -0400
-@@ -585,7 +585,7 @@ struct ath_hw_private_ops {
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath9k/hw.h    2011-11-16 18:39:07.000000000 -0500
+@@ -588,7 +588,7 @@ struct ath_hw_private_ops {
  
        /* ANI */
        void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -30642,7 +32830,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/n
  
  /**
   * struct ath_hw_ops - callbacks used by hardware code and driver code
-@@ -637,7 +637,7 @@ struct ath_hw_ops {
+@@ -639,7 +639,7 @@ struct ath_hw_ops {
        void (*antdiv_comb_conf_set)(struct ath_hw *ah,
                        struct ath_hw_antcomb_conf *antconf);
  
@@ -30651,7 +32839,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/n
  
  struct ath_nf_limits {
        s16 max;
-@@ -650,7 +650,7 @@ struct ath_nf_limits {
+@@ -652,7 +652,7 @@ struct ath_nf_limits {
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  
  struct ath_hw {
@@ -30660,9 +32848,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/n
  
        struct ieee80211_hw *hw;
        struct ath_common common;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath.h linux-3.0.4/drivers/net/wireless/ath/ath.h
---- linux-3.0.4/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/ath/ath.h linux-3.1.1/drivers/net/wireless/ath/ath.h
+--- linux-3.1.1/drivers/net/wireless/ath/ath.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ath/ath.h 2011-11-16 18:39:07.000000000 -0500
 @@ -121,6 +121,7 @@ struct ath_ops {
        void (*write_flush) (void *);
        u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
@@ -30671,10 +32859,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath.h linux-3.0.4/drivers/net/wi
  
  struct ath_common;
  struct ath_bus_ops;
-diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400
-@@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
+diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-16 18:40:22.000000000 -0500
+@@ -2102,6 +2102,8 @@ static int ipw2100_set_essid(struct ipw2
        int err;
        DECLARE_SSID_BUF(ssid);
  
@@ -30683,7 +32871,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/driver
        IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
  
        if (ssid_len)
-@@ -5449,6 +5451,8 @@ static int ipw2100_set_key(struct ipw210
+@@ -5451,6 +5453,8 @@ static int ipw2100_set_key(struct ipw210
        struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
        int err;
  
@@ -30692,9 +32880,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/driver
        IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
                     idx, keylen, len);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-11-16 18:40:22.000000000 -0500
 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
        unsigned long flags;
        DECLARE_SSID_BUF(ssid);
@@ -30704,10 +32892,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/driv
        LIBIPW_DEBUG_SCAN("'%s' (%pM"
                     "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
                     print_ssid(ssid, info_element->data, info_element->len),
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-08-23 21:47:55.000000000 -0400
-@@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-11-16 18:39:07.000000000 -0500
+@@ -3687,7 +3687,9 @@ static int iwl3945_pci_probe(struct pci_
         */
        if (iwl3945_mod_params.disable_hw_scan) {
                IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
@@ -30718,10 +32906,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/
        }
  
        IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-08-23 21:48:14.000000000 -0400
-@@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-11-16 18:40:22.000000000 -0500
+@@ -920,6 +920,8 @@ static void rs_tx_status(void *priv_r, s
        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
  
@@ -30730,7 +32918,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/dri
        IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
  
        /* Treat uninitialized rate scaling data same as non-existing. */
-@@ -2918,6 +2920,8 @@ static void rs_fill_link_cmd(struct iwl_
+@@ -2931,6 +2933,8 @@ static void rs_fill_link_cmd(struct iwl_
                container_of(lq_sta, struct iwl_station_priv, lq_sta);
        struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
  
@@ -30739,10 +32927,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/dri
        /* Override starting rate (index 0) if needed for debug purposes */
        rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-08-23 21:48:14.000000000 -0400
-@@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-11-16 18:40:22.000000000 -0500
+@@ -561,6 +561,8 @@ static ssize_t iwl_dbgfs_status_read(str
        int pos = 0;
        const size_t bufsz = sizeof(buf);
  
@@ -30751,7 +32939,7 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/dr
        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
                test_bit(STATUS_HCMD_ACTIVE, &priv->status));
        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",
-@@ -680,6 +682,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
+@@ -693,6 +695,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
        char buf[256 * NUM_IWL_RXON_CTX];
        const size_t bufsz = sizeof(buf);
  
@@ -30760,9 +32948,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/dr
        for_each_context(priv, ctx) {
                pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
                                 ctx->ctxid);
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-11-16 18:39:07.000000000 -0500
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -30774,9 +32962,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.4/driv
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
                                      const void *p, u32 len)
  {}
-diff -urNp linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-11-16 18:40:22.000000000 -0500
 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
        int buf_len = 512;
        size_t len = 0;
@@ -30786,10 +32974,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/d
        if (*ppos != 0)
                return 0;
        if (count < sizeof(buf))
-diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c  2011-08-23 21:47:55.000000000 -0400
-@@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
+diff -urNp linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/mac80211_hwsim.c  2011-11-16 18:39:07.000000000 -0500
+@@ -1670,9 +1670,11 @@ static int __init init_mac80211_hwsim(vo
                return -EINVAL;
  
        if (fake_hw_scan) {
@@ -30804,9 +32992,21 @@ diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers
        }
  
        spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net/wireless/rndis_wlan.c
---- linux-3.0.4/drivers/net/wireless/rndis_wlan.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/rndis_wlan.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/mwifiex/main.h linux-3.1.1/drivers/net/wireless/mwifiex/main.h
+--- linux-3.1.1/drivers/net/wireless/mwifiex/main.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/mwifiex/main.h    2011-11-16 18:39:07.000000000 -0500
+@@ -560,7 +560,7 @@ struct mwifiex_if_ops {
+ 
+       void (*update_mp_end_port) (struct mwifiex_adapter *, u16);
+       void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
+-};
++} __no_const;
+ 
+ struct mwifiex_adapter {
+       struct mwifiex_private *priv[MWIFIEX_MAX_BSS_NUM];
+diff -urNp linux-3.1.1/drivers/net/wireless/rndis_wlan.c linux-3.1.1/drivers/net/wireless/rndis_wlan.c
+--- linux-3.1.1/drivers/net/wireless/rndis_wlan.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/rndis_wlan.c      2011-11-16 18:39:07.000000000 -0500
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
        netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -30816,9 +33016,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net
                rts_threshold = 2347;
  
        tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-11-16 18:40:22.000000000 -0500
 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
        u8 rfpath;
        u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -30828,9 +33028,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
        precommoncmdcnt = 0;
        _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
                                         MAX_PRECMD_CNT,
-diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/wl1251/wl1251.h   2011-11-16 18:39:07.000000000 -0500
 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
        void (*reset)(struct wl1251 *wl);
        void (*enable_irq)(struct wl1251 *wl);
@@ -30840,10 +33040,10 @@ diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/
  
  struct wl1251 {
        struct ieee80211_hw *hw;
-diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net/wireless/wl12xx/spi.c
---- linux-3.0.4/drivers/net/wireless/wl12xx/spi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/wl12xx/spi.c      2011-08-23 21:48:14.000000000 -0400
-@@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
+diff -urNp linux-3.1.1/drivers/net/wireless/wl12xx/spi.c linux-3.1.1/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.1.1/drivers/net/wireless/wl12xx/spi.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/net/wireless/wl12xx/spi.c      2011-11-16 18:40:22.000000000 -0500
+@@ -281,6 +281,8 @@ static void wl1271_spi_raw_write(struct 
        u32 chunk_len;
        int i;
  
@@ -30852,9 +33052,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net
        WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
        spi_message_init(&m);
-diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofile/buffer_sync.c
---- linux-3.0.4/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/buffer_sync.c linux-3.1.1/drivers/oprofile/buffer_sync.c
+--- linux-3.1.1/drivers/oprofile/buffer_sync.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/buffer_sync.c 2011-11-16 18:39:07.000000000 -0500
 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
                if (cookie == NO_COOKIE)
                        offset = pc;
@@ -30890,9 +33090,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofi
                }
        }
        release_mm(mm);
-diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprofile/event_buffer.c
---- linux-3.0.4/drivers/oprofile/event_buffer.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/event_buffer.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/event_buffer.c linux-3.1.1/drivers/oprofile/event_buffer.c
+--- linux-3.1.1/drivers/oprofile/event_buffer.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/event_buffer.c        2011-11-16 18:39:07.000000000 -0500
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
        }
  
@@ -30902,9 +33102,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprof
                return;
        }
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/oprof.c
---- linux-3.0.4/drivers/oprofile/oprof.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprof.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/oprof.c linux-3.1.1/drivers/oprofile/oprof.c
+--- linux-3.1.1/drivers/oprofile/oprof.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprof.c       2011-11-16 18:39:07.000000000 -0500
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
        if (oprofile_ops.switch_events())
                return;
@@ -30914,9 +33114,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/opr
        start_switch_worker();
  }
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprofilefs.c linux-3.0.4/drivers/oprofile/oprofilefs.c
---- linux-3.0.4/drivers/oprofile/oprofilefs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprofilefs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/oprofilefs.c linux-3.1.1/drivers/oprofile/oprofilefs.c
+--- linux-3.1.1/drivers/oprofile/oprofilefs.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofilefs.c  2011-11-16 18:39:07.000000000 -0500
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -30926,9 +33126,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprofilefs.c linux-3.0.4/drivers/oprofil
  {
        return __oprofilefs_create_file(sb, root, name,
                                        &atomic_ro_fops, 0444, val);
-diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/oprofile/oprofile_stats.c
---- linux-3.0.4/drivers/oprofile/oprofile_stats.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprofile_stats.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.c linux-3.1.1/drivers/oprofile/oprofile_stats.c
+--- linux-3.1.1/drivers/oprofile/oprofile_stats.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofile_stats.c      2011-11-16 18:39:07.000000000 -0500
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
                cpu_buf->sample_invalid_eip = 0;
        }
@@ -30946,11 +33146,11 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/opr
  }
  
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/oprofile/oprofile_stats.h
---- linux-3.0.4/drivers/oprofile/oprofile_stats.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprofile_stats.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/oprofile/oprofile_stats.h linux-3.1.1/drivers/oprofile/oprofile_stats.h
+--- linux-3.1.1/drivers/oprofile/oprofile_stats.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/oprofile/oprofile_stats.h      2011-11-16 18:39:07.000000000 -0500
 @@ -13,11 +13,11 @@
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct oprofile_stat_struct {
 -      atomic_t sample_lost_no_mm;
@@ -30966,9 +33166,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/opr
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/procfs.c
---- linux-3.0.4/drivers/parport/procfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/parport/procfs.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/parport/procfs.c linux-3.1.1/drivers/parport/procfs.c
+--- linux-3.1.1/drivers/parport/procfs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/parport/procfs.c       2011-11-16 18:39:07.000000000 -0500
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
        *ppos += len;
@@ -30987,9 +33187,9 @@ diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/proc
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/hotplug/cpci_hotplug.h     2011-11-16 18:39:07.000000000 -0500
 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
        int (*hardware_test) (struct slot* slot, u32 value);
        u8  (*get_power) (struct slot* slot);
@@ -30999,9 +33199,9 @@ diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pc
  
  struct cpci_hp_controller {
        unsigned int irq;
-diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/hotplug/cpqphp_nvram.c     2011-11-16 18:39:07.000000000 -0500
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -31016,9 +33216,9 @@ diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pc
        dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
        /* initialize our int15 lock */
-diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm.c
---- linux-3.0.4/drivers/pci/pcie/aspm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/pcie/aspm.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pci/pcie/aspm.c linux-3.1.1/drivers/pci/pcie/aspm.c
+--- linux-3.1.1/drivers/pci/pcie/aspm.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/pcie/aspm.c        2011-11-16 18:39:07.000000000 -0500
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -31032,10 +33232,10 @@ diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm
  #define ASPM_STATE_L0S                (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL                (ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
---- linux-3.0.4/drivers/pci/probe.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/probe.c    2011-08-23 21:47:55.000000000 -0400
-@@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
+diff -urNp linux-3.1.1/drivers/pci/probe.c linux-3.1.1/drivers/pci/probe.c
+--- linux-3.1.1/drivers/pci/probe.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/probe.c    2011-11-16 18:39:07.000000000 -0500
+@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev,
        u32 l, sz, mask;
        u16 orig_cmd;
  
@@ -31044,9 +33244,9 @@ diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
  
        if (!dev->mmio_always_on) {
                pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
---- linux-3.0.4/drivers/pci/proc.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/proc.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pci/proc.c linux-3.1.1/drivers/pci/proc.c
+--- linux-3.1.1/drivers/pci/proc.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/proc.c     2011-11-16 18:40:22.000000000 -0500
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -31064,9 +33264,9 @@ diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
        proc_create("devices", 0, proc_bus_pci_dir,
                    &proc_bus_pci_dev_operations);
        proc_initialized = 1;
-diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pcifront.c
---- linux-3.0.4/drivers/pci/xen-pcifront.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/xen-pcifront.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pci/xen-pcifront.c linux-3.1.1/drivers/pci/xen-pcifront.c
+--- linux-3.1.1/drivers/pci/xen-pcifront.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pci/xen-pcifront.c     2011-11-16 18:40:22.000000000 -0500
 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
        struct pcifront_sd *sd = bus->sysdata;
        struct pcifront_device *pdev = pcifront_get_pdev(sd);
@@ -31112,9 +33312,9 @@ diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pc
        err = do_pci_op(pdev, &op);
        if (likely(!err)) {
                vector[0] = op.value;
-diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/platform/x86/thinkpad_acpi.c   2011-11-16 18:39:07.000000000 -0500
 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
        return 0;
  }
@@ -31124,9 +33324,9 @@ diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/
  {
        /* log only what the user can fix... */
        const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pnp/pnpbios/bioscalls.c        2011-11-16 18:39:07.000000000 -0500
 @@ -59,7 +59,7 @@ do { \
        set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -31183,9 +33383,9 @@ diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/p
 +
 +      pax_close_kernel();
  }
-diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
---- linux-3.0.4/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/pnp/resource.c linux-3.1.1/drivers/pnp/resource.c
+--- linux-3.1.1/drivers/pnp/resource.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/pnp/resource.c 2011-11-16 18:39:07.000000000 -0500
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
                return 1;
  
@@ -31204,9 +33404,9 @@ diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
                return 0;
  
        /* check if the resource is reserved */
-diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power/bq27x00_battery.c
---- linux-3.0.4/drivers/power/bq27x00_battery.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/power/bq27x00_battery.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/power/bq27x00_battery.c linux-3.1.1/drivers/power/bq27x00_battery.c
+--- linux-3.1.1/drivers/power/bq27x00_battery.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/power/bq27x00_battery.c        2011-11-16 18:39:07.000000000 -0500
 @@ -67,7 +67,7 @@
  struct bq27x00_device_info;
  struct bq27x00_access_methods {
@@ -31216,9 +33416,9 @@ diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power
  
  enum bq27x00_chip { BQ27000, BQ27500 };
  
-diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator/max8660.c
---- linux-3.0.4/drivers/regulator/max8660.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/regulator/max8660.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/regulator/max8660.c linux-3.1.1/drivers/regulator/max8660.c
+--- linux-3.1.1/drivers/regulator/max8660.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/regulator/max8660.c    2011-11-16 18:39:07.000000000 -0500
 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
                max8660->shadow_regs[MAX8660_OVER1] = 5;
        } else {
@@ -31232,9 +33432,9 @@ diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator
        }
  
        /*
-diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers/regulator/mc13892-regulator.c
---- linux-3.0.4/drivers/regulator/mc13892-regulator.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/regulator/mc13892-regulator.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/regulator/mc13892-regulator.c linux-3.1.1/drivers/regulator/mc13892-regulator.c
+--- linux-3.1.1/drivers/regulator/mc13892-regulator.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/regulator/mc13892-regulator.c  2011-11-16 18:39:07.000000000 -0500
 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
        }
        mc13xxx_unlock(mc13892);
@@ -31250,9 +33450,9 @@ diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers
        for (i = 0; i < pdata->num_regulators; i++) {
                init_data = &pdata->regulators[i];
                priv->regulators[i] = regulator_register(
-diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
---- linux-3.0.4/drivers/rtc/rtc-dev.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/rtc/rtc-dev.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/rtc/rtc-dev.c linux-3.1.1/drivers/rtc/rtc-dev.c
+--- linux-3.1.1/drivers/rtc/rtc-dev.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/rtc/rtc-dev.c  2011-11-16 18:40:22.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -31270,9 +33470,9 @@ diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
                return rtc_set_time(rtc, &tm);
  
        case RTC_PIE_ON:
-diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/aacraid/aacraid.h
---- linux-3.0.4/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/aacraid.h linux-3.1.1/drivers/scsi/aacraid/aacraid.h
+--- linux-3.1.1/drivers/scsi/aacraid/aacraid.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/aacraid.h 2011-11-16 18:39:07.000000000 -0500
 @@ -492,7 +492,7 @@ struct adapter_ops
        int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
        /* Administrative operations */
@@ -31282,9 +33482,9 @@ diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/a
  
  /*
   *    Define which interrupt handler needs to be installed
-diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/aacraid/commctrl.c
---- linux-3.0.4/drivers/scsi/aacraid/commctrl.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/aacraid/commctrl.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/commctrl.c linux-3.1.1/drivers/scsi/aacraid/commctrl.c
+--- linux-3.1.1/drivers/scsi/aacraid/commctrl.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/commctrl.c        2011-11-16 18:40:22.000000000 -0500
 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
        u32 actual_fibsize64, actual_fibsize = 0;
        int i;
@@ -31293,22 +33493,78 @@ diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/
  
        if (dev->in_reset) {
                dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfad.c linux-3.0.4/drivers/scsi/bfa/bfad.c
---- linux-3.0.4/drivers/scsi/bfa/bfad.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfad.c        2011-08-23 21:48:14.000000000 -0400
-@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
+diff -urNp linux-3.1.1/drivers/scsi/aacraid/linit.c linux-3.1.1/drivers/scsi/aacraid/linit.c
+--- linux-3.1.1/drivers/scsi/aacraid/linit.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aacraid/linit.c   2011-11-16 18:39:07.000000000 -0500
+@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
+ #elif defined(__devinitconst)
+ static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
+ #else
+-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
++static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
+ #endif
+       { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
+       { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
+diff -urNp linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/aic94xx/aic94xx_init.c    2011-11-16 18:39:07.000000000 -0500
+@@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
+       .lldd_control_phy       = asd_control_phy,
+ };
+ 
+-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
++static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
+       {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
+       {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfad.c linux-3.1.1/drivers/scsi/bfa/bfad.c
+--- linux-3.1.1/drivers/scsi/bfa/bfad.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfad.c        2011-11-16 19:01:15.000000000 -0500
+@@ -1019,6 +1019,8 @@ bfad_start_ops(struct bfad_s *bfad) {
        struct bfad_vport_s *vport, *vport_new;
        struct bfa_fcs_driver_info_s driver_info;
  
 +      pax_track_stack();
 +
-       /* Fill the driver_info info to fcs*/
-       memset(&driver_info, 0, sizeof(driver_info));
-       strncpy(driver_info.version, BFAD_DRIVER_VERSION,
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c       2011-08-23 21:48:14.000000000 -0400
-@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
+       /* Limit min/max. xfer size to [64k-32MB] */
+       if (max_xfer_size < BFAD_MIN_SECTORS >> 1)
+               max_xfer_size = BFAD_MIN_SECTORS >> 1;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.c   2011-11-16 18:39:07.000000000 -0500
+@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct
+               void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
+ {
+       struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
+-      struct bfa_itn_s *itn;
++      bfa_itn_s_no_const *itn;
+ 
+       itn =  BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
+       itn->isr = isr;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcpim.h   2011-11-16 18:39:07.000000000 -0500
+@@ -37,6 +37,7 @@ struct bfa_iotag_s {
+ struct bfa_itn_s {
+       bfa_isr_func_t isr;
+ };
++typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
+ 
+ void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
+               void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
+@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
+       struct list_head        iotag_tio_free_q;       /* free IO resources */
+       struct list_head        iotag_unused_q; /* unused IO resources*/
+       struct bfa_iotag_s      *iotag_arr;
+-      struct bfa_itn_s        *itn_arr;
++      bfa_itn_s_no_const      *itn_arr;
+       int                     num_ioim_reqs;
+       int                     num_fwtio_reqs;
+       int                     num_itns;
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_lport.c       2011-11-16 18:40:22.000000000 -0500
+@@ -1700,6 +1700,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
        u16        len, count;
        u16     templen;
  
@@ -31317,7 +33573,7 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi
        /*
         * get hba attributes
         */
-@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
+@@ -1977,6 +1979,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
        u8      count = 0;
        u16     templen;
  
@@ -31326,10 +33582,10 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi
        /*
         * get port attributes
         */
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c       2011-08-23 21:48:14.000000000 -0400
-@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_fcs_rport.c       2011-11-16 18:40:22.000000000 -0500
+@@ -1871,6 +1871,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
        struct fc_rpsc_speed_info_s speeds;
        struct bfa_port_attr_s pport_attr;
  
@@ -31338,22 +33594,22 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi
        bfa_trc(port->fcs, rx_fchs->s_id);
        bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa.h linux-3.0.4/drivers/scsi/bfa/bfa.h
---- linux-3.0.4/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400
-@@ -238,7 +238,7 @@ struct bfa_hwif_s {
-                               u32 *nvecs, u32 *maxvec);
-       void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa.h linux-3.1.1/drivers/scsi/bfa/bfa.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa.h 2011-11-16 18:39:07.000000000 -0500
+@@ -196,7 +196,7 @@ struct bfa_hwif_s {
                                       u32 *end);
+       int     cpe_vec_q0;
+       int     rme_vec_q0;
 -};
 +} __no_const;
  typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
  
- struct bfa_iocfc_s {
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h     2011-08-23 21:47:55.000000000 -0400
-@@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
+ struct bfa_faa_cbfn_s {
+diff -urNp linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/bfa/bfa_ioc.h     2011-11-16 18:39:07.000000000 -0500
+@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
        bfa_ioc_disable_cbfn_t  disable_cbfn;
        bfa_ioc_hbfail_cbfn_t   hbfail_cbfn;
        bfa_ioc_reset_cbfn_t    reset_cbfn;
@@ -31361,19 +33617,19 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/b
 +} __no_const;
  
  /*
-  * Heartbeat failure notification queue element.
-@@ -268,7 +268,7 @@ struct bfa_ioc_hwif_s {
-       void            (*ioc_sync_leave)       (struct bfa_ioc_s *ioc);
+  * IOC event notification mechanism.
+@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
        void            (*ioc_sync_ack)         (struct bfa_ioc_s *ioc);
        bfa_boolean_t   (*ioc_sync_complete)    (struct bfa_ioc_s *ioc);
+       bfa_boolean_t   (*ioc_lpu_read_stat)    (struct bfa_ioc_s *ioc);
 -};
 +} __no_const;
  
- #define bfa_ioc_pcifn(__ioc)          ((__ioc)->pcidev.pci_func)
- #define bfa_ioc_devid(__ioc)          ((__ioc)->pcidev.device_id)
-diff -urNp linux-3.0.4/drivers/scsi/BusLogic.c linux-3.0.4/drivers/scsi/BusLogic.c
---- linux-3.0.4/drivers/scsi/BusLogic.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/BusLogic.c        2011-08-23 21:48:14.000000000 -0400
+ /*
+  * Queue element to wait for room in request queue. FIFO order is
+diff -urNp linux-3.1.1/drivers/scsi/BusLogic.c linux-3.1.1/drivers/scsi/BusLogic.c
+--- linux-3.1.1/drivers/scsi/BusLogic.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/BusLogic.c        2011-11-16 18:40:22.000000000 -0500
 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
                                                    *PrototypeHostAdapter)
@@ -31383,9 +33639,9 @@ diff -urNp linux-3.0.4/drivers/scsi/BusLogic.c linux-3.0.4/drivers/scsi/BusLogic
        /*
           If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
           Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff -urNp linux-3.0.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
---- linux-3.0.4/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/dpt_i2o.c linux-3.1.1/drivers/scsi/dpt_i2o.c
+--- linux-3.1.1/drivers/scsi/dpt_i2o.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/dpt_i2o.c 2011-11-16 18:40:22.000000000 -0500
 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
        dma_addr_t addr;
        ulong flags = 0;
@@ -31404,9 +33660,9 @@ diff -urNp linux-3.0.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
        memset(msg, 0 , sizeof(msg));
        len = scsi_bufflen(cmd);
        direction = 0x00000000; 
-diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
---- linux-3.0.4/drivers/scsi/eata.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/eata.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/eata.c linux-3.1.1/drivers/scsi/eata.c
+--- linux-3.1.1/drivers/scsi/eata.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/eata.c    2011-11-16 18:40:22.000000000 -0500
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
        struct hostdata *ha;
        char name[16];
@@ -31416,9 +33672,9 @@ diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
        sprintf(name, "%s%d", driver_name, j);
  
        if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/fcoe/fcoe_ctlr.c  2011-11-16 18:40:22.000000000 -0500
 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
        } buf;
        int rc;
@@ -31428,9 +33684,9 @@ diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fc
        fiph = (struct fip_header *)skb->data;
        sub = fiph->fip_subcode;
  
-diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
---- linux-3.0.4/drivers/scsi/gdth.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/gdth.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/gdth.c linux-3.1.1/drivers/scsi/gdth.c
+--- linux-3.1.1/drivers/scsi/gdth.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/gdth.c    2011-11-16 18:40:22.000000000 -0500
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -31468,9 +33724,9 @@ diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_proc.c
---- linux-3.0.4/drivers/scsi/gdth_proc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/gdth_proc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/gdth_proc.c linux-3.1.1/drivers/scsi/gdth_proc.c
+--- linux-3.1.1/drivers/scsi/gdth_proc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/gdth_proc.c       2011-11-16 18:40:22.000000000 -0500
 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
@@ -31490,9 +33746,9 @@ diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_pr
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
---- linux-3.0.4/drivers/scsi/hosts.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hosts.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/hosts.c linux-3.1.1/drivers/scsi/hosts.c
+--- linux-3.1.1/drivers/scsi/hosts.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hosts.c   2011-11-16 18:39:07.000000000 -0500
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -31502,7 +33758,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
  
  
  static void scsi_host_cls_release(struct device *dev)
-@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct
+@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct
         * subtract one because we increment first then return, but we need to
         * know what the next host number was before increment
         */
@@ -31511,9 +33767,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
        shost->dma_channel = 0xff;
  
        /* These three are default values which can be overridden */
-diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
---- linux-3.0.4/drivers/scsi/hpsa.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hpsa.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/hpsa.c linux-3.1.1/drivers/scsi/hpsa.c
+--- linux-3.1.1/drivers/scsi/hpsa.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hpsa.c    2011-11-16 18:39:07.000000000 -0500
 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
        u32 a;
  
@@ -31523,7 +33779,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
        if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
                a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -2938,7 +2938,7 @@ static void start_io(struct ctlr_info *h
+@@ -2955,7 +2955,7 @@ static void start_io(struct ctlr_info *h
        while (!list_empty(&h->reqQ)) {
                c = list_entry(h->reqQ.next, struct CommandList, list);
                /* can't do anything if fifo is full */
@@ -31532,7 +33788,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
                        dev_warn(&h->pdev->dev, "fifo full\n");
                        break;
                }
-@@ -2948,7 +2948,7 @@ static void start_io(struct ctlr_info *h
+@@ -2965,7 +2965,7 @@ static void start_io(struct ctlr_info *h
                h->Qdepth--;
  
                /* Tell the controller execute command */
@@ -31541,7 +33797,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
                /* Put job onto the completed Q */
                addQ(&h->cmpQ, c);
-@@ -2957,17 +2957,17 @@ static void start_io(struct ctlr_info *h
+@@ -2974,17 +2974,17 @@ static void start_io(struct ctlr_info *h
  
  static inline unsigned long get_next_completion(struct ctlr_info *h)
  {
@@ -31562,7 +33818,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
                (h->interrupts_enabled == 0);
  }
  
-@@ -3857,7 +3857,7 @@ static int __devinit hpsa_pci_init(struc
+@@ -3881,7 +3881,7 @@ static int __devinit hpsa_pci_init(struc
        if (prod_index < 0)
                return -ENODEV;
        h->product_name = products[prod_index].product_name;
@@ -31571,7 +33827,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
        if (hpsa_board_disabled(h->pdev)) {
                dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -4134,7 +4134,7 @@ reinit_after_soft_reset:
+@@ -4158,7 +4158,7 @@ reinit_after_soft_reset:
        }
  
        /* make sure the board interrupts are off */
@@ -31580,7 +33836,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
        if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
                goto clean2;
-@@ -4168,7 +4168,7 @@ reinit_after_soft_reset:
+@@ -4192,7 +4192,7 @@ reinit_after_soft_reset:
                 * fake ones to scoop up any residual completions.
                 */
                spin_lock_irqsave(&h->lock, flags);
@@ -31589,7 +33845,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
                spin_unlock_irqrestore(&h->lock, flags);
                free_irq(h->intr[h->intr_mode], h);
                rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4187,9 +4187,9 @@ reinit_after_soft_reset:
+@@ -4211,9 +4211,9 @@ reinit_after_soft_reset:
                dev_info(&h->pdev->dev, "Board READY.\n");
                dev_info(&h->pdev->dev,
                        "Waiting for stale completions to drain.\n");
@@ -31601,7 +33857,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
                rc = controller_reset_failed(h->cfgtable);
                if (rc)
-@@ -4210,7 +4210,7 @@ reinit_after_soft_reset:
+@@ -4234,7 +4234,7 @@ reinit_after_soft_reset:
        }
  
        /* Turn the interrupts on so we can service requests */
@@ -31610,7 +33866,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
        hpsa_hba_inquiry(h);
        hpsa_register_scsi(h);  /* hook ourselves into SCSI subsystem */
-@@ -4263,7 +4263,7 @@ static void hpsa_shutdown(struct pci_dev
+@@ -4287,7 +4287,7 @@ static void hpsa_shutdown(struct pci_dev
         * To write all data in the battery backed cache to disks
         */
        hpsa_flush_cache(h);
@@ -31619,7 +33875,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
        free_irq(h->intr[h->intr_mode], h);
  #ifdef CONFIG_PCI_MSI
        if (h->msix_vector)
-@@ -4426,7 +4426,7 @@ static __devinit void hpsa_enter_perform
+@@ -4450,7 +4450,7 @@ static __devinit void hpsa_enter_perform
                return;
        }
        /* Change the access methods to the performant access methods */
@@ -31628,9 +33884,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
        h->transMethod = CFGTBL_Trans_Performant;
  }
  
-diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
---- linux-3.0.4/drivers/scsi/hpsa.h    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hpsa.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/hpsa.h linux-3.1.1/drivers/scsi/hpsa.h
+--- linux-3.1.1/drivers/scsi/hpsa.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/hpsa.h    2011-11-16 18:39:07.000000000 -0500
 @@ -73,7 +73,7 @@ struct ctlr_info {
        unsigned int msix_vector;
        unsigned int msi_vector;
@@ -31640,9 +33896,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
  
        /* queue and queue Info */
        struct list_head reqQ;
-diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
---- linux-3.0.4/drivers/scsi/ips.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/ips.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/ips.h linux-3.1.1/drivers/scsi/ips.h
+--- linux-3.1.1/drivers/scsi/ips.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/ips.h     2011-11-16 18:39:07.000000000 -0500
 @@ -1027,7 +1027,7 @@ typedef struct {
     int       (*intr)(struct ips_ha *);
     void      (*enableint)(struct ips_ha *);
@@ -31652,9 +33908,9 @@ diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/libfc/fc_exch.c
---- linux-3.0.4/drivers/scsi/libfc/fc_exch.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/libfc/fc_exch.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/libfc/fc_exch.c linux-3.1.1/drivers/scsi/libfc/fc_exch.c
+--- linux-3.1.1/drivers/scsi/libfc/fc_exch.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/libfc/fc_exch.c   2011-11-16 18:39:07.000000000 -0500
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
         * all together if not used XXX
         */
@@ -31674,7 +33930,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
        } stats;
  };
  
-@@ -700,7 +700,7 @@ static struct fc_exch *fc_exch_em_alloc(
+@@ -718,7 +718,7 @@ static struct fc_exch *fc_exch_em_alloc(
        /* allocate memory for exchange */
        ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
        if (!ep) {
@@ -31683,7 +33939,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                goto out;
        }
        memset(ep, 0, sizeof(*ep));
-@@ -761,7 +761,7 @@ out:
+@@ -779,7 +779,7 @@ out:
        return ep;
  err:
        spin_unlock_bh(&pool->lock);
@@ -31692,7 +33948,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
        mempool_free(ep, mp->ep_pool);
        return NULL;
  }
-@@ -906,7 +906,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -922,7 +922,7 @@ static enum fc_pf_rjt_reason fc_seq_look
                xid = ntohs(fh->fh_ox_id);      /* we originated exch */
                ep = fc_exch_find(mp, xid);
                if (!ep) {
@@ -31701,7 +33957,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                        reject = FC_RJT_OX_ID;
                        goto out;
                }
-@@ -936,7 +936,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -952,7 +952,7 @@ static enum fc_pf_rjt_reason fc_seq_look
                ep = fc_exch_find(mp, xid);
                if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
                        if (ep) {
@@ -31710,7 +33966,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                                reject = FC_RJT_RX_ID;
                                goto rel;
                        }
-@@ -947,7 +947,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -963,7 +963,7 @@ static enum fc_pf_rjt_reason fc_seq_look
                        }
                        xid = ep->xid;  /* get our XID */
                } else if (!ep) {
@@ -31719,16 +33975,16 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                        reject = FC_RJT_RX_ID;  /* XID not found */
                        goto out;
                }
-@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_look
+@@ -980,7 +980,7 @@ static enum fc_pf_rjt_reason fc_seq_look
        } else {
                sp = &ep->seq;
                if (sp->id != fh->fh_seq_id) {
 -                      atomic_inc(&mp->stats.seq_not_found);
 +                      atomic_inc_unchecked(&mp->stats.seq_not_found);
-                       reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
-                       goto rel;
-               }
-@@ -1392,22 +1392,22 @@ static void fc_exch_recv_seq_resp(struct
+                       if (f_ctl & FC_FC_END_SEQ) {
+                               /*
+                                * Update sequence_id based on incoming last
+@@ -1430,22 +1430,22 @@ static void fc_exch_recv_seq_resp(struct
  
        ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
        if (!ep) {
@@ -31755,7 +34011,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                goto rel;
        }
        sof = fr_sof(fp);
-@@ -1416,7 +1416,7 @@ static void fc_exch_recv_seq_resp(struct
+@@ -1454,7 +1454,7 @@ static void fc_exch_recv_seq_resp(struct
                sp->ssb_stat |= SSB_ST_RESP;
                sp->id = fh->fh_seq_id;
        } else if (sp->id != fh->fh_seq_id) {
@@ -31764,7 +34020,7 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
                goto rel;
        }
  
-@@ -1480,9 +1480,9 @@ static void fc_exch_recv_resp(struct fc_
+@@ -1518,9 +1518,9 @@ static void fc_exch_recv_resp(struct fc_
        sp = fc_seq_lookup_orig(mp, fp);        /* doesn't hold sequence */
  
        if (!sp)
@@ -31776,9 +34032,9 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
  
        fc_frame_free(fp);
  }
-diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/libsas/sas_ata.c
---- linux-3.0.4/drivers/scsi/libsas/sas_ata.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/libsas/sas_ata.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/libsas/sas_ata.c linux-3.1.1/drivers/scsi/libsas/sas_ata.c
+--- linux-3.1.1/drivers/scsi/libsas/sas_ata.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/libsas/sas_ata.c  2011-11-16 18:39:07.000000000 -0500
 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
        .postreset              = ata_std_postreset,
        .error_handler          = ata_std_error_handler,
@@ -31788,10 +34044,10 @@ diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/li
        .qc_prep                = ata_noop_qc_prep,
        .qc_issue               = sas_ata_qc_issue,
        .qc_fill_rtf            = sas_ata_qc_fill_rtf,
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c       2011-08-23 21:48:14.000000000 -0400
-@@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_debugfs.c       2011-11-16 18:40:22.000000000 -0500
+@@ -105,7 +105,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
  #include <linux/debugfs.h>
  
@@ -31800,7 +34056,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
  static unsigned long lpfc_debugfs_start_time = 0L;
  
  /* iDiag */
-@@ -141,7 +141,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
+@@ -146,7 +146,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
        lpfc_debugfs_enable = 0;
  
        len = 0;
@@ -31809,7 +34065,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
                (lpfc_debugfs_max_disc_trc - 1);
        for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
                dtp = vport->disc_trc + i;
-@@ -202,7 +202,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
+@@ -212,7 +212,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
        lpfc_debugfs_enable = 0;
  
        len = 0;
@@ -31818,16 +34074,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
                (lpfc_debugfs_max_slow_ring_trc - 1);
        for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
                dtp = phba->slow_ring_trc + i;
-@@ -380,6 +380,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf
-       uint32_t *ptr;
-       char buffer[1024];
- 
-+      pax_track_stack();
-+
-       off = 0;
-       spin_lock_irq(&phba->hbalock);
- 
-@@ -617,14 +619,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
+@@ -635,14 +635,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
                !vport || !vport->disc_trc)
                return;
  
@@ -31844,7 +34091,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
        dtp->jif = jiffies;
  #endif
        return;
-@@ -655,14 +657,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
+@@ -673,14 +673,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
                !phba || !phba->slow_ring_trc)
                return;
  
@@ -31861,7 +34108,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
        dtp->jif = jiffies;
  #endif
        return;
-@@ -2606,7 +2608,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -3828,7 +3828,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
                                                 "slow_ring buffer\n");
                                goto debug_failed;
                        }
@@ -31870,7 +34117,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
                        memset(phba->slow_ring_trc, 0,
                                (sizeof(struct lpfc_debugfs_trc) *
                                lpfc_debugfs_max_slow_ring_trc));
-@@ -2652,7 +2654,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+@@ -3874,7 +3874,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
                                 "buffer\n");
                goto debug_failed;
        }
@@ -31879,10 +34126,10 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
  
        snprintf(name, sizeof(name), "discovery_trace");
        vport->debug_disc_trc =
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lpfc.h
---- linux-3.0.4/drivers/scsi/lpfc/lpfc.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc.h       2011-08-23 21:47:55.000000000 -0400
-@@ -420,7 +420,7 @@ struct lpfc_vport {
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc.h linux-3.1.1/drivers/scsi/lpfc/lpfc.h
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc.h       2011-11-16 18:39:07.000000000 -0500
+@@ -425,7 +425,7 @@ struct lpfc_vport {
        struct dentry *debug_nodelist;
        struct dentry *vport_debugfs_root;
        struct lpfc_debugfs_trc *disc_trc;
@@ -31891,7 +34138,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lp
  #endif
        uint8_t stat_data_enabled;
        uint8_t stat_data_blocked;
-@@ -826,8 +826,8 @@ struct lpfc_hba {
+@@ -835,8 +835,8 @@ struct lpfc_hba {
        struct timer_list fabric_block_timer;
        unsigned long bit_flags;
  #define       FABRIC_COMANDS_BLOCKED  0
@@ -31902,7 +34149,7 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lp
        unsigned long last_rsrc_error_time;
        unsigned long last_ramp_down_time;
        unsigned long last_ramp_up_time;
-@@ -841,7 +841,7 @@ struct lpfc_hba {
+@@ -850,7 +850,7 @@ struct lpfc_hba {
        struct dentry *debug_dumpDif;    /* BlockGuard BPL*/
        struct dentry *debug_slow_ring_trc;
        struct lpfc_debugfs_trc *slow_ring_trc;
@@ -31911,10 +34158,10 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lp
        /* iDiag debugfs sub-directory */
        struct dentry *idiag_root;
        struct dentry *idiag_pci_cfg;
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c  2011-08-23 21:47:56.000000000 -0400
-@@ -9923,8 +9923,10 @@ lpfc_init(void)
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_init.c  2011-11-16 18:39:07.000000000 -0500
+@@ -9969,8 +9969,10 @@ lpfc_init(void)
        printk(LPFC_COPYRIGHT "\n");
  
        if (lpfc_enable_npiv) {
@@ -31927,9 +34174,9 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lp
        }
        lpfc_transport_template =
                                fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/lpfc/lpfc_scsi.c  2011-11-16 18:39:07.000000000 -0500
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
        uint32_t evt_posted;
  
@@ -31981,9 +34228,9 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lp
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/megaraid/megaraid_mbox.c  2011-11-16 18:40:22.000000000 -0500
 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
        int             rval;
        int             i;
@@ -31993,9 +34240,9 @@ diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers
        // Allocate memory for the base list of scb for management module.
        adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi/osd/osd_initiator.c
---- linux-3.0.4/drivers/scsi/osd/osd_initiator.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/osd/osd_initiator.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/osd/osd_initiator.c linux-3.1.1/drivers/scsi/osd/osd_initiator.c
+--- linux-3.1.1/drivers/scsi/osd/osd_initiator.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/osd/osd_initiator.c       2011-11-16 18:40:22.000000000 -0500
 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
        int nelem = ARRAY_SIZE(get_attrs), a = 0;
        int ret;
@@ -32005,9 +34252,9 @@ diff -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi
        or = osd_start_request(od, GFP_KERNEL);
        if (!or)
                return -ENOMEM;
-diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
---- linux-3.0.4/drivers/scsi/pmcraid.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/pmcraid.c linux-3.1.1/drivers/scsi/pmcraid.c
+--- linux-3.1.1/drivers/scsi/pmcraid.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/pmcraid.c 2011-11-16 18:39:07.000000000 -0500
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
                res->scsi_dev = scsi_dev;
                scsi_dev->hostdata = res;
@@ -32078,9 +34325,9 @@ diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
        schedule_work(&pinstance->worker_q);
        return rc;
  
-diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
---- linux-3.0.4/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/pmcraid.h linux-3.1.1/drivers/scsi/pmcraid.h
+--- linux-3.1.1/drivers/scsi/pmcraid.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/pmcraid.h 2011-11-16 18:39:07.000000000 -0500
 @@ -749,7 +749,7 @@ struct pmcraid_instance {
        struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -32110,9 +34357,9 @@ diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
  
        /* To indicate add/delete/modify during CCN */
        u8 change_detected;
-diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla2xxx/qla_def.h 2011-11-16 18:39:07.000000000 -0500
 @@ -2244,7 +2244,7 @@ struct isp_operations {
        int (*get_flash_version) (struct scsi_qla_host *, void *);
        int (*start_scsi) (srb_t *);
@@ -32122,9 +34369,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/q
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_def.h 2011-11-16 18:39:07.000000000 -0500
 @@ -256,7 +256,7 @@ struct ddb_entry {
        atomic_t retry_relogin_timer; /* Min Time between relogins
                                       * (4000 only) */
@@ -32134,9 +34381,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/q
                                       * retried */
  
        uint16_t port;
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_init.c        2011-11-16 18:39:07.000000000 -0500
 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
        ddb_entry->fw_ddb_index = fw_ddb_index;
        atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -32155,9 +34402,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/
                atomic_set(&ddb_entry->relogin_timer, 0);
                clear_bit(DF_RELOGIN, &ddb_entry->flags);
                iscsi_unblock_session(ddb_entry->sess);
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/qla4xxx/ql4_os.c  2011-11-16 18:39:07.000000000 -0500
 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
                            ddb_entry->fw_ddb_device_state ==
                            DDB_DS_SESSION_FAILED) {
@@ -32174,9 +34421,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/ql
                                                          relogin_retry_count))
                                        );
                                start_dpc++;
-diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
---- linux-3.0.4/drivers/scsi/scsi.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi.c linux-3.1.1/drivers/scsi/scsi.c
+--- linux-3.1.1/drivers/scsi/scsi.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi.c    2011-11-16 18:39:07.000000000 -0500
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
        unsigned long timeout;
        int rtn = 0;
@@ -32186,9 +34433,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
  
        /* check if the device is still usable */
        if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_debug.c
---- linux-3.0.4/drivers/scsi/scsi_debug.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_debug.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi_debug.c linux-3.1.1/drivers/scsi/scsi_debug.c
+--- linux-3.1.1/drivers/scsi/scsi_debug.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_debug.c      2011-11-16 18:40:22.000000000 -0500
 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
        unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
        unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -32207,10 +34454,10 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_d
        if ((errsts = check_readiness(scp, 1, devip)))
                return errsts;
        memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib.c
---- linux-3.0.4/drivers/scsi/scsi_lib.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_lib.c        2011-08-23 21:47:56.000000000 -0400
-@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
+diff -urNp linux-3.1.1/drivers/scsi/scsi_lib.c linux-3.1.1/drivers/scsi/scsi_lib.c
+--- linux-3.1.1/drivers/scsi/scsi_lib.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_lib.c        2011-11-16 18:39:07.000000000 -0500
+@@ -1413,7 +1413,7 @@ static void scsi_kill_request(struct req
        shost = sdev->host;
        scsi_init_cmd_errh(cmd);
        cmd->result = DID_NO_CONNECT << 16;
@@ -32219,7 +34466,7 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib
  
        /*
         * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1438,9 +1438,9 @@ static void scsi_softirq_done(struct req
+@@ -1439,9 +1439,9 @@ static void scsi_softirq_done(struct req
  
        INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -32231,9 +34478,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib
  
        disposition = scsi_decide_disposition(cmd);
        if (disposition != SUCCESS &&
-diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_sysfs.c
---- linux-3.0.4/drivers/scsi/scsi_sysfs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_sysfs.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi_sysfs.c linux-3.1.1/drivers/scsi/scsi_sysfs.c
+--- linux-3.1.1/drivers/scsi/scsi_sysfs.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_sysfs.c      2011-11-16 18:39:07.000000000 -0500
 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
                    char *buf)                                          \
  {                                                                     \
@@ -32243,9 +34490,21 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_s
        return snprintf(buf, 20, "0x%llx\n", count);                    \
  }                                                                     \
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi/scsi_transport_fc.c
---- linux-3.0.4/drivers/scsi/scsi_transport_fc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_fc.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi_tgt_lib.c linux-3.1.1/drivers/scsi/scsi_tgt_lib.c
+--- linux-3.1.1/drivers/scsi/scsi_tgt_lib.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_tgt_lib.c    2011-11-16 18:39:07.000000000 -0500
+@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
+       int err;
+ 
+       dprintk("%lx %u\n", uaddr, len);
+-      err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
++      err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
+       if (err) {
+               /*
+                * TODO: need to fixup sg_tablesize, max_segment_size,
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_fc.c linux-3.1.1/drivers/scsi/scsi_transport_fc.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_fc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_fc.c       2011-11-16 18:39:07.000000000 -0500
 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -32282,9 +34541,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi
                return -EINVAL;
        /*
         * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_iscsi.c    2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct iscsi_internal {
        struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -32312,9 +34571,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/s
  
        err = class_register(&iscsi_transport_class);
        if (err)
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scsi/scsi_transport_srp.c
---- linux-3.0.4/drivers/scsi/scsi_transport_srp.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_srp.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/scsi_transport_srp.c linux-3.1.1/drivers/scsi/scsi_transport_srp.c
+--- linux-3.1.1/drivers/scsi/scsi_transport_srp.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/scsi_transport_srp.c      2011-11-16 18:39:07.000000000 -0500
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -32342,9 +34601,18 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scs
        dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
        transport_setup_device(&rport->dev);
-diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
---- linux-3.0.4/drivers/scsi/sg.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/sg.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/sg.c linux-3.1.1/drivers/scsi/sg.c
+--- linux-3.1.1/drivers/scsi/sg.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/sg.c      2011-11-16 18:39:07.000000000 -0500
+@@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
+                                      sdp->disk->disk_name,
+                                      MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
+                                      NULL,
+-                                     (char *)arg);
++                                     (char __user *)arg);
+       case BLKTRACESTART:
+               return blk_trace_startstop(sdp->device->request_queue, 1);
+       case BLKTRACESTOP:
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
        const struct file_operations * fops;
  };
@@ -32363,9 +34631,9 @@ diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
  
        sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
        if (!sg_proc_sgp)
-diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-11-16 18:40:22.000000000 -0500
 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
        int do_iounmap = 0;
        int do_disable_device = 1;
@@ -32375,9 +34643,9 @@ diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/s
        memset(&sym_dev, 0, sizeof(sym_dev));
        memset(&nvram, 0, sizeof(nvram));
        sym_dev.pdev = pdev;
-diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pvscsi.c
---- linux-3.0.4/drivers/scsi/vmw_pvscsi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/vmw_pvscsi.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/scsi/vmw_pvscsi.c linux-3.1.1/drivers/scsi/vmw_pvscsi.c
+--- linux-3.1.1/drivers/scsi/vmw_pvscsi.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/scsi/vmw_pvscsi.c      2011-11-16 18:40:22.000000000 -0500
 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
        dma_addr_t base;
        unsigned i;
@@ -32387,9 +34655,9 @@ diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pv
        cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
        cmd.reqRingNumPages = adapter->req_pages;
        cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
---- linux-3.0.4/drivers/spi/spi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/spi/spi.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/spi/spi.c linux-3.1.1/drivers/spi/spi.c
+--- linux-3.1.1/drivers/spi/spi.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/spi/spi.c      2011-11-16 18:39:07.000000000 -0500
 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
@@ -32399,9 +34667,21 @@ diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
  
  static u8     *buf;
  
-diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/spi/spi-dw-pci.c linux-3.1.1/drivers/spi/spi-dw-pci.c
+--- linux-3.1.1/drivers/spi/spi-dw-pci.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/spi/spi-dw-pci.c       2011-11-16 18:39:07.000000000 -0500
+@@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd
+ #define spi_resume    NULL
+ #endif
+ 
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+       /* Intel MID platform SPI controller 0 */
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
+       {},
+diff -urNp linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-11-16 18:39:07.000000000 -0500
 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
          (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
  
@@ -32411,9 +34691,9 @@ diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/
      .ndo_init               = NULL,
      .ndo_open               = ar6000_open,
      .ndo_stop               = ar6000_close,
-diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-11-16 18:39:07.000000000 -0500
 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
  typedef struct ar6k_pal_config_s
  {
@@ -32423,99 +34703,99 @@ diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
  
  void register_pal_cb(ar6k_pal_config_t *palConfig_p);
  #endif /* _AR6K_PAL_H_ */
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400
-@@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-16 18:39:07.000000000 -0500
+@@ -451,14 +451,14 @@ static void brcmf_op_if(struct brcmf_if 
                        free_netdev(ifp->net);
                }
                /* Allocate etherdev, including space for private structure */
--              ifp->net = alloc_etherdev(sizeof(dhd));
-+              ifp->net = alloc_etherdev(sizeof(*dhd));
+-              ifp->net = alloc_etherdev(sizeof(drvr_priv));
++              ifp->net = alloc_etherdev(sizeof(*drvr_priv));
                if (!ifp->net) {
-                       DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
+                       BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
                        ret = -ENOMEM;
                }
                if (ret == 0) {
                        strcpy(ifp->net->name, ifp->name);
--                      memcpy(netdev_priv(ifp->net), &dhd, sizeof(dhd));
-+                      memcpy(netdev_priv(ifp->net), dhd, sizeof(*dhd));
-                       err = dhd_net_attach(&dhd->pub, ifp->idx);
+-                      memcpy(netdev_priv(ifp->net), &drvr_priv, sizeof(drvr_priv));
++                      memcpy(netdev_priv(ifp->net), &drvr_priv, sizeof(*drvr_priv));
+                       err = brcmf_net_attach(&drvr_priv->pub, ifp->idx);
                        if (err != 0) {
-                               DHD_ERROR(("%s: dhd_net_attach failed, "
-@@ -1872,7 +1872,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
-               strcpy(nv_path, nvram_path);
+                               BRCMF_ERROR(("%s: brcmf_net_attach failed, "
+@@ -1279,7 +1279,7 @@ struct brcmf_pub *brcmf_attach(struct br
+       BRCMF_TRACE(("%s: Enter\n", __func__));
  
        /* Allocate etherdev, including space for private structure */
--      net = alloc_etherdev(sizeof(dhd));
-+      net = alloc_etherdev(sizeof(*dhd));
+-      net = alloc_etherdev(sizeof(drvr_priv));
++      net = alloc_etherdev(sizeof(*drvr_priv));
        if (!net) {
-               DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
+               BRCMF_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
                goto fail;
-@@ -1888,7 +1888,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
+@@ -1295,7 +1295,7 @@ struct brcmf_pub *brcmf_attach(struct br
        /*
-        * Save the dhd_info into the priv
+        * Save the brcmf_info into the priv
         */
--      memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-+      memcpy(netdev_priv(net), dhd, sizeof(*dhd));
+-      memcpy(netdev_priv(net), &drvr_priv, sizeof(drvr_priv));
++      memcpy(netdev_priv(net), &drvr_priv, sizeof(*drvr_priv));
  
        /* Set network interface name if it was provided as module parameter */
        if (iface_name[0]) {
-@@ -2004,7 +2004,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
+@@ -1352,7 +1352,7 @@ struct brcmf_pub *brcmf_attach(struct br
        /*
-        * Save the dhd_info into the priv
+        * Save the brcmf_info into the priv
         */
--      memcpy(netdev_priv(net), &dhd, sizeof(dhd));
-+      memcpy(netdev_priv(net), dhd, sizeof(*dhd));
- 
- #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
-       g_bus = bus;
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
---- linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-08-23 21:47:56.000000000 -0400
-@@ -593,7 +593,7 @@ struct phy_func_ptr {
+-      memcpy(netdev_priv(net), &drvr_priv, sizeof(drvr_priv));
++      memcpy(netdev_priv(net), &drvr_priv, sizeof(*drvr_priv));
+ 
+ #if defined(CONFIG_PM_SLEEP)
+       atomic_set(&brcmf_mmc_suspend, false);
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h
+--- linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmfmac/sdio_host.h 2011-11-16 18:39:07.000000000 -0500
+@@ -263,7 +263,7 @@ struct brcmf_sdioh_driver {
+                        u16 func, uint bustype, u32 regsva, void *param);
+       /* detach from device */
+       void (*detach) (void *ch);
+-};
++} __no_const;
+ 
+ struct sdioh_info;
+ 
+diff -urNp linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+--- linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h       2011-11-16 18:39:07.000000000 -0500
+@@ -591,7 +591,7 @@ struct phy_func_ptr {
        initfn_t carrsuppr;
        rxsigpwrfn_t rxsigpwr;
        detachfn_t detach;
 -};
 +} __no_const;
- typedef struct phy_func_ptr phy_func_ptr_t;
- 
- struct phy_info {
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h
---- linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h     2011-08-23 21:47:56.000000000 -0400
-@@ -185,7 +185,7 @@ typedef struct {
-                        u16 func, uint bustype, void *regsva, void *param);
-       /* detach from device */
-       void (*detach) (void *ch);
--} bcmsdh_driver_t;
-+} __no_const bcmsdh_driver_t;
- 
- /* platform specific/high level functions */
- extern int bcmsdh_register(bcmsdh_driver_t *driver);
-diff -urNp linux-3.0.4/drivers/staging/et131x/et1310_tx.c linux-3.0.4/drivers/staging/et131x/et1310_tx.c
---- linux-3.0.4/drivers/staging/et131x/et1310_tx.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/et131x/et1310_tx.c     2011-08-23 21:47:56.000000000 -0400
+ 
+ struct brcms_phy {
+       struct brcms_phy_pub pubpi_ro;
+diff -urNp linux-3.1.1/drivers/staging/et131x/et1310_tx.c linux-3.1.1/drivers/staging/et131x/et1310_tx.c
+--- linux-3.1.1/drivers/staging/et131x/et1310_tx.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/et131x/et1310_tx.c     2011-11-16 18:39:07.000000000 -0500
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
        struct net_device_stats *stats = &etdev->net_stats;
  
        if (tcb->flags & fMP_DEST_BROAD)
--              atomic_inc(&etdev->Stats.brdcstxmt);
-+              atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
+-              atomic_inc(&etdev->stats.brdcstxmt);
++              atomic_inc_unchecked(&etdev->stats.brdcstxmt);
        else if (tcb->flags & fMP_DEST_MULTI)
--              atomic_inc(&etdev->Stats.multixmt);
-+              atomic_inc_unchecked(&etdev->Stats.multixmt);
+-              atomic_inc(&etdev->stats.multixmt);
++              atomic_inc_unchecked(&etdev->stats.multixmt);
        else
--              atomic_inc(&etdev->Stats.unixmt);
-+              atomic_inc_unchecked(&etdev->Stats.unixmt);
+-              atomic_inc(&etdev->stats.unixmt);
++              atomic_inc_unchecked(&etdev->stats.unixmt);
  
        if (tcb->skb) {
                stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drivers/staging/et131x/et131x_adapter.h
---- linux-3.0.4/drivers/staging/et131x/et131x_adapter.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/et131x/et131x_adapter.h        2011-08-23 21:47:56.000000000 -0400
-@@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
+diff -urNp linux-3.1.1/drivers/staging/et131x/et131x_adapter.h linux-3.1.1/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.1.1/drivers/staging/et131x/et131x_adapter.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/et131x/et131x_adapter.h        2011-11-16 18:39:07.000000000 -0500
+@@ -106,11 +106,11 @@ struct ce_stats {
         * operations
         */
        u32 unircv;     /* # multicast packets received */
@@ -32530,10 +34810,10 @@ diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drive
        u32 norcvbuf;   /* # Rx packets discarded */
        u32 noxmtbuf;   /* # Tx packets discarded */
  
-diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/hv/channel.c
---- linux-3.0.4/drivers/staging/hv/channel.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/channel.c   2011-08-23 21:47:56.000000000 -0400
-@@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
+diff -urNp linux-3.1.1/drivers/staging/hv/channel.c linux-3.1.1/drivers/staging/hv/channel.c
+--- linux-3.1.1/drivers/staging/hv/channel.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/channel.c   2011-11-16 18:39:07.000000000 -0500
+@@ -447,8 +447,8 @@ int vmbus_establish_gpadl(struct vmbus_c
        int ret = 0;
        int t;
  
@@ -32544,9 +34824,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/
  
        ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
        if (ret)
-diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv.c
---- linux-3.0.4/drivers/staging/hv/hv.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hv.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/hv/hv.c linux-3.1.1/drivers/staging/hv/hv.c
+--- linux-3.1.1/drivers/staging/hv/hv.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hv.c        2011-11-16 18:39:07.000000000 -0500
 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
        u64 output_address = (output) ? virt_to_phys(output) : 0;
        u32 output_address_hi = output_address >> 32;
@@ -32556,10 +34836,10 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv
  
        __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
                              "=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging/hv/hv_mouse.c
---- linux-3.0.4/drivers/staging/hv/hv_mouse.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hv_mouse.c  2011-08-23 21:47:56.000000000 -0400
-@@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
+diff -urNp linux-3.1.1/drivers/staging/hv/hv_mouse.c linux-3.1.1/drivers/staging/hv/hv_mouse.c
+--- linux-3.1.1/drivers/staging/hv/hv_mouse.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hv_mouse.c  2011-11-16 18:39:07.000000000 -0500
+@@ -878,8 +878,10 @@ static void reportdesc_callback(struct h
        if (hid_dev) {
                DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
  
@@ -32572,9 +34852,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging
  
                hid_dev->bus = BUS_VIRTUAL;
                hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/hyperv_vmbus.h      2011-11-16 18:39:07.000000000 -0500
 @@ -559,7 +559,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
        enum vmbus_connect_state conn_state;
@@ -32584,9 +34864,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/sta
  
        /*
         * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/staging/hv/rndis_filter.c
---- linux-3.0.4/drivers/staging/hv/rndis_filter.c      2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/rndis_filter.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/hv/rndis_filter.c linux-3.1.1/drivers/staging/hv/rndis_filter.c
+--- linux-3.1.1/drivers/staging/hv/rndis_filter.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/rndis_filter.c      2011-11-16 18:39:07.000000000 -0500
 @@ -43,7 +43,7 @@ struct rndis_device {
  
        enum rndis_device_state state;
@@ -32605,7 +34885,7 @@ diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/sta
  
        /* Add to the request list */
        spin_lock_irqsave(&dev->request_lock, flags);
-@@ -637,7 +637,7 @@ static void rndis_filter_halt_device(str
+@@ -622,7 +622,7 @@ static void rndis_filter_halt_device(str
  
        /* Setup the rndis set */
        halt = &request->request_msg.msg.halt_req;
@@ -32614,10 +34894,10 @@ diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/sta
  
        /* Ignore return since this msg is optional. */
        rndis_filter_send_request(dev, request);
-diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/staging/hv/vmbus_drv.c
---- linux-3.0.4/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400
-@@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
+diff -urNp linux-3.1.1/drivers/staging/hv/vmbus_drv.c linux-3.1.1/drivers/staging/hv/vmbus_drv.c
+--- linux-3.1.1/drivers/staging/hv/vmbus_drv.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/hv/vmbus_drv.c 2011-11-16 18:39:07.000000000 -0500
+@@ -660,11 +660,11 @@ int vmbus_child_device_register(struct h
  {
        int ret = 0;
  
@@ -32631,9 +34911,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/stagin
  
        /* The new device belongs to this bus */
        child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/staging/iio/ring_generic.h
---- linux-3.0.4/drivers/staging/iio/ring_generic.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/iio/ring_generic.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/iio/ring_generic.h linux-3.1.1/drivers/staging/iio/ring_generic.h
+--- linux-3.1.1/drivers/staging/iio/ring_generic.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/iio/ring_generic.h     2011-11-16 18:39:07.000000000 -0500
 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
  
        int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -32643,9 +34923,30 @@ diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/st
  
  struct iio_ring_setup_ops {
        int                             (*preenable)(struct iio_dev *);
-diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet.c linux-3.0.4/drivers/staging/octeon/ethernet.c
---- linux-3.0.4/drivers/staging/octeon/ethernet.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/octeon/ethernet.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/mei/interface.c linux-3.1.1/drivers/staging/mei/interface.c
+--- linux-3.1.1/drivers/staging/mei/interface.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/mei/interface.c        2011-11-17 18:39:18.000000000 -0500
+@@ -332,7 +332,7 @@ int mei_send_flow_control(struct mei_dev
+       mei_hdr->reserved = 0;
+ 
+       mei_flow_control = (struct hbm_flow_control *) &dev->wr_msg_buf[1];
+-      memset(mei_flow_control, 0, sizeof(mei_flow_control));
++      memset(mei_flow_control, 0, sizeof(*mei_flow_control));
+       mei_flow_control->host_addr = cl->host_client_id;
+       mei_flow_control->me_addr = cl->me_client_id;
+       mei_flow_control->cmd.cmd = MEI_FLOW_CONTROL_CMD;
+@@ -396,7 +396,7 @@ int mei_disconnect(struct mei_device *de
+ 
+       mei_cli_disconnect =
+           (struct hbm_client_disconnect_request *) &dev->wr_msg_buf[1];
+-      memset(mei_cli_disconnect, 0, sizeof(mei_cli_disconnect));
++      memset(mei_cli_disconnect, 0, sizeof(*mei_cli_disconnect));
+       mei_cli_disconnect->host_addr = cl->host_client_id;
+       mei_cli_disconnect->me_addr = cl->me_client_id;
+       mei_cli_disconnect->cmd.cmd = CLIENT_DISCONNECT_REQ_CMD;
+diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet.c linux-3.1.1/drivers/staging/octeon/ethernet.c
+--- linux-3.1.1/drivers/staging/octeon/ethernet.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/octeon/ethernet.c      2011-11-16 18:39:07.000000000 -0500
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
                 * since the RX tasklet also increments it.
                 */
@@ -32662,10 +34963,10 @@ diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet.c linux-3.0.4/drivers/sta
  #endif
        }
  
-diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/staging/octeon/ethernet-rx.c
---- linux-3.0.4/drivers/staging/octeon/ethernet-rx.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/octeon/ethernet-rx.c   2011-08-23 21:47:56.000000000 -0400
-@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
+diff -urNp linux-3.1.1/drivers/staging/octeon/ethernet-rx.c linux-3.1.1/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.1.1/drivers/staging/octeon/ethernet-rx.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/octeon/ethernet-rx.c   2011-11-16 18:39:07.000000000 -0500
+@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi
                                /* Increment RX stats for virtual ports */
                                if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
  #ifdef CONFIG_64BIT
@@ -32681,7 +34982,7 @@ diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/
  #endif
                                }
                                netif_receive_skb(skb);
-@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi
+@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi
                                           dev->name);
                                */
  #ifdef CONFIG_64BIT
@@ -32693,10 +34994,10 @@ diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/
  #endif
                                dev_kfree_skb_irq(skb);
                        }
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/staging/pohmelfs/inode.c
---- linux-3.0.4/drivers/staging/pohmelfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/inode.c       2011-08-23 21:47:56.000000000 -0400
-@@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/inode.c linux-3.1.1/drivers/staging/pohmelfs/inode.c
+--- linux-3.1.1/drivers/staging/pohmelfs/inode.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/inode.c       2011-11-16 18:39:07.000000000 -0500
+@@ -1861,7 +1861,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);
@@ -32705,7 +35006,7 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/stag
  
        psb->trans_max_pages = 100;
  
-@@ -1871,7 +1871,7 @@ static int pohmelfs_fill_super(struct su
+@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct su
        INIT_LIST_HEAD(&psb->crypto_ready_list);
        INIT_LIST_HEAD(&psb->crypto_active_list);
  
@@ -32714,9 +35015,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/stag
        atomic_long_set(&psb->total_inodes, 0);
  
        mutex_init(&psb->state_lock);
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/staging/pohmelfs/mcache.c
---- linux-3.0.4/drivers/staging/pohmelfs/mcache.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/mcache.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/mcache.c linux-3.1.1/drivers/staging/pohmelfs/mcache.c
+--- linux-3.1.1/drivers/staging/pohmelfs/mcache.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/mcache.c      2011-11-16 18:39:07.000000000 -0500
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
        m->data = data;
        m->start = start;
@@ -32726,9 +35027,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/sta
  
        mutex_lock(&psb->mcache_lock);
        err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/staging/pohmelfs/netfs.h
---- linux-3.0.4/drivers/staging/pohmelfs/netfs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/netfs.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/netfs.h linux-3.1.1/drivers/staging/pohmelfs/netfs.h
+--- linux-3.1.1/drivers/staging/pohmelfs/netfs.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/netfs.h       2011-11-16 18:39:07.000000000 -0500
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
        struct rb_root          mcache_root;
@@ -32746,9 +35047,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/stag
  
        unsigned int            crypto_attached_size;
        unsigned int            crypto_align_size;
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/staging/pohmelfs/trans.c
---- linux-3.0.4/drivers/staging/pohmelfs/trans.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/trans.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/pohmelfs/trans.c linux-3.1.1/drivers/staging/pohmelfs/trans.c
+--- linux-3.1.1/drivers/staging/pohmelfs/trans.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/pohmelfs/trans.c       2011-11-16 18:39:07.000000000 -0500
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
        int err;
        struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -32758,9 +35059,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/stag
  
        cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
                t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/rtl8712/rtl871x_io.h   2011-11-16 18:39:07.000000000 -0500
 @@ -83,7 +83,7 @@ struct       _io_ops {
                          u8 *pmem);
        u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -32770,9 +35071,9 @@ diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/
  
  struct io_req {
        struct list_head list;
-diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c     2011-08-24 18:21:41.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/sbe-2t3e3/netdev.c     2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
        t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
  
@@ -32782,22 +35083,10 @@ diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/st
                        return -EFAULT;
  
        return 0;
-diff -urNp linux-3.0.4/drivers/staging/tty/stallion.c linux-3.0.4/drivers/staging/tty/stallion.c
---- linux-3.0.4/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400
-@@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
-       struct stlport  stl_dummyport;
-       struct stlport  *portp;
- 
-+      pax_track_stack();
-+
-       if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
-               return -EFAULT;
-       portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-3.0.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/staging/usbip/usbip_common.h
---- linux-3.0.4/drivers/staging/usbip/usbip_common.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/usbip_common.h   2011-08-23 21:47:56.000000000 -0400
-@@ -315,7 +315,7 @@ struct usbip_device {
+diff -urNp linux-3.1.1/drivers/staging/usbip/usbip_common.h linux-3.1.1/drivers/staging/usbip/usbip_common.h
+--- linux-3.1.1/drivers/staging/usbip/usbip_common.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/usbip_common.h   2011-11-16 18:39:08.000000000 -0500
+@@ -289,7 +289,7 @@ struct usbip_device {
                void (*shutdown)(struct usbip_device *);
                void (*reset)(struct usbip_device *);
                void (*unusable)(struct usbip_device *);
@@ -32805,11 +35094,11 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/
 +      } __no_const eh_ops;
  };
  
- void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/usbip/vhci.h
---- linux-3.0.4/drivers/staging/usbip/vhci.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci.h   2011-08-23 21:47:56.000000000 -0400
-@@ -94,7 +94,7 @@ struct vhci_hcd {
+ #if 0
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci.h linux-3.1.1/drivers/staging/usbip/vhci.h
+--- linux-3.1.1/drivers/staging/usbip/vhci.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci.h   2011-11-16 18:39:08.000000000 -0500
+@@ -85,7 +85,7 @@ struct vhci_hcd {
        unsigned resuming:1;
        unsigned long re_timeout;
  
@@ -32818,10 +35107,10 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/
  
        /*
         * NOTE:
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/staging/usbip/vhci_hcd.c
---- linux-3.0.4/drivers/staging/usbip/vhci_hcd.c       2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci_hcd.c       2011-08-23 21:47:56.000000000 -0400
-@@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_hcd.c linux-3.1.1/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.1.1/drivers/staging/usbip/vhci_hcd.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci_hcd.c       2011-11-16 18:39:08.000000000 -0500
+@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
                return;
        }
  
@@ -32830,7 +35119,7 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/stag
        if (priv->seqnum == 0xffff)
                dev_info(&urb->dev->dev, "seqnum max\n");
  
-@@ -765,7 +765,7 @@ static int vhci_urb_dequeue(struct usb_h
+@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_h
                        return -ENOMEM;
                }
  
@@ -32839,7 +35128,7 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/stag
                if (unlink->seqnum == 0xffff)
                        pr_info("seqnum max\n");
  
-@@ -955,7 +955,7 @@ static int vhci_start(struct usb_hcd *hc
+@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hc
                vdev->rhport = rhport;
        }
  
@@ -32848,9 +35137,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/stag
        spin_lock_init(&vhci->lock);
  
        hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/staging/usbip/vhci_rx.c
---- linux-3.0.4/drivers/staging/usbip/vhci_rx.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci_rx.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/usbip/vhci_rx.c linux-3.1.1/drivers/staging/usbip/vhci_rx.c
+--- linux-3.1.1/drivers/staging/usbip/vhci_rx.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/usbip/vhci_rx.c        2011-11-16 18:39:08.000000000 -0500
 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct 
        if (!urb) {
                pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
@@ -32860,9 +35149,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/stagi
                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                return;
        }
-diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/staging/vt6655/hostap.c
---- linux-3.0.4/drivers/staging/vt6655/hostap.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/vt6655/hostap.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/vt6655/hostap.c linux-3.1.1/drivers/staging/vt6655/hostap.c
+--- linux-3.1.1/drivers/staging/vt6655/hostap.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/vt6655/hostap.c        2011-11-16 18:39:08.000000000 -0500
 @@ -79,14 +79,13 @@ static int          msglevel            
   *
   */
@@ -32889,9 +35178,9 @@ diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/stagi
        pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
        pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/staging/vt6656/hostap.c
---- linux-3.0.4/drivers/staging/vt6656/hostap.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/vt6656/hostap.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/vt6656/hostap.c linux-3.1.1/drivers/staging/vt6656/hostap.c
+--- linux-3.1.1/drivers/staging/vt6656/hostap.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/vt6656/hostap.c        2011-11-16 18:39:08.000000000 -0500
 @@ -80,14 +80,13 @@ static int          msglevel            
   *
   */
@@ -32918,9 +35207,9 @@ diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/stagi
        pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
        pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/wlan-ng/hfa384x_usb.c  2011-11-16 18:39:08.000000000 -0500
 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
  
  struct usbctlx_completor {
@@ -32930,9 +35219,9 @@ diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers
  
  static int
  hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging/zcache/tmem.c
---- linux-3.0.4/drivers/staging/zcache/tmem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/zcache/tmem.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.c linux-3.1.1/drivers/staging/zcache/tmem.c
+--- linux-3.1.1/drivers/staging/zcache/tmem.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/zcache/tmem.c  2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@
   * A tmem host implementation must use this function to register callbacks
   * for memory allocation.
@@ -32951,18 +35240,18 @@ diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging
  
  void tmem_register_pamops(struct tmem_pamops *m)
  {
-diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging/zcache/tmem.h
---- linux-3.0.4/drivers/staging/zcache/tmem.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/zcache/tmem.h  2011-08-23 21:47:56.000000000 -0400
-@@ -171,6 +171,7 @@ struct tmem_pamops {
-       int (*get_data)(struct page *, void *, struct tmem_pool *);
-       void (*free)(void *, struct tmem_pool *);
+diff -urNp linux-3.1.1/drivers/staging/zcache/tmem.h linux-3.1.1/drivers/staging/zcache/tmem.h
+--- linux-3.1.1/drivers/staging/zcache/tmem.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/staging/zcache/tmem.h  2011-11-16 18:39:08.000000000 -0500
+@@ -180,6 +180,7 @@ struct tmem_pamops {
+       void (*new_obj)(struct tmem_obj *);
+       int (*replace_in_obj)(void *, struct tmem_obj *);
  };
 +typedef struct tmem_pamops __no_const tmem_pamops_no_const;
  extern void tmem_register_pamops(struct tmem_pamops *m);
  
  /* memory allocation methods provided by the host implementation */
-@@ -180,6 +181,7 @@ struct tmem_hostops {
+@@ -189,6 +190,7 @@ struct tmem_hostops {
        struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
        void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
  };
@@ -32970,10 +35259,22 @@ diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging
  extern void tmem_register_hostops(struct tmem_hostops *m);
  
  /* core tmem accessor functions */
-diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/target/target_core_alua.c
---- linux-3.0.4/drivers/target/target_core_alua.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_alua.c      2011-08-23 21:48:14.000000000 -0400
-@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
+diff -urNp linux-3.1.1/drivers/target/iscsi/iscsi_target.c linux-3.1.1/drivers/target/iscsi/iscsi_target.c
+--- linux-3.1.1/drivers/target/iscsi/iscsi_target.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/iscsi/iscsi_target.c    2011-11-16 18:39:08.000000000 -0500
+@@ -1368,7 +1368,7 @@ static int iscsit_handle_data_out(struct
+                * outstanding_r2ts reaches zero, go ahead and send the delayed
+                * TASK_ABORTED status.
+                */
+-              if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
++              if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
+                       if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
+                               if (--cmd->outstanding_r2ts < 1) {
+                                       iscsit_stop_dataout_timer(cmd);
+diff -urNp linux-3.1.1/drivers/target/target_core_alua.c linux-3.1.1/drivers/target/target_core_alua.c
+--- linux-3.1.1/drivers/target/target_core_alua.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_alua.c      2011-11-16 18:40:29.000000000 -0500
+@@ -723,6 +723,8 @@ static int core_alua_update_tpg_primary_
        char path[ALUA_METADATA_PATH_LEN];
        int len;
  
@@ -32982,7 +35283,7 @@ diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/tar
        memset(path, 0, ALUA_METADATA_PATH_LEN);
  
        len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len,
-@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar
+@@ -986,6 +988,8 @@ static int core_alua_update_tpg_secondar
        char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN];
        int len;
  
@@ -32991,10 +35292,10 @@ diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/tar
        memset(path, 0, ALUA_METADATA_PATH_LEN);
        memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/target/target_core_cdb.c
---- linux-3.0.4/drivers/target/target_core_cdb.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_cdb.c       2011-08-23 21:48:14.000000000 -0400
-@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
+diff -urNp linux-3.1.1/drivers/target/target_core_cdb.c linux-3.1.1/drivers/target/target_core_cdb.c
+--- linux-3.1.1/drivers/target/target_core_cdb.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_cdb.c       2011-11-16 18:40:29.000000000 -0500
+@@ -933,6 +933,8 @@ target_emulate_modesense(struct se_cmd *
        int length = 0;
        unsigned char buf[SE_MODE_PAGE_BUF];
  
@@ -33003,21 +35304,21 @@ diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/targ
        memset(buf, 0, SE_MODE_PAGE_BUF);
  
        switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.0.4/drivers/target/target_core_configfs.c linux-3.0.4/drivers/target/target_core_configfs.c
---- linux-3.0.4/drivers/target/target_core_configfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_configfs.c  2011-08-23 21:48:14.000000000 -0400
-@@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
+diff -urNp linux-3.1.1/drivers/target/target_core_configfs.c linux-3.1.1/drivers/target/target_core_configfs.c
+--- linux-3.1.1/drivers/target/target_core_configfs.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_configfs.c  2011-11-16 19:04:37.000000000 -0500
+@@ -1267,6 +1267,8 @@ static ssize_t target_core_dev_pr_show_a
        ssize_t len = 0;
        int reg_count = 0, prf_isid;
  
 +      pax_track_stack();
 +
-       if (!(su_dev->se_dev_ptr))
+       if (!su_dev->se_dev_ptr)
                return -ENODEV;
  
-diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/target/target_core_pr.c
---- linux-3.0.4/drivers/target/target_core_pr.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_pr.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/target/target_core_pr.c linux-3.1.1/drivers/target/target_core_pr.c
+--- linux-3.1.1/drivers/target/target_core_pr.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_pr.c        2011-11-16 18:40:29.000000000 -0500
 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
        unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
        u16 tpgt;
@@ -33027,7 +35328,7 @@ diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/targe
        memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN);
        memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN);
        /*
-@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf
+@@ -1867,6 +1869,8 @@ static int __core_scsi3_update_aptpl_buf
        ssize_t len = 0;
        int reg_count = 0;
  
@@ -33036,7 +35337,7 @@ diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/targe
        memset(buf, 0, pr_aptpl_buf_len);
        /*
         * Called to clear metadata once APTPL has been deactivated.
-@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f
+@@ -1989,6 +1993,8 @@ static int __core_scsi3_write_aptpl_to_f
        char path[512];
        int ret;
  
@@ -33045,40 +35346,40 @@ diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/targe
        memset(iov, 0, sizeof(struct iovec));
        memset(path, 0, 512);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_tmr.c linux-3.0.4/drivers/target/target_core_tmr.c
---- linux-3.0.4/drivers/target/target_core_tmr.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_tmr.c       2011-08-23 21:47:56.000000000 -0400
-@@ -269,7 +269,7 @@ int core_tmr_lun_reset(
-                       CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
-                       T_TASK(cmd)->t_task_cdbs,
-                       atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--                      atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+                      atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
-                       atomic_read(&T_TASK(cmd)->t_transport_active),
-                       atomic_read(&T_TASK(cmd)->t_transport_stop),
-                       atomic_read(&T_TASK(cmd)->t_transport_sent));
-@@ -311,7 +311,7 @@ int core_tmr_lun_reset(
-                       DEBUG_LR("LUN_RESET: got t_transport_active = 1 for"
+diff -urNp linux-3.1.1/drivers/target/target_core_tmr.c linux-3.1.1/drivers/target/target_core_tmr.c
+--- linux-3.1.1/drivers/target/target_core_tmr.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_tmr.c       2011-11-16 18:39:08.000000000 -0500
+@@ -255,7 +255,7 @@ static void core_tmr_drain_task_list(
+                       cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
+                       cmd->t_task_list_num,
+                       atomic_read(&cmd->t_task_cdbs_left),
+-                      atomic_read(&cmd->t_task_cdbs_sent),
++                      atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+                       atomic_read(&cmd->t_transport_active),
+                       atomic_read(&cmd->t_transport_stop),
+                       atomic_read(&cmd->t_transport_sent));
+@@ -291,7 +291,7 @@ static void core_tmr_drain_task_list(
+                       pr_debug("LUN_RESET: got t_transport_active = 1 for"
                                " task: %p, t_fe_count: %d dev: %p\n", task,
                                fe_count, dev);
--                      atomic_set(&T_TASK(cmd)->t_transport_aborted, 1);
-+                      atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1);
-                       spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
-                                               flags);
+-                      atomic_set(&cmd->t_transport_aborted, 1);
++                      atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+                       spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+ 
                        core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
-@@ -321,7 +321,7 @@ int core_tmr_lun_reset(
+@@ -299,7 +299,7 @@ static void core_tmr_drain_task_list(
                }
-               DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p,"
+               pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
                        " t_fe_count: %d dev: %p\n", task, fe_count, dev);
--              atomic_set(&T_TASK(cmd)->t_transport_aborted, 1);
-+              atomic_set_unchecked(&T_TASK(cmd)->t_transport_aborted, 1);
-               spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
-               core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+-              atomic_set(&cmd->t_transport_aborted, 1);
++              atomic_set_unchecked(&cmd->t_transport_aborted, 1);
+               spin_unlock_irqrestore(&cmd->t_state_lock, flags);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/drivers/target/target_core_transport.c
---- linux-3.0.4/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400
-@@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
+               core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+diff -urNp linux-3.1.1/drivers/target/target_core_transport.c linux-3.1.1/drivers/target/target_core_transport.c
+--- linux-3.1.1/drivers/target/target_core_transport.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/target/target_core_transport.c 2011-11-16 18:39:08.000000000 -0500
+@@ -1445,7 +1445,7 @@ struct se_device *transport_add_device_t
  
        dev->queue_depth        = dev_limits->queue_depth;
        atomic_set(&dev->depth_left, dev->queue_depth);
@@ -33087,75 +35388,75 @@ diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/driver
  
        se_dev_set_default_attribs(dev, dev_limits);
  
-@@ -1882,7 +1882,7 @@ static int transport_check_alloc_task_at
+@@ -1633,7 +1633,7 @@ static int transport_check_alloc_task_at
         * Used to determine when ORDERED commands should go from
         * Dormant to Active status.
         */
--      cmd->se_ordered_id = atomic_inc_return(&SE_DEV(cmd)->dev_ordered_id);
-+      cmd->se_ordered_id = atomic_inc_return_unchecked(&SE_DEV(cmd)->dev_ordered_id);
+-      cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
++      cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
        smp_mb__after_atomic_inc();
-       DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
+       pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
                        cmd->se_ordered_id, cmd->sam_task_attr,
-@@ -2169,7 +2169,7 @@ static void transport_generic_request_fa
+@@ -1960,7 +1960,7 @@ static void transport_generic_request_fa
                " t_transport_active: %d t_transport_stop: %d"
-               " t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs,
-               atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--              atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+              atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
-               atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left),
-               atomic_read(&T_TASK(cmd)->t_transport_active),
-               atomic_read(&T_TASK(cmd)->t_transport_stop),
-@@ -2673,9 +2673,9 @@ check_depth:
-       spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+               " t_transport_sent: %d\n", cmd->t_task_list_num,
+               atomic_read(&cmd->t_task_cdbs_left),
+-              atomic_read(&cmd->t_task_cdbs_sent),
++              atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+               atomic_read(&cmd->t_task_cdbs_ex_left),
+               atomic_read(&cmd->t_transport_active),
+               atomic_read(&cmd->t_transport_stop),
+@@ -2460,9 +2460,9 @@ check_depth:
+       spin_lock_irqsave(&cmd->t_state_lock, flags);
        atomic_set(&task->task_active, 1);
        atomic_set(&task->task_sent, 1);
--      atomic_inc(&T_TASK(cmd)->t_task_cdbs_sent);
-+      atomic_inc_unchecked(&T_TASK(cmd)->t_task_cdbs_sent);
+-      atomic_inc(&cmd->t_task_cdbs_sent);
++      atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
  
--      if (atomic_read(&T_TASK(cmd)->t_task_cdbs_sent) ==
-+      if (atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent) ==
-           T_TASK(cmd)->t_task_cdbs)
+-      if (atomic_read(&cmd->t_task_cdbs_sent) ==
++      if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
+           cmd->t_task_list_num)
                atomic_set(&cmd->transport_sent, 1);
  
-@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_t
-               atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
+@@ -4665,7 +4665,7 @@ static void transport_generic_wait_for_t
+               atomic_set(&cmd->transport_lun_stop, 0);
        }
-       if (!atomic_read(&T_TASK(cmd)->t_transport_active) ||
--           atomic_read(&T_TASK(cmd)->t_transport_aborted))
-+           atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted))
+       if (!atomic_read(&cmd->t_transport_active) ||
+-           atomic_read(&cmd->t_transport_aborted))
++           atomic_read_unchecked(&cmd->t_transport_aborted))
                goto remove;
  
-       atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
-@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struc
+       atomic_set(&cmd->t_transport_stop, 1);
+@@ -4900,7 +4900,7 @@ int transport_check_aborted_status(struc
  {
        int ret = 0;
  
--      if (atomic_read(&T_TASK(cmd)->t_transport_aborted) != 0) {
-+      if (atomic_read_unchecked(&T_TASK(cmd)->t_transport_aborted) != 0) {
-               if (!(send_status) ||
+-      if (atomic_read(&cmd->t_transport_aborted) != 0) {
++      if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
+               if (!send_status ||
                     (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
                        return 1;
-@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se
+@@ -4937,7 +4937,7 @@ void transport_send_task_abort(struct se
         */
        if (cmd->data_direction == DMA_TO_DEVICE) {
-               if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
--                      atomic_inc(&T_TASK(cmd)->t_transport_aborted);
-+                      atomic_inc_unchecked(&T_TASK(cmd)->t_transport_aborted);
+               if (cmd->se_tfo->write_pending_status(cmd) != 0) {
+-                      atomic_inc(&cmd->t_transport_aborted);
++                      atomic_inc_unchecked(&cmd->t_transport_aborted);
                        smp_mb__after_atomic_inc();
                        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
                        transport_new_cmd_failure(cmd);
-@@ -5949,7 +5949,7 @@ static void transport_processing_shutdow
-                       CMD_TFO(cmd)->get_task_tag(cmd),
-                       T_TASK(cmd)->t_task_cdbs,
-                       atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
--                      atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
-+                      atomic_read_unchecked(&T_TASK(cmd)->t_task_cdbs_sent),
-                       atomic_read(&T_TASK(cmd)->t_transport_active),
-                       atomic_read(&T_TASK(cmd)->t_transport_stop),
-                       atomic_read(&T_TASK(cmd)->t_transport_sent));
-diff -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj.c
---- linux-3.0.4/drivers/telephony/ixj.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/telephony/ixj.c        2011-08-23 21:48:14.000000000 -0400
+@@ -5051,7 +5051,7 @@ static void transport_processing_shutdow
+                       cmd->se_tfo->get_task_tag(cmd),
+                       cmd->t_task_list_num,
+                       atomic_read(&cmd->t_task_cdbs_left),
+-                      atomic_read(&cmd->t_task_cdbs_sent),
++                      atomic_read_unchecked(&cmd->t_task_cdbs_sent),
+                       atomic_read(&cmd->t_transport_active),
+                       atomic_read(&cmd->t_transport_stop),
+                       atomic_read(&cmd->t_transport_sent));
+diff -urNp linux-3.1.1/drivers/telephony/ixj.c linux-3.1.1/drivers/telephony/ixj.c
+--- linux-3.1.1/drivers/telephony/ixj.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/telephony/ixj.c        2011-11-16 18:40:29.000000000 -0500
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
        bool mContinue;
        char *pIn, *pOut;
@@ -33165,9 +35466,9 @@ diff -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj
        if (!SCI_Prepare(j))
                return 0;
  
-diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
---- linux-3.0.4/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/hvc/hvcs.c linux-3.1.1/drivers/tty/hvc/hvcs.c
+--- linux-3.1.1/drivers/tty/hvc/hvcs.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/hvc/hvcs.c 2011-11-16 18:39:08.000000000 -0500
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -33270,9 +35571,9 @@ diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
                return 0;
  
        return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwireless/tty.c
---- linux-3.0.4/drivers/tty/ipwireless/tty.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/ipwireless/tty.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/ipwireless/tty.c linux-3.1.1/drivers/tty/ipwireless/tty.c
+--- linux-3.1.1/drivers/tty/ipwireless/tty.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/ipwireless/tty.c   2011-11-16 18:39:08.000000000 -0500
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -33395,21 +35696,21 @@ diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwi
                                do_ipw_close(ttyj);
                        ipwireless_disassociate_network_ttys(network,
                                                             ttyj->channel_idx);
-diff -urNp linux-3.0.4/drivers/tty/n_gsm.c linux-3.0.4/drivers/tty/n_gsm.c
---- linux-3.0.4/drivers/tty/n_gsm.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/tty/n_gsm.c    2011-08-23 21:47:56.000000000 -0400
-@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
-               return NULL;
-       spin_lock_init(&dlci->lock);
+diff -urNp linux-3.1.1/drivers/tty/n_gsm.c linux-3.1.1/drivers/tty/n_gsm.c
+--- linux-3.1.1/drivers/tty/n_gsm.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/n_gsm.c    2011-11-16 18:39:08.000000000 -0500
+@@ -1625,7 +1625,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
+       kref_init(&dlci->ref);
+       mutex_init(&dlci->mutex);
        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-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
---- linux-3.0.4/drivers/tty/n_tty.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/n_tty.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/n_tty.c linux-3.1.1/drivers/tty/n_tty.c
+--- linux-3.1.1/drivers/tty/n_tty.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/n_tty.c    2011-11-16 18:39:08.000000000 -0500
 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
        *ops = tty_ldisc_N_TTY;
@@ -33419,10 +35720,10 @@ diff -urNp linux-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
 +      ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
---- linux-3.0.4/drivers/tty/pty.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/pty.c      2011-08-23 21:47:56.000000000 -0400
-@@ -754,8 +754,10 @@ static void __init unix98_pty_init(void)
+diff -urNp linux-3.1.1/drivers/tty/pty.c linux-3.1.1/drivers/tty/pty.c
+--- linux-3.1.1/drivers/tty/pty.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/pty.c      2011-11-16 18:39:08.000000000 -0500
+@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
        register_sysctl_table(pty_root_table);
  
        /* Now create the /dev/ptmx special device */
@@ -33434,9 +35735,9 @@ diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
  
        cdev_init(&ptmx_cdev, &ptmx_fops);
        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
---- linux-3.0.4/drivers/tty/rocket.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/rocket.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/rocket.c linux-3.1.1/drivers/tty/rocket.c
+--- linux-3.1.1/drivers/tty/rocket.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/rocket.c   2011-11-16 18:40:29.000000000 -0500
 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
        struct rocket_ports tmp;
        int board;
@@ -33446,9 +35747,9 @@ diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
        if (!retports)
                return -EFAULT;
        memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/serial/kgdboc.c
---- linux-3.0.4/drivers/tty/serial/kgdboc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/serial/kgdboc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/serial/kgdboc.c linux-3.1.1/drivers/tty/serial/kgdboc.c
+--- linux-3.1.1/drivers/tty/serial/kgdboc.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/kgdboc.c    2011-11-16 18:39:08.000000000 -0500
 @@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN                40
  
@@ -33547,9 +35848,21 @@ diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/seria
  #ifdef CONFIG_KGDB_SERIAL_CONSOLE
  /* This is only available if kgdboc is a built in for early debugging */
  static int __init kgdboc_early_init(char *opt)
-diff -urNp linux-3.0.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty/serial/mrst_max3110.c
---- linux-3.0.4/drivers/tty/serial/mrst_max3110.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/serial/mrst_max3110.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/serial/mfd.c linux-3.1.1/drivers/tty/serial/mfd.c
+--- linux-3.1.1/drivers/tty/serial/mfd.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/mfd.c       2011-11-16 18:39:08.000000000 -0500
+@@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
+ }
+ 
+ /* First 3 are UART ports, and the 4th is the DMA */
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
+diff -urNp linux-3.1.1/drivers/tty/serial/mrst_max3110.c linux-3.1.1/drivers/tty/serial/mrst_max3110.c
+--- linux-3.1.1/drivers/tty/serial/mrst_max3110.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/serial/mrst_max3110.c      2011-11-16 18:40:29.000000000 -0500
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
        int loop = 1, num, total = 0;
        u8 recv_buf[512], *pbuf;
@@ -33559,10 +35872,10 @@ diff -urNp linux-3.0.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty
        pbuf = recv_buf;
        do {
                num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
---- linux-3.0.4/drivers/tty/tty_io.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/tty_io.c   2011-08-23 21:47:56.000000000 -0400
-@@ -3215,7 +3215,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+diff -urNp linux-3.1.1/drivers/tty/tty_io.c linux-3.1.1/drivers/tty/tty_io.c
+--- linux-3.1.1/drivers/tty/tty_io.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/tty_io.c   2011-11-16 18:39:08.000000000 -0500
+@@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
  {
@@ -33571,9 +35884,9 @@ diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
  }
  
  /*
-diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc.c
---- linux-3.0.4/drivers/tty/tty_ldisc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/tty_ldisc.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/tty_ldisc.c linux-3.1.1/drivers/tty/tty_ldisc.c
+--- linux-3.1.1/drivers/tty/tty_ldisc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/tty_ldisc.c        2011-11-16 18:39:08.000000000 -0500
 @@ -74,7 +74,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;
@@ -33619,9 +35932,9 @@ diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc
        module_put(ldops->owner);
        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyboard.c
---- linux-3.0.4/drivers/tty/vt/keyboard.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/keyboard.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/vt/keyboard.c linux-3.1.1/drivers/tty/vt/keyboard.c
+--- linux-3.1.1/drivers/tty/vt/keyboard.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/keyboard.c      2011-11-16 18:40:29.000000000 -0500
 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
             kbd->kbdmode == VC_OFF) &&
             value != KVAL(K_SAK))
@@ -33639,9 +35952,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyb
        fn_handler[value](vc);
  }
  
-diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
---- linux-3.0.4/drivers/tty/vt/vt.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/vt.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/vt/vt.c linux-3.1.1/drivers/tty/vt/vt.c
+--- linux-3.1.1/drivers/tty/vt/vt.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/vt.c    2011-11-16 18:39:08.000000000 -0500
 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -33651,9 +35964,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
        atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_ioctl.c
---- linux-3.0.4/drivers/tty/vt/vt_ioctl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/vt_ioctl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/tty/vt/vt_ioctl.c linux-3.1.1/drivers/tty/vt/vt_ioctl.c
+--- linux-3.1.1/drivers/tty/vt/vt_ioctl.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/tty/vt/vt_ioctl.c      2011-11-16 18:40:29.000000000 -0500
 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
                return -EFAULT;
@@ -33694,9 +36007,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_i
                if (!perm) {
                        ret = -EPERM;
                        goto reterr;
-diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
---- linux-3.0.4/drivers/uio/uio.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/uio/uio.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/uio/uio.c linux-3.1.1/drivers/uio/uio.c
+--- linux-3.1.1/drivers/uio/uio.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/uio/uio.c      2011-11-16 18:39:08.000000000 -0500
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -33788,9 +36101,9 @@ diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
  
        ret = uio_get_minor(idev);
        if (ret)
-diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxacru.c
---- linux-3.0.4/drivers/usb/atm/cxacru.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/atm/cxacru.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/usb/atm/cxacru.c linux-3.1.1/drivers/usb/atm/cxacru.c
+--- linux-3.1.1/drivers/usb/atm/cxacru.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/atm/cxacru.c       2011-11-16 18:39:08.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)
@@ -33800,10 +36113,10 @@ diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxac
                        return -EINVAL;
                pos += tmp;
  
-diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usbatm.c
---- linux-3.0.4/drivers/usb/atm/usbatm.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/atm/usbatm.c       2011-08-23 21:47:56.000000000 -0400
-@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
+diff -urNp linux-3.1.1/drivers/usb/atm/usbatm.c linux-3.1.1/drivers/usb/atm/usbatm.c
+--- linux-3.1.1/drivers/usb/atm/usbatm.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/atm/usbatm.c       2011-11-16 18:39:08.000000000 -0500
+@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
                if (printk_ratelimit())
                        atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
                                __func__, vpi, vci);
@@ -33812,7 +36125,7 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
                return;
        }
  
-@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(stru
+@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru
                if (length > ATM_MAX_AAL5_PDU) {
                        atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
                                  __func__, length, vcc);
@@ -33821,7 +36134,7 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
                        goto out;
                }
  
-@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(stru
+@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru
                if (sarb->len < pdu_length) {
                        atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
                                  __func__, pdu_length, sarb->len, vcc);
@@ -33838,7 +36151,7 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
                        goto out;
                }
  
-@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(stru
+@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru
                        if (printk_ratelimit())
                                atm_err(instance, "%s: no memory for skb (length: %u)!\n",
                                        __func__, length);
@@ -33847,7 +36160,7 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
                        goto out;
                }
  
-@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(stru
+@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru
  
                vcc->push(vcc, skb);
  
@@ -33856,7 +36169,7 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
        out:
                skb_trim(sarb, 0);
        }
-@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l
+@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned l
                        struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
  
                        usbatm_pop(vcc, skb);
@@ -33882,9 +36195,9 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
  
        if (!left--) {
                if (instance->disconnected)
-diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/devices.c
---- linux-3.0.4/drivers/usb/core/devices.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/core/devices.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/usb/core/devices.c linux-3.1.1/drivers/usb/core/devices.c
+--- linux-3.1.1/drivers/usb/core/devices.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/core/devices.c     2011-11-16 18:39:08.000000000 -0500
 @@ -126,7 +126,7 @@ static const char format_endpt[] =
   * time it gets called.
   */
@@ -33912,9 +36225,9 @@ diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/d
        if (file->f_version != event_count) {
                file->f_version = event_count;
                return POLLIN | POLLRDNORM;
-diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/message.c
---- linux-3.0.4/drivers/usb/core/message.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/core/message.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/usb/core/message.c linux-3.1.1/drivers/usb/core/message.c
+--- linux-3.1.1/drivers/usb/core/message.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/core/message.c     2011-11-16 18:39:08.000000000 -0500
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
        if (buf) {
@@ -33926,9 +36239,9 @@ diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/m
                        if (!smallbuf)
                                return buf;
                        memcpy(smallbuf, buf, len);
-diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/early/ehci-dbgp.c
---- linux-3.0.4/drivers/usb/early/ehci-dbgp.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/early/ehci-dbgp.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/usb/early/ehci-dbgp.c linux-3.1.1/drivers/usb/early/ehci-dbgp.c
+--- linux-3.1.1/drivers/usb/early/ehci-dbgp.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/early/ehci-dbgp.c  2011-11-16 18:39:08.000000000 -0500
 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
@@ -33966,10 +36279,10 @@ diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/ear
  
        return 0;
  }
-diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/xhci-mem.c
---- linux-3.0.4/drivers/usb/host/xhci-mem.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/host/xhci-mem.c    2011-08-23 21:48:14.000000000 -0400
-@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
+diff -urNp linux-3.1.1/drivers/usb/host/xhci-mem.c linux-3.1.1/drivers/usb/host/xhci-mem.c
+--- linux-3.1.1/drivers/usb/host/xhci-mem.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/host/xhci-mem.c    2011-11-16 18:40:29.000000000 -0500
+@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(str
        unsigned int num_tests;
        int i, ret;
  
@@ -33978,9 +36291,9 @@ diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/
        num_tests = ARRAY_SIZE(simple_test_vector);
        for (i = 0; i < num_tests; i++) {
                ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusbcore/wa-hc.h
---- linux-3.0.4/drivers/usb/wusbcore/wa-hc.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/wusbcore/wa-hc.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-hc.h linux-3.1.1/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.1.1/drivers/usb/wusbcore/wa-hc.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/wusbcore/wa-hc.h   2011-11-16 18:39:08.000000000 -0500
 @@ -192,7 +192,7 @@ struct wahc {
        struct list_head xfer_delayed_list;
        spinlock_t xfer_list_lock;
@@ -33999,10 +36312,10 @@ diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusb
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400
-@@ -294,7 +294,7 @@ out:
+diff -urNp linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/usb/wusbcore/wa-xfer.c 2011-11-16 18:39:08.000000000 -0500
+@@ -295,7 +295,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
  {
@@ -34011,11 +36324,11 @@ diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wu
  }
  
  /*
-diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
---- linux-3.0.4/drivers/vhost/vhost.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/vhost/vhost.c  2011-08-23 21:47:56.000000000 -0400
-@@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
-       return get_user(vq->last_used_idx, &used->idx);
+diff -urNp linux-3.1.1/drivers/vhost/vhost.c linux-3.1.1/drivers/vhost/vhost.c
+--- linux-3.1.1/drivers/vhost/vhost.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/vhost/vhost.c  2011-11-16 18:39:08.000000000 -0500
+@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhos
+       return 0;
  }
  
 -static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
@@ -34023,9 +36336,21 @@ diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
  {
        struct file *eventfp, *filep = NULL,
                    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
---- linux-3.0.4/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/aty/aty128fb.c linux-3.1.1/drivers/video/aty/aty128fb.c
+--- linux-3.1.1/drivers/video/aty/aty128fb.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/aty/aty128fb.c   2011-11-16 18:39:08.000000000 -0500
+@@ -148,7 +148,7 @@ enum {
+ };
+ 
+ /* Must match above enum */
+-static const char *r128_family[] __devinitdata = {
++static const char *r128_family[] __devinitconst = {
+       "AGP",
+       "PCI",
+       "PRO AGP",
+diff -urNp linux-3.1.1/drivers/video/fbcmap.c linux-3.1.1/drivers/video/fbcmap.c
+--- linux-3.1.1/drivers/video/fbcmap.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/fbcmap.c 2011-11-16 18:39:08.000000000 -0500
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
                rc = -ENODEV;
                goto out;
@@ -34036,9 +36361,9 @@ diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
                rc = -EINVAL;
                goto out1;
        }
-diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
---- linux-3.0.4/drivers/video/fbmem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/fbmem.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/fbmem.c linux-3.1.1/drivers/video/fbmem.c
+--- linux-3.1.1/drivers/video/fbmem.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/fbmem.c  2011-11-16 18:40:29.000000000 -0500
 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
                        image->dx += image->width + 8;
                }
@@ -34084,9 +36409,42 @@ diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
                        return -EINVAL;
                if (!registered_fb[con2fb.framebuffer])
                        request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video/i810/i810_accel.c
---- linux-3.0.4/drivers/video/i810/i810_accel.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/i810/i810_accel.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/geode/gx1fb_core.c linux-3.1.1/drivers/video/geode/gx1fb_core.c
+--- linux-3.1.1/drivers/video/geode/gx1fb_core.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/geode/gx1fb_core.c       2011-11-16 18:39:08.000000000 -0500
+@@ -29,7 +29,7 @@ static int  crt_option = 1;
+ static char panel_option[32] = "";
+ 
+ /* Modes relevant to the GX1 (taken from modedb.c) */
+-static const struct fb_videomode __devinitdata gx1_modedb[] = {
++static const struct fb_videomode __devinitconst gx1_modedb[] = {
+       /* 640x480-60 VESA */
+       { NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
+         0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+diff -urNp linux-3.1.1/drivers/video/gxt4500.c linux-3.1.1/drivers/video/gxt4500.c
+--- linux-3.1.1/drivers/video/gxt4500.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/gxt4500.c        2011-11-16 18:39:08.000000000 -0500
+@@ -156,7 +156,7 @@ struct gxt4500_par {
+ static char *mode_option;
+ 
+ /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
+-static const struct fb_videomode defaultmode __devinitdata = {
++static const struct fb_videomode defaultmode __devinitconst = {
+       .refresh = 60,
+       .xres = 1280,
+       .yres = 1024,
+@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, stru
+       return 0;
+ }
+ 
+-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
++static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
+       .id = "IBM GXT4500P",
+       .type = FB_TYPE_PACKED_PIXELS,
+       .visual = FB_VISUAL_PSEUDOCOLOR,
+diff -urNp linux-3.1.1/drivers/video/i810/i810_accel.c linux-3.1.1/drivers/video/i810/i810_accel.c
+--- linux-3.1.1/drivers/video/i810/i810_accel.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/i810/i810_accel.c        2011-11-16 18:39:08.000000000 -0500
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
                }
        }
@@ -34095,9 +36453,33 @@ diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video
        i810_report_error(mmio); 
        par->dev_flags |= LOCKUP;
        info->pixmap.scan_align = 1;
-diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm      2011-08-29 23:49:40.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/i810/i810_main.c linux-3.1.1/drivers/video/i810/i810_main.c
+--- linux-3.1.1/drivers/video/i810/i810_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/i810/i810_main.c 2011-11-16 18:39:08.000000000 -0500
+@@ -97,7 +97,7 @@ static int i810fb_blank      (int blank_
+ static void i810fb_release_resource       (struct fb_info *info, struct i810fb_par *par);
+ 
+ /* PCI */
+-static const char *i810_pci_list[] __devinitdata = {
++static const char *i810_pci_list[] __devinitconst = {
+       "Intel(R) 810 Framebuffer Device"                                 ,
+       "Intel(R) 810-DC100 Framebuffer Device"                           ,
+       "Intel(R) 810E Framebuffer Device"                                ,
+diff -urNp linux-3.1.1/drivers/video/jz4740_fb.c linux-3.1.1/drivers/video/jz4740_fb.c
+--- linux-3.1.1/drivers/video/jz4740_fb.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/jz4740_fb.c      2011-11-16 18:39:08.000000000 -0500
+@@ -136,7 +136,7 @@ struct jzfb {
+       uint32_t pseudo_palette[16];
+ };
+ 
+-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
++static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
+       .id             = "JZ4740 FB",
+       .type           = FB_TYPE_PACKED_PIXELS,
+       .visual         = FB_VISUAL_TRUECOLOR,
+diff -urNp linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/logo/logo_linux_clut224.ppm      2011-11-16 18:40:29.000000000 -0500
 @@ -1,1604 +1,1123 @@
  P3
 -# Standard 224-color Linux logo
@@ -36823,10 +39205,10 @@ diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/dri
 +4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
 +4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
 +4 4 4  4 4 4
-diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
---- linux-3.0.4/drivers/video/udlfb.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/udlfb.c  2011-08-23 21:47:56.000000000 -0400
-@@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data 
+diff -urNp linux-3.1.1/drivers/video/udlfb.c linux-3.1.1/drivers/video/udlfb.c
+--- linux-3.1.1/drivers/video/udlfb.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/udlfb.c  2011-11-16 18:39:08.000000000 -0500
+@@ -585,11 +585,11 @@ int dlfb_handle_damage(struct dlfb_data 
                dlfb_urb_completion(urb);
  
  error:
@@ -36842,7 +39224,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
                    >> 10)), /* Kcycles */
                   &dev->cpu_kcycles_used);
  
-@@ -711,11 +711,11 @@ static void dlfb_dpy_deferred_io(struct 
+@@ -710,11 +710,11 @@ static void dlfb_dpy_deferred_io(struct 
                dlfb_urb_completion(urb);
  
  error:
@@ -36858,7 +39240,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
                    >> 10)), /* Kcycles */
                   &dev->cpu_kcycles_used);
  }
-@@ -1307,7 +1307,7 @@ static ssize_t metrics_bytes_rendered_sh
+@@ -1306,7 +1306,7 @@ static ssize_t metrics_bytes_rendered_sh
        struct fb_info *fb_info = dev_get_drvdata(fbdev);
        struct dlfb_data *dev = fb_info->par;
        return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36867,7 +39249,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1315,7 +1315,7 @@ static ssize_t metrics_bytes_identical_s
+@@ -1314,7 +1314,7 @@ static ssize_t metrics_bytes_identical_s
        struct fb_info *fb_info = dev_get_drvdata(fbdev);
        struct dlfb_data *dev = fb_info->par;
        return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36876,7 +39258,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1323,7 +1323,7 @@ static ssize_t metrics_bytes_sent_show(s
+@@ -1322,7 +1322,7 @@ static ssize_t metrics_bytes_sent_show(s
        struct fb_info *fb_info = dev_get_drvdata(fbdev);
        struct dlfb_data *dev = fb_info->par;
        return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36885,7 +39267,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  }
  
  static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1331,7 +1331,7 @@ static ssize_t metrics_cpu_kcycles_used_
+@@ -1330,7 +1330,7 @@ static ssize_t metrics_cpu_kcycles_used_
        struct fb_info *fb_info = dev_get_drvdata(fbdev);
        struct dlfb_data *dev = fb_info->par;
        return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36894,7 +39276,7 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  }
  
  static ssize_t edid_show(
-@@ -1388,10 +1388,10 @@ static ssize_t metrics_reset_store(struc
+@@ -1387,10 +1387,10 @@ static ssize_t metrics_reset_store(struc
        struct fb_info *fb_info = dev_get_drvdata(fbdev);
        struct dlfb_data *dev = fb_info->par;
  
@@ -36909,9 +39291,9 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  
        return count;
  }
-diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb.c
---- linux-3.0.4/drivers/video/uvesafb.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/uvesafb.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/uvesafb.c linux-3.1.1/drivers/video/uvesafb.c
+--- linux-3.1.1/drivers/video/uvesafb.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/uvesafb.c        2011-11-16 18:39:08.000000000 -0500
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -36987,9 +39369,9 @@ diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb
                }
  
                framebuffer_release(info);
-diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
---- linux-3.0.4/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/vesafb.c linux-3.1.1/drivers/video/vesafb.c
+--- linux-3.1.1/drivers/video/vesafb.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/vesafb.c 2011-11-16 18:39:08.000000000 -0500
 @@ -9,6 +9,7 @@
   */
  
@@ -37092,9 +39474,9 @@ diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
        if (info->screen_base)
                iounmap(info->screen_base);
        framebuffer_release(info);
-diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/via/via_clock.h
---- linux-3.0.4/drivers/video/via/via_clock.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/via/via_clock.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/drivers/video/via/via_clock.h linux-3.1.1/drivers/video/via/via_clock.h
+--- linux-3.1.1/drivers/video/via/via_clock.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/video/via/via_clock.h  2011-11-16 18:39:08.000000000 -0500
 @@ -56,7 +56,7 @@ struct via_clock {
  
        void (*set_engine_pll_state)(u8 state);
@@ -37104,9 +39486,9 @@ diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/v
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virtio/virtio_balloon.c
---- linux-3.0.4/drivers/virtio/virtio_balloon.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/virtio/virtio_balloon.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/drivers/virtio/virtio_balloon.c linux-3.1.1/drivers/virtio/virtio_balloon.c
+--- linux-3.1.1/drivers/virtio/virtio_balloon.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/virtio/virtio_balloon.c        2011-11-16 18:40:29.000000000 -0500
 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct 
        struct sysinfo i;
        int idx = 0;
@@ -37116,10 +39498,32 @@ diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virti
        all_vm_events(events);
        si_meminfo(&i);
  
-diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/fs/9p/vfs_inode.c
---- linux-3.0.4/fs/9p/vfs_inode.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/9p/vfs_inode.c      2011-08-23 21:47:56.000000000 -0400
-@@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-3.1.1/drivers/xen/xen-pciback/conf_space.h linux-3.1.1/drivers/xen/xen-pciback/conf_space.h
+--- linux-3.1.1/drivers/xen/xen-pciback/conf_space.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/drivers/xen/xen-pciback/conf_space.h   2011-11-16 18:39:08.000000000 -0500
+@@ -44,15 +44,15 @@ struct config_field {
+               struct {
+                       conf_dword_write write;
+                       conf_dword_read read;
+-              } dw;
++              } __no_const dw;
+               struct {
+                       conf_word_write write;
+                       conf_word_read read;
+-              } w;
++              } __no_const w;
+               struct {
+                       conf_byte_write write;
+                       conf_byte_read read;
+-              } b;
++              } __no_const b;
+       } u;
+       struct list_head list;
+ };
+diff -urNp linux-3.1.1/fs/9p/vfs_inode.c linux-3.1.1/fs/9p/vfs_inode.c
+--- linux-3.1.1/fs/9p/vfs_inode.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/9p/vfs_inode.c      2011-11-16 18:39:08.000000000 -0500
+@@ -1288,7 +1288,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -37128,9 +39532,9 @@ diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/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-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
---- linux-3.0.4/fs/aio.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/aio.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/aio.c linux-3.1.1/fs/aio.c
+--- linux-3.1.1/fs/aio.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/aio.c       2011-11-16 18:40:29.000000000 -0500
 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx 
        size += sizeof(struct io_event) * nr_events;
        nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -37179,9 +39583,9 @@ diff -urNp linux-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
        kiocb->ki_nr_segs = kiocb->ki_nbytes;
        kiocb->ki_cur_seg = 0;
        /* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-3.0.4/fs/attr.c linux-3.0.4/fs/attr.c
---- linux-3.0.4/fs/attr.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/attr.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/attr.c linux-3.1.1/fs/attr.c
+--- linux-3.1.1/fs/attr.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/attr.c      2011-11-16 18:40:29.000000000 -0500
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
                unsigned long limit;
  
@@ -37190,9 +39594,21 @@ diff -urNp linux-3.0.4/fs/attr.c linux-3.0.4/fs/attr.c
                if (limit != RLIM_INFINITY && offset > limit)
                        goto out_sig;
                if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
---- linux-3.0.4/fs/befs/linuxvfs.c     2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/fs/befs/linuxvfs.c     2011-08-29 23:26:27.000000000 -0400
+diff -urNp linux-3.1.1/fs/autofs4/waitq.c linux-3.1.1/fs/autofs4/waitq.c
+--- linux-3.1.1/fs/autofs4/waitq.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/autofs4/waitq.c     2011-11-16 18:39:08.000000000 -0500
+@@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
+ {
+       unsigned long sigpipe, flags;
+       mm_segment_t fs;
+-      const char *data = (const char *)addr;
++      const char __user *data = (const char __force_user *)addr;
+       ssize_t wr = 0;
+ 
+       /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
+diff -urNp linux-3.1.1/fs/befs/linuxvfs.c linux-3.1.1/fs/befs/linuxvfs.c
+--- linux-3.1.1/fs/befs/linuxvfs.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/befs/linuxvfs.c     2011-11-16 18:39:08.000000000 -0500
 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry 
  {
        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -37202,9 +39618,9 @@ diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
                if (!IS_ERR(link))
                        kfree(link);
        }
-diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/fs/binfmt_aout.c
---- linux-3.0.4/fs/binfmt_aout.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_aout.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/binfmt_aout.c linux-3.1.1/fs/binfmt_aout.c
+--- linux-3.1.1/fs/binfmt_aout.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_aout.c       2011-11-16 18:40:29.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -37281,9 +39697,9 @@ diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/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-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
---- linux-3.0.4/fs/binfmt_elf.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_elf.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/binfmt_elf.c linux-3.1.1/fs/binfmt_elf.c
+--- linux-3.1.1/fs/binfmt_elf.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_elf.c        2011-11-16 18:40:29.000000000 -0500
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump NULL
  #endif
@@ -37634,7 +40050,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
  
        loc = kmalloc(sizeof(*loc), GFP_KERNEL);
        if (!loc) {
-@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_
+@@ -713,11 +930,81 @@ static int load_elf_binary(struct linux_
  
        /* OK, This is the point of no return */
        current->flags &= ~PF_FORKNOEXEC;
@@ -37717,7 +40133,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        if (elf_read_implies_exec(loc->elf_ex, executable_stack))
                current->personality |= READ_IMPLIES_EXEC;
  
-@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_
+@@ -808,6 +1095,20 @@ static int load_elf_binary(struct linux_
  #else
                        load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -37738,7 +40154,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                }
  
                error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_
+@@ -840,9 +1141,9 @@ static int load_elf_binary(struct linux_
                 * allowed task size. Note that p_filesz must always be
                 * <= p_memsz so it is only necessary to check p_memsz.
                 */
@@ -37751,7 +40167,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                        /* set_brk can never work. Avoid overflows. */
                        send_sig(SIGKILL, current, 0);
                        retval = -EINVAL;
-@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_
+@@ -870,6 +1171,11 @@ static int load_elf_binary(struct linux_
        start_data += load_bias;
        end_data += load_bias;
  
@@ -37763,7 +40179,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        /* Calling set_brk effectively mmaps the pages that we need
         * for the bss and break sections.  We must do this before
         * mapping in the interpreter, to make sure it doesn't wind
-@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_
+@@ -881,9 +1187,11 @@ static int load_elf_binary(struct linux_
                goto out_free_dentry;
        }
        if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -37778,7 +40194,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        }
  
        if (elf_interpreter) {
-@@ -1090,7 +1398,7 @@ out:
+@@ -1098,7 +1406,7 @@ out:
   * Decide what to dump of a segment, part, all or none.
   */
  static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -37787,7 +40203,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
  {
  #define FILTER(type)  (mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struc
+@@ -1132,7 +1440,7 @@ static unsigned long vma_dump_size(struc
        if (vma->vm_file == NULL)
                return 0;
  
@@ -37796,7 +40212,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                goto whole;
  
        /*
-@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelf
+@@ -1354,9 +1662,9 @@ static void fill_auxv_note(struct memelf
  {
        elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
        int i = 0;
@@ -37808,7 +40224,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfh
+@@ -1862,14 +2170,14 @@ static void fill_extnum_info(struct elfh
  }
  
  static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
@@ -37825,7 +40241,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        return size;
  }
  
-@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump
+@@ -1963,7 +2271,7 @@ static int elf_core_dump(struct coredump
  
        dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
  
@@ -37834,7 +40250,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        offset += elf_core_extra_data_size();
        e_shoff = offset;
  
-@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump
+@@ -1977,10 +2285,12 @@ static int elf_core_dump(struct coredump
        offset = dataoff;
  
        size += sizeof(*elf);
@@ -37847,7 +40263,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
        if (size > cprm->limit
            || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
                goto end_coredump;
-@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump
+@@ -1994,7 +2304,7 @@ static int elf_core_dump(struct coredump
                phdr.p_offset = offset;
                phdr.p_vaddr = vma->vm_start;
                phdr.p_paddr = 0;
@@ -37856,7 +40272,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                phdr.p_memsz = vma->vm_end - vma->vm_start;
                offset += phdr.p_filesz;
                phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump
+@@ -2005,6 +2315,7 @@ static int elf_core_dump(struct coredump
                phdr.p_align = ELF_EXEC_PAGESIZE;
  
                size += sizeof(phdr);
@@ -37864,7 +40280,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                if (size > cprm->limit
                    || !dump_write(cprm->file, &phdr, sizeof(phdr)))
                        goto end_coredump;
-@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump
+@@ -2029,7 +2340,7 @@ static int elf_core_dump(struct coredump
                unsigned long addr;
                unsigned long end;
  
@@ -37873,7 +40289,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
  
                for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
                        struct page *page;
-@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump
+@@ -2038,6 +2349,7 @@ static int elf_core_dump(struct coredump
                        page = get_dump_page(addr);
                        if (page) {
                                void *kaddr = kmap(page);
@@ -37881,7 +40297,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                                stop = ((size += PAGE_SIZE) > cprm->limit) ||
                                        !dump_write(cprm->file, kaddr,
                                                    PAGE_SIZE);
-@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump
+@@ -2055,6 +2367,7 @@ static int elf_core_dump(struct coredump
  
        if (e_phnum == PN_XNUM) {
                size += sizeof(*shdr4extnum);
@@ -37889,7 +40305,7 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
                if (size > cprm->limit
                    || !dump_write(cprm->file, shdr4extnum,
                                   sizeof(*shdr4extnum)))
-@@ -2067,6 +2380,97 @@ out:
+@@ -2075,6 +2388,97 @@ out:
  
  #endif                /* CONFIG_ELF_CORE */
  
@@ -37987,9 +40403,9 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
        return register_binfmt(&elf_format);
-diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
---- linux-3.0.4/fs/binfmt_flat.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_flat.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/binfmt_flat.c linux-3.1.1/fs/binfmt_flat.c
+--- linux-3.1.1/fs/binfmt_flat.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/binfmt_flat.c       2011-11-16 18:39:08.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",
@@ -38022,22 +40438,22 @@ diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
                        ret = result;
                        goto err;
                }
-diff -urNp linux-3.0.4/fs/bio.c linux-3.0.4/fs/bio.c
---- linux-3.0.4/fs/bio.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/bio.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/bio.c linux-3.1.1/fs/bio.c
+--- linux-3.1.1/fs/bio.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/bio.c       2011-11-16 18:39:08.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;
 -      char *p = bmd->sgvecs[0].iov_base;
-+      char *p = (__force char *)bmd->sgvecs[0].iov_base;
++      char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
  
        __bio_for_each_segment(bvec, bio, i, 0) {
                char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/fs/block_dev.c
---- linux-3.0.4/fs/block_dev.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/block_dev.c 2011-08-23 21:47:56.000000000 -0400
-@@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
+diff -urNp linux-3.1.1/fs/block_dev.c linux-3.1.1/fs/block_dev.c
+--- linux-3.1.1/fs/block_dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/block_dev.c 2011-11-16 18:39:08.000000000 -0500
+@@ -681,7 +681,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 */
  
@@ -38046,10 +40462,10 @@ diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/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-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
---- linux-3.0.4/fs/btrfs/ctree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/ctree.c       2011-08-23 21:47:56.000000000 -0400
-@@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
+diff -urNp linux-3.1.1/fs/btrfs/ctree.c linux-3.1.1/fs/btrfs/ctree.c
+--- linux-3.1.1/fs/btrfs/ctree.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/ctree.c       2011-11-16 18:39:08.000000000 -0500
+@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(st
                free_extent_buffer(buf);
                add_root_to_dirty_list(root);
        } else {
@@ -38065,10 +40481,10 @@ diff -urNp linux-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
                        parent_start = 0;
  
                WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
---- linux-3.0.4/fs/btrfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/inode.c       2011-08-23 21:48:14.000000000 -0400
-@@ -6895,7 +6895,7 @@ fail:
+diff -urNp linux-3.1.1/fs/btrfs/inode.c linux-3.1.1/fs/btrfs/inode.c
+--- linux-3.1.1/fs/btrfs/inode.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/inode.c       2011-11-17 18:12:11.000000000 -0500
+@@ -6922,7 +6922,7 @@ fail:
        return -ENOMEM;
  }
  
@@ -38077,7 +40493,7 @@ diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
                         struct dentry *dentry, struct kstat *stat)
  {
        struct inode *inode = dentry->d_inode;
-@@ -6907,6 +6907,14 @@ static int btrfs_getattr(struct vfsmount
+@@ -6934,6 +6934,14 @@ static int btrfs_getattr(struct vfsmount
        return 0;
  }
  
@@ -38085,17 +40501,17 @@ diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
 +
 +dev_t get_btrfs_dev_from_inode(struct inode *inode)
 +{
-+      return BTRFS_I(inode)->root->anon_super.s_dev;
++      return BTRFS_I(inode)->root->anon_dev;
 +}
 +EXPORT_SYMBOL(get_btrfs_dev_from_inode);
 +
  /*
   * If a file is moved, it will inherit the cow and compression flags of the new
   * directory.
-diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
---- linux-3.0.4/fs/btrfs/ioctl.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/ioctl.c       2011-08-23 21:48:14.000000000 -0400
-@@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
+diff -urNp linux-3.1.1/fs/btrfs/ioctl.c linux-3.1.1/fs/btrfs/ioctl.c
+--- linux-3.1.1/fs/btrfs/ioctl.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/ioctl.c       2011-11-16 18:40:29.000000000 -0500
+@@ -2704,9 +2704,12 @@ long btrfs_ioctl_space_info(struct btrfs
        for (i = 0; i < num_types; i++) {
                struct btrfs_space_info *tmp;
  
@@ -38108,7 +40524,7 @@ diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
                info = NULL;
                rcu_read_lock();
                list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2700,10 +2703,7 @@ long btrfs_ioctl_space_info(struct btrfs
+@@ -2728,15 +2731,12 @@ long btrfs_ioctl_space_info(struct btrfs
                                memcpy(dest, &space, sizeof(space));
                                dest++;
                                space_args.total_spaces++;
@@ -38119,9 +40535,15 @@ diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
                }
                up_read(&info->groups_sem);
        }
-diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
---- linux-3.0.4/fs/btrfs/relocation.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/relocation.c  2011-08-23 21:47:56.000000000 -0400
+ 
+-      user_dest = (struct btrfs_ioctl_space_info *)
++      user_dest = (struct btrfs_ioctl_space_info __user *)
+               (arg + sizeof(struct btrfs_ioctl_space_args));
+ 
+       if (copy_to_user(user_dest, dest_orig, alloc_size))
+diff -urNp linux-3.1.1/fs/btrfs/relocation.c linux-3.1.1/fs/btrfs/relocation.c
+--- linux-3.1.1/fs/btrfs/relocation.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/btrfs/relocation.c  2011-11-16 18:39:08.000000000 -0500
 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
        }
        spin_unlock(&rc->reloc_root_tree.lock);
@@ -38131,9 +40553,9 @@ diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
  
        if (!del) {
                spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
---- linux-3.0.4/fs/cachefiles/bind.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/bind.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/bind.c linux-3.1.1/fs/cachefiles/bind.c
+--- linux-3.1.1/fs/cachefiles/bind.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/bind.c   2011-11-16 18:39:08.000000000 -0500
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
               args);
  
@@ -38150,9 +40572,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
               cache->bcull_percent < cache->brun_percent &&
               cache->brun_percent  < 100);
  
-diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
---- linux-3.0.4/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/daemon.c linux-3.1.1/fs/cachefiles/daemon.c
+--- linux-3.1.1/fs/cachefiles/daemon.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/daemon.c 2011-11-16 18:39:08.000000000 -0500
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
        if (n > buflen)
                return -EMSGSIZE;
@@ -38189,9 +40611,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
                return cachefiles_daemon_range_error(cache, args);
  
        cache->bstop_percent = bstop;
-diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/internal.h
---- linux-3.0.4/fs/cachefiles/internal.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/internal.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/internal.h linux-3.1.1/fs/cachefiles/internal.h
+--- linux-3.1.1/fs/cachefiles/internal.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/internal.h       2011-11-16 18:39:08.000000000 -0500
 @@ -57,7 +57,7 @@ struct cachefiles_cache {
        wait_queue_head_t               daemon_pollwq;  /* poll waitqueue for daemon */
        struct rb_root                  active_nodes;   /* active nodes (can't be culled) */
@@ -38226,9 +40648,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/intern
  }
  
  #else
-diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
---- linux-3.0.4/fs/cachefiles/namei.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/namei.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/namei.c linux-3.1.1/fs/cachefiles/namei.c
+--- linux-3.1.1/fs/cachefiles/namei.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/namei.c  2011-11-16 18:39:08.000000000 -0500
 @@ -318,7 +318,7 @@ try_again:
        /* first step is to make up a grave dentry in the graveyard */
        sprintf(nbuffer, "%08x%08x",
@@ -38238,9 +40660,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
  
        /* do the multiway lock magic */
        trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
---- linux-3.0.4/fs/cachefiles/proc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/proc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/proc.c linux-3.1.1/fs/cachefiles/proc.c
+--- linux-3.1.1/fs/cachefiles/proc.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/proc.c   2011-11-16 18:39:08.000000000 -0500
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -38267,22 +40689,22 @@ diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
                if (x == 0 && y == 0 && z == 0)
                        return 0;
  
-diff -urNp linux-3.0.4/fs/cachefiles/rdwr.c linux-3.0.4/fs/cachefiles/rdwr.c
---- linux-3.0.4/fs/cachefiles/rdwr.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/rdwr.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/cachefiles/rdwr.c linux-3.1.1/fs/cachefiles/rdwr.c
+--- linux-3.1.1/fs/cachefiles/rdwr.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cachefiles/rdwr.c   2011-11-16 18:39:08.000000000 -0500
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
                        old_fs = get_fs();
                        set_fs(KERNEL_DS);
                        ret = file->f_op->write(
 -                              file, (const void __user *) data, len, &pos);
-+                              file, (__force const void __user *) data, len, &pos);
++                              file, (const void __force_user *) data, len, &pos);
                        set_fs(old_fs);
                        kunmap(page);
                        if (ret != len)
-diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
---- linux-3.0.4/fs/ceph/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ceph/dir.c  2011-08-23 21:47:56.000000000 -0400
-@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
+diff -urNp linux-3.1.1/fs/ceph/dir.c linux-3.1.1/fs/ceph/dir.c
+--- linux-3.1.1/fs/ceph/dir.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ceph/dir.c  2011-11-16 18:39:08.000000000 -0500
+@@ -244,7 +244,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);
@@ -38291,9 +40713,9 @@ diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
        int err;
        u32 ftype;
        struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
---- linux-3.0.4/fs/cifs/cifs_debug.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifs_debug.c   2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.1.1/fs/cifs/cifs_debug.c linux-3.1.1/fs/cifs/cifs_debug.c
+--- linux-3.1.1/fs/cifs/cifs_debug.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifs_debug.c   2011-11-16 18:39:08.000000000 -0500
 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
  
        if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
@@ -38423,10 +40845,10 @@ diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
                        }
                }
        }
-diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
---- linux-3.0.4/fs/cifs/cifsfs.c       2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifsfs.c       2011-08-25 17:18:05.000000000 -0400
-@@ -994,7 +994,7 @@ cifs_init_request_bufs(void)
+diff -urNp linux-3.1.1/fs/cifs/cifsfs.c linux-3.1.1/fs/cifs/cifsfs.c
+--- linux-3.1.1/fs/cifs/cifsfs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifsfs.c       2011-11-16 18:39:08.000000000 -0500
+@@ -981,7 +981,7 @@ cifs_init_request_bufs(void)
        cifs_req_cachep = kmem_cache_create("cifs_request",
                                            CIFSMaxBufSize +
                                            MAX_CIFS_HDR_SIZE, 0,
@@ -38435,7 +40857,7 @@ diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
        if (cifs_req_cachep == NULL)
                return -ENOMEM;
  
-@@ -1021,7 +1021,7 @@ cifs_init_request_bufs(void)
+@@ -1008,7 +1008,7 @@ cifs_init_request_bufs(void)
        efficient to alloc 1 per page off the slab compared to 17K (5page)
        alloc of large cifs buffers even when page debugging is on */
        cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
@@ -38444,7 +40866,7 @@ diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
                        NULL);
        if (cifs_sm_req_cachep == NULL) {
                mempool_destroy(cifs_req_poolp);
-@@ -1106,8 +1106,8 @@ init_cifs(void)
+@@ -1093,8 +1093,8 @@ init_cifs(void)
        atomic_set(&bufAllocCount, 0);
        atomic_set(&smBufAllocCount, 0);
  #ifdef CONFIG_CIFS_STATS2
@@ -38455,9 +40877,9 @@ diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
  #endif /* CONFIG_CIFS_STATS2 */
  
        atomic_set(&midCount, 0);
-diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
---- linux-3.0.4/fs/cifs/cifsglob.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifsglob.h     2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.1.1/fs/cifs/cifsglob.h linux-3.1.1/fs/cifs/cifsglob.h
+--- linux-3.1.1/fs/cifs/cifsglob.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/cifsglob.h     2011-11-16 18:39:08.000000000 -0500
 @@ -381,28 +381,28 @@ struct cifs_tcon {
        __u16 Flags;            /* optional support bits */
        enum statusEnum tidStatus;
@@ -38518,7 +40940,7 @@ diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
  
  static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
                                            unsigned int bytes)
-@@ -911,8 +911,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
+@@ -953,8 +953,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
  /* Various Debug counters */
  GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */
  #ifdef CONFIG_CIFS_STATS2
@@ -38529,10 +40951,10 @@ diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
---- linux-3.0.4/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400
-@@ -587,7 +587,7 @@ symlink_exit:
+diff -urNp linux-3.1.1/fs/cifs/link.c linux-3.1.1/fs/cifs/link.c
+--- linux-3.1.1/fs/cifs/link.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/link.c 2011-11-16 18:39:08.000000000 -0500
+@@ -593,7 +593,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -38541,9 +40963,9 @@ diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
        if (!IS_ERR(p))
                kfree(p);
  }
-diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
---- linux-3.0.4/fs/cifs/misc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/misc.c 2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.1.1/fs/cifs/misc.c linux-3.1.1/fs/cifs/misc.c
+--- linux-3.1.1/fs/cifs/misc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/cifs/misc.c 2011-11-16 18:39:08.000000000 -0500
 @@ -156,7 +156,7 @@ cifs_buf_get(void)
                memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
                atomic_inc(&bufAllocCount);
@@ -38562,9 +40984,9 @@ diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
  #endif /* CONFIG_CIFS_STATS2 */
  
        }
-diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
---- linux-3.0.4/fs/coda/cache.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/coda/cache.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/coda/cache.c linux-3.1.1/fs/coda/cache.c
+--- linux-3.1.1/fs/coda/cache.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/coda/cache.c        2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -38609,9 +41031,9 @@ diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
        spin_unlock(&cii->c_lock);
  
        return hit;
-diff -urNp linux-3.0.4/fs/compat_binfmt_elf.c linux-3.0.4/fs/compat_binfmt_elf.c
---- linux-3.0.4/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/compat_binfmt_elf.c linux-3.1.1/fs/compat_binfmt_elf.c
+--- linux-3.1.1/fs/compat_binfmt_elf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat_binfmt_elf.c 2011-11-16 18:39:08.000000000 -0500
 @@ -30,11 +30,13 @@
  #undef        elf_phdr
  #undef        elf_shdr
@@ -38626,9 +41048,29 @@ diff -urNp linux-3.0.4/fs/compat_binfmt_elf.c linux-3.0.4/fs/compat_binfmt_elf.c
  #define elf_addr_t    Elf32_Addr
  
  /*
-diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
---- linux-3.0.4/fs/compat.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/compat.c    2011-08-23 22:49:33.000000000 -0400
+diff -urNp linux-3.1.1/fs/compat.c linux-3.1.1/fs/compat.c
+--- linux-3.1.1/fs/compat.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat.c    2011-11-16 18:40:29.000000000 -0500
+@@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const 
+ static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
+ {
+       compat_ino_t ino = stat->ino;
+-      typeof(ubuf->st_uid) uid = 0;
+-      typeof(ubuf->st_gid) gid = 0;
++      typeof(((struct compat_stat *)0)->st_uid) uid = 0;
++      typeof(((struct compat_stat *)0)->st_gid) gid = 0;
+       int err;
+ 
+       SET_UID(uid, stat->uid);
+@@ -508,7 +508,7 @@ compat_sys_io_setup(unsigned nr_reqs, u3
+ 
+       set_fs(KERNEL_DS);
+       /* The __user pointer cast is valid because of the set_fs() */
+-      ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
++      ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
+       set_fs(oldfs);
+       /* truncating is ok because it's a user address */
+       if (!ret)
 @@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
                goto out;
  
@@ -38711,7 +41153,7 @@ diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
        dirent = buf->previous;
  
        if (dirent) {
-@@ -1073,6 +1090,7 @@ asmlinkage long compat_sys_getdents64(un
+@@ -1073,13 +1090,14 @@ asmlinkage long compat_sys_getdents64(un
        buf.previous = NULL;
        buf.count = count;
        buf.error = 0;
@@ -38719,6 +41161,14 @@ diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
  
        error = vfs_readdir(file, compat_filldir64, &buf);
        if (error >= 0)
+               error = buf.error;
+       lastdirent = buf.previous;
+       if (lastdirent) {
+-              typeof(lastdirent->d_off) d_off = file->f_pos;
++              typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
+               if (__put_user_unaligned(d_off, &lastdirent->d_off))
+                       error = -EFAULT;
+               else
 @@ -1446,6 +1464,8 @@ int compat_core_sys_select(int n, compat
        struct fdtable *fdt;
        long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
@@ -38728,10 +41178,10 @@ diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
        if (n < 0)
                goto out_nofds;
  
-diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
---- linux-3.0.4/fs/compat_ioctl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/compat_ioctl.c      2011-08-23 21:47:56.000000000 -0400
-@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
+diff -urNp linux-3.1.1/fs/compat_ioctl.c linux-3.1.1/fs/compat_ioctl.c
+--- linux-3.1.1/fs/compat_ioctl.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/compat_ioctl.c      2011-11-16 18:39:08.000000000 -0500
+@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsi
  
        err  = get_user(palp, &up->palette);
        err |= get_user(length, &up->length);
@@ -38740,7 +41190,25 @@ diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
  
        up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
        err  = put_user(compat_ptr(palp), &up_native->palette);
-@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigne
+@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned 
+                       return -EFAULT;
+                 if (__get_user(udata, &ss32->iomem_base))
+                       return -EFAULT;
+-                ss.iomem_base = compat_ptr(udata);
++                ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
+                 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
+                   __get_user(ss.port_high, &ss32->port_high))
+                       return -EFAULT;
+@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(stru
+           copy_in_user(&p->l_len,     &p32->l_len,    sizeof(s64)) ||
+           copy_in_user(&p->l_sysid,   &p32->l_sysid,  sizeof(s32)) ||
+           copy_in_user(&p->l_pid,     &p32->l_pid,    sizeof(u32)) ||
+-          copy_in_user(&p->l_pad,     &p32->l_pad,    4*sizeof(u32)))
++          copy_in_user(p->l_pad,      &p32->l_pad,    4*sizeof(u32)))
+               return -EFAULT;
+ 
+       return ioctl_preallocate(file, p);
+@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigne
  static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
  {
        unsigned int a, b;
@@ -38751,9 +41219,9 @@ diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
        if (a > b)
                return 1;
        if (a < b)
-diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
---- linux-3.0.4/fs/configfs/dir.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/configfs/dir.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/configfs/dir.c linux-3.1.1/fs/configfs/dir.c
+--- linux-3.1.1/fs/configfs/dir.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/configfs/dir.c      2011-11-16 18:39:08.000000000 -0500
 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
                        }
                        for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -38778,10 +41246,10 @@ diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
  
                                /*
                                 * We'll have a dentry and an inode for
-diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
---- linux-3.0.4/fs/dcache.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/dcache.c    2011-08-23 21:47:56.000000000 -0400
-@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
+diff -urNp linux-3.1.1/fs/dcache.c linux-3.1.1/fs/dcache.c
+--- linux-3.1.1/fs/dcache.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/dcache.c    2011-11-16 18:39:08.000000000 -0500
+@@ -2998,7 +2998,7 @@ void __init vfs_caches_init(unsigned lon
        mempages -= reserve;
  
        names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -38790,28 +41258,28 @@ diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
  
        dcache_init();
        inode_init();
-diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
---- linux-3.0.4/fs/ecryptfs/inode.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ecryptfs/inode.c    2011-08-23 21:47:56.000000000 -0400
-@@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
+diff -urNp linux-3.1.1/fs/ecryptfs/inode.c linux-3.1.1/fs/ecryptfs/inode.c
+--- linux-3.1.1/fs/ecryptfs/inode.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/inode.c    2011-11-16 18:39:08.000000000 -0500
+@@ -681,7 +681,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,
 -                                                 (char __user *)lower_buf,
-+                                                 (__force char __user *)lower_buf,
++                                                 (char __force_user *)lower_buf,
                                                   lower_bufsiz);
        set_fs(old_fs);
        if (rc < 0)
-@@ -750,7 +750,7 @@ static void *ecryptfs_follow_link(struct
+@@ -727,7 +727,7 @@ static void *ecryptfs_follow_link(struct
        }
        old_fs = get_fs();
        set_fs(get_ds());
 -      rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
-+      rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
++      rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
        set_fs(old_fs);
        if (rc < 0) {
                kfree(buf);
-@@ -765,7 +765,7 @@ out:
+@@ -742,7 +742,7 @@ out:
  static void
  ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
  {
@@ -38820,9 +41288,9 @@ diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
        if (!IS_ERR(buf)) {
                /* Free the char* */
                kfree(buf);
-diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/fs/ecryptfs/miscdev.c
---- linux-3.0.4/fs/ecryptfs/miscdev.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ecryptfs/miscdev.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ecryptfs/miscdev.c linux-3.1.1/fs/ecryptfs/miscdev.c
+--- linux-3.1.1/fs/ecryptfs/miscdev.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/miscdev.c  2011-11-16 18:39:08.000000000 -0500
 @@ -328,7 +328,7 @@ check_list:
                goto out_unlock_msg_ctx;
        i = 5;
@@ -38832,9 +41300,30 @@ diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/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-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
---- linux-3.0.4/fs/exec.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/exec.c      2011-08-25 17:26:58.000000000 -0400
+diff -urNp linux-3.1.1/fs/ecryptfs/read_write.c linux-3.1.1/fs/ecryptfs/read_write.c
+--- linux-3.1.1/fs/ecryptfs/read_write.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ecryptfs/read_write.c       2011-11-16 18:39:08.000000000 -0500
+@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
+               return -EIO;
+       fs_save = get_fs();
+       set_fs(get_ds());
+-      rc = vfs_write(lower_file, data, size, &offset);
++      rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
+       set_fs(fs_save);
+       mark_inode_dirty_sync(ecryptfs_inode);
+       return rc;
+@@ -235,7 +235,7 @@ int ecryptfs_read_lower(char *data, loff
+               return -EIO;
+       fs_save = get_fs();
+       set_fs(get_ds());
+-      rc = vfs_read(lower_file, data, size, &offset);
++      rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
+       set_fs(fs_save);
+       return rc;
+ }
+diff -urNp linux-3.1.1/fs/exec.c linux-3.1.1/fs/exec.c
+--- linux-3.1.1/fs/exec.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/exec.c      2011-11-17 18:40:47.000000000 -0500
 @@ -55,12 +55,24 @@
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
@@ -38869,16 +41358,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  
  /* The maximal length of core_pattern is also specified in sysctl.c */
  
-@@ -116,7 +128,7 @@ SYSCALL_DEFINE1(uselib, const char __use
-       char *tmp = getname(library);
-       int error = PTR_ERR(tmp);
-       static const struct open_flags uselib_flags = {
--              .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
-+              .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
-               .acc_mode = MAY_READ | MAY_EXEC | MAY_OPEN,
-               .intent = LOOKUP_OPEN
-       };
-@@ -195,18 +207,10 @@ static struct page *get_arg_page(struct 
+@@ -188,18 +200,10 @@ static struct page *get_arg_page(struct 
                int write)
  {
        struct page *page;
@@ -38900,7 +41380,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
                return NULL;
  
        if (write) {
-@@ -281,6 +285,11 @@ static int __bprm_mm_init(struct linux_b
+@@ -274,6 +278,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;
@@ -38912,7 +41392,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        INIT_LIST_HEAD(&vma->anon_vma_chain);
  
-@@ -295,6 +304,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -288,6 +297,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 *);
@@ -38925,7 +41405,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        return 0;
  err:
        up_write(&mm->mmap_sem);
-@@ -403,19 +418,7 @@ err:
+@@ -396,19 +411,7 @@ err:
        return err;
  }
  
@@ -38946,16 +41426,51 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  {
        const char __user *native;
  
-@@ -566,7 +569,7 @@ int copy_strings_kernel(int argc, const 
+@@ -417,14 +420,14 @@ static const char __user *get_user_arg_p
+               compat_uptr_t compat;
+ 
+               if (get_user(compat, argv.ptr.compat + nr))
+-                      return ERR_PTR(-EFAULT);
++                      return (const char __force_user *)ERR_PTR(-EFAULT);
+ 
+               return compat_ptr(compat);
+       }
+ #endif
+ 
+       if (get_user(native, argv.ptr.native + nr))
+-              return ERR_PTR(-EFAULT);
++              return (const char __force_user *)ERR_PTR(-EFAULT);
+ 
+       return native;
+ }
+@@ -443,7 +446,7 @@ static int count(struct user_arg_ptr arg
+                       if (!p)
+                               break;
+ 
+-                      if (IS_ERR(p))
++                      if (IS_ERR((const char __force_kernel *)p))
+                               return -EFAULT;
+ 
+                       if (i++ >= max)
+@@ -477,7 +480,7 @@ static int copy_strings(int argc, struct
+ 
+               ret = -EFAULT;
+               str = get_user_arg_ptr(argv, argc);
+-              if (IS_ERR(str))
++              if (IS_ERR((const char __force_kernel *)str))
+                       goto out;
+ 
+               len = strnlen_user(str, MAX_ARG_STRLEN);
+@@ -559,7 +562,7 @@ int copy_strings_kernel(int argc, const 
        int r;
        mm_segment_t oldfs = get_fs();
        struct user_arg_ptr argv = {
 -              .ptr.native = (const char __user *const  __user *)__argv,
-+              .ptr.native = (__force const char __user *const  __user *)__argv,
++              .ptr.native = (const char __force_user *const  __force_user *)__argv,
        };
  
        set_fs(KERNEL_DS);
-@@ -601,7 +604,8 @@ static int shift_arg_pages(struct vm_are
+@@ -594,7 +597,8 @@ static int shift_arg_pages(struct vm_are
        unsigned long new_end = old_end - shift;
        struct mmu_gather tlb;
  
@@ -38965,7 +41480,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  
        /*
         * ensure there are no vmas between where we want to go
-@@ -610,6 +614,10 @@ static int shift_arg_pages(struct vm_are
+@@ -603,6 +607,10 @@ static int shift_arg_pages(struct vm_are
        if (vma != find_vma(mm, new_start))
                return -EFAULT;
  
@@ -38976,7 +41491,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        /*
         * cover the whole range: [new_start, old_end)
         */
-@@ -690,10 +698,6 @@ int setup_arg_pages(struct linux_binprm 
+@@ -683,10 +691,6 @@ int setup_arg_pages(struct linux_binprm 
        stack_top = arch_align_stack(stack_top);
        stack_top = PAGE_ALIGN(stack_top);
  
@@ -38987,7 +41502,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        stack_shift = vma->vm_end - stack_top;
  
        bprm->p -= stack_shift;
-@@ -705,8 +709,28 @@ int setup_arg_pages(struct linux_binprm 
+@@ -698,8 +702,28 @@ int setup_arg_pages(struct linux_binprm 
        bprm->exec -= stack_shift;
  
        down_write(&mm->mmap_sem);
@@ -39016,7 +41531,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        /*
         * Adjust stack execute permissions; explicitly enable for
         * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -725,13 +749,6 @@ int setup_arg_pages(struct linux_binprm 
+@@ -718,13 +742,6 @@ int setup_arg_pages(struct linux_binprm 
                goto out_unlock;
        BUG_ON(prev != vma);
  
@@ -39030,25 +41545,16 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        /* mprotect_fixup is overkill to remove the temporary stack flags */
        vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
  
-@@ -771,7 +788,7 @@ struct file *open_exec(const char *name)
-       struct file *file;
-       int err;
-       static const struct open_flags open_exec_flags = {
--              .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
-+              .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
-               .acc_mode = MAY_EXEC | MAY_OPEN,
-               .intent = LOOKUP_OPEN
-       };
-@@ -812,7 +829,7 @@ int kernel_read(struct file *file, loff_
+@@ -805,7 +822,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() */
 -      result = vfs_read(file, (void __user *)addr, count, &pos);
-+      result = vfs_read(file, (__force void __user *)addr, count, &pos);
++      result = vfs_read(file, (void __force_user *)addr, count, &pos);
        set_fs(old_fs);
        return result;
  }
-@@ -1236,7 +1253,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1251,7 +1268,7 @@ int check_unsafe_exec(struct linux_binpr
        }
        rcu_read_unlock();
  
@@ -39057,7 +41563,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
                bprm->unsafe |= LSM_UNSAFE_SHARE;
        } else {
                res = -EAGAIN;
-@@ -1428,11 +1445,35 @@ static int do_execve_common(const char *
+@@ -1454,6 +1471,11 @@ static int do_execve_common(const char *
                                struct user_arg_ptr envp,
                                struct pt_regs *regs)
  {
@@ -39069,31 +41575,16 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-       bool clear_in_exec;
+@@ -1461,6 +1483,8 @@ static int do_execve_common(const char *
        int retval;
-+      const struct cred *cred = current_cred();
-+
+       const struct cred *cred = current_cred();
+ 
 +      gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
 +
-+      /*
-+       * We move the actual failure in case of RLIMIT_NPROC excess from
-+       * set*uid() to execve() because too many poorly written programs
-+       * don't check setuid() return code.  Here we additionally recheck
-+       * whether NPROC limit is still exceeded.
-+       */
-+      if ((current->flags & PF_NPROC_EXCEEDED) &&
-+          atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) {
-+              retval = -EAGAIN;
-+              goto out_ret;
-+      }
-+
-+      /* We're below the limit (still or again), so we don't want to make
-+       * further execve() calls fail. */
-+      current->flags &= ~PF_NPROC_EXCEEDED;
- 
-       retval = unshare_files(&displaced);
-       if (retval)
-@@ -1464,6 +1505,16 @@ static int do_execve_common(const char *
+       /*
+        * We move the actual failure in case of RLIMIT_NPROC excess from
+        * set*uid() to execve() because too many poorly written programs
+@@ -1507,6 +1531,16 @@ static int do_execve_common(const char *
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -39110,7 +41601,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1493,9 +1544,40 @@ static int do_execve_common(const char *
+@@ -1536,9 +1570,40 @@ static int do_execve_common(const char *
        if (retval < 0)
                goto out;
  
@@ -39152,7 +41643,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  
        /* execve succeeded */
        current->fs->in_exec = 0;
-@@ -1506,6 +1588,14 @@ static int do_execve_common(const char *
+@@ -1549,6 +1614,14 @@ static int do_execve_common(const char *
                put_files_struct(displaced);
        return retval;
  
@@ -39167,7 +41658,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  out:
        if (bprm->mm) {
                acct_arg_size(bprm, 0);
-@@ -1579,7 +1669,7 @@ static int expand_corename(struct core_n
+@@ -1622,7 +1695,7 @@ static int expand_corename(struct core_n
  {
        char *old_corename = cn->corename;
  
@@ -39176,7 +41667,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
  
        if (!cn->corename) {
-@@ -1667,7 +1757,7 @@ static int format_corename(struct core_n
+@@ -1719,7 +1792,7 @@ static int format_corename(struct core_n
        int pid_in_pattern = 0;
        int err = 0;
  
@@ -39185,7 +41676,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        cn->corename = kmalloc(cn->size, GFP_KERNEL);
        cn->used = 0;
  
-@@ -1758,6 +1848,219 @@ out:
+@@ -1816,6 +1889,218 @@ out:
        return ispipe;
  }
  
@@ -39308,7 +41799,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
 +                      task_uid(tsk), task_euid(tsk), pc, sp);
 +      free_page((unsigned long)buffer_exec);
 +      free_page((unsigned long)buffer_fault);
-+      pax_report_insns(pc, sp);
++      pax_report_insns(regs, pc, sp);
 +      do_coredump(SIGKILL, SIGKILL, regs);
 +}
 +#endif
@@ -39376,7 +41867,6 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
 +#endif
 +}
 +
-+
 +NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
 +{
 +      if (current->signal->curr_ip)
@@ -39405,7 +41895,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  static int zap_process(struct task_struct *start, int exit_code)
  {
        struct task_struct *t;
-@@ -1969,17 +2272,17 @@ static void wait_for_dump_helpers(struct
+@@ -2027,17 +2312,17 @@ static void wait_for_dump_helpers(struct
        pipe = file->f_path.dentry->d_inode->i_pipe;
  
        pipe_lock(pipe);
@@ -39428,7 +41918,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        pipe_unlock(pipe);
  
  }
-@@ -2040,7 +2343,7 @@ void do_coredump(long signr, int exit_co
+@@ -2098,7 +2383,7 @@ void do_coredump(long signr, int exit_co
        int retval = 0;
        int flag = 0;
        int ispipe;
@@ -39437,7 +41927,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        struct coredump_params cprm = {
                .signr = signr,
                .regs = regs,
-@@ -2055,6 +2358,9 @@ void do_coredump(long signr, int exit_co
+@@ -2113,6 +2398,9 @@ void do_coredump(long signr, int exit_co
  
        audit_core_dumps(signr);
  
@@ -39447,16 +41937,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
        binfmt = mm->binfmt;
        if (!binfmt || !binfmt->core_dump)
                goto fail;
-@@ -2095,6 +2401,8 @@ void do_coredump(long signr, int exit_co
-               goto fail_corename;
-       }
- 
-+      gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
-+
-       if (ispipe) {
-               int dump_count;
-               char **helper_argv;
-@@ -2122,7 +2430,7 @@ void do_coredump(long signr, int exit_co
+@@ -2180,7 +2468,7 @@ void do_coredump(long signr, int exit_co
                }
                cprm.limit = RLIM_INFINITY;
  
@@ -39465,7 +41946,16 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
                if (core_pipe_limit && (core_pipe_limit < dump_count)) {
                        printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
                               task_tgid_vnr(current), current->comm);
-@@ -2192,7 +2500,7 @@ close_fail:
+@@ -2207,6 +2495,8 @@ void do_coredump(long signr, int exit_co
+       } else {
+               struct inode *inode;
+ 
++              gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
++
+               if (cprm.limit < binfmt->min_coredump)
+                       goto fail_unlock;
+ 
+@@ -2250,7 +2540,7 @@ close_fail:
                filp_close(cprm.file, NULL);
  fail_dropcount:
        if (ispipe)
@@ -39474,9 +41964,18 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  fail_unlock:
        kfree(cn.corename);
  fail_corename:
-diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
---- linux-3.0.4/fs/ext2/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext2/balloc.c       2011-08-23 21:48:14.000000000 -0400
+@@ -2269,7 +2559,7 @@ fail:
+  */
+ int dump_write(struct file *file, const void *addr, int nr)
+ {
+-      return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
++      return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
+ }
+ EXPORT_SYMBOL(dump_write);
+ 
+diff -urNp linux-3.1.1/fs/ext2/balloc.c linux-3.1.1/fs/ext2/balloc.c
+--- linux-3.1.1/fs/ext2/balloc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext2/balloc.c       2011-11-16 18:40:29.000000000 -0500
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -39486,10 +41985,10 @@ diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
---- linux-3.0.4/fs/ext3/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext3/balloc.c       2011-08-23 21:48:14.000000000 -0400
-@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
+diff -urNp linux-3.1.1/fs/ext3/balloc.c linux-3.1.1/fs/ext3/balloc.c
+--- linux-3.1.1/fs/ext3/balloc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext3/balloc.c       2011-11-16 18:40:29.000000000 -0500
+@@ -1446,7 +1446,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);
@@ -39498,9 +41997,9 @@ diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
---- linux-3.0.4/fs/ext4/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext4/balloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/ext4/balloc.c linux-3.1.1/fs/ext4/balloc.c
+--- linux-3.1.1/fs/ext4/balloc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/balloc.c       2011-11-16 18:40:29.000000000 -0500
 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
        /* Hm, nope.  Are (enough) root reserved blocks available? */
        if (sbi->s_resuid == current_fsuid() ||
@@ -39512,10 +42011,10 @@ diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
  
                if (free_blocks >= (nblocks + dirty_blocks))
                        return 1;
-diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
---- linux-3.0.4/fs/ext4/ext4.h 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400
-@@ -1177,19 +1177,19 @@ struct ext4_sb_info {
+diff -urNp linux-3.1.1/fs/ext4/ext4.h linux-3.1.1/fs/ext4/ext4.h
+--- linux-3.1.1/fs/ext4/ext4.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/ext4.h 2011-11-16 18:39:08.000000000 -0500
+@@ -1180,19 +1180,19 @@ struct ext4_sb_info {
        unsigned long s_mb_last_start;
  
        /* stats for buddy allocator */
@@ -39545,10 +42044,45 @@ diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
        atomic_t s_lock_busy;
  
        /* locality groups */
-diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
---- linux-3.0.4/fs/ext4/mballoc.c      2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ext4/mballoc.c      2011-08-23 21:48:14.000000000 -0400
-@@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
+diff -urNp linux-3.1.1/fs/ext4/file.c linux-3.1.1/fs/ext4/file.c
+--- linux-3.1.1/fs/ext4/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/file.c 2011-11-16 18:40:29.000000000 -0500
+@@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
+               path.dentry = mnt->mnt_root;
+               cp = d_path(&path, buf, sizeof(buf));
+               if (!IS_ERR(cp)) {
+-                      memcpy(sbi->s_es->s_last_mounted, cp,
+-                             sizeof(sbi->s_es->s_last_mounted));
++                      strlcpy(sbi->s_es->s_last_mounted, cp,
++                              sizeof(sbi->s_es->s_last_mounted));
+                       ext4_mark_super_dirty(sb);
+               }
+       }
+diff -urNp linux-3.1.1/fs/ext4/ioctl.c linux-3.1.1/fs/ext4/ioctl.c
+--- linux-3.1.1/fs/ext4/ioctl.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/ioctl.c        2011-11-16 18:39:08.000000000 -0500
+@@ -348,7 +348,7 @@ mext_out:
+               if (!blk_queue_discard(q))
+                       return -EOPNOTSUPP;
+ 
+-              if (copy_from_user(&range, (struct fstrim_range *)arg,
++              if (copy_from_user(&range, (struct fstrim_range __user *)arg,
+                   sizeof(range)))
+                       return -EFAULT;
+ 
+@@ -358,7 +358,7 @@ mext_out:
+               if (ret < 0)
+                       return ret;
+ 
+-              if (copy_to_user((struct fstrim_range *)arg, &range,
++              if (copy_to_user((struct fstrim_range __user *)arg, &range,
+                   sizeof(range)))
+                       return -EFAULT;
+ 
+diff -urNp linux-3.1.1/fs/ext4/mballoc.c linux-3.1.1/fs/ext4/mballoc.c
+--- linux-3.1.1/fs/ext4/mballoc.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ext4/mballoc.c      2011-11-16 18:40:29.000000000 -0500
+@@ -1795,7 +1795,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)
@@ -39557,7 +42091,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
  
                break;
        }
-@@ -2087,7 +2087,7 @@ repeat:
+@@ -2089,7 +2089,7 @@ repeat:
                        ac->ac_status = AC_STATUS_CONTINUE;
                        ac->ac_flags |= EXT4_MB_HINT_FIRST;
                        cr = 3;
@@ -39566,7 +42100,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
                        goto repeat;
                }
        }
-@@ -2130,6 +2130,8 @@ static int ext4_mb_seq_groups_show(struc
+@@ -2132,6 +2132,8 @@ static int ext4_mb_seq_groups_show(struc
                ext4_grpblk_t counters[16];
        } sg;
  
@@ -39575,19 +42109,19 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
        group--;
        if (group == 0)
                seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
-@@ -2553,25 +2555,25 @@ int ext4_mb_release(struct super_block *
+@@ -2573,25 +2575,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",
+               ext4_msg(sb, KERN_INFO,
+                      "mballoc: %u blocks %u reqs (%u success)",
 -                              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",
+               ext4_msg(sb, KERN_INFO,
+                     "mballoc: %u extents scanned, %u goal hits, "
+                               "%u 2^N hits, %u breaks, %u lost",
 -                              atomic_read(&sbi->s_bal_ex_scanned),
 -                              atomic_read(&sbi->s_bal_goals),
 -                              atomic_read(&sbi->s_bal_2orders),
@@ -39598,12 +42132,12 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
 +                              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++,
+               ext4_msg(sb, KERN_INFO,
+                      "mballoc: %lu generated and it took %Lu",
+                               sbi->s_mb_buddies_generated,
                                sbi->s_mb_generation_time);
-               printk(KERN_INFO
-                      "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
+               ext4_msg(sb, KERN_INFO,
+                      "mballoc: %u preallocated, %u discarded",
 -                              atomic_read(&sbi->s_mb_preallocated),
 -                              atomic_read(&sbi->s_mb_discarded));
 +                              atomic_read_unchecked(&sbi->s_mb_preallocated),
@@ -39611,7 +42145,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
        }
  
        free_percpu(sbi->s_locality_groups);
-@@ -3041,16 +3043,16 @@ static void ext4_mb_collect_stats(struct
+@@ -3070,16 +3072,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) {
@@ -39634,7 +42168,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
        }
  
        if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3448,7 +3450,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
+@@ -3477,7 +3479,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
        trace_ext4_mb_new_inode_pa(ac, pa);
  
        ext4_mb_use_inode_pa(ac, pa);
@@ -39643,7 +42177,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
  
        ei = EXT4_I(ac->ac_inode);
        grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3508,7 +3510,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
+@@ -3537,7 +3539,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
        trace_ext4_mb_new_group_pa(ac, pa);
  
        ext4_mb_use_group_pa(ac, pa);
@@ -39652,7 +42186,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
  
        grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
        lg = ac->ac_lg;
-@@ -3595,7 +3597,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
+@@ -3625,7 +3627,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
                 * from the bitmap and continue.
                 */
        }
@@ -39661,7 +42195,7 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
  
        return err;
  }
-@@ -3613,7 +3615,7 @@ ext4_mb_release_group_pa(struct ext4_bud
+@@ -3643,7 +3645,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);
@@ -39670,9 +42204,9 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
        trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
        return 0;
-diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
---- linux-3.0.4/fs/fcntl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fcntl.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/fcntl.c linux-3.1.1/fs/fcntl.c
+--- linux-3.1.1/fs/fcntl.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fcntl.c     2011-11-16 23:40:25.000000000 -0500
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
        if (err)
                return err;
@@ -39685,6 +42219,24 @@ diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
        f_modown(filp, pid, type, force);
        return 0;
  }
+@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
+ 
+ static int f_setown_ex(struct file *filp, unsigned long arg)
+ {
+-      struct f_owner_ex * __user owner_p = (void * __user)arg;
++      struct f_owner_ex __user *owner_p = (void __user *)arg;
+       struct f_owner_ex owner;
+       struct pid *pid;
+       int type;
+@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp
+ 
+ static int f_getown_ex(struct file *filp, unsigned long arg)
+ {
+-      struct f_owner_ex * __user owner_p = (void * __user)arg;
++      struct f_owner_ex __user *owner_p = (void __user *)arg;
+       struct f_owner_ex owner;
+       int ret = 0;
+ 
 @@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned in
        switch (cmd) {
        case F_DUPFD:
@@ -39693,26 +42245,9 @@ diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
                if (arg >= rlimit(RLIMIT_NOFILE))
                        break;
                err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-@@ -835,14 +841,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(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
-+      BUILD_BUG_ON(20 - 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    | O_PATH
-+              __FMODE_EXEC    | O_PATH        | FMODE_GREXEC
-               ));
- 
-       fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
---- linux-3.0.4/fs/fifo.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fifo.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fifo.c linux-3.1.1/fs/fifo.c
+--- linux-3.1.1/fs/fifo.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fifo.c      2011-11-16 18:39:08.000000000 -0500
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &read_pipefifo_fops;
@@ -39783,9 +42318,9 @@ diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
                free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
---- linux-3.0.4/fs/file.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/file.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/file.c linux-3.1.1/fs/file.c
+--- linux-3.1.1/fs/file.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/file.c      2011-11-16 18:40:29.000000000 -0500
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -39802,9 +42337,9 @@ diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
        if (nr >= rlimit(RLIMIT_NOFILE))
                return -EMFILE;
  
-diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
---- linux-3.0.4/fs/filesystems.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/filesystems.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/filesystems.c linux-3.1.1/fs/filesystems.c
+--- linux-3.1.1/fs/filesystems.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/filesystems.c       2011-11-16 18:40:29.000000000 -0500
 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
        int len = dot ? dot - name : strlen(name);
  
@@ -39818,9 +42353,9 @@ diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
                fs = __get_fs_type(name, len);
  
        if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
---- linux-3.0.4/fs/fscache/cookie.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/cookie.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/cookie.c linux-3.1.1/fs/fscache/cookie.c
+--- linux-3.1.1/fs/fscache/cookie.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/cookie.c    2011-11-16 18:39:08.000000000 -0500
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
               parent ? (char *) parent->def->name : "<no-parent>",
               def->name, netfs_data);
@@ -39939,9 +42474,9 @@ diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
                wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
                            fscache_wait_bit, TASK_UNINTERRUPTIBLE);
        }
-diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
---- linux-3.0.4/fs/fscache/internal.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/internal.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/internal.h linux-3.1.1/fs/fscache/internal.h
+--- linux-3.1.1/fs/fscache/internal.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/internal.h  2011-11-16 18:39:08.000000000 -0500
 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -40145,9 +42680,9 @@ diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
---- linux-3.0.4/fs/fscache/object.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/object.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/object.c linux-3.1.1/fs/fscache/object.c
+--- linux-3.1.1/fs/fscache/object.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/object.c    2011-11-16 18:39:08.000000000 -0500
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
                /* update the object metadata on disk */
        case FSCACHE_OBJECT_UPDATING:
@@ -40259,9 +42794,9 @@ diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
                break;
  
        default:
-diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
---- linux-3.0.4/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/operation.c linux-3.1.1/fs/fscache/operation.c
+--- linux-3.1.1/fs/fscache/operation.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/operation.c 2011-11-16 18:39:08.000000000 -0500
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -40377,9 +42912,9 @@ diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
  
                ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
---- linux-3.0.4/fs/fscache/page.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/page.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/page.c linux-3.1.1/fs/fscache/page.c
+--- linux-3.1.1/fs/fscache/page.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/page.c      2011-11-16 18:39:08.000000000 -0500
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
        val = radix_tree_lookup(&cookie->stores, page->index);
        if (!val) {
@@ -40763,9 +43298,9 @@ diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
  #endif
  
        for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
---- linux-3.0.4/fs/fscache/stats.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/stats.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fscache/stats.c linux-3.1.1/fs/fscache/stats.c
+--- linux-3.1.1/fs/fscache/stats.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fscache/stats.c     2011-11-16 18:39:08.000000000 -0500
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -41141,9 +43676,9 @@ diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
  
        seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
                   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-3.0.4/fs/fs_struct.c linux-3.0.4/fs/fs_struct.c
---- linux-3.0.4/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/fs_struct.c linux-3.1.1/fs/fs_struct.c
+--- linux-3.1.1/fs/fs_struct.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fs_struct.c 2011-11-16 18:40:29.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -41233,9 +43768,9 @@ diff -urNp linux-3.0.4/fs/fs_struct.c linux-3.0.4/fs/fs_struct.c
                spin_unlock(&fs->lock);
  
                task_unlock(current);
-diff -urNp linux-3.0.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
---- linux-3.0.4/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/fuse/cuse.c linux-3.1.1/fs/fuse/cuse.c
+--- linux-3.1.1/fs/fuse/cuse.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/cuse.c 2011-11-16 18:39:08.000000000 -0500
 @@ -586,10 +586,12 @@ static int __init cuse_init(void)
                INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -41253,10 +43788,10 @@ diff -urNp linux-3.0.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
  
        cuse_class = class_create(THIS_MODULE, "cuse");
        if (IS_ERR(cuse_class))
-diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
---- linux-3.0.4/fs/fuse/dev.c  2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/fs/fuse/dev.c  2011-08-29 23:26:27.000000000 -0400
-@@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
+diff -urNp linux-3.1.1/fs/fuse/dev.c linux-3.1.1/fs/fuse/dev.c
+--- linux-3.1.1/fs/fuse/dev.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/dev.c  2011-11-16 18:39:08.000000000 -0500
+@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru
        ret = 0;
        pipe_lock(pipe);
  
@@ -41265,10 +43800,10 @@ diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
                send_sig(SIGPIPE, current, 0);
                if (!ret)
                        ret = -EPIPE;
-diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
---- linux-3.0.4/fs/fuse/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fuse/dir.c  2011-08-23 21:47:56.000000000 -0400
-@@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
+diff -urNp linux-3.1.1/fs/fuse/dir.c linux-3.1.1/fs/fuse/dir.c
+--- linux-3.1.1/fs/fuse/dir.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/fuse/dir.c  2011-11-16 18:39:08.000000000 -0500
+@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *de
        return link;
  }
  
@@ -41277,10 +43812,10 @@ diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
  {
        if (!IS_ERR(link))
                free_page((unsigned long) link);
-diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
---- linux-3.0.4/fs/gfs2/inode.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/gfs2/inode.c        2011-08-23 21:47:56.000000000 -0400
-@@ -1525,7 +1525,7 @@ out:
+diff -urNp linux-3.1.1/fs/gfs2/inode.c linux-3.1.1/fs/gfs2/inode.c
+--- linux-3.1.1/fs/gfs2/inode.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/gfs2/inode.c        2011-11-16 18:39:08.000000000 -0500
+@@ -1517,7 +1517,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -41289,9 +43824,9 @@ diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
        if (!IS_ERR(s))
                kfree(s);
  }
-diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
---- linux-3.0.4/fs/hfsplus/catalog.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/catalog.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/hfsplus/catalog.c linux-3.1.1/fs/hfsplus/catalog.c
+--- linux-3.1.1/fs/hfsplus/catalog.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/catalog.c   2011-11-16 19:23:09.000000000 -0500
 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
        int err;
        u16 type;
@@ -41309,20 +43844,20 @@ diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
 +
        dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n",
                str->name, cnid, inode->i_nlink);
-       hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
-@@ -349,6 +353,8 @@ int hfsplus_rename_cat(u32 cnid,
+       err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
+@@ -353,6 +357,8 @@ int hfsplus_rename_cat(u32 cnid,
        int entry_size, type;
-       int err = 0;
+       int err;
  
 +      pax_track_stack();
 +
        dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
                cnid, src_dir->i_ino, src_name->name,
                dst_dir->i_ino, dst_name->name);
-diff -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
---- linux-3.0.4/fs/hfsplus/dir.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/dir.c       2011-08-23 21:48:14.000000000 -0400
-@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
+diff -urNp linux-3.1.1/fs/hfsplus/dir.c linux-3.1.1/fs/hfsplus/dir.c
+--- linux-3.1.1/fs/hfsplus/dir.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/dir.c       2011-11-16 18:40:29.000000000 -0500
+@@ -131,6 +131,8 @@ static int hfsplus_readdir(struct file *
        struct hfsplus_readdir_data *rd;
        u16 type;
  
@@ -41331,10 +43866,10 @@ diff -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
        if (filp->f_pos >= inode->i_size)
                return 0;
  
-diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
---- linux-3.0.4/fs/hfsplus/inode.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/inode.c     2011-08-23 21:48:14.000000000 -0400
-@@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
+diff -urNp linux-3.1.1/fs/hfsplus/inode.c linux-3.1.1/fs/hfsplus/inode.c
+--- linux-3.1.1/fs/hfsplus/inode.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/inode.c     2011-11-16 18:40:29.000000000 -0500
+@@ -501,6 +501,8 @@ int hfsplus_cat_read_inode(struct inode 
        int res = 0;
        u16 type;
  
@@ -41343,7 +43878,7 @@ diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
        type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
  
        HFSPLUS_I(inode)->linkid = 0;
-@@ -552,6 +554,8 @@ int hfsplus_cat_write_inode(struct inode
+@@ -564,6 +566,8 @@ int hfsplus_cat_write_inode(struct inode
        struct hfs_find_data fd;
        hfsplus_cat_entry entry;
  
@@ -41352,9 +43887,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
        if (HFSPLUS_IS_RSRC(inode))
                main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
---- linux-3.0.4/fs/hfsplus/ioctl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/ioctl.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/hfsplus/ioctl.c linux-3.1.1/fs/hfsplus/ioctl.c
+--- linux-3.1.1/fs/hfsplus/ioctl.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/ioctl.c     2011-11-16 18:40:29.000000000 -0500
 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
        struct hfsplus_cat_file *file;
        int res;
@@ -41373,11 +43908,11 @@ diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
        if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
                return -EOPNOTSUPP;
  
-diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
---- linux-3.0.4/fs/hfsplus/super.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/super.c     2011-08-23 21:48:14.000000000 -0400
-@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
-       struct nls_table *nls = NULL;
+diff -urNp linux-3.1.1/fs/hfsplus/super.c linux-3.1.1/fs/hfsplus/super.c
+--- linux-3.1.1/fs/hfsplus/super.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hfsplus/super.c     2011-11-16 19:23:30.000000000 -0500
+@@ -347,6 +347,8 @@ static int hfsplus_fill_super(struct sup
+       u64 last_fs_block, last_fs_page;
        int err;
  
 +      pax_track_stack();
@@ -41385,10 +43920,10 @@ diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
        err = -EINVAL;
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
-diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
---- linux-3.0.4/fs/hugetlbfs/inode.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hugetlbfs/inode.c   2011-08-23 21:48:14.000000000 -0400
-@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
+diff -urNp linux-3.1.1/fs/hugetlbfs/inode.c linux-3.1.1/fs/hugetlbfs/inode.c
+--- linux-3.1.1/fs/hugetlbfs/inode.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/hugetlbfs/inode.c   2011-11-16 18:40:29.000000000 -0500
+@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
        .kill_sb        = kill_litter_super,
  };
  
@@ -41397,10 +43932,10 @@ diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
---- linux-3.0.4/fs/inode.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/inode.c     2011-08-23 21:47:56.000000000 -0400
-@@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
+diff -urNp linux-3.1.1/fs/inode.c linux-3.1.1/fs/inode.c
+--- linux-3.1.1/fs/inode.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/inode.c     2011-11-16 18:39:08.000000000 -0500
+@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
        if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
@@ -41411,10 +43946,10 @@ diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
  
                res = next - LAST_INO_BATCH;
        }
-diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
---- linux-3.0.4/fs/jbd/checkpoint.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jbd/checkpoint.c    2011-08-23 21:48:14.000000000 -0400
-@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
+diff -urNp linux-3.1.1/fs/jbd/checkpoint.c linux-3.1.1/fs/jbd/checkpoint.c
+--- linux-3.1.1/fs/jbd/checkpoint.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jbd/checkpoint.c    2011-11-16 18:40:29.000000000 -0500
+@@ -358,6 +358,8 @@ int log_do_checkpoint(journal_t *journal
        tid_t this_tid;
        int result;
  
@@ -41423,9 +43958,9 @@ diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
        jbd_debug(1, "Start checkpoint\n");
  
        /*
-diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
---- linux-3.0.4/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/jffs2/compr_rtime.c linux-3.1.1/fs/jffs2/compr_rtime.c
+--- linux-3.1.1/fs/jffs2/compr_rtime.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/compr_rtime.c 2011-11-16 18:40:29.000000000 -0500
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
        int outpos = 0;
        int pos=0;
@@ -41444,9 +43979,9 @@ diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
        memset(positions,0,sizeof(positions));
  
        while (outpos<destlen) {
-diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
---- linux-3.0.4/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/jffs2/compr_rubin.c linux-3.1.1/fs/jffs2/compr_rubin.c
+--- linux-3.1.1/fs/jffs2/compr_rubin.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/compr_rubin.c 2011-11-16 18:40:29.000000000 -0500
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
        int ret;
        uint32_t mysrclen, mydstlen;
@@ -41456,9 +43991,9 @@ diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
        mysrclen = *sourcelen;
        mydstlen = *dstlen - 8;
  
-diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
---- linux-3.0.4/fs/jffs2/erase.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/erase.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/jffs2/erase.c linux-3.1.1/fs/jffs2/erase.c
+--- linux-3.1.1/fs/jffs2/erase.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/erase.c       2011-11-16 18:39:08.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),
@@ -41469,9 +44004,9 @@ diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
                };
  
                jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
---- linux-3.0.4/fs/jffs2/wbuf.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/wbuf.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/jffs2/wbuf.c linux-3.1.1/fs/jffs2/wbuf.c
+--- linux-3.1.1/fs/jffs2/wbuf.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/wbuf.c        2011-11-16 18:39:08.000000000 -0500
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
        .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -41482,9 +44017,9 @@ diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
---- linux-3.0.4/fs/jffs2/xattr.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/xattr.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/jffs2/xattr.c linux-3.1.1/fs/jffs2/xattr.c
+--- linux-3.1.1/fs/jffs2/xattr.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jffs2/xattr.c       2011-11-16 18:40:29.000000000 -0500
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
        BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -41494,9 +44029,9 @@ diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
        /* Phase.1 : Merge same xref */
        for (i=0; i < XREF_TMPHASH_SIZE; i++)
                xref_tmphash[i] = NULL;
-diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
---- linux-3.0.4/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/jfs/super.c linux-3.1.1/fs/jfs/super.c
+--- linux-3.1.1/fs/jfs/super.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/jfs/super.c 2011-11-16 18:39:08.000000000 -0500
 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
  
        jfs_inode_cachep =
@@ -41506,9 +44041,9 @@ diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
                            init_once);
        if (jfs_inode_cachep == NULL)
                return -ENOMEM;
-diff -urNp linux-3.0.4/fs/Kconfig.binfmt linux-3.0.4/fs/Kconfig.binfmt
---- linux-3.0.4/fs/Kconfig.binfmt      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/Kconfig.binfmt      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/Kconfig.binfmt linux-3.1.1/fs/Kconfig.binfmt
+--- linux-3.1.1/fs/Kconfig.binfmt      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/Kconfig.binfmt      2011-11-16 18:39:08.000000000 -0500
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -41518,10 +44053,10 @@ diff -urNp linux-3.0.4/fs/Kconfig.binfmt linux-3.0.4/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-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
---- linux-3.0.4/fs/libfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/libfs.c     2011-08-23 21:47:56.000000000 -0400
-@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
+diff -urNp linux-3.1.1/fs/libfs.c linux-3.1.1/fs/libfs.c
+--- linux-3.1.1/fs/libfs.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/libfs.c     2011-11-16 18:39:08.000000000 -0500
+@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, v
  
                        for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
                                struct dentry *next;
@@ -41531,7 +44066,7 @@ diff -urNp linux-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
                                next = list_entry(p, struct dentry, d_u.d_child);
                                spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
                                if (!simple_positive(next)) {
-@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v
+@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, v
  
                                spin_unlock(&next->d_lock);
                                spin_unlock(&dentry->d_lock);
@@ -41545,9 +44080,9 @@ diff -urNp linux-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
                                            next->d_name.len, filp->f_pos, 
                                            next->d_inode->i_ino, 
                                            dt_type(next->d_inode)) < 0)
-diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
---- linux-3.0.4/fs/lockd/clntproc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/lockd/clntproc.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/lockd/clntproc.c linux-3.1.1/fs/lockd/clntproc.c
+--- linux-3.1.1/fs/lockd/clntproc.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/lockd/clntproc.c    2011-11-16 18:40:29.000000000 -0500
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -41562,7 +44097,7 @@ diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
  
        memcpy(c->data, &cookie, 4);
        c->len=4;
-@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
+@@ -621,6 +621,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
        struct nlm_rqst reqst, *req;
        int             status;
  
@@ -41571,10 +44106,10 @@ diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
        req = &reqst;
        memset(req, 0, sizeof(*req));
        locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
---- linux-3.0.4/fs/locks.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/locks.c     2011-08-23 21:47:56.000000000 -0400
-@@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
+diff -urNp linux-3.1.1/fs/locks.c linux-3.1.1/fs/locks.c
+--- linux-3.1.1/fs/locks.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/locks.c     2011-11-16 18:39:08.000000000 -0500
+@@ -2022,16 +2022,16 @@ void locks_remove_flock(struct file *fil
                return;
  
        if (filp->f_op && filp->f_op->flock) {
@@ -41595,9 +44130,9 @@ diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
        }
  
        lock_flocks();
-diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
---- linux-3.0.4/fs/logfs/super.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/logfs/super.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/logfs/super.c linux-3.1.1/fs/logfs/super.c
+--- linux-3.1.1/fs/logfs/super.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/logfs/super.c       2011-11-16 18:40:29.000000000 -0500
 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
        struct logfs_disk_super _ds1, *ds1 = &_ds1;
        int err, valid0, valid1;
@@ -41607,80 +44142,50 @@ diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
        /* read first superblock */
        err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
        if (err)
-diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
---- linux-3.0.4/fs/namei.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/namei.c     2011-08-23 21:48:14.000000000 -0400
-@@ -237,21 +237,31 @@ int generic_permission(struct inode *ino
-               return ret;
+diff -urNp linux-3.1.1/fs/namei.c linux-3.1.1/fs/namei.c
+--- linux-3.1.1/fs/namei.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/namei.c     2011-11-17 00:36:54.000000000 -0500
+@@ -283,14 +283,22 @@ int generic_permission(struct inode *ino
  
+       if (S_ISDIR(inode->i_mode)) {
+               /* DACs are overridable for directories */
+-              if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
+-                      return 0;
+               if (!(mask & MAY_WRITE))
+                       if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
+                               return 0;
++              if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
++                      return 0;
+               return -EACCES;
+       }
        /*
--       * Read/write DACs are always overridable.
--       * Executable DACs are overridable for all directories and
--       * for non-directories that have least one exec bit set.
 +       * Searching includes executable on directories, else just read.
-        */
--      if (!(mask & MAY_EXEC) || execute_ok(inode))
--              if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
++       */
 +      mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
-+      if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE))) {
-+#ifdef CONFIG_GRKERNSEC
-+              if (flags & IPERM_FLAG_RCU)
-+                      return -ECHILD;
-+#endif
++      if (mask == MAY_READ)
 +              if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
++                      return 0;
++
++      /*
+        * Read/write DACs are always overridable.
+        * Executable DACs are overridable when there is
+        * at least one exec bit set.
+@@ -299,14 +307,6 @@ int generic_permission(struct inode *ino
+               if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
                        return 0;
-+      }
  
-       /*
+-      /*
 -       * Searching includes executable on directories, else just read.
-+       * Read/write DACs are always overridable.
-+       * Executable DACs are overridable for all directories and
-+       * for non-directories that have least one exec bit set.
-        */
+-       */
 -      mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
--      if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
+-      if (mask == MAY_READ)
 -              if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
-+      if (!(mask & MAY_EXEC) || execute_ok(inode)) {
-+#ifdef CONFIG_GRKERNSEC
-+              if (flags & IPERM_FLAG_RCU)
-+                      return -ECHILD;
-+#endif
-+              if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
-                       return 0;
-+      }
- 
+-                      return 0;
+-
        return -EACCES;
  }
-@@ -547,6 +557,9 @@ static int complete_walk(struct nameidat
-               br_read_unlock(vfsmount_lock);
-       }
- 
-+      if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
-+              return -ENOENT;
-+
-       if (likely(!(nd->flags & LOOKUP_JUMPED)))
-               return 0;
- 
-@@ -593,9 +606,16 @@ static inline int exec_permission(struct
-       if (ret == -ECHILD)
-               return ret;
- 
--      if (ns_capable(ns, CAP_DAC_OVERRIDE) ||
--                      ns_capable(ns, CAP_DAC_READ_SEARCH))
-+      if (ns_capable_nolog(ns, CAP_DAC_OVERRIDE))
-               goto ok;
-+      else {
-+#ifdef CONFIG_GRKERNSEC
-+              if (flags & IPERM_FLAG_RCU)
-+                      return -ECHILD;
-+#endif
-+              if (ns_capable(ns, CAP_DAC_READ_SEARCH) || ns_capable(ns, CAP_DAC_OVERRIDE))
-+                      goto ok;
-+      }
  
-       return ret;
- ok:
-@@ -703,11 +723,19 @@ follow_link(struct path *link, struct na
+@@ -653,11 +653,19 @@ follow_link(struct path *link, struct na
                return error;
        }
  
@@ -41701,7 +44206,20 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                error = 0;
                if (s)
                        error = __vfs_follow_link(nd, s);
-@@ -1625,6 +1653,9 @@ static int do_path_lookup(int dfd, const
+@@ -1622,6 +1630,12 @@ static int path_lookupat(int dfd, const 
+       if (!err)
+               err = complete_walk(nd);
+ 
++      if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++              if (!err)
++                      path_put(&nd->path);
++              err = -ENOENT;
++      }
++
+       if (!err && nd->flags & LOOKUP_DIRECTORY) {
+               if (!nd->inode->i_op->lookup) {
+                       path_put(&nd->path);
+@@ -1649,6 +1663,9 @@ static int do_path_lookup(int dfd, const
                retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
  
        if (likely(!retval)) {
@@ -41711,38 +44229,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                if (unlikely(!audit_dummy_context())) {
                        if (nd->path.dentry && nd->inode)
                                audit_inode(name, nd->path.dentry);
-@@ -1935,6 +1966,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;
-+}
-+
- static int may_open(struct path *path, int acc_mode, int flag)
- {
-       struct dentry *dentry = path->dentry;
-@@ -1987,7 +2042,27 @@ static int may_open(struct path *path, i
+@@ -2049,7 +2066,27 @@ static int may_open(struct path *path, i
        /*
         * Ensure there are no outstanding leases on the file.
         */
@@ -41762,7 +44249,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
 +              goto exit;
 +      }
 +
-+      if (!gr_acl_handle_open(dentry, path->mnt, open_to_namei_flags(flag))) {
++      if (!gr_acl_handle_open(dentry, path->mnt, acc_mode)) {
 +              error = -EACCES;
 +              goto exit;
 +      }
@@ -41771,51 +44258,46 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  }
  
  static int handle_truncate(struct file *filp)
-@@ -2013,30 +2088,6 @@ static int handle_truncate(struct file *
- }
+@@ -2110,6 +2147,10 @@ static struct file *do_last(struct namei
+               error = complete_walk(nd);
+               if (error)
+                       return ERR_PTR(error);
++              if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++                      error = -ENOENT;
++                      goto exit;
++              }
+               audit_inode(pathname, nd->path.dentry);
+               if (open_flag & O_CREAT) {
+                       error = -EISDIR;
+@@ -2120,6 +2161,10 @@ static struct file *do_last(struct namei
+               error = complete_walk(nd);
+               if (error)
+                       return ERR_PTR(error);
++              if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
++                      error = -ENOENT;
++                      goto exit;
++              }
+               audit_inode(pathname, dir);
+               goto ok;
+       }
+@@ -2142,6 +2187,11 @@ static struct file *do_last(struct namei
+               if (error)
+                       return ERR_PTR(-ECHILD);
  
- /*
-- * 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;
--}
--
--/*
-  * Handle the last step of open()
-  */
- static struct file *do_last(struct nameidata *nd, struct path *path,
-@@ -2045,6 +2096,7 @@ static struct file *do_last(struct namei
-       struct dentry *dir = nd->path.dentry;
-       struct dentry *dentry;
-       int open_flag = op->open_flag;
-+      int flag = open_to_namei_flags(open_flag);
-       int will_truncate = open_flag & O_TRUNC;
-       int want_write = 0;
-       int acc_mode = op->acc_mode;
-@@ -2132,6 +2184,12 @@ static struct file *do_last(struct namei
++              if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++                      error = -ENOENT;
++                      goto exit;
++              }
++
+               error = -ENOTDIR;
+               if (nd->flags & LOOKUP_DIRECTORY) {
+                       if (!nd->inode->i_op->lookup)
+@@ -2181,6 +2231,12 @@ static struct file *do_last(struct namei
        /* Negative dentry, just create the file */
        if (!dentry->d_inode) {
                int mode = op->mode;
 +
-+              if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, flag, mode)) {
++              if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
 +                      error = -EACCES;
 +                      goto exit_mutex_unlock;
 +              }
@@ -41823,7 +44305,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                if (!IS_POSIXACL(dir->d_inode))
                        mode &= ~current_umask();
                /*
-@@ -2155,6 +2213,8 @@ static struct file *do_last(struct namei
+@@ -2204,6 +2260,8 @@ static struct file *do_last(struct namei
                error = vfs_create(dir->d_inode, dentry, mode, nd);
                if (error)
                        goto exit_mutex_unlock;
@@ -41832,14 +44314,19 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                mutex_unlock(&dir->d_inode->i_mutex);
                dput(nd->path.dentry);
                nd->path.dentry = dentry;
-@@ -2164,6 +2224,14 @@ static struct file *do_last(struct namei
+@@ -2213,6 +2271,19 @@ static struct file *do_last(struct namei
        /*
         * It already exists.
         */
 +
++      if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
++              error = -ENOENT;
++              goto exit_mutex_unlock;
++      }
++
 +      /* 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)) {
++      if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
 +              error = -EACCES;
 +              goto exit_mutex_unlock;
 +      }
@@ -41847,58 +44334,90 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
        mutex_unlock(&dir->d_inode->i_mutex);
        audit_inode(pathname, path->dentry);
  
-@@ -2450,6 +2518,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
-       error = may_mknod(mode);
+@@ -2425,6 +2496,11 @@ struct dentry *kern_path_create(int dfd,
+       *path = nd.path;
+       return dentry;
+ eexist:
++      if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
++              dput(dentry);
++              dentry = ERR_PTR(-ENOENT);
++              goto fail;
++      }
+       dput(dentry);
+       dentry = ERR_PTR(-EEXIST);
+ fail:
+@@ -2447,6 +2523,20 @@ struct dentry *user_path_create(int dfd,
+ }
+ EXPORT_SYMBOL(user_path_create);
+ 
++static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
++{
++      char *tmp = getname(pathname);
++      struct dentry *res;
++      if (IS_ERR(tmp))
++              return ERR_CAST(tmp);
++      res = kern_path_create(dfd, tmp, path, is_dir);
++      if (IS_ERR(res))
++              putname(tmp);
++      else
++              *to = tmp;
++      return res;
++}
++
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
+ {
+       int error = may_create(dir, dentry);
+@@ -2514,6 +2604,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+       error = mnt_want_write(path.mnt);
        if (error)
                goto out_dput;
 +
-+      if (gr_handle_chroot_mknod(dentry, nd.path.mnt, mode)) {
++      if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
 +              error = -EPERM;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-+      if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
++      if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
 +              error = -EACCES;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-       error = mnt_want_write(nd.path.mnt);
+       error = security_path_mknod(&path, dentry, mode, dev);
        if (error)
-               goto out_dput;
-@@ -2470,6 +2549,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+               goto out_drop_write;
+@@ -2531,6 +2632,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        }
  out_drop_write:
-       mnt_drop_write(nd.path.mnt);
+       mnt_drop_write(path.mnt);
 +
 +      if (!error)
-+              gr_handle_create(dentry, nd.path.mnt);
++              gr_handle_create(dentry, path.mnt);
  out_dput:
        dput(dentry);
- out_unlock:
-@@ -2522,6 +2604,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
-       if (IS_ERR(dentry))
-               goto out_unlock;
- 
-+      if (!gr_acl_handle_mkdir(dentry, nd.path.dentry, nd.path.mnt)) {
+       mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2580,12 +2684,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+       error = mnt_want_write(path.mnt);
+       if (error)
+               goto out_dput;
++
++      if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
 +              error = -EACCES;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-       if (!IS_POSIXACL(nd.path.dentry->d_inode))
-               mode &= ~current_umask();
-       error = mnt_want_write(nd.path.mnt);
-@@ -2533,6 +2620,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
-       error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
+       error = security_path_mkdir(&path, dentry, mode);
+       if (error)
+               goto out_drop_write;
+       error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
  out_drop_write:
-       mnt_drop_write(nd.path.mnt);
+       mnt_drop_write(path.mnt);
 +
 +      if (!error)
-+              gr_handle_create(dentry, nd.path.mnt);
-+
++              gr_handle_create(dentry, path.mnt);
  out_dput:
        dput(dentry);
- out_unlock:
-@@ -2613,6 +2704,8 @@ static long do_rmdir(int dfd, const char
+       mutex_unlock(&path.dentry->d_inode->i_mutex);
+@@ -2665,6 +2778,8 @@ static long do_rmdir(int dfd, const char
        char * name;
        struct dentry *dentry;
        struct nameidata nd;
@@ -41907,15 +44426,13 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2641,6 +2734,17 @@ static long do_rmdir(int dfd, const char
+@@ -2693,6 +2808,15 @@ static long do_rmdir(int dfd, const char
                error = -ENOENT;
                goto exit3;
        }
 +
-+      if (dentry->d_inode->i_nlink <= 1) {
-+              saved_ino = dentry->d_inode->i_ino;
-+              saved_dev = gr_get_dev_from_dentry(dentry);
-+      }
++      saved_ino = dentry->d_inode->i_ino;
++      saved_dev = gr_get_dev_from_dentry(dentry);
 +
 +      if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
 +              error = -EACCES;
@@ -41925,7 +44442,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto exit3;
-@@ -2648,6 +2752,8 @@ static long do_rmdir(int dfd, const char
+@@ -2700,6 +2824,8 @@ static long do_rmdir(int dfd, const char
        if (error)
                goto exit4;
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -41934,7 +44451,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit4:
        mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2710,6 +2816,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2762,6 +2888,8 @@ static long do_unlinkat(int dfd, const c
        struct dentry *dentry;
        struct nameidata nd;
        struct inode *inode = NULL;
@@ -41943,7 +44460,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2732,6 +2840,16 @@ static long do_unlinkat(int dfd, const c
+@@ -2784,6 +2912,16 @@ static long do_unlinkat(int dfd, const c
                if (!inode)
                        goto slashes;
                ihold(inode);
@@ -41960,7 +44477,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit2;
-@@ -2739,6 +2857,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2791,6 +2929,8 @@ static long do_unlinkat(int dfd, const c
                if (error)
                        goto exit3;
                error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -41969,58 +44486,74 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit3:
                mnt_drop_write(nd.path.mnt);
        exit2:
-@@ -2816,6 +2936,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
-       if (IS_ERR(dentry))
-               goto out_unlock;
- 
-+      if (!gr_acl_handle_symlink(dentry, nd.path.dentry, nd.path.mnt, from)) {
+@@ -2866,10 +3006,18 @@ SYSCALL_DEFINE3(symlinkat, const char __
+       error = mnt_want_write(path.mnt);
+       if (error)
+               goto out_dput;
++
++      if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
 +              error = -EACCES;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-       error = mnt_want_write(nd.path.mnt);
-       if (error)
-               goto out_dput;
-@@ -2823,6 +2948,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+       error = security_path_symlink(&path, dentry, from);
        if (error)
                goto out_drop_write;
-       error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
+       error = vfs_symlink(path.dentry->d_inode, dentry, from);
 +      if (!error)
-+              gr_handle_create(dentry, nd.path.mnt);
++              gr_handle_create(dentry, path.mnt);
  out_drop_write:
-       mnt_drop_write(nd.path.mnt);
+       mnt_drop_write(path.mnt);
  out_dput:
-@@ -2931,6 +3058,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2941,6 +3089,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+ {
+       struct dentry *new_dentry;
+       struct path old_path, new_path;
++      char *to;
+       int how = 0;
+       int error;
+ 
+@@ -2964,7 +3113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+       if (error)
+               return error;
+ 
+-      new_dentry = user_path_create(newdfd, newname, &new_path, 0);
++      new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
        error = PTR_ERR(new_dentry);
        if (IS_ERR(new_dentry))
-               goto out_unlock;
+               goto out;
+@@ -2975,13 +3124,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+       error = mnt_want_write(new_path.mnt);
+       if (error)
+               goto out_dput;
 +
 +      if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
 +                             old_path.dentry->d_inode,
 +                             old_path.dentry->d_inode->i_mode, to)) {
 +              error = -EACCES;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-+      if (!gr_acl_handle_link(new_dentry, nd.path.dentry, nd.path.mnt,
++      if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
 +                              old_path.dentry, old_path.mnt, to)) {
 +              error = -EACCES;
-+              goto out_dput;
++              goto out_drop_write;
 +      }
 +
-       error = mnt_want_write(nd.path.mnt);
-       if (error)
-               goto out_dput;
-@@ -2938,6 +3079,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+       error = security_path_link(old_path.dentry, &new_path, new_dentry);
        if (error)
                goto out_drop_write;
-       error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
+       error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
 +      if (!error)
-+              gr_handle_create(new_dentry, nd.path.mnt);
++              gr_handle_create(new_dentry, new_path.mnt);
  out_drop_write:
-       mnt_drop_write(nd.path.mnt);
+       mnt_drop_write(new_path.mnt);
  out_dput:
-@@ -3113,6 +3256,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
++      putname(to);
+       dput(new_dentry);
+       mutex_unlock(&new_path.dentry->d_inode->i_mutex);
+       path_put(&new_path);
+@@ -3153,6 +3319,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        char *to;
        int error;
  
@@ -42029,7 +44562,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
        error = user_path_parent(olddfd, oldname, &oldnd, &from);
        if (error)
                goto exit;
-@@ -3169,6 +3314,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3209,6 +3377,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        if (new_dentry == trap)
                goto exit5;
  
@@ -42042,7 +44575,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
        error = mnt_want_write(oldnd.path.mnt);
        if (error)
                goto exit5;
-@@ -3178,6 +3329,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3218,6 +3392,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
                goto exit6;
        error = vfs_rename(old_dir->d_inode, old_dentry,
                                   new_dir->d_inode, new_dentry);
@@ -42052,7 +44585,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit6:
        mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -3203,6 +3357,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -3243,6 +3420,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -42061,7 +44594,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
        int len;
  
        len = PTR_ERR(link);
-@@ -3212,7 +3368,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -3252,7 +3431,14 @@ int vfs_readlink(struct dentry *dentry, 
        len = strlen(link);
        if (len > (unsigned) buflen)
                len = buflen;
@@ -42077,10 +44610,10 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
                len = -EFAULT;
  out:
        return len;
-diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
---- linux-3.0.4/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400
-@@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn
+diff -urNp linux-3.1.1/fs/namespace.c linux-3.1.1/fs/namespace.c
+--- linux-3.1.1/fs/namespace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/namespace.c 2011-11-16 18:40:29.000000000 -0500
+@@ -1329,6 +1329,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);
@@ -42090,7 +44623,7 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
                return retval;
        }
  
-@@ -1347,6 +1350,9 @@ static int do_umount(struct vfsmount *mn
+@@ -1348,6 +1351,9 @@ static int do_umount(struct vfsmount *mn
        br_write_unlock(vfsmount_lock);
        up_write(&namespace_sem);
        release_mounts(&umount_list);
@@ -42100,7 +44633,7 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
        return retval;
  }
  
-@@ -2338,6 +2344,16 @@ long do_mount(char *dev_name, char *dir_
+@@ -2339,6 +2345,16 @@ long do_mount(char *dev_name, char *dir_
                   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
                   MS_STRICTATIME);
  
@@ -42117,7 +44650,7 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
        if (flags & MS_REMOUNT)
                retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
                                    data_page);
-@@ -2352,6 +2368,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2353,6 +2369,9 @@ long do_mount(char *dev_name, char *dir_
                                      dev_name, data_page);
  dput_out:
        path_put(&path);
@@ -42127,7 +44660,7 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
        return retval;
  }
  
-@@ -2575,6 +2594,11 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2576,6 +2595,11 @@ SYSCALL_DEFINE2(pivot_root, const char _
        if (error)
                goto out2;
  
@@ -42139,9 +44672,9 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
        get_fs_root(current->fs, &root);
        error = lock_mount(&old);
        if (error)
-diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
---- linux-3.0.4/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/ncpfs/dir.c linux-3.1.1/fs/ncpfs/dir.c
+--- linux-3.1.1/fs/ncpfs/dir.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ncpfs/dir.c 2011-11-16 18:40:29.000000000 -0500
 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
        int res, val = 0, len;
        __u8 __name[NCP_MAXPATHLEN + 1];
@@ -42187,9 +44720,9 @@ diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
        DPRINTK("ncp_rename: %s/%s to %s/%s\n",
                old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
                new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
-diff -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
---- linux-3.0.4/fs/ncpfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ncpfs/inode.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/ncpfs/inode.c linux-3.1.1/fs/ncpfs/inode.c
+--- linux-3.1.1/fs/ncpfs/inode.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ncpfs/inode.c       2011-11-16 18:40:29.000000000 -0500
 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
        struct ncp_entry_info finfo;
@@ -42199,9 +44732,21 @@ diff -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
        memset(&data, 0, sizeof(data));
        server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
        if (!server)
-diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
---- linux-3.0.4/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/nfs/blocklayout/blocklayout.c linux-3.1.1/fs/nfs/blocklayout/blocklayout.c
+--- linux-3.1.1/fs/nfs/blocklayout/blocklayout.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfs/blocklayout/blocklayout.c       2011-11-16 18:39:08.000000000 -0500
+@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block
+  */
+ struct parallel_io {
+       struct kref refcnt;
+-      struct rpc_call_ops call_ops;
++      rpc_call_ops_no_const call_ops;
+       void (*pnfs_callback) (void *data);
+       void *data;
+ };
+diff -urNp linux-3.1.1/fs/nfs/inode.c linux-3.1.1/fs/nfs/inode.c
+--- linux-3.1.1/fs/nfs/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfs/inode.c 2011-11-16 18:39:08.000000000 -0500
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
        nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
        nfsi->attrtimeo_timestamp = jiffies;
@@ -42211,7 +44756,7 @@ diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
        if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
                nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
        else
-@@ -1000,16 +1000,16 @@ static int nfs_size_need_update(const st
+@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const st
        return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -42231,10 +44776,10 @@ diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
---- linux-3.0.4/fs/nfsd/nfs4state.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/nfs4state.c    2011-08-23 21:48:14.000000000 -0400
-@@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+diff -urNp linux-3.1.1/fs/nfsd/nfs4state.c linux-3.1.1/fs/nfsd/nfs4state.c
+--- linux-3.1.1/fs/nfsd/nfs4state.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/nfs4state.c    2011-11-16 18:40:29.000000000 -0500
+@@ -3999,6 +3999,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
        unsigned int strhashval;
        int err;
  
@@ -42243,10 +44788,10 @@ diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
        dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
                (long long) lock->lk_offset,
                (long long) lock->lk_length);
-diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
---- linux-3.0.4/fs/nfsd/nfs4xdr.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/nfs4xdr.c      2011-08-23 21:48:14.000000000 -0400
-@@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+diff -urNp linux-3.1.1/fs/nfsd/nfs4xdr.c linux-3.1.1/fs/nfsd/nfs4xdr.c
+--- linux-3.1.1/fs/nfsd/nfs4xdr.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/nfs4xdr.c      2011-11-16 18:40:29.000000000 -0500
+@@ -1875,6 +1875,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
                .dentry = dentry,
        };
  
@@ -42255,15 +44800,15 @@ diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
        BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
        BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
        BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
---- linux-3.0.4/fs/nfsd/vfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/vfs.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/nfsd/vfs.c linux-3.1.1/fs/nfsd/vfs.c
+--- linux-3.1.1/fs/nfsd/vfs.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/nfsd/vfs.c  2011-11-16 18:39:08.000000000 -0500
 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
        } else {
                oldfs = get_fs();
                set_fs(KERNEL_DS);
 -              host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
-+              host_err = vfs_readv(file, (__force struct iovec __user *)vec, vlen, &offset);
++              host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
                set_fs(oldfs);
        }
  
@@ -42272,7 +44817,7 @@ diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
        /* Write the data. */
        oldfs = get_fs(); set_fs(KERNEL_DS);
 -      host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
-+      host_err = vfs_writev(file, (__force struct iovec __user *)vec, vlen, &offset);
++      host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
        set_fs(oldfs);
        if (host_err < 0)
                goto out_nfserr;
@@ -42281,13 +44826,13 @@ diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
  
        oldfs = get_fs(); set_fs(KERNEL_DS);
 -      host_err = inode->i_op->readlink(dentry, buf, *lenp);
-+      host_err = inode->i_op->readlink(dentry, (__force char __user *)buf, *lenp);
++      host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
        set_fs(oldfs);
  
        if (host_err < 0)
-diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/fanotify/fanotify_user.c
---- linux-3.0.4/fs/notify/fanotify/fanotify_user.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/notify/fanotify/fanotify_user.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/notify/fanotify/fanotify_user.c linux-3.1.1/fs/notify/fanotify/fanotify_user.c
+--- linux-3.1.1/fs/notify/fanotify/fanotify_user.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/notify/fanotify/fanotify_user.c     2011-11-16 18:39:08.000000000 -0500
 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
                goto out_close_fd;
  
@@ -42298,9 +44843,9 @@ diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/
                         fanotify_event_metadata.event_len))
                goto out_kill_access_response;
  
-diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notification.c
---- linux-3.0.4/fs/notify/notification.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/notify/notification.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/notify/notification.c linux-3.1.1/fs/notify/notification.c
+--- linux-3.1.1/fs/notify/notification.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/notify/notification.c       2011-11-16 18:39:08.000000000 -0500
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -42319,9 +44864,9 @@ diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notificati
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/fs/ntfs/dir.c
---- linux-3.0.4/fs/ntfs/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ntfs/dir.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ntfs/dir.c linux-3.1.1/fs/ntfs/dir.c
+--- linux-3.1.1/fs/ntfs/dir.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ntfs/dir.c  2011-11-16 18:39:08.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)));
@@ -42331,10 +44876,10 @@ diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/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-3.0.4/fs/ntfs/file.c linux-3.0.4/fs/ntfs/file.c
---- linux-3.0.4/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400
-@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
+diff -urNp linux-3.1.1/fs/ntfs/file.c linux-3.1.1/fs/ntfs/file.c
+--- linux-3.1.1/fs/ntfs/file.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ntfs/file.c 2011-11-16 18:39:08.000000000 -0500
+@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
  
@@ -42343,9 +44888,9 @@ diff -urNp linux-3.0.4/fs/ntfs/file.c linux-3.0.4/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-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
---- linux-3.0.4/fs/ocfs2/localalloc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/localalloc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/localalloc.c linux-3.1.1/fs/ocfs2/localalloc.c
+--- linux-3.1.1/fs/ocfs2/localalloc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/localalloc.c  2011-11-16 18:39:08.000000000 -0500
 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
                goto bail;
        }
@@ -42355,9 +44900,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
  
  bail:
        if (handle)
-diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
---- linux-3.0.4/fs/ocfs2/namei.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/namei.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/namei.c linux-3.1.1/fs/ocfs2/namei.c
+--- linux-3.1.1/fs/ocfs2/namei.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/namei.c       2011-11-16 18:40:29.000000000 -0500
 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
        struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
        struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -42367,9 +44912,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
        /* At some point it might be nice to break this function up a
         * bit. */
  
-diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
---- linux-3.0.4/fs/ocfs2/ocfs2.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/ocfs2.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/ocfs2.h linux-3.1.1/fs/ocfs2/ocfs2.h
+--- linux-3.1.1/fs/ocfs2/ocfs2.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/ocfs2.h       2011-11-16 18:39:08.000000000 -0500
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -42387,9 +44932,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
---- linux-3.0.4/fs/ocfs2/suballoc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/suballoc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/suballoc.c linux-3.1.1/fs/ocfs2/suballoc.c
+--- linux-3.1.1/fs/ocfs2/suballoc.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/suballoc.c    2011-11-16 18:39:08.000000000 -0500
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
                                mlog_errno(status);
                        goto bail;
@@ -42444,9 +44989,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
                        *num_clusters = res.sr_bits;
                }
        }
-diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
---- linux-3.0.4/fs/ocfs2/super.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/super.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/super.c linux-3.1.1/fs/ocfs2/super.c
+--- linux-3.1.1/fs/ocfs2/super.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/super.c       2011-11-16 18:39:08.000000000 -0500
 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
                        "%10s => GlobalAllocs: %d  LocalAllocs: %d  "
                        "SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -42481,9 +45026,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
  
        /* Copy the blockcheck stats from the superblock probe */
        osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
---- linux-3.0.4/fs/ocfs2/symlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/symlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/ocfs2/symlink.c linux-3.1.1/fs/ocfs2/symlink.c
+--- linux-3.1.1/fs/ocfs2/symlink.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/ocfs2/symlink.c     2011-11-16 18:39:08.000000000 -0500
 @@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -42493,9 +45038,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
        if (!IS_ERR(link))
                kfree(link);
  }
-diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
---- linux-3.0.4/fs/open.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/open.c      2011-09-14 09:16:46.000000000 -0400
+diff -urNp linux-3.1.1/fs/open.c linux-3.1.1/fs/open.c
+--- linux-3.1.1/fs/open.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/open.c      2011-11-17 19:07:55.000000000 -0500
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
        error = locks_verify_truncate(inode, NULL, length);
        if (!error)
@@ -42554,59 +45099,24 @@ diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
        error = 0;
  dput_and_out:
        path_put(&path);
-@@ -466,12 +488,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
-       err = mnt_want_write_file(file);
-       if (err)
-               goto out_putf;
-+
-       mutex_lock(&inode->i_mutex);
-+
-+      if (!gr_acl_handle_fchmod(dentry, file->f_vfsmnt, mode)) {
-+              err = -EACCES;
-+              goto out_unlock;
-+      }
-+
-       err = security_path_chmod(dentry, file->f_vfsmnt, mode);
-       if (err)
-               goto out_unlock;
-       if (mode == (mode_t) -1)
-               mode = inode->i_mode;
-+
-+      if (gr_handle_chroot_chmod(dentry, file->f_vfsmnt, mode)) {
-+              err = -EACCES;
-+              goto out_unlock;
-+      }
-+
-       newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
-       newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
-       err = notify_change(dentry, &newattrs);
-@@ -499,12 +534,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
-       error = mnt_want_write(path.mnt);
+@@ -456,6 +478,16 @@ static int chmod_common(struct path *pat
        if (error)
-               goto dput_and_out;
-+
+               return error;
        mutex_lock(&inode->i_mutex);
 +
-+      if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
++      if (!gr_acl_handle_fchmod(path->dentry, path->mnt, mode)) {
 +              error = -EACCES;
 +              goto out_unlock;
 +      }
-+
-       error = security_path_chmod(path.dentry, path.mnt, mode);
-       if (error)
-               goto out_unlock;
-       if (mode == (mode_t) -1)
-               mode = inode->i_mode;
-+
-+      if (gr_handle_chroot_chmod(path.dentry, path.mnt, mode)) {
++      if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
 +              error = -EACCES;
 +              goto out_unlock;
 +      }
 +
-       newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
-       newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
-       error = notify_change(path.dentry, &newattrs);
-@@ -528,6 +576,9 @@ static int chown_common(struct path *pat
+       error = security_path_chmod(path->dentry, path->mnt, mode);
+       if (error)
+               goto out_unlock;
+@@ -506,6 +538,9 @@ static int chown_common(struct path *pat
        int error;
        struct iattr newattrs;
  
@@ -42616,30 +45126,10 @@ diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
        newattrs.ia_valid =  ATTR_CTIME;
        if (user != (uid_t) -1) {
                newattrs.ia_valid |= ATTR_UID;
-@@ -998,7 +1049,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, &op, lookup);
-+                      struct file *f;
-+                      /* don't allow to be set by userland */
-+                      flags &= ~FMODE_GREXEC;
-+                      f = do_filp_open(dfd, tmp, &op, lookup);
-                       if (IS_ERR(f)) {
-                               put_unused_fd(fd);
-                               fd = PTR_ERR(f);
-diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
---- linux-3.0.4/fs/partitions/ldm.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/partitions/ldm.c    2011-08-23 21:48:14.000000000 -0400
-@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
-               ldm_error ("A VBLK claims to have %d parts.", num);
-               return false;
-       }
-+
-       if (rec >= num) {
-               ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
-               return false;
-@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
+diff -urNp linux-3.1.1/fs/partitions/ldm.c linux-3.1.1/fs/partitions/ldm.c
+--- linux-3.1.1/fs/partitions/ldm.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/partitions/ldm.c    2011-11-17 19:08:15.000000000 -0500
+@@ -1322,7 +1322,7 @@ static bool ldm_frag_add (const u8 *data
                        goto found;
        }
  
@@ -42648,9 +45138,9 @@ diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
        if (!f) {
                ldm_crit ("Out of memory.");
                return false;
-diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
---- linux-3.0.4/fs/pipe.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/pipe.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/pipe.c linux-3.1.1/fs/pipe.c
+--- linux-3.1.1/fs/pipe.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/pipe.c      2011-11-16 18:40:29.000000000 -0500
 @@ -420,9 +420,9 @@ redo:
                }
                if (bufs)       /* More to do? */
@@ -42774,9 +45264,9 @@ diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
        inode->i_fop = &rdwr_pipefifo_fops;
  
        /*
-diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
---- linux-3.0.4/fs/proc/array.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/array.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/array.c linux-3.1.1/fs/proc/array.c
+--- linux-3.1.1/fs/proc/array.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/array.c        2011-11-17 18:42:02.000000000 -0500
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -42832,12 +45322,8 @@ diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                        struct pid *pid, struct task_struct *task, int whole)
  {
-@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file 
-       cputime_t cutime, cstime, utime, stime;
-       cputime_t cgtime, gtime;
-       unsigned long rsslim = 0;
--      char tcomm[sizeof(task->comm)];
-+      char tcomm[sizeof(task->comm)] = { 0 };
+@@ -378,6 +409,8 @@ static int do_task_stat(struct seq_file 
+       char tcomm[sizeof(task->comm)];
        unsigned long flags;
  
 +      pax_track_stack();
@@ -42900,9 +45386,9 @@ diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
 +      return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
---- linux-3.0.4/fs/proc/base.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/proc/base.c 2011-09-13 14:50:28.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/base.c linux-3.1.1/fs/proc/base.c
+--- linux-3.1.1/fs/proc/base.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/base.c 2011-11-17 18:43:19.000000000 -0500
 @@ -107,6 +107,22 @@ struct pid_entry {
        union proc_op op;
  };
@@ -43033,7 +45519,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        ret = -ENOMEM;
        page = (char *)__get_free_page(GFP_TEMPORARY);
        if (!page)
-@@ -1614,7 +1658,7 @@ static void *proc_pid_follow_link(struct
+@@ -1613,7 +1657,7 @@ static void *proc_pid_follow_link(struct
        path_put(&nd->path);
  
        /* Are we allowed to snoop on the tasks file descriptors? */
@@ -43042,7 +45528,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
                goto out;
  
        error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
-@@ -1653,8 +1697,18 @@ static int proc_pid_readlink(struct dent
+@@ -1652,8 +1696,18 @@ static int proc_pid_readlink(struct dent
        struct path path;
  
        /* Are we allowed to snoop on the tasks file descriptors? */
@@ -43063,7 +45549,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  
        error = PROC_I(inode)->op.proc_get_link(inode, &path);
        if (error)
-@@ -1719,7 +1773,11 @@ struct inode *proc_pid_make_inode(struct
+@@ -1718,7 +1772,11 @@ struct inode *proc_pid_make_inode(struct
                rcu_read_lock();
                cred = __task_cred(task);
                inode->i_uid = cred->euid;
@@ -43075,7 +45561,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
                rcu_read_unlock();
        }
        security_task_to_inode(task, inode);
-@@ -1737,6 +1795,9 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1736,6 +1794,9 @@ int pid_getattr(struct vfsmount *mnt, st
        struct inode *inode = dentry->d_inode;
        struct task_struct *task;
        const struct cred *cred;
@@ -43085,7 +45571,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  
        generic_fillattr(inode, stat);
  
-@@ -1744,13 +1805,41 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1743,13 +1804,41 @@ int pid_getattr(struct vfsmount *mnt, st
        stat->uid = 0;
        stat->gid = 0;
        task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -43128,7 +45614,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        }
        rcu_read_unlock();
        return 0;
-@@ -1787,11 +1876,20 @@ int pid_revalidate(struct dentry *dentry
+@@ -1786,11 +1875,20 @@ int pid_revalidate(struct dentry *dentry
  
        if (task) {
                if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -43149,7 +45635,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
                        rcu_read_unlock();
                } else {
                        inode->i_uid = 0;
-@@ -1909,7 +2007,8 @@ static int proc_fd_info(struct inode *in
+@@ -1908,7 +2006,8 @@ static int proc_fd_info(struct inode *in
        int fd = proc_fd(inode);
  
        if (task) {
@@ -43159,12 +45645,12 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
                put_task_struct(task);
        }
        if (files) {
-@@ -2169,11 +2268,21 @@ static const struct file_operations proc
+@@ -2176,11 +2275,21 @@ static const struct file_operations proc
   */
- static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
+ static int proc_fd_permission(struct inode *inode, int mask)
  {
 +      struct task_struct *task;
-       int rv = generic_permission(inode, mask, flags, NULL);
+       int rv = generic_permission(inode, mask);
 -      if (rv == 0)
 -              return 0;
 +
@@ -43183,7 +45669,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        return rv;
  }
  
-@@ -2283,6 +2392,9 @@ static struct dentry *proc_pident_lookup
+@@ -2290,6 +2399,9 @@ static struct dentry *proc_pident_lookup
        if (!task)
                goto out_no_task;
  
@@ -43193,7 +45679,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/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.
-@@ -2327,6 +2439,9 @@ static int proc_pident_readdir(struct fi
+@@ -2334,6 +2446,9 @@ static int proc_pident_readdir(struct fi
        if (!task)
                goto out_no_task;
  
@@ -43203,7 +45689,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        ret = 0;
        i = filp->f_pos;
        switch (i) {
-@@ -2597,7 +2712,7 @@ static void *proc_self_follow_link(struc
+@@ -2604,7 +2719,7 @@ static void *proc_self_follow_link(struc
  static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
                                void *cookie)
  {
@@ -43212,7 +45698,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        if (!IS_ERR(s))
                __putname(s);
  }
-@@ -2795,7 +2910,7 @@ static const struct pid_entry tgid_base_
+@@ -2802,7 +2917,7 @@ static const struct pid_entry tgid_base_
        REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
  #endif
        REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -43221,7 +45707,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
        INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2820,10 +2935,10 @@ static const struct pid_entry tgid_base_
+@@ -2827,10 +2942,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
@@ -43234,7 +45720,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2857,6 +2972,9 @@ static const struct pid_entry tgid_base_
+@@ -2864,6 +2979,9 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_HARDWALL
        INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
@@ -43244,7 +45730,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2982,7 +3100,14 @@ static struct dentry *proc_pid_instantia
+@@ -2989,7 +3107,14 @@ static struct dentry *proc_pid_instantia
        if (!inode)
                goto out;
  
@@ -43259,10 +45745,13 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        inode->i_op = &proc_tgid_base_inode_operations;
        inode->i_fop = &proc_tgid_base_operations;
        inode->i_flags|=S_IMMUTABLE;
-@@ -3024,7 +3149,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3031,7 +3156,14 @@ struct dentry *proc_pid_lookup(struct in
        if (!task)
                goto out;
  
++      if (!has_group_leader_pid(task))
++              goto out_put_task;
++
 +      if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
 +              goto out_put_task;
 +
@@ -43271,7 +45760,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        put_task_struct(task);
  out:
        return result;
-@@ -3089,6 +3218,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3096,6 +3228,11 @@ int proc_pid_readdir(struct file * filp,
  {
        unsigned int nr;
        struct task_struct *reaper;
@@ -43283,7 +45772,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        struct tgid_iter iter;
        struct pid_namespace *ns;
  
-@@ -3112,8 +3246,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3119,8 +3256,27 @@ int proc_pid_readdir(struct file * filp,
        for (iter = next_tgid(ns, iter);
             iter.task;
             iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -43312,7 +45801,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
                        put_task_struct(iter.task);
                        goto out;
                }
-@@ -3141,7 +3294,7 @@ static const struct pid_entry tid_base_s
+@@ -3148,7 +3304,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),
@@ -43321,7 +45810,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
        INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3165,10 +3318,10 @@ static const struct pid_entry tid_base_s
+@@ -3172,10 +3328,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
@@ -43334,9 +45823,9 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
        ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
---- linux-3.0.4/fs/proc/cmdline.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/cmdline.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/cmdline.c linux-3.1.1/fs/proc/cmdline.c
+--- linux-3.1.1/fs/proc/cmdline.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/cmdline.c      2011-11-16 18:40:29.000000000 -0500
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -43349,9 +45838,9 @@ diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
        return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
---- linux-3.0.4/fs/proc/devices.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/devices.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/devices.c linux-3.1.1/fs/proc/devices.c
+--- linux-3.1.1/fs/proc/devices.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/devices.c      2011-11-16 18:40:29.000000000 -0500
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -43364,10 +45853,43 @@ diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
        return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
---- linux-3.0.4/fs/proc/inode.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/inode.c        2011-08-23 21:48:14.000000000 -0400
-@@ -440,7 +440,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-3.1.1/fs/proc/inode.c linux-3.1.1/fs/proc/inode.c
+--- linux-3.1.1/fs/proc/inode.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/inode.c        2011-11-16 18:40:29.000000000 -0500
+@@ -18,12 +18,18 @@
+ #include <linux/module.h>
+ #include <linux/sysctl.h>
+ #include <linux/slab.h>
++#include <linux/grsecurity.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+ 
++#ifdef CONFIG_PROC_SYSCTL
++extern const struct inode_operations proc_sys_inode_operations;
++extern const struct inode_operations proc_sys_dir_operations;
++#endif
++
+ static void proc_evict_inode(struct inode *inode)
+ {
+       struct proc_dir_entry *de;
+@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inod
+       ns_ops = PROC_I(inode)->ns_ops;
+       if (ns_ops && ns_ops->put)
+               ns_ops->put(PROC_I(inode)->ns);
++
++#ifdef CONFIG_PROC_SYSCTL
++      if (inode->i_op == &proc_sys_inode_operations ||
++          inode->i_op == &proc_sys_dir_operations)
++              gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
++#endif
++
+ }
+ 
+ static struct kmem_cache * proc_inode_cachep;
+@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct supe
                if (de->mode) {
                        inode->i_mode = de->mode;
                        inode->i_uid = de->uid;
@@ -43379,9 +45901,9 @@ diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
                }
                if (de->size)
                        inode->i_size = de->size;
-diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/fs/proc/internal.h
---- linux-3.0.4/fs/proc/internal.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/internal.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/internal.h linux-3.1.1/fs/proc/internal.h
+--- linux-3.1.1/fs/proc/internal.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/internal.h     2011-11-16 18:40:29.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,
@@ -43392,9 +45914,9 @@ diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/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-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
---- linux-3.0.4/fs/proc/Kconfig        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/Kconfig        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/Kconfig linux-3.1.1/fs/proc/Kconfig
+--- linux-3.1.1/fs/proc/Kconfig        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/Kconfig        2011-11-16 18:40:29.000000000 -0500
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -43422,9 +45944,9 @@ diff -urNp linux-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
        bool "Enable /proc page monitoring" if EXPERT
        help
          Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-3.0.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
---- linux-3.0.4/fs/proc/kcore.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/kcore.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/kcore.c linux-3.1.1/fs/proc/kcore.c
+--- linux-3.1.1/fs/proc/kcore.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/kcore.c        2011-11-16 18:40:29.000000000 -0500
 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
        off_t offset = 0;
        struct kcore_list *m;
@@ -43492,9 +46014,9 @@ diff -urNp linux-3.0.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
        if (!capable(CAP_SYS_RAWIO))
                return -EPERM;
        if (kcore_need_update)
-diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
---- linux-3.0.4/fs/proc/meminfo.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/meminfo.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/meminfo.c linux-3.1.1/fs/proc/meminfo.c
+--- linux-3.1.1/fs/proc/meminfo.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/meminfo.c      2011-11-16 18:40:29.000000000 -0500
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
        unsigned long pages[NR_LRU_LISTS];
        int lru;
@@ -43513,9 +46035,9 @@ diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
---- linux-3.0.4/fs/proc/nommu.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/nommu.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/nommu.c linux-3.1.1/fs/proc/nommu.c
+--- linux-3.1.1/fs/proc/nommu.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/nommu.c        2011-11-16 18:39:08.000000000 -0500
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
                if (len < 1)
                        len = 1;
@@ -43525,9 +46047,9 @@ diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
        }
  
        seq_putc(m, '\n');
-diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
---- linux-3.0.4/fs/proc/proc_net.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/proc_net.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/proc_net.c linux-3.1.1/fs/proc/proc_net.c
+--- linux-3.1.1/fs/proc/proc_net.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/proc_net.c     2011-11-16 18:40:29.000000000 -0500
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
        struct task_struct *task;
        struct nsproxy *ns;
@@ -43546,10 +46068,10 @@ diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
  
        rcu_read_lock();
        task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
---- linux-3.0.4/fs/proc/proc_sysctl.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/proc_sysctl.c  2011-08-23 21:48:14.000000000 -0400
-@@ -8,6 +8,8 @@
+diff -urNp linux-3.1.1/fs/proc/proc_sysctl.c linux-3.1.1/fs/proc/proc_sysctl.c
+--- linux-3.1.1/fs/proc/proc_sysctl.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/proc_sysctl.c  2011-11-16 18:40:29.000000000 -0500
+@@ -8,11 +8,13 @@
  #include <linux/namei.h>
  #include "internal.h"
  
@@ -43557,18 +46079,40 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/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;
-@@ -111,6 +113,9 @@ static struct dentry *proc_sys_lookup(st
-       if (!p)
-               goto out;
+-static const struct inode_operations proc_sys_inode_operations;
++const struct inode_operations proc_sys_inode_operations;
+ static const struct file_operations proc_sys_dir_file_operations;
+-static const struct inode_operations proc_sys_dir_operations;
++const struct inode_operations proc_sys_dir_operations;
+ 
+ static struct inode *proc_sys_make_inode(struct super_block *sb,
+               struct ctl_table_header *head, struct ctl_table *table)
+@@ -121,8 +123,14 @@ static struct dentry *proc_sys_lookup(st
+ 
+       err = NULL;
+       d_set_d_op(dentry, &proc_sys_dentry_operations);
++
++      gr_handle_proc_create(dentry, inode);
++
+       d_add(dentry, inode);
  
 +      if (gr_handle_sysctl(p, MAY_EXEC))
-+              goto out;
++              err = ERR_PTR(-ENOENT);
++
+ out:
+       sysctl_head_finish(head);
+       return err;
+@@ -202,6 +210,9 @@ static int proc_sys_fill_cache(struct fi
+                               return -ENOMEM;
+                       } else {
+                               d_set_d_op(child, &proc_sys_dentry_operations);
++
++                              gr_handle_proc_create(child, inode);
 +
-       err = ERR_PTR(-ENOMEM);
-       inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
-       if (h)
-@@ -230,6 +235,9 @@ static int scan(struct ctl_table_header 
+                               d_add(child, inode);
+                       }
+               } else {
+@@ -230,6 +241,9 @@ static int scan(struct ctl_table_header 
                if (*pos < file->f_pos)
                        continue;
  
@@ -43578,7 +46122,7 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
                res = proc_sys_fill_cache(file, dirent, filldir, head, table);
                if (res)
                        return res;
-@@ -355,6 +363,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -355,6 +369,9 @@ static int proc_sys_getattr(struct vfsmo
        if (IS_ERR(head))
                return PTR_ERR(head);
  
@@ -43588,9 +46132,25 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
        generic_fillattr(inode, stat);
        if (table)
                stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
---- linux-3.0.4/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400
+@@ -374,13 +391,13 @@ static const struct file_operations proc
+       .llseek         = generic_file_llseek,
+ };
+ 
+-static const struct inode_operations proc_sys_inode_operations = {
++const struct inode_operations proc_sys_inode_operations = {
+       .permission     = proc_sys_permission,
+       .setattr        = proc_sys_setattr,
+       .getattr        = proc_sys_getattr,
+ };
+ 
+-static const struct inode_operations proc_sys_dir_operations = {
++const struct inode_operations proc_sys_dir_operations = {
+       .lookup         = proc_sys_lookup,
+       .permission     = proc_sys_permission,
+       .setattr        = proc_sys_setattr,
+diff -urNp linux-3.1.1/fs/proc/root.c linux-3.1.1/fs/proc/root.c
+--- linux-3.1.1/fs/proc/root.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/root.c 2011-11-16 18:40:29.000000000 -0500
 @@ -123,7 +123,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
        proc_device_tree_init();
@@ -43607,9 +46167,9 @@ diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
        proc_sys_init();
  }
  
-diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
---- linux-3.0.4/fs/proc/task_mmu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/task_mmu.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/task_mmu.c linux-3.1.1/fs/proc/task_mmu.c
+--- linux-3.1.1/fs/proc/task_mmu.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/task_mmu.c     2011-11-16 18:40:29.000000000 -0500
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
                "VmExe:\t%8lu kB\n"
                "VmLib:\t%8lu kB\n"
@@ -43740,7 +46300,7 @@ diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
                   mss.resident >> 10,
                   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
                   mss.shared_clean  >> 10,
-@@ -1001,7 +1032,7 @@ static int show_numa_map(struct seq_file
+@@ -1031,7 +1062,7 @@ static int show_numa_map(struct seq_file
  
        if (file) {
                seq_printf(m, " file=");
@@ -43749,9 +46309,9 @@ diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.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-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
---- linux-3.0.4/fs/proc/task_nommu.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/task_nommu.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/proc/task_nommu.c linux-3.1.1/fs/proc/task_nommu.c
+--- linux-3.1.1/fs/proc/task_nommu.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/proc/task_nommu.c   2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
        else
                bytes += kobjsize(mm);
@@ -43770,9 +46330,9 @@ diff -urNp linux-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
        } else if (mm) {
                if (vma->vm_start <= mm->start_stack &&
                        vma->vm_end >= mm->start_stack) {
-diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
---- linux-3.0.4/fs/quota/netlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/quota/netlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/quota/netlink.c linux-3.1.1/fs/quota/netlink.c
+--- linux-3.1.1/fs/quota/netlink.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/quota/netlink.c     2011-11-16 18:39:08.000000000 -0500
 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
  void quota_send_warning(short type, unsigned int id, dev_t dev,
                        const char warntype)
@@ -43791,9 +46351,9 @@ diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
                        &quota_genl_family, 0, QUOTA_NL_C_WARNING);
        if (!msg_head) {
                printk(KERN_ERR
-diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
---- linux-3.0.4/fs/readdir.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/readdir.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/readdir.c linux-3.1.1/fs/readdir.c
+--- linux-3.1.1/fs/readdir.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/readdir.c   2011-11-16 18:40:29.000000000 -0500
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -43883,10 +46443,19 @@ diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
        buf.count = count;
        buf.error = 0;
  
-diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
---- linux-3.0.4/fs/reiserfs/dir.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/dir.c      2011-08-23 21:48:14.000000000 -0400
-@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
+@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
+               error = buf.error;
+       lastdirent = buf.previous;
+       if (lastdirent) {
+-              typeof(lastdirent->d_off) d_off = file->f_pos;
++              typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
+               if (__put_user(d_off, &lastdirent->d_off))
+                       error = -EFAULT;
+               else
+diff -urNp linux-3.1.1/fs/reiserfs/dir.c linux-3.1.1/fs/reiserfs/dir.c
+--- linux-3.1.1/fs/reiserfs/dir.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/dir.c      2011-11-16 18:40:29.000000000 -0500
+@@ -75,6 +75,8 @@ int reiserfs_readdir_dentry(struct dentr
        struct reiserfs_dir_entry de;
        int ret = 0;
  
@@ -43895,9 +46464,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
        reiserfs_write_lock(inode->i_sb);
  
        reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
---- linux-3.0.4/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/reiserfs/do_balan.c linux-3.1.1/fs/reiserfs/do_balan.c
+--- linux-3.1.1/fs/reiserfs/do_balan.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/do_balan.c 2011-11-16 18:39:08.000000000 -0500
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
                return;
        }
@@ -43907,10 +46476,10 @@ diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
        do_balance_starts(tb);
  
        /* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
---- linux-3.0.4/fs/reiserfs/journal.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/journal.c  2011-08-23 21:48:14.000000000 -0400
-@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
+diff -urNp linux-3.1.1/fs/reiserfs/journal.c linux-3.1.1/fs/reiserfs/journal.c
+--- linux-3.1.1/fs/reiserfs/journal.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/journal.c  2011-11-16 18:40:29.000000000 -0500
+@@ -2289,6 +2289,8 @@ static struct buffer_head *reiserfs_brea
        struct buffer_head *bh;
        int i, j;
  
@@ -43919,9 +46488,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
        bh = __getblk(dev, block, bufsize);
        if (buffer_uptodate(bh))
                return (bh);
-diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
---- linux-3.0.4/fs/reiserfs/namei.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/namei.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/reiserfs/namei.c linux-3.1.1/fs/reiserfs/namei.c
+--- linux-3.1.1/fs/reiserfs/namei.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/namei.c    2011-11-16 18:40:29.000000000 -0500
 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
        unsigned long savelink = 1;
        struct timespec ctime;
@@ -43931,9 +46500,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
        /* three balancings: (1) old name removal, (2) new name insertion
           and (3) maybe "save" link insertion
           stat data updates: (1) old directory,
-diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
---- linux-3.0.4/fs/reiserfs/procfs.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/procfs.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/reiserfs/procfs.c linux-3.1.1/fs/reiserfs/procfs.c
+--- linux-3.1.1/fs/reiserfs/procfs.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/procfs.c   2011-11-16 18:40:29.000000000 -0500
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
                   "SMALL_TAILS " : "NO_TAILS ",
                   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -43952,9 +46521,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
        seq_printf(m,           /* on-disk fields */
                   "jp_journal_1st_block: \t%i\n"
                   "jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
---- linux-3.0.4/fs/reiserfs/stree.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/stree.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/reiserfs/stree.c linux-3.1.1/fs/reiserfs/stree.c
+--- linux-3.1.1/fs/reiserfs/stree.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/stree.c    2011-11-16 18:40:29.000000000 -0500
 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
        int iter = 0;
  #endif
@@ -44000,9 +46569,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
        BUG_ON(!th->t_trans_id);
  
        if (inode) {            /* Do we count quotas for item? */
-diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
---- linux-3.0.4/fs/reiserfs/super.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/super.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/reiserfs/super.c linux-3.1.1/fs/reiserfs/super.c
+--- linux-3.1.1/fs/reiserfs/super.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/reiserfs/super.c    2011-11-16 18:40:29.000000000 -0500
 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
                {.option_name = NULL}
        };
@@ -44012,9 +46581,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
        *blocks = 0;
        if (!options || !*options)
                /* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
---- linux-3.0.4/fs/select.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/select.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/select.c linux-3.1.1/fs/select.c
+--- linux-3.1.1/fs/select.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/select.c    2011-11-16 18:40:29.000000000 -0500
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -44051,9 +46620,9 @@ diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
        if (nfds > rlimit(RLIMIT_NOFILE))
                return -EINVAL;
  
-diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
---- linux-3.0.4/fs/seq_file.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/seq_file.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/seq_file.c linux-3.1.1/fs/seq_file.c
+--- linux-3.1.1/fs/seq_file.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/seq_file.c  2011-11-16 18:39:08.000000000 -0500
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
                return 0;
        }
@@ -44103,9 +46672,9 @@ diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
        int res = -ENOMEM;
  
        if (op) {
-diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
---- linux-3.0.4/fs/splice.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/splice.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/splice.c linux-3.1.1/fs/splice.c
+--- linux-3.1.1/fs/splice.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/splice.c    2011-11-16 18:40:29.000000000 -0500
 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
        pipe_lock(pipe);
  
@@ -44141,7 +46710,7 @@ diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
        set_fs(get_ds());
        /* The cast to a user pointer is valid due to the set_fs() */
 -      res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
-+      res = vfs_readv(file, (__force const struct iovec __user *)vec, vlen, &pos);
++      res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
        set_fs(old_fs);
  
        return res;
@@ -44150,7 +46719,7 @@ diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
        set_fs(get_ds());
        /* The cast to a user pointer is valid due to the set_fs() */
 -      res = vfs_write(file, (const char __user *)buf, count, &pos);
-+      res = vfs_write(file, (__force const char __user *)buf, count, &pos);
++      res = vfs_write(file, (const char __force_user *)buf, count, &pos);
        set_fs(old_fs);
  
        return res;
@@ -44168,7 +46737,7 @@ diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
  
                this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
 -              vec[i].iov_base = (void __user *) page_address(page);
-+              vec[i].iov_base = (__force void __user *) page_address(page);
++              vec[i].iov_base = (void __force_user *) page_address(page);
                vec[i].iov_len = this_len;
                spd.pages[i] = page;
                spd.nr_pages++;
@@ -44271,9 +46840,9 @@ diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
                ret = -EAGAIN;
  
        pipe_unlock(ipipe);
-diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
---- linux-3.0.4/fs/sysfs/file.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/file.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/sysfs/file.c linux-3.1.1/fs/sysfs/file.c
+--- linux-3.1.1/fs/sysfs/file.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/file.c        2011-11-16 18:39:08.000000000 -0500
 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -44319,9 +46888,9 @@ diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
                wake_up_interruptible(&od->poll);
        }
  
-diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
---- linux-3.0.4/fs/sysfs/mount.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/mount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/sysfs/mount.c linux-3.1.1/fs/sysfs/mount.c
+--- linux-3.1.1/fs/sysfs/mount.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/mount.c       2011-11-16 18:40:29.000000000 -0500
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
        .s_name         = "",
        .s_count        = ATOMIC_INIT(1),
@@ -44334,9 +46903,9 @@ diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
        .s_ino          = 1,
  };
  
-diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
---- linux-3.0.4/fs/sysfs/symlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/symlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/sysfs/symlink.c linux-3.1.1/fs/sysfs/symlink.c
+--- linux-3.1.1/fs/sysfs/symlink.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/sysfs/symlink.c     2011-11-16 18:39:08.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)
@@ -44346,9 +46915,9 @@ diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
        if (!IS_ERR(page))
                free_page((unsigned long)page);
  }
-diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
---- linux-3.0.4/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/udf/inode.c linux-3.1.1/fs/udf/inode.c
+--- linux-3.1.1/fs/udf/inode.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/udf/inode.c 2011-11-16 18:40:29.000000000 -0500
 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
        int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
        int lastblock = 0;
@@ -44358,9 +46927,9 @@ diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
        prev_epos.offset = udf_file_entry_alloc_offset(inode);
        prev_epos.block = iinfo->i_location;
        prev_epos.bh = NULL;
-diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
---- linux-3.0.4/fs/udf/misc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/udf/misc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/udf/misc.c linux-3.1.1/fs/udf/misc.c
+--- linux-3.1.1/fs/udf/misc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/udf/misc.c  2011-11-16 18:39:08.000000000 -0500
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -44370,9 +46939,9 @@ diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
        u8 checksum = 0;
        int i;
        for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
---- linux-3.0.4/fs/utimes.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/utimes.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/utimes.c linux-3.1.1/fs/utimes.c
+--- linux-3.1.1/fs/utimes.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/utimes.c    2011-11-16 18:40:29.000000000 -0500
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -44394,9 +46963,9 @@ diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
        mutex_lock(&inode->i_mutex);
        error = notify_change(path->dentry, &newattrs);
        mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.0.4/fs/xattr_acl.c linux-3.0.4/fs/xattr_acl.c
---- linux-3.0.4/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/fs/xattr_acl.c linux-3.1.1/fs/xattr_acl.c
+--- linux-3.1.1/fs/xattr_acl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xattr_acl.c 2011-11-16 18:39:08.000000000 -0500
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -44408,9 +46977,9 @@ diff -urNp linux-3.0.4/fs/xattr_acl.c linux-3.0.4/fs/xattr_acl.c
        int count;
        struct posix_acl *acl;
        struct posix_acl_entry *acl_e;
-diff -urNp linux-3.0.4/fs/xattr.c linux-3.0.4/fs/xattr.c
---- linux-3.0.4/fs/xattr.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xattr.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/xattr.c linux-3.1.1/fs/xattr.c
+--- linux-3.1.1/fs/xattr.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xattr.c     2011-11-16 18:40:29.000000000 -0500
 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -44473,45 +47042,10 @@ diff -urNp linux-3.0.4/fs/xattr.c linux-3.0.4/fs/xattr.c
                mnt_drop_write(f->f_path.mnt);
        }
        fput(f);
-diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400
-@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
-       xfs_fsop_geom_t           fsgeo;
-       int                       error;
- 
-+      memset(&fsgeo, 0, sizeof(fsgeo));
-       error = xfs_fs_geometry(mp, &fsgeo, 3);
-       if (error)
-               return -error;
-diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c   2011-08-23 21:47:56.000000000 -0400
-@@ -128,7 +128,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) ||
-           copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
-               goto out_put;
- 
-diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c    2011-08-23 21:47:56.000000000 -0400
-@@ -437,7 +437,7 @@ xfs_vn_put_link(
-       struct nameidata *nd,
-       void            *p)
- {
--      char            *s = nd_get_link(nd);
-+      const char      *s = nd_get_link(nd);
- 
-       if (!IS_ERR(s))
-               kfree(s);
-diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
---- linux-3.0.4/fs/xfs/xfs_bmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/xfs_bmap.c      2011-08-23 21:47:56.000000000 -0400
-@@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
+diff -urNp linux-3.1.1/fs/xfs/xfs_bmap.c linux-3.1.1/fs/xfs/xfs_bmap.c
+--- linux-3.1.1/fs/xfs/xfs_bmap.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_bmap.c      2011-11-16 18:39:08.000000000 -0500
+@@ -250,7 +250,7 @@ xfs_bmap_validate_ret(
        int                     nmap,
        int                     ret_nmap);
  #else
@@ -44520,13 +47054,13 @@ diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
---- linux-3.0.4/fs/xfs/xfs_dir2_sf.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/xfs_dir2_sf.c   2011-08-23 21:47:56.000000000 -0400
-@@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
+diff -urNp linux-3.1.1/fs/xfs/xfs_dir2_sf.c linux-3.1.1/fs/xfs/xfs_dir2_sf.c
+--- linux-3.1.1/fs/xfs/xfs_dir2_sf.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_dir2_sf.c   2011-11-16 18:39:08.000000000 -0500
+@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
                }
  
-               ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
+               ino = xfs_dir2_sfe_get_ino(sfp, sfep);
 -              if (filldir(dirent, (char *)sfep->name, sfep->namelen,
 +              if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
 +                      char name[sfep->namelen];
@@ -44540,9 +47074,33 @@ diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
                            off & 0x7fffffff, ino, DT_UNKNOWN)) {
                        *offset = off & 0x7fffffff;
                        return 0;
-diff -urNp linux-3.0.4/grsecurity/gracl_alloc.c linux-3.0.4/grsecurity/gracl_alloc.c
---- linux-3.0.4/grsecurity/gracl_alloc.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_alloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/fs/xfs/xfs_ioctl.c linux-3.1.1/fs/xfs/xfs_ioctl.c
+--- linux-3.1.1/fs/xfs/xfs_ioctl.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_ioctl.c     2011-11-16 18:39:08.000000000 -0500
+@@ -128,7 +128,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) ||
+           copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
+               goto out_put;
+ 
+diff -urNp linux-3.1.1/fs/xfs/xfs_iops.c linux-3.1.1/fs/xfs/xfs_iops.c
+--- linux-3.1.1/fs/xfs/xfs_iops.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/fs/xfs/xfs_iops.c      2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ xfs_vn_put_link(
+       struct nameidata *nd,
+       void            *p)
+ {
+-      char            *s = nd_get_link(nd);
++      const char      *s = nd_get_link(nd);
+ 
+       if (!IS_ERR(s))
+               kfree(s);
+diff -urNp linux-3.1.1/grsecurity/gracl_alloc.c linux-3.1.1/grsecurity/gracl_alloc.c
+--- linux-3.1.1/grsecurity/gracl_alloc.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_alloc.c       2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -44649,10 +47207,10 @@ diff -urNp linux-3.0.4/grsecurity/gracl_alloc.c linux-3.0.4/grsecurity/gracl_all
 +      else
 +              return 1;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
---- linux-3.0.4/grsecurity/gracl.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl.c     2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,4106 @@
+diff -urNp linux-3.1.1/grsecurity/gracl.c linux-3.1.1/grsecurity/gracl.c
+--- linux-3.1.1/grsecurity/gracl.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl.c     2011-11-16 19:31:00.000000000 -0500
+@@ -0,0 +1,4156 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -44969,6 +47527,27 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +      return ret;
 +}
 +
++static char *
++gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++      char *ret;
++      char *buf;
++      int buflen;
++
++      write_seqlock(&rename_lock);
++      br_read_lock(vfsmount_lock);
++      buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
++      ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
++      buflen = (int)(ret - buf);
++      if (buflen >= 5)
++              prepend(&ret, &buflen, "/proc", 5);
++      else
++              ret = strcpy(buf, "<path too long>");
++      br_read_unlock(vfsmount_lock);
++      write_sequnlock(&rename_lock);
++      return ret;
++}
++
 +char *
 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -46680,63 +49259,6 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +__u32
-+gr_check_link(const struct dentry * new_dentry,
-+            const struct dentry * parent_dentry,
-+            const struct vfsmount * parent_mnt,
-+            const struct dentry * old_dentry, const struct vfsmount * old_mnt)
-+{
-+      struct acl_object_label *obj;
-+      __u32 oldmode, newmode;
-+      __u32 needmode;
-+
-+      if (unlikely(!(gr_status & GR_READY)))
-+              return (GR_CREATE | GR_LINK);
-+
-+      obj = chk_obj_label(old_dentry, old_mnt, current->acl);
-+      oldmode = obj->mode;
-+
-+      if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
-+              oldmode |= (GR_CREATE | GR_LINK);
-+
-+      needmode = GR_CREATE | GR_AUDIT_CREATE | GR_SUPPRESS;
-+      if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+              needmode |= GR_SETID | GR_AUDIT_SETID;
-+
-+      newmode =
-+          gr_check_create(new_dentry, parent_dentry, parent_mnt,
-+                          oldmode | needmode);
-+
-+      needmode = newmode & (GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC |
-+                            GR_SETID | GR_READ | GR_FIND | GR_DELETE |
-+                            GR_INHERIT | GR_AUDIT_INHERIT);
-+
-+      if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID) && !(newmode & GR_SETID))
-+              goto bad;
-+
-+      if ((oldmode & needmode) != needmode)
-+              goto bad;
-+
-+      needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
-+      if ((newmode & needmode) != needmode)
-+              goto bad;
-+
-+      if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
-+              return newmode;
-+bad:
-+      needmode = oldmode;
-+      if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+              needmode |= GR_SETID;
-+      
-+      if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+              gr_log_learn(old_dentry, old_mnt, needmode);
-+              return (GR_CREATE | GR_LINK);
-+      } else if (newmode & GR_SUPPRESS)
-+              return GR_SUPPRESS;
-+      else
-+              return 0;
-+}
-+
-+__u32
 +gr_search_file(const struct dentry * dentry, const __u32 mode,
 +             const struct vfsmount * mnt)
 +{
@@ -46791,70 +49313,124 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +      return retval;
 +}
 +
-+__u32
-+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
-+              const struct vfsmount * mnt, const __u32 mode)
++struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
++                                            const struct dentry *parent,
++                                            const struct vfsmount *mnt)
 +{
 +      struct name_entry *match;
 +      struct acl_object_label *matchpo;
 +      struct acl_subject_label *curracl;
 +      char *path;
-+      __u32 retval;
 +
 +      if (unlikely(!(gr_status & GR_READY)))
-+              return (mode & ~GR_AUDITS);
++              return NULL;
 +
 +      preempt_disable();
 +      path = gr_to_filename_rbac(new_dentry, mnt);
 +      match = lookup_name_entry_create(path);
 +
-+      if (!match)
-+              goto check_parent;
-+
 +      curracl = current->acl;
 +
-+      read_lock(&gr_inode_lock);
-+      matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
-+      read_unlock(&gr_inode_lock);
-+
-+      if (matchpo) {
-+              if ((matchpo->mode & mode) !=
-+                  (mode & ~(GR_AUDITS | GR_SUPPRESS))
-+                  && curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+                      __u32 new_mode = mode;
-+
-+                      new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
-+
-+                      gr_log_learn(new_dentry, mnt, new_mode);
++      if (match) {
++              read_lock(&gr_inode_lock);
++              matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
++              read_unlock(&gr_inode_lock);
 +
++              if (matchpo) {
 +                      preempt_enable();
-+                      return new_mode;
++                      return matchpo;
 +              }
-+              preempt_enable();
-+              return (matchpo->mode & mode);
 +      }
 +
-+      check_parent:
-+      curracl = current->acl;
++      // lookup parent
 +
 +      matchpo = chk_obj_create_label(parent, mnt, curracl, path);
++
++      preempt_enable();
++      return matchpo;
++}
++
++__u32
++gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
++              const struct vfsmount * mnt, const __u32 mode)
++{
++      struct acl_object_label *matchpo;
++      __u32 retval;
++
++      if (unlikely(!(gr_status & GR_READY)))
++              return (mode & ~GR_AUDITS);
++
++      matchpo = gr_get_create_object(new_dentry, parent, mnt);
++
 +      retval = matchpo->mode & mode;
 +
 +      if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
-+          && (curracl->mode & (GR_LEARN | GR_INHERITLEARN))) {
++          && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
 +              __u32 new_mode = mode;
 +
 +              new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 +
 +              gr_log_learn(new_dentry, mnt, new_mode);
-+              preempt_enable();
 +              return new_mode;
 +      }
 +
-+      preempt_enable();
 +      return retval;
 +}
 +
++__u32
++gr_check_link(const struct dentry * new_dentry,
++            const struct dentry * parent_dentry,
++            const struct vfsmount * parent_mnt,
++            const struct dentry * old_dentry, const struct vfsmount * old_mnt)
++{
++      struct acl_object_label *obj;
++      __u32 oldmode, newmode;
++      __u32 needmode;
++      __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
++                         GR_DELETE | GR_INHERIT;
++
++      if (unlikely(!(gr_status & GR_READY)))
++              return (GR_CREATE | GR_LINK);
++
++      obj = chk_obj_label(old_dentry, old_mnt, current->acl);
++      oldmode = obj->mode;
++
++      obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
++      newmode = obj->mode;
++
++      needmode = newmode & checkmodes;
++
++      // old name for hardlink must have at least the permissions of the new name
++      if ((oldmode & needmode) != needmode)
++              goto bad;
++
++      // if old name had restrictions/auditing, make sure the new name does as well
++      needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
++
++      // don't allow hardlinking of suid/sgid files without permission
++      if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++              needmode |= GR_SETID;
++
++      if ((newmode & needmode) != needmode)
++              goto bad;
++
++      // enforce minimum permissions
++      if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
++              return newmode;
++bad:
++      needmode = oldmode;
++      if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++              needmode |= GR_SETID;
++      
++      if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
++              gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
++              return (GR_CREATE | GR_LINK);
++      } else if (newmode & GR_SUPPRESS)
++              return GR_SUPPRESS;
++      else
++              return 0;
++}
++
 +int
 +gr_check_hidden_task(const struct task_struct *task)
 +{
@@ -47382,15 +49958,12 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +static void
-+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
-+               const struct vfsmount *mnt)
++__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
 +{
 +      struct acl_subject_label *subj;
 +      struct acl_role_label *role;
 +      unsigned int x;
-+      ino_t ino = dentry->d_inode->i_ino;
-+      dev_t dev = __get_dev(dentry);
-+      
++
 +      FOR_EACH_ROLE_START(role)
 +              update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
 +
@@ -47411,6 +49984,18 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +      return;
 +}
 +
++static void
++do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
++               const struct vfsmount *mnt)
++{
++      ino_t ino = dentry->d_inode->i_ino;
++      dev_t dev = __get_dev(dentry);
++
++      __do_handle_create(matchn, ino, dev);   
++
++      return;
++}
++
 +void
 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -47433,6 +50018,27 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +void
++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
++{
++      struct name_entry *matchn;
++
++      if (unlikely(!(gr_status & GR_READY)))
++              return;
++
++      preempt_disable();
++      matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
++
++      if (unlikely((unsigned long)matchn)) {
++              write_lock(&gr_inode_lock);
++              __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
++              write_unlock(&gr_inode_lock);
++      }
++      preempt_enable();
++
++      return;
++}
++
++void
 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
 +               struct dentry *old_dentry,
 +               struct dentry *new_dentry,
@@ -47440,6 +50046,7 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +{
 +      struct name_entry *matchn;
 +      struct inodev_entry *inodev;
++      struct inode *inode = new_dentry->d_inode;
 +      ino_t old_ino = old_dentry->d_inode->i_ino;
 +      dev_t old_dev = __get_dev(old_dentry);
 +
@@ -47462,17 +50069,17 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +       */
 +
 +      write_lock(&gr_inode_lock);
-+      if (unlikely(replace && new_dentry->d_inode)) {
-+              ino_t new_ino = new_dentry->d_inode->i_ino;
++      if (unlikely(replace && inode)) {
++              ino_t new_ino = inode->i_ino;
 +              dev_t new_dev = __get_dev(new_dentry);
 +
 +              inodev = lookup_inodev_entry(new_ino, new_dev);
-+              if (inodev != NULL && (new_dentry->d_inode->i_nlink <= 1))
++              if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
 +                      do_handle_delete(inodev, new_ino, new_dev);
 +      }
 +
 +      inodev = lookup_inodev_entry(old_ino, old_dev);
-+      if (inodev != NULL && (old_dentry->d_inode->i_nlink <= 1))
++      if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
 +              do_handle_delete(inodev, old_ino, old_dev);
 +
 +      if (unlikely((unsigned long)matchn))
@@ -48462,6 +51069,7 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +              
 +      if (retmode & GR_PTRACERD) {
 +              switch (request) {
++              case PTRACE_SEIZE:
 +              case PTRACE_POKETEXT:
 +              case PTRACE_POKEDATA:
 +              case PTRACE_POKEUSR:
@@ -48759,9 +51367,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
---- linux-3.0.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_cap.c 2011-09-14 09:21:24.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_cap.c linux-3.1.1/grsecurity/gracl_cap.c
+--- linux-3.1.1/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_cap.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,101 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -48864,10 +51472,10 @@ diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
 +      return 0;
 +}
 +
-diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
---- linux-3.0.4/grsecurity/gracl_fs.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_fs.c  2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,431 @@
+diff -urNp linux-3.1.1/grsecurity/gracl_fs.c linux-3.1.1/grsecurity/gracl_fs.c
+--- linux-3.1.1/grsecurity/gracl_fs.c  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_fs.c  2011-11-17 00:25:32.000000000 -0500
+@@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/types.h>
@@ -48904,7 +51512,7 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +
 +__u32
 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
-+                 const int fmode)
++                 int acc_mode)
 +{
 +      __u32 reqmode = GR_FIND;
 +      __u32 mode;
@@ -48912,14 +51520,13 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +      if (unlikely(!dentry->d_inode))
 +              return reqmode;
 +
-+      if (unlikely(fmode & O_APPEND))
++      if (acc_mode & MAY_APPEND)
 +              reqmode |= GR_APPEND;
-+      else if (unlikely(fmode & FMODE_WRITE))
++      else if (acc_mode & MAY_WRITE)
 +              reqmode |= GR_WRITE;
-+      if (likely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
++      if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
 +              reqmode |= GR_READ;
-+      if ((fmode & FMODE_GREXEC) && (fmode & __FMODE_EXEC))
-+              reqmode &= ~GR_READ;
++
 +      mode =
 +          gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
 +                         mnt);
@@ -48947,17 +51554,20 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +__u32
 +gr_acl_handle_creat(const struct dentry * dentry,
 +                  const struct dentry * p_dentry,
-+                  const struct vfsmount * p_mnt, const int fmode,
++                  const struct vfsmount * p_mnt, int open_flags, int acc_mode,
 +                  const int imode)
 +{
 +      __u32 reqmode = GR_WRITE | GR_CREATE;
 +      __u32 mode;
 +
-+      if (unlikely(fmode & O_APPEND))
++      if (acc_mode & MAY_APPEND)
 +              reqmode |= GR_APPEND;
-+      if (unlikely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY)))
++      // if a directory was required or the directory already exists, then
++      // don't count this open as a read
++      if ((acc_mode & MAY_READ) &&
++          !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
 +              reqmode |= GR_READ;
-+      if (unlikely((fmode & O_CREAT) && (imode & (S_ISUID | S_ISGID))))
++      if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
 +              reqmode |= GR_SETID;
 +
 +      mode =
@@ -49115,7 +51725,7 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +                         GR_UNIXCONNECT_ACL_MSG);
 +}
 +
-+/* hardlinks require at minimum create permission,
++/* hardlinks require at minimum create and link permission,
 +   any additional privilege required is based on the
 +   privilege of the file being linked to
 +*/
@@ -49299,9 +51909,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
---- linux-3.0.4/grsecurity/gracl_ip.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_ip.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_ip.c linux-3.1.1/grsecurity/gracl_ip.c
+--- linux-3.1.1/grsecurity/gracl_ip.c  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_ip.c  2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -49684,9 +52294,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
 +
 +      return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_learn.c
---- linux-3.0.4/grsecurity/gracl_learn.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_learn.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_learn.c linux-3.1.1/grsecurity/gracl_learn.c
+--- linux-3.1.1/grsecurity/gracl_learn.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_learn.c       2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -49895,9 +52505,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_lea
 +      .release        = close_learn,
 +      .poll           = poll_learn,
 +};
-diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
---- linux-3.0.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_res.c linux-3.1.1/grsecurity/gracl_res.c
+--- linux-3.1.1/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_res.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49967,9 +52577,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
 +      rcu_read_unlock();
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv.c
---- linux-3.0.4/grsecurity/gracl_segv.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_segv.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_segv.c linux-3.1.1/grsecurity/gracl_segv.c
+--- linux-3.1.1/grsecurity/gracl_segv.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_segv.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -50152,7 +52762,6 @@ diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv
 +gr_handle_crash(struct task_struct *task, const int sig)
 +{
 +      struct acl_subject_label *curr;
-+      struct acl_subject_label *curr2;
 +      struct task_struct *tsk, *tsk2;
 +      const struct cred *cred;
 +      const struct cred *cred2;
@@ -50199,15 +52808,16 @@ diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv
 +              } else {
 +                      gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
 +                      read_lock(&tasklist_lock);
++                      read_lock(&grsec_exec_file_lock);
 +                      do_each_thread(tsk2, tsk) {
 +                              if (likely(tsk != task)) {
-+                                      curr2 = tsk->acl;
-+
-+                                      if (curr2->device == curr->device &&
-+                                          curr2->inode == curr->inode)
++                                      // if this thread has the same subject as the one that triggered
++                                      // RES_CRASH and it's the same binary, kill it
++                                      if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
 +                                              gr_fake_force_sig(SIGKILL, tsk);
 +                              }
 +                      } while_each_thread(tsk2, tsk);
++                      read_unlock(&grsec_exec_file_lock);
 +                      read_unlock(&tasklist_lock);
 +              }
 +              rcu_read_unlock();
@@ -50270,9 +52880,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv
 +
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
---- linux-3.0.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/gracl_shm.c linux-3.1.1/grsecurity/gracl_shm.c
+--- linux-3.1.1/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/gracl_shm.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -50314,9 +52924,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
 +
 +      return 1;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chdir.c
---- linux-3.0.4/grsecurity/grsec_chdir.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_chdir.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_chdir.c linux-3.1.1/grsecurity/grsec_chdir.c
+--- linux-3.1.1/grsecurity/grsec_chdir.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_chdir.c       2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -50337,9 +52947,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chd
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_chroot.c
---- linux-3.0.4/grsecurity/grsec_chroot.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_chroot.c      2011-09-15 06:47:48.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_chroot.c linux-3.1.1/grsecurity/grsec_chroot.c
+--- linux-3.1.1/grsecurity/grsec_chroot.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_chroot.c      2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,351 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -50692,10 +53302,10 @@ diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_ch
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_disabled.c
---- linux-3.0.4/grsecurity/grsec_disabled.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_disabled.c    2011-09-24 08:13:01.000000000 -0400
-@@ -0,0 +1,433 @@
+diff -urNp linux-3.1.1/grsecurity/grsec_disabled.c linux-3.1.1/grsecurity/grsec_disabled.c
+--- linux-3.1.1/grsecurity/grsec_disabled.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_disabled.c    2011-11-17 00:16:25.000000000 -0500
+@@ -0,0 +1,439 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -50737,6 +53347,12 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +      return 0;
 +}
 +
++void
++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) 
++{
++      return;
++}
++
 +int
 +gr_handle_rawio(const struct inode *inode)
 +{
@@ -50884,7 +53500,7 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +
 +__u32
 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
-+                 const int fmode)
++                 int acc_mode)
 +{
 +      return 1;
 +}
@@ -51053,7 +53669,7 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +__u32
 +gr_acl_handle_creat(const struct dentry * dentry,
 +                  const struct dentry * p_dentry,
-+                  const struct vfsmount * p_mnt, const int fmode,
++                  const struct vfsmount * p_mnt, int open_flags, int acc_mode,
 +                  const int imode)
 +{
 +      return 1;
@@ -51129,10 +53745,10 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec.c
---- linux-3.0.4/grsecurity/grsec_exec.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_exec.c        2011-09-14 09:20:28.000000000 -0400
-@@ -0,0 +1,145 @@
+diff -urNp linux-3.1.1/grsecurity/grsec_exec.c linux-3.1.1/grsecurity/grsec_exec.c
+--- linux-3.1.1/grsecurity/grsec_exec.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_exec.c        2011-11-16 18:40:31.000000000 -0500
+@@ -0,0 +1,146 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -51249,7 +53865,8 @@ diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec
 +      "CAP_SETFCAP",
 +      "CAP_MAC_OVERRIDE",
 +      "CAP_MAC_ADMIN",
-+      "CAP_SYSLOG"
++      "CAP_SYSLOG",
++      "CAP_WAKE_ALARM"
 +};
 +
 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
@@ -51278,9 +53895,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec
 +
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
-diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo.c
---- linux-3.0.4/grsecurity/grsec_fifo.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_fifo.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_fifo.c linux-3.1.1/grsecurity/grsec_fifo.c
+--- linux-3.1.1/grsecurity/grsec_fifo.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_fifo.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51306,9 +53923,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork.c
---- linux-3.0.4/grsecurity/grsec_fork.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_fork.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_fork.c linux-3.1.1/grsecurity/grsec_fork.c
+--- linux-3.1.1/grsecurity/grsec_fork.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_fork.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51333,9 +53950,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init.c
---- linux-3.0.4/grsecurity/grsec_init.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_init.c        2011-08-25 17:25:12.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_init.c linux-3.1.1/grsecurity/grsec_init.c
+--- linux-3.1.1/grsecurity/grsec_init.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_init.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,269 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51606,9 +54223,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init
 +
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link.c
---- linux-3.0.4/grsecurity/grsec_link.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_link.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_link.c linux-3.1.1/grsecurity/grsec_link.c
+--- linux-3.1.1/grsecurity/grsec_link.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_link.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51653,10 +54270,10 @@ diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
---- linux-3.0.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_log.c 2011-09-26 10:46:21.000000000 -0400
-@@ -0,0 +1,315 @@
+diff -urNp linux-3.1.1/grsecurity/grsec_log.c linux-3.1.1/grsecurity/grsec_log.c
+--- linux-3.1.1/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_log.c 2011-11-16 18:40:31.000000000 -0500
+@@ -0,0 +1,322 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -51778,12 +54395,15 @@ diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 +      return;
 +}
 +
-+static void gr_log_end(int audit)
++static void gr_log_end(int audit, int append_default)
 +{
 +      char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
-+      unsigned int len = strlen(buf);
 +
-+      snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++      if (append_default) {
++              unsigned int len = strlen(buf);
++              snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
++      }
++
 +      printk("%s\n", buf);
 +
 +      return;
@@ -51969,12 +54589,16 @@ diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 +              gr_log_middle(audit, msg, ap);
 +      }
 +      va_end(ap);
-+      gr_log_end(audit);
++      // these don't need DEFAULTSECARGS printed on the end
++      if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
++              gr_log_end(audit, 0);
++      else
++              gr_log_end(audit, 1);
 +      END_LOCKS(audit);
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
---- linux-3.0.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_mem.c linux-3.1.1/grsecurity/grsec_mem.c
+--- linux-3.1.1/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_mem.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52009,9 +54633,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
 +      gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mount.c
---- linux-3.0.4/grsecurity/grsec_mount.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_mount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_mount.c linux-3.1.1/grsecurity/grsec_mount.c
+--- linux-3.1.1/grsecurity/grsec_mount.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_mount.c       2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52075,9 +54699,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mou
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
---- linux-3.0.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_pax.c linux-3.1.1/grsecurity/grsec_pax.c
+--- linux-3.1.1/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_pax.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52115,9 +54739,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_ptrace.c
---- linux-3.0.4/grsecurity/grsec_ptrace.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_ptrace.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_ptrace.c linux-3.1.1/grsecurity/grsec_ptrace.c
+--- linux-3.1.1/grsecurity/grsec_ptrace.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_ptrace.c      2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52133,9 +54757,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_pt
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
---- linux-3.0.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_sig.c linux-3.1.1/grsecurity/grsec_sig.c
+--- linux-3.1.1/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sig.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52343,9 +54967,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock.c
---- linux-3.0.4/grsecurity/grsec_sock.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sock.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_sock.c linux-3.1.1/grsecurity/grsec_sock.c
+--- linux-3.1.1/grsecurity/grsec_sock.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sock.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -52591,9 +55215,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sysctl.c
---- linux-3.0.4/grsecurity/grsec_sysctl.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sysctl.c      2011-08-25 17:26:15.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_sysctl.c linux-3.1.1/grsecurity/grsec_sysctl.c
+--- linux-3.1.1/grsecurity/grsec_sysctl.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_sysctl.c      2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53028,9 +55652,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sy
 +      { }
 +};
 +#endif
-diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time.c
---- linux-3.0.4/grsecurity/grsec_time.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_time.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_time.c linux-3.1.1/grsecurity/grsec_time.c
+--- linux-3.1.1/grsecurity/grsec_time.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_time.c        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53048,9 +55672,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
---- linux-3.0.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsec_tpe.c linux-3.1.1/grsecurity/grsec_tpe.c
+--- linux-3.1.1/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsec_tpe.c 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53091,9 +55715,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
 +#endif
 +      return 1;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
---- linux-3.0.4/grsecurity/grsum.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsum.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/grsecurity/grsum.c linux-3.1.1/grsecurity/grsum.c
+--- linux-3.1.1/grsecurity/grsum.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/grsum.c     2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -53156,10 +55780,10 @@ diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
 +
 +      return retval;
 +}
-diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
---- linux-3.0.4/grsecurity/Kconfig     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/Kconfig     2011-09-15 00:00:57.000000000 -0400
-@@ -0,0 +1,1038 @@
+diff -urNp linux-3.1.1/grsecurity/Kconfig linux-3.1.1/grsecurity/Kconfig
+--- linux-3.1.1/grsecurity/Kconfig     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/Kconfig     2011-11-16 18:40:31.000000000 -0500
+@@ -0,0 +1,1037 @@
 +#
 +# grecurity configuration
 +#
@@ -53256,7 +55880,7 @@ diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
 +        - Deny mknod in chroot
 +        - Deny access to abstract AF_UNIX sockets out of chroot
 +        - Deny pivot_root in chroot
-+        - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++        - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
 +        - /proc restrictions with special GID set to 10 (usually wheel)
 +        - Address Space Layout Randomization (ASLR)
 +        - Prevent exploitation of most refcount overflows
@@ -53346,7 +55970,6 @@ diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
 +        - Kernel stack randomization
 +        - Mount/unmount/remount logging
 +        - Kernel symbol hiding
-+        - Prevention of memory exhaustion-based exploits
 +        - Hardening of module auto-loading
 +        - Ptrace restrictions
 +        - Restricted vm86 mode
@@ -53369,12 +55992,12 @@ diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
 +depends on GRKERNSEC
 +
 +config GRKERNSEC_KMEM
-+      bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++      bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
 +      select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
 +      help
 +        If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+        be written to via mmap or otherwise to modify the running kernel.
-+        /dev/port will also not be allowed to be opened. If you have module
++        be written to or read from to modify or leak the contents of the running
++        kernel.  /dev/port will also not be allowed to be opened. If you have module
 +        support disabled, enabling this will close up four ways that are
 +        currently used  to insert malicious code into the running kernel.
 +        Even with all these features enabled, we still highly recommend that
@@ -54198,10 +56821,10 @@ diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-3.0.4/grsecurity/Makefile linux-3.0.4/grsecurity/Makefile
---- linux-3.0.4/grsecurity/Makefile    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/Makefile    2011-09-14 23:29:56.000000000 -0400
-@@ -0,0 +1,35 @@
+diff -urNp linux-3.1.1/grsecurity/Makefile linux-3.1.1/grsecurity/Makefile
+--- linux-3.1.1/grsecurity/Makefile    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/grsecurity/Makefile    2011-11-16 18:40:31.000000000 -0500
+@@ -0,0 +1,36 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
 +# into an RBAC system
@@ -54234,12 +56857,13 @@ diff -urNp linux-3.0.4/grsecurity/Makefile linux-3.0.4/grsecurity/Makefile
 +      @-chmod -f 500 /boot
 +      @-chmod -f 500 /lib/modules
 +      @-chmod -f 500 /lib64/modules
++      @-chmod -f 500 /lib32/modules
 +      @-chmod -f 700 .
 +      @echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus.h
---- linux-3.0.4/include/acpi/acpi_bus.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/acpi/acpi_bus.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/acpi/acpi_bus.h linux-3.1.1/include/acpi/acpi_bus.h
+--- linux-3.1.1/include/acpi/acpi_bus.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/acpi/acpi_bus.h        2011-11-16 18:39:08.000000000 -0500
 @@ -107,7 +107,7 @@ struct acpi_device_ops {
        acpi_op_bind bind;
        acpi_op_unbind unbind;
@@ -54249,9 +56873,9 @@ diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1     /* system AND device events */
  
-diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm-generic/atomic-long.h
---- linux-3.0.4/include/asm-generic/atomic-long.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/atomic-long.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/atomic-long.h linux-3.1.1/include/asm-generic/atomic-long.h
+--- linux-3.1.1/include/asm-generic/atomic-long.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/atomic-long.h      2011-11-16 18:39:08.000000000 -0500
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -54552,9 +57176,9 @@ diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-generic/cache.h
---- linux-3.0.4/include/asm-generic/cache.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/cache.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/cache.h linux-3.1.1/include/asm-generic/cache.h
+--- linux-3.1.1/include/asm-generic/cache.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/cache.h    2011-11-16 18:39:08.000000000 -0500
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -54565,9 +57189,9 @@ diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-gener
 +#define L1_CACHE_BYTES                (1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-generic/int-l64.h
---- linux-3.0.4/include/asm-generic/int-l64.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/int-l64.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/int-l64.h linux-3.1.1/include/asm-generic/int-l64.h
+--- linux-3.1.1/include/asm-generic/int-l64.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/int-l64.h  2011-11-16 18:39:08.000000000 -0500
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -54577,9 +57201,9 @@ diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-gen
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-generic/int-ll64.h
---- linux-3.0.4/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/int-ll64.h linux-3.1.1/include/asm-generic/int-ll64.h
+--- linux-3.1.1/include/asm-generic/int-ll64.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/int-ll64.h 2011-11-16 18:39:08.000000000 -0500
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -54589,9 +57213,9 @@ diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-ge
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-generic/kmap_types.h
---- linux-3.0.4/include/asm-generic/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/kmap_types.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/kmap_types.h linux-3.1.1/include/asm-generic/kmap_types.h
+--- linux-3.1.1/include/asm-generic/kmap_types.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/kmap_types.h       2011-11-16 18:39:08.000000000 -0500
 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
  KMAP_D(17)    KM_NMI,
  KMAP_D(18)    KM_NMI_PTE,
@@ -54605,9 +57229,9 @@ diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-
  };
  
  #undef KMAP_D
-diff -urNp linux-3.0.4/include/asm-generic/pgtable.h linux-3.0.4/include/asm-generic/pgtable.h
---- linux-3.0.4/include/asm-generic/pgtable.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/pgtable.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/pgtable.h linux-3.1.1/include/asm-generic/pgtable.h
+--- linux-3.1.1/include/asm-generic/pgtable.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable.h  2011-11-16 18:39:08.000000000 -0500
 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -54623,9 +57247,9 @@ diff -urNp linux-3.0.4/include/asm-generic/pgtable.h linux-3.0.4/include/asm-gen
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/asm-generic/pgtable-nopmd.h
---- linux-3.0.4/include/asm-generic/pgtable-nopmd.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/pgtable-nopmd.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopmd.h linux-3.1.1/include/asm-generic/pgtable-nopmd.h
+--- linux-3.1.1/include/asm-generic/pgtable-nopmd.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable-nopmd.h    2011-11-16 18:39:08.000000000 -0500
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -54662,9 +57286,9 @@ diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/a
  /*
   * 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-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/asm-generic/pgtable-nopud.h
---- linux-3.0.4/include/asm-generic/pgtable-nopud.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/pgtable-nopud.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/pgtable-nopud.h linux-3.1.1/include/asm-generic/pgtable-nopud.h
+--- linux-3.1.1/include/asm-generic/pgtable-nopud.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/pgtable-nopud.h    2011-11-16 18:39:08.000000000 -0500
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -54695,9 +57319,9 @@ diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/a
  /*
   * 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-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm-generic/vmlinux.lds.h
---- linux-3.0.4/include/asm-generic/vmlinux.lds.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/vmlinux.lds.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/asm-generic/vmlinux.lds.h linux-3.1.1/include/asm-generic/vmlinux.lds.h
+--- linux-3.1.1/include/asm-generic/vmlinux.lds.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/asm-generic/vmlinux.lds.h      2011-11-16 18:39:08.000000000 -0500
 @@ -217,6 +217,7 @@
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                VMLINUX_SYMBOL(__start_rodata) = .;                     \
@@ -54729,9 +57353,9 @@ diff -urNp linux-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm
  
  /**
   * PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.0.4/include/drm/drm_crtc_helper.h linux-3.0.4/include/drm/drm_crtc_helper.h
---- linux-3.0.4/include/drm/drm_crtc_helper.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/drm/drm_crtc_helper.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/drm/drm_crtc_helper.h linux-3.1.1/include/drm/drm_crtc_helper.h
+--- linux-3.1.1/include/drm/drm_crtc_helper.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/drm_crtc_helper.h  2011-11-16 18:39:08.000000000 -0500
 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
  
        /* disable crtc when not in use - more explicit than dpms off */
@@ -54750,9 +57374,9 @@ diff -urNp linux-3.0.4/include/drm/drm_crtc_helper.h linux-3.0.4/include/drm/drm
  
  struct drm_connector_helper_funcs {
        int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
---- linux-3.0.4/include/drm/drmP.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/drm/drmP.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/drm/drmP.h linux-3.1.1/include/drm/drmP.h
+--- linux-3.1.1/include/drm/drmP.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/drmP.h     2011-11-16 18:39:08.000000000 -0500
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -54761,7 +57385,7 @@ diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
  #include "drm.h"
  
  #include <linux/idr.h>
-@@ -1033,7 +1034,7 @@ struct drm_device {
+@@ -1035,7 +1036,7 @@ struct drm_device {
  
        /** \name Usage Counters */
        /*@{ */
@@ -54770,7 +57394,7 @@ diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/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 */
-@@ -1044,7 +1045,7 @@ struct drm_device {
+@@ -1046,7 +1047,7 @@ struct drm_device {
        /*@{ */
        unsigned long counters;
        enum drm_stat_type types[15];
@@ -54779,9 +57403,9 @@ diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
        /*@} */
  
        struct list_head filelist;
-diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/ttm_memory.h
---- linux-3.0.4/include/drm/ttm/ttm_memory.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/drm/ttm/ttm_memory.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/drm/ttm/ttm_memory.h linux-3.1.1/include/drm/ttm/ttm_memory.h
+--- linux-3.1.1/include/drm/ttm/ttm_memory.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/drm/ttm/ttm_memory.h   2011-11-16 18:39:08.000000000 -0500
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -54791,9 +57415,9 @@ diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
---- linux-3.0.4/include/linux/a.out.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/a.out.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/a.out.h linux-3.1.1/include/linux/a.out.h
+--- linux-3.1.1/include/linux/a.out.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/a.out.h  2011-11-16 18:39:08.000000000 -0500
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152               /* MIPS R6000/R4000 binary */
  };
@@ -54809,9 +57433,9 @@ diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
---- linux-3.0.4/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/atmdev.h linux-3.1.1/include/linux/atmdev.h
+--- linux-3.1.1/include/linux/atmdev.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/atmdev.h 2011-11-16 18:39:08.000000000 -0500
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -54821,9 +57445,9 @@ diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts.h
---- linux-3.0.4/include/linux/binfmts.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/binfmts.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/binfmts.h linux-3.1.1/include/linux/binfmts.h
+--- linux-3.1.1/include/linux/binfmts.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/binfmts.h        2011-11-16 18:39:08.000000000 -0500
 @@ -88,6 +88,7 @@ struct linux_binfmt {
        int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
        int (*load_shlib)(struct file *);
@@ -54832,10 +57456,10 @@ diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts
        unsigned long min_coredump;     /* minimal dump size */
  };
  
-diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
---- linux-3.0.4/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/blkdev.h 2011-08-26 19:49:56.000000000 -0400
-@@ -1308,7 +1308,7 @@ struct block_device_operations {
+diff -urNp linux-3.1.1/include/linux/blkdev.h linux-3.1.1/include/linux/blkdev.h
+--- linux-3.1.1/include/linux/blkdev.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/blkdev.h 2011-11-16 18:39:08.000000000 -0500
+@@ -1321,7 +1321,7 @@ struct block_device_operations {
        /* this callback is with swap_lock and sometimes page table lock held */
        void (*swap_slot_free_notify) (struct block_device *, unsigned long);
        struct module *owner;
@@ -54844,10 +57468,10 @@ diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
                                 unsigned long);
-diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/blktrace_api.h
---- linux-3.0.4/include/linux/blktrace_api.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/blktrace_api.h   2011-08-23 21:47:56.000000000 -0400
-@@ -161,7 +161,7 @@ struct blk_trace {
+diff -urNp linux-3.1.1/include/linux/blktrace_api.h linux-3.1.1/include/linux/blktrace_api.h
+--- linux-3.1.1/include/linux/blktrace_api.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/blktrace_api.h   2011-11-16 18:39:08.000000000 -0500
+@@ -162,7 +162,7 @@ struct blk_trace {
        struct dentry *dir;
        struct dentry *dropped_file;
        struct dentry *msg_file;
@@ -54856,9 +57480,9 @@ diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/bl
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/include/linux/byteorder/little_endian.h
---- linux-3.0.4/include/linux/byteorder/little_endian.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/byteorder/little_endian.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/byteorder/little_endian.h linux-3.1.1/include/linux/byteorder/little_endian.h
+--- linux-3.1.1/include/linux/byteorder/little_endian.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/byteorder/little_endian.h        2011-11-16 18:39:08.000000000 -0500
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -54923,9 +57547,9 @@ diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/inclu
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
---- linux-3.0.4/include/linux/cache.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cache.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/cache.h linux-3.1.1/include/linux/cache.h
+--- linux-3.1.1/include/linux/cache.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cache.h  2011-11-16 18:39:08.000000000 -0500
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -54937,9 +57561,9 @@ diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capability.h
---- linux-3.0.4/include/linux/capability.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/capability.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/capability.h linux-3.1.1/include/linux/capability.h
+--- linux-3.1.1/include/linux/capability.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/capability.h     2011-11-16 18:40:31.000000000 -0500
 @@ -547,6 +547,9 @@ extern bool capable(int cap);
  extern bool ns_capable(struct user_namespace *ns, int cap);
  extern bool task_ns_capable(struct task_struct *t, int cap);
@@ -54950,9 +57574,9 @@ diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capa
  
  /* audit system wants to get cap info from files as well */
  extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/cleancache.h
---- linux-3.0.4/include/linux/cleancache.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cleancache.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/cleancache.h linux-3.1.1/include/linux/cleancache.h
+--- linux-3.1.1/include/linux/cleancache.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cleancache.h     2011-11-16 18:39:08.000000000 -0500
 @@ -31,7 +31,7 @@ struct cleancache_ops {
        void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
        void (*flush_inode)(int, struct cleancache_filekey);
@@ -54962,9 +57586,9 @@ diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/clea
  
  extern struct cleancache_ops
        cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/compiler-gcc4.h
---- linux-3.0.4/include/linux/compiler-gcc4.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/compiler-gcc4.h  2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/compiler-gcc4.h linux-3.1.1/include/linux/compiler-gcc4.h
+--- linux-3.1.1/include/linux/compiler-gcc4.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/compiler-gcc4.h  2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,12 @@
  
  
@@ -54990,10 +57614,83 @@ diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/c
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compiler.h
---- linux-3.0.4/include/linux/compiler.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/compiler.h       2011-08-26 19:49:56.000000000 -0400
-@@ -264,6 +264,14 @@ void ftrace_likely_update(struct ftrace_
+diff -urNp linux-3.1.1/include/linux/compiler.h linux-3.1.1/include/linux/compiler.h
+--- linux-3.1.1/include/linux/compiler.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/compiler.h       2011-11-16 18:39:08.000000000 -0500
+@@ -5,31 +5,62 @@
+ 
+ #ifdef __CHECKER__
+ # define __user               __attribute__((noderef, address_space(1)))
++# define __force_user __force __user
+ # define __kernel     __attribute__((address_space(0)))
++# define __force_kernel       __force __kernel
+ # define __safe               __attribute__((safe))
+ # define __force      __attribute__((force))
+ # define __nocast     __attribute__((nocast))
+ # define __iomem      __attribute__((noderef, address_space(2)))
++# define __force_iomem        __force __iomem
+ # define __acquires(x)        __attribute__((context(x,0,1)))
+ # define __releases(x)        __attribute__((context(x,1,0)))
+ # define __acquire(x) __context__(x,1)
+ # define __release(x) __context__(x,-1)
+ # define __cond_lock(x,c)     ((c) ? ({ __acquire(x); 1; }) : 0)
+ # define __percpu     __attribute__((noderef, address_space(3)))
++# define __force_percpu       __force __percpu
+ #ifdef CONFIG_SPARSE_RCU_POINTER
+ # define __rcu                __attribute__((noderef, address_space(4)))
++# define __force_rcu  __force __rcu
+ #else
+ # define __rcu
++# define __force_rcu
+ #endif
+ extern void __chk_user_ptr(const volatile void __user *);
+ extern void __chk_io_ptr(const volatile void __iomem *);
++#elif defined(CHECKER_PLUGIN)
++//# define __user
++//# define __force_user
++//# define __kernel
++//# define __force_kernel
++# define __safe
++# define __force
++# define __nocast
++# define __iomem
++# define __force_iomem
++# define __chk_user_ptr(x) (void)0
++# define __chk_io_ptr(x) (void)0
++# define __builtin_warning(x, y...) (1)
++# define __acquires(x)
++# define __releases(x)
++# define __acquire(x) (void)0
++# define __release(x) (void)0
++# define __cond_lock(x,c) (c)
++# define __percpu
++# define __force_percpu
++# define __rcu
++# define __force_rcu
+ #else
+ # define __user
++# define __force_user
+ # define __kernel
++# define __force_kernel
+ # define __safe
+ # define __force
+ # define __nocast
+ # define __iomem
++# define __force_iomem
+ # define __chk_user_ptr(x) (void)0
+ # define __chk_io_ptr(x) (void)0
+ # define __builtin_warning(x, y...) (1)
+@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile 
+ # define __release(x) (void)0
+ # define __cond_lock(x,c) (c)
+ # define __percpu
++# define __force_percpu
+ # define __rcu
++# define __force_rcu
+ #endif
+ 
+ #ifdef __KERNEL__
+@@ -264,6 +297,14 @@ void ftrace_likely_update(struct ftrace_
  # define __attribute_const__  /* unimplemented */
  #endif
  
@@ -55008,7 +57705,7 @@ diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compil
  /*
   * Tell gcc if a function is cold. The compiler will assume any path
   * directly leading to the call is unlikely.
-@@ -273,6 +281,22 @@ void ftrace_likely_update(struct ftrace_
+@@ -273,6 +314,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
@@ -55031,7 +57728,7 @@ diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compil
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -306,6 +330,7 @@ void ftrace_likely_update(struct ftrace_
+@@ -306,6 +363,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.
   */
@@ -55040,9 +57737,9 @@ diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
---- linux-3.0.4/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/cpuset.h linux-3.1.1/include/linux/cpuset.h
+--- linux-3.1.1/include/linux/cpuset.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/cpuset.h 2011-11-16 18:39:08.000000000 -0500
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
         * nodemask.
         */
@@ -55052,9 +57749,9 @@ diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
---- linux-3.0.4/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/crypto.h linux-3.1.1/include/linux/crypto.h
+--- linux-3.1.1/include/linux/crypto.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/crypto.h 2011-11-16 18:39:08.000000000 -0500
 @@ -361,7 +361,7 @@ struct cipher_tfm {
                          const u8 *key, unsigned int keylen);
        void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -55080,9 +57777,9 @@ diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
  
  #define crt_ablkcipher        crt_u.ablkcipher
  #define crt_aead      crt_u.aead
-diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/decompress/mm.h
---- linux-3.0.4/include/linux/decompress/mm.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/decompress/mm.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/decompress/mm.h linux-3.1.1/include/linux/decompress/mm.h
+--- linux-3.1.1/include/linux/decompress/mm.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/decompress/mm.h  2011-11-16 18:39:08.000000000 -0500
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -55092,10 +57789,10 @@ diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/d
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma-mapping.h
---- linux-3.0.4/include/linux/dma-mapping.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/dma-mapping.h    2011-08-26 19:49:56.000000000 -0400
-@@ -50,7 +50,7 @@ struct dma_map_ops {
+diff -urNp linux-3.1.1/include/linux/dma-mapping.h linux-3.1.1/include/linux/dma-mapping.h
+--- linux-3.1.1/include/linux/dma-mapping.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/dma-mapping.h    2011-11-16 18:39:08.000000000 -0500
+@@ -42,7 +42,7 @@ struct dma_map_ops {
        int (*dma_supported)(struct device *dev, u64 mask);
        int (*set_dma_mask)(struct device *dev, u64 mask);
        int is_phys;
@@ -55104,10 +57801,10 @@ diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma
  
  #define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
-diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
---- linux-3.0.4/include/linux/efi.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/efi.h    2011-08-23 21:47:56.000000000 -0400
-@@ -410,7 +410,7 @@ struct efivar_operations {
+diff -urNp linux-3.1.1/include/linux/efi.h linux-3.1.1/include/linux/efi.h
+--- linux-3.1.1/include/linux/efi.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/efi.h    2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ struct efivar_operations {
        efi_get_variable_t *get_variable;
        efi_get_next_variable_t *get_next_variable;
        efi_set_variable_t *set_variable;
@@ -55116,9 +57813,9 @@ diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
  
  struct efivars {
        /*
-diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
---- linux-3.0.4/include/linux/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/elf.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/elf.h linux-3.1.1/include/linux/elf.h
+--- linux-3.1.1/include/linux/elf.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/elf.h    2011-11-16 18:39:08.000000000 -0500
 @@ -49,6 +49,17 @@ typedef __s64       Elf64_Sxword;
  #define PT_GNU_EH_FRAME               0x6474e550
  
@@ -55191,9 +57888,9 @@ diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewire.h
---- linux-3.0.4/include/linux/firewire.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/firewire.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/firewire.h linux-3.1.1/include/linux/firewire.h
+--- linux-3.1.1/include/linux/firewire.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/firewire.h       2011-11-16 18:39:08.000000000 -0500
 @@ -428,7 +428,7 @@ struct fw_iso_context {
        union {
                fw_iso_callback_t sc;
@@ -55203,9 +57900,9 @@ diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewi
        void *callback_data;
  };
  
-diff -urNp linux-3.0.4/include/linux/fscache-cache.h linux-3.0.4/include/linux/fscache-cache.h
---- linux-3.0.4/include/linux/fscache-cache.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fscache-cache.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/fscache-cache.h linux-3.1.1/include/linux/fscache-cache.h
+--- linux-3.1.1/include/linux/fscache-cache.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fscache-cache.h  2011-11-16 18:39:08.000000000 -0500
 @@ -102,7 +102,7 @@ struct fscache_operation {
        fscache_operation_release_t release;
  };
@@ -55224,22 +57921,10 @@ diff -urNp linux-3.0.4/include/linux/fscache-cache.h linux-3.0.4/include/linux/f
        op->processor = processor;
        op->release = release;
        INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-3.0.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
---- linux-3.0.4/include/linux/fs.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fs.h     2011-08-26 19:49:56.000000000 -0400
-@@ -109,6 +109,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)0x2000000)
-+
- /*
-  * The below are the various read and write types that we support. Some of
-  * them include behavioral modifiers that send information down to the
-@@ -1571,7 +1576,8 @@ struct file_operations {
+diff -urNp linux-3.1.1/include/linux/fs.h linux-3.1.1/include/linux/fs.h
+--- linux-3.1.1/include/linux/fs.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fs.h     2011-11-16 23:39:39.000000000 -0500
+@@ -1588,7 +1588,8 @@ struct file_operations {
        int (*setlease)(struct file *, long, struct file_lock **);
        long (*fallocate)(struct file *file, int mode, loff_t offset,
                          loff_t len);
@@ -55247,11 +57932,11 @@ diff -urNp linux-3.0.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
 +} __do_const;
 +typedef struct file_operations __no_const file_operations_no_const;
  
- #define IPERM_FLAG_RCU        0x0001
- 
-diff -urNp linux-3.0.4/include/linux/fsnotify.h linux-3.0.4/include/linux/fsnotify.h
---- linux-3.0.4/include/linux/fsnotify.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fsnotify.h       2011-08-24 18:10:29.000000000 -0400
+ struct inode_operations {
+       struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+diff -urNp linux-3.1.1/include/linux/fsnotify.h linux-3.1.1/include/linux/fsnotify.h
+--- linux-3.1.1/include/linux/fsnotify.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fsnotify.h       2011-11-16 18:39:08.000000000 -0500
 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
   */
  static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
@@ -55261,9 +57946,9 @@ diff -urNp linux-3.0.4/include/linux/fsnotify.h linux-3.0.4/include/linux/fsnoti
  }
  
  /*
-diff -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_struct.h
---- linux-3.0.4/include/linux/fs_struct.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fs_struct.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/fs_struct.h linux-3.1.1/include/linux/fs_struct.h
+--- linux-3.1.1/include/linux/fs_struct.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/fs_struct.h      2011-11-16 18:39:08.000000000 -0500
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -55273,10 +57958,10 @@ diff -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_st
        spinlock_t lock;
        seqcount_t seq;
        int umask;
-diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ftrace_event.h
---- linux-3.0.4/include/linux/ftrace_event.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/ftrace_event.h   2011-08-23 21:47:56.000000000 -0400
-@@ -96,7 +96,7 @@ struct trace_event_functions {
+diff -urNp linux-3.1.1/include/linux/ftrace_event.h linux-3.1.1/include/linux/ftrace_event.h
+--- linux-3.1.1/include/linux/ftrace_event.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/ftrace_event.h   2011-11-16 18:39:08.000000000 -0500
+@@ -97,7 +97,7 @@ struct trace_event_functions {
        trace_print_func        raw;
        trace_print_func        hex;
        trace_print_func        binary;
@@ -55285,7 +57970,7 @@ diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ft
  
  struct trace_event {
        struct hlist_node               node;
-@@ -247,7 +247,7 @@ extern int trace_define_field(struct ftr
+@@ -252,7 +252,7 @@ extern int trace_define_field(struct ftr
  extern int trace_add_event_call(struct ftrace_event_call *call);
  extern void trace_remove_event_call(struct ftrace_event_call *call);
  
@@ -55294,9 +57979,9 @@ diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ft
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
---- linux-3.0.4/include/linux/genhd.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/genhd.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/genhd.h linux-3.1.1/include/linux/genhd.h
+--- linux-3.1.1/include/linux/genhd.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/genhd.h  2011-11-16 18:39:08.000000000 -0500
 @@ -184,7 +184,7 @@ struct gendisk {
        struct kobject *slave_dir;
  
@@ -55306,9 +57991,9 @@ diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
        struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
        struct blk_integrity *integrity;
-diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
---- linux-3.0.4/include/linux/gracl.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/gracl.h  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/gracl.h linux-3.1.1/include/linux/gracl.h
+--- linux-3.1.1/include/linux/gracl.h  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/gracl.h  2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -55627,9 +58312,9 @@ diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc.h
---- linux-3.0.4/include/linux/gralloc.h        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/gralloc.h        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/gralloc.h linux-3.1.1/include/linux/gralloc.h
+--- linux-3.1.1/include/linux/gralloc.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/gralloc.h        2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -55640,9 +58325,9 @@ diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
---- linux-3.0.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/grdefs.h linux-3.1.1/include/linux/grdefs.h
+--- linux-3.1.1/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grdefs.h 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -55784,10 +58469,10 @@ diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
 +};
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grinternal.h
---- linux-3.0.4/include/linux/grinternal.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grinternal.h     2011-09-24 08:43:45.000000000 -0400
-@@ -0,0 +1,219 @@
+diff -urNp linux-3.1.1/include/linux/grinternal.h linux-3.1.1/include/linux/grinternal.h
+--- linux-3.1.1/include/linux/grinternal.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grinternal.h     2011-11-16 18:40:31.000000000 -0500
+@@ -0,0 +1,220 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
 +
@@ -55912,7 +58597,8 @@ diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grin
 +      CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
 +      CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
 +      CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
-+      CAP_TO_MASK(CAP_IPC_OWNER) , CAP_TO_MASK(CAP_SYSLOG) }}
++      CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
++      CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
 +
 +#define security_learn(normal_msg,args...) \
 +({ \
@@ -56007,9 +58693,9 @@ diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grin
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
---- linux-3.0.4/include/linux/grmsg.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grmsg.h  2011-09-14 09:16:54.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/grmsg.h linux-3.1.1/include/linux/grmsg.h
+--- linux-3.1.1/include/linux/grmsg.h  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grmsg.h  2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,108 @@
 +#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"
@@ -56119,10 +58805,10 @@ diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grsecurity.h
---- linux-3.0.4/include/linux/grsecurity.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grsecurity.h     2011-09-14 09:16:54.000000000 -0400
-@@ -0,0 +1,226 @@
+diff -urNp linux-3.1.1/include/linux/grsecurity.h linux-3.1.1/include/linux/grsecurity.h
+--- linux-3.1.1/include/linux/grsecurity.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grsecurity.h     2011-11-17 00:16:10.000000000 -0500
+@@ -0,0 +1,228 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -56280,13 +58966,15 @@ diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grse
 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
 +                              const struct vfsmount *mnt);
 +__u32 gr_acl_handle_open(const struct dentry *dentry,
-+                              const struct vfsmount *mnt, const int fmode);
++                              const struct vfsmount *mnt, int acc_mode);
 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
 +                               const struct dentry *p_dentry,
-+                               const struct vfsmount *p_mnt, const int fmode,
-+                               const int imode);
++                               const struct vfsmount *p_mnt,
++                               int open_flags, int acc_mode, const int imode);
 +void gr_handle_create(const struct dentry *dentry,
 +                           const struct vfsmount *mnt);
++void gr_handle_proc_create(const struct dentry *dentry,
++                         const struct inode *inode);
 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
 +                               const struct dentry *parent_dentry,
 +                               const struct vfsmount *parent_mnt,
@@ -56349,9 +59037,9 @@ diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grse
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
---- linux-3.0.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/grsock.h linux-3.1.1/include/linux/grsock.h
+--- linux-3.1.1/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/grsock.h 2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -56372,10 +59060,10 @@ diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
 +                          const int protocol);
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
---- linux-3.0.4/include/linux/hid.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/hid.h    2011-08-23 21:47:56.000000000 -0400
-@@ -675,7 +675,7 @@ struct hid_ll_driver {
+diff -urNp linux-3.1.1/include/linux/hid.h linux-3.1.1/include/linux/hid.h
+--- linux-3.1.1/include/linux/hid.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/hid.h    2011-11-16 18:39:08.000000000 -0500
+@@ -676,7 +676,7 @@ struct hid_ll_driver {
                        unsigned int code, int value);
  
        int (*parse)(struct hid_device *hdev);
@@ -56384,9 +59072,9 @@ diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
  
  #define       PM_HINT_FULLON  1<<5
  #define PM_HINT_NORMAL        1<<1
-diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem.h
---- linux-3.0.4/include/linux/highmem.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/highmem.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/highmem.h linux-3.1.1/include/linux/highmem.h
+--- linux-3.1.1/include/linux/highmem.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/highmem.h        2011-11-16 18:39:08.000000000 -0500
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
        kunmap_atomic(kaddr, KM_USER0);
  }
@@ -56406,9 +59094,9 @@ diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem
  static inline void zero_user_segments(struct page *page,
        unsigned start1, unsigned end1,
        unsigned start2, unsigned end2)
-diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
---- linux-3.0.4/include/linux/i2c.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/i2c.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/i2c.h linux-3.1.1/include/linux/i2c.h
+--- linux-3.1.1/include/linux/i2c.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/i2c.h    2011-11-16 18:39:08.000000000 -0500
 @@ -346,6 +346,7 @@ struct i2c_algorithm {
        /* To determine what the adapter supports */
        u32 (*functionality) (struct i2c_adapter *);
@@ -56417,9 +59105,9 @@ diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
---- linux-3.0.4/include/linux/i2o.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/i2o.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/i2o.h linux-3.1.1/include/linux/i2o.h
+--- linux-3.1.1/include/linux/i2o.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/i2o.h    2011-11-16 18:39:08.000000000 -0500
 @@ -564,7 +564,7 @@ struct i2o_controller {
        struct i2o_device *exec;        /* Executive */
  #if BITS_PER_LONG == 64
@@ -56429,9 +59117,9 @@ diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
        struct list_head context_list;  /* list of context id's
                                           and pointers */
  #endif
-diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
---- linux-3.0.4/include/linux/init.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/init.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/init.h linux-3.1.1/include/linux/init.h
+--- linux-3.1.1/include/linux/init.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/init.h   2011-11-16 18:39:08.000000000 -0500
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -56448,9 +59136,9 @@ diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
        { return exitfn; }                                      \
        void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_task.h
---- linux-3.0.4/include/linux/init_task.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/init_task.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/init_task.h linux-3.1.1/include/linux/init_task.h
+--- linux-3.1.1/include/linux/init_task.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/init_task.h      2011-11-16 18:39:08.000000000 -0500
 @@ -126,6 +126,12 @@ extern struct cred init_cred;
  # define INIT_PERF_EVENTS(tsk)
  #endif
@@ -56472,9 +59160,9 @@ diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_
        .fs             = &init_fs,                                     \
        .files          = &init_files,                                  \
        .signal         = &init_signals,                                \
-diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/intel-iommu.h
---- linux-3.0.4/include/linux/intel-iommu.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/intel-iommu.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/intel-iommu.h linux-3.1.1/include/linux/intel-iommu.h
+--- linux-3.1.1/include/linux/intel-iommu.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/intel-iommu.h    2011-11-16 18:39:08.000000000 -0500
 @@ -296,7 +296,7 @@ struct iommu_flush {
                              u8 fm, u64 type);
        void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -56484,10 +59172,10 @@ diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/int
  
  enum {
        SR_DMAR_FECTL_REG,
-diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/interrupt.h
---- linux-3.0.4/include/linux/interrupt.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/interrupt.h      2011-08-23 21:47:56.000000000 -0400
-@@ -422,7 +422,7 @@ enum
+diff -urNp linux-3.1.1/include/linux/interrupt.h linux-3.1.1/include/linux/interrupt.h
+--- linux-3.1.1/include/linux/interrupt.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/interrupt.h      2011-11-16 18:39:08.000000000 -0500
+@@ -425,7 +425,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
   */
@@ -56496,7 +59184,7 @@ diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/inter
  
  /* softirq mask and active fields moved to irq_cpustat_t in
   * asm/hardirq.h to get better cache usage.  KAO
-@@ -430,12 +430,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
+@@ -433,12 +433,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
  
  struct softirq_action
  {
@@ -56511,9 +59199,9 @@ diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/inter
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsyms.h
---- linux-3.0.4/include/linux/kallsyms.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kallsyms.h       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/kallsyms.h linux-3.1.1/include/linux/kallsyms.h
+--- linux-3.1.1/include/linux/kallsyms.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kallsyms.h       2011-11-16 18:40:31.000000000 -0500
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -56541,9 +59229,9 @@ diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsy
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
---- linux-3.0.4/include/linux/kgdb.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kgdb.h   2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/kgdb.h linux-3.1.1/include/linux/kgdb.h
+--- linux-3.1.1/include/linux/kgdb.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kgdb.h   2011-11-16 18:39:08.000000000 -0500
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -56571,9 +59259,9 @@ diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
  
  extern struct kgdb_arch               arch_kgdb_ops;
  
-diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
---- linux-3.0.4/include/linux/kmod.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kmod.h   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/kmod.h linux-3.1.1/include/linux/kmod.h
+--- linux-3.1.1/include/linux/kmod.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kmod.h   2011-11-16 18:40:31.000000000 -0500
 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -56583,10 +59271,10 @@ diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_host.h
---- linux-3.0.4/include/linux/kvm_host.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kvm_host.h       2011-08-23 21:47:56.000000000 -0400
-@@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-3.1.1/include/linux/kvm_host.h linux-3.1.1/include/linux/kvm_host.h
+--- linux-3.1.1/include/linux/kvm_host.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/kvm_host.h       2011-11-16 18:39:08.000000000 -0500
+@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
@@ -56595,7 +59283,7 @@ diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_ho
                  struct module *module);
  void kvm_exit(void);
  
-@@ -446,7 +446,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -454,7 +454,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);
  
@@ -56604,10 +59292,10 @@ diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_ho
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
---- linux-3.0.4/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/libata.h 2011-08-26 19:49:56.000000000 -0400
-@@ -899,7 +899,7 @@ struct ata_port_operations {
+diff -urNp linux-3.1.1/include/linux/libata.h linux-3.1.1/include/linux/libata.h
+--- linux-3.1.1/include/linux/libata.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/libata.h 2011-11-16 18:39:08.000000000 -0500
+@@ -909,7 +909,7 @@ struct ata_port_operations {
         * fields must be pointers.
         */
        const struct ata_port_operations        *inherits;
@@ -56616,9 +59304,9 @@ diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
  
  struct ata_port_info {
        unsigned long           flags;
-diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
---- linux-3.0.4/include/linux/mca.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mca.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/mca.h linux-3.1.1/include/linux/mca.h
+--- linux-3.1.1/include/linux/mca.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mca.h    2011-11-16 18:39:08.000000000 -0500
 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
                                                  int region);
        void *          (*mca_transform_memory)(struct mca_device *,
@@ -56628,9 +59316,9 @@ diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
  
  struct mca_bus {
        u64                     default_dma_mask;
-diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
---- linux-3.0.4/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/memory.h linux-3.1.1/include/linux/memory.h
+--- linux-3.1.1/include/linux/memory.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/memory.h 2011-11-16 18:39:08.000000000 -0500
 @@ -144,7 +144,7 @@ struct memory_accessor {
                        size_t count);
        ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -56640,9 +59328,9 @@ diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/abx500.h
---- linux-3.0.4/include/linux/mfd/abx500.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mfd/abx500.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/mfd/abx500.h linux-3.1.1/include/linux/mfd/abx500.h
+--- linux-3.1.1/include/linux/mfd/abx500.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mfd/abx500.h     2011-11-16 18:39:08.000000000 -0500
 @@ -234,6 +234,7 @@ struct abx500_ops {
        int (*event_registers_startup_state_get) (struct device *, u8 *);
        int (*startup_irq_enabled) (struct device *, unsigned int);
@@ -56651,10 +59339,10 @@ diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/
  
  int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
  void abx500_remove_ops(struct device *dev);
-diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
---- linux-3.0.4/include/linux/mm.h     2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/mm.h     2011-08-23 21:47:56.000000000 -0400
-@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
+diff -urNp linux-3.1.1/include/linux/mm.h linux-3.1.1/include/linux/mm.h
+--- linux-3.1.1/include/linux/mm.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mm.h     2011-11-16 18:39:08.000000000 -0500
+@@ -114,7 +114,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000   /* Has ->fault & does nonlinear pages */
  #define VM_MIXEDMAP   0x10000000      /* Can contain "struct page" and pure PFN pages */
@@ -56669,7 +59357,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/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 */
  
-@@ -1009,34 +1016,6 @@ int set_page_dirty(struct page *page);
+@@ -1011,34 +1018,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);
  
@@ -56704,9 +59392,9 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
  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);
-@@ -1169,6 +1148,15 @@ struct shrinker {
- extern void register_shrinker(struct shrinker *);
- extern void unregister_shrinker(struct shrinker *);
+@@ -1133,6 +1112,15 @@ static inline void sync_mm_rss(struct ta
+ }
+ #endif
  
 +#ifdef CONFIG_MMU
 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
@@ -56720,7 +59408,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/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,
-@@ -1452,6 +1440,7 @@ out:
+@@ -1417,6 +1405,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -56728,7 +59416,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1510,6 +1499,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1474,6 +1463,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);
  
@@ -56739,7 +59427,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/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)
-@@ -1526,15 +1519,6 @@ static inline unsigned long vma_pages(st
+@@ -1490,15 +1483,6 @@ static inline unsigned long vma_pages(st
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -56755,7 +59443,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/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);
-@@ -1647,7 +1631,7 @@ extern int unpoison_memory(unsigned long
+@@ -1612,7 +1596,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);
@@ -56764,7 +59452,7 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
  extern int soft_offline_page(struct page *page, int flags);
  
  extern void dump_page(struct page *page);
-@@ -1661,5 +1645,11 @@ extern void copy_user_huge_page(struct p
+@@ -1626,5 +1610,11 @@ extern void copy_user_huge_page(struct p
                                unsigned int pages_per_huge_page);
  #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
  
@@ -56776,10 +59464,10 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_types.h
---- linux-3.0.4/include/linux/mm_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mm_types.h       2011-08-23 21:47:56.000000000 -0400
-@@ -184,6 +184,8 @@ struct vm_area_struct {
+diff -urNp linux-3.1.1/include/linux/mm_types.h linux-3.1.1/include/linux/mm_types.h
+--- linux-3.1.1/include/linux/mm_types.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mm_types.h       2011-11-16 18:39:08.000000000 -0500
+@@ -230,6 +230,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
        struct mempolicy *vm_policy;    /* NUMA policy for the VMA */
  #endif
@@ -56788,7 +59476,7 @@ diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_typ
  };
  
  struct core_thread {
-@@ -316,6 +318,24 @@ struct mm_struct {
+@@ -362,6 +364,24 @@ struct mm_struct {
  #ifdef CONFIG_CPUMASK_OFFSTACK
        struct cpumask cpumask_allocation;
  #endif
@@ -56813,9 +59501,9 @@ diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_typ
  };
  
  static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mmu_notifier.h
---- linux-3.0.4/include/linux/mmu_notifier.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mmu_notifier.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/mmu_notifier.h linux-3.1.1/include/linux/mmu_notifier.h
+--- linux-3.1.1/include/linux/mmu_notifier.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mmu_notifier.h   2011-11-16 18:39:08.000000000 -0500
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)             \
@@ -56832,10 +59520,10 @@ diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mm
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)             \
-diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
---- linux-3.0.4/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400
-@@ -350,7 +350,7 @@ struct zone {
+diff -urNp linux-3.1.1/include/linux/mmzone.h linux-3.1.1/include/linux/mmzone.h
+--- linux-3.1.1/include/linux/mmzone.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mmzone.h 2011-11-16 18:39:08.000000000 -0500
+@@ -356,7 +356,7 @@ struct zone {
        unsigned long           flags;             /* zone flags, see below */
  
        /* Zone statistics */
@@ -56844,9 +59532,9 @@ diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
  
        /*
         * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux/mod_devicetable.h
---- linux-3.0.4/include/linux/mod_devicetable.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mod_devicetable.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/mod_devicetable.h linux-3.1.1/include/linux/mod_devicetable.h
+--- linux-3.1.1/include/linux/mod_devicetable.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/mod_devicetable.h        2011-11-16 18:39:08.000000000 -0500
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -56865,9 +59553,9 @@ diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux
  
  struct hid_device_id {
        __u16 bus;
-diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
---- linux-3.0.4/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/module.h linux-3.1.1/include/linux/module.h
+--- linux-3.1.1/include/linux/module.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/module.h 2011-11-16 18:39:08.000000000 -0500
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -56876,7 +59564,7 @@ diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
  
  #include <linux/percpu.h>
  #include <asm/module.h>
-@@ -325,19 +326,16 @@ struct module
+@@ -327,19 +328,16 @@ struct module
        int (*init)(void);
  
        /* If this is non-NULL, vfree after init() returns */
@@ -56900,7 +59588,7 @@ diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
  
        /* Arch-specific module values */
        struct mod_arch_specific arch;
-@@ -393,6 +391,10 @@ struct module
+@@ -395,6 +393,10 @@ struct module
  #ifdef CONFIG_EVENT_TRACING
        struct ftrace_event_call **trace_events;
        unsigned int num_trace_events;
@@ -56911,7 +59599,7 @@ diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
  #endif
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
        unsigned int num_ftrace_callsites;
-@@ -443,16 +445,46 @@ bool is_module_address(unsigned long add
+@@ -445,16 +447,46 @@ bool is_module_address(unsigned long add
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -56962,10 +59650,10 @@ diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/moduleloader.h
---- linux-3.0.4/include/linux/moduleloader.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/moduleloader.h   2011-08-23 21:47:56.000000000 -0400
-@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
+diff -urNp linux-3.1.1/include/linux/moduleloader.h linux-3.1.1/include/linux/moduleloader.h
+--- linux-3.1.1/include/linux/moduleloader.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/moduleloader.h   2011-11-16 18:39:08.000000000 -0500
+@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
  
@@ -56987,9 +59675,9 @@ diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/mo
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/moduleparam.h
---- linux-3.0.4/include/linux/moduleparam.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/moduleparam.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/moduleparam.h linux-3.1.1/include/linux/moduleparam.h
+--- linux-3.1.1/include/linux/moduleparam.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/moduleparam.h    2011-11-16 18:39:08.000000000 -0500
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -57008,9 +59696,9 @@ diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/mod
        = { .max = ARRAY_SIZE(array), .num = nump,                      \
            .ops = &param_ops_##type,                                   \
            .elemsize = sizeof(array[0]), .elem = array };              \
-diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
---- linux-3.0.4/include/linux/namei.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/namei.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/namei.h linux-3.1.1/include/linux/namei.h
+--- linux-3.1.1/include/linux/namei.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/namei.h  2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@ struct nameidata {
        unsigned        seq;
        int             last_type;
@@ -57020,7 +59708,7 @@ diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
  
        /* Intent data */
        union {
-@@ -91,12 +91,12 @@ extern int follow_up(struct path *);
+@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
  extern struct dentry *lock_rename(struct dentry *, struct dentry *);
  extern void unlock_rename(struct dentry *, struct dentry *);
  
@@ -57035,10 +59723,10 @@ diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
  {
        return nd->saved_names[nd->depth];
  }
-diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netdevice.h
---- linux-3.0.4/include/linux/netdevice.h      2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/netdevice.h      2011-08-23 21:47:56.000000000 -0400
-@@ -979,6 +979,7 @@ struct net_device_ops {
+diff -urNp linux-3.1.1/include/linux/netdevice.h linux-3.1.1/include/linux/netdevice.h
+--- linux-3.1.1/include/linux/netdevice.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/netdevice.h      2011-11-16 18:39:08.000000000 -0500
+@@ -944,6 +944,7 @@ struct net_device_ops {
        int                     (*ndo_set_features)(struct net_device *dev,
                                                    u32 features);
  };
@@ -57046,9 +59734,9 @@ diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netde
  
  /*
   *    The DEVICE structure.
-diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/linux/netfilter/xt_gradm.h
---- linux-3.0.4/include/linux/netfilter/xt_gradm.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/netfilter/xt_gradm.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/netfilter/xt_gradm.h linux-3.1.1/include/linux/netfilter/xt_gradm.h
+--- linux-3.1.1/include/linux/netfilter/xt_gradm.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/include/linux/netfilter/xt_gradm.h     2011-11-16 18:40:31.000000000 -0500
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -57059,9 +59747,9 @@ diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/li
 +};
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
---- linux-3.0.4/include/linux/of_pdt.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/of_pdt.h 2011-08-30 06:20:11.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/of_pdt.h linux-3.1.1/include/linux/of_pdt.h
+--- linux-3.1.1/include/linux/of_pdt.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/of_pdt.h 2011-11-16 18:39:08.000000000 -0500
 @@ -32,7 +32,7 @@ struct of_pdt_ops {
  
        /* return 0 on success; fill in 'len' with number of bytes in path */
@@ -57071,9 +59759,9 @@ diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
  
  extern void *prom_early_alloc(unsigned long size);
  
-diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofile.h
---- linux-3.0.4/include/linux/oprofile.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/oprofile.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/oprofile.h linux-3.1.1/include/linux/oprofile.h
+--- linux-3.1.1/include/linux/oprofile.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/oprofile.h       2011-11-16 18:39:08.000000000 -0500
 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
        char const * name, ulong * val);
@@ -57086,9 +59774,9 @@ diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofi
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
---- linux-3.0.4/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/padata.h linux-3.1.1/include/linux/padata.h
+--- linux-3.1.1/include/linux/padata.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/padata.h 2011-11-16 18:39:08.000000000 -0500
 @@ -129,7 +129,7 @@ struct parallel_data {
        struct padata_instance          *pinst;
        struct padata_parallel_queue    __percpu *pqueue;
@@ -57098,10 +59786,10 @@ diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
        atomic_t                        reorder_objects;
        atomic_t                        refcnt;
        unsigned int                    max_seq_nr;
-diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf_event.h
---- linux-3.0.4/include/linux/perf_event.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/perf_event.h     2011-08-23 21:47:56.000000000 -0400
-@@ -761,8 +761,8 @@ struct perf_event {
+diff -urNp linux-3.1.1/include/linux/perf_event.h linux-3.1.1/include/linux/perf_event.h
+--- linux-3.1.1/include/linux/perf_event.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/perf_event.h     2011-11-16 18:39:08.000000000 -0500
+@@ -745,8 +745,8 @@ struct perf_event {
  
        enum perf_event_active_state    state;
        unsigned int                    attach_state;
@@ -57112,7 +59800,7 @@ diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf
  
        /*
         * These are the total time in nanoseconds that the event
-@@ -813,8 +813,8 @@ struct perf_event {
+@@ -797,8 +797,8 @@ struct perf_event {
         * These accumulate total time (in nanoseconds) that children
         * events have been enabled and running, respectively.
         */
@@ -57123,9 +59811,9 @@ diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf
  
        /*
         * Protect attach/detach and child_list:
-diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_fs_i.h
---- linux-3.0.4/include/linux/pipe_fs_i.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/pipe_fs_i.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/pipe_fs_i.h linux-3.1.1/include/linux/pipe_fs_i.h
+--- linux-3.1.1/include/linux/pipe_fs_i.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/pipe_fs_i.h      2011-11-16 18:39:08.000000000 -0500
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
        wait_queue_head_t wait;
@@ -57139,10 +59827,10 @@ diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_
        unsigned int r_counter;
        unsigned int w_counter;
        struct page *tmp_page;
-diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_runtime.h
---- linux-3.0.4/include/linux/pm_runtime.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/pm_runtime.h     2011-08-23 21:47:56.000000000 -0400
-@@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
+diff -urNp linux-3.1.1/include/linux/pm_runtime.h linux-3.1.1/include/linux/pm_runtime.h
+--- linux-3.1.1/include/linux/pm_runtime.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/pm_runtime.h     2011-11-16 18:39:08.000000000 -0500
+@@ -99,7 +99,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
  {
@@ -57151,9 +59839,9 @@ diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_r
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
---- linux-3.0.4/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/poison.h linux-3.1.1/include/linux/poison.h
+--- linux-3.1.1/include/linux/poison.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/poison.h 2011-11-16 18:39:08.000000000 -0500
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -57165,10 +59853,10 @@ diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt.h
---- linux-3.0.4/include/linux/preempt.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/preempt.h        2011-08-23 21:47:56.000000000 -0400
-@@ -115,7 +115,7 @@ struct preempt_ops {
+diff -urNp linux-3.1.1/include/linux/preempt.h linux-3.1.1/include/linux/preempt.h
+--- linux-3.1.1/include/linux/preempt.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/preempt.h        2011-11-16 18:39:08.000000000 -0500
+@@ -123,7 +123,7 @@ struct preempt_ops {
        void (*sched_in)(struct preempt_notifier *notifier, int cpu);
        void (*sched_out)(struct preempt_notifier *notifier,
                          struct task_struct *next);
@@ -57177,9 +59865,9 @@ diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs.h
---- linux-3.0.4/include/linux/proc_fs.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/proc_fs.h        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/proc_fs.h linux-3.1.1/include/linux/proc_fs.h
+--- linux-3.1.1/include/linux/proc_fs.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/proc_fs.h        2011-11-16 18:40:31.000000000 -0500
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
        return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -57209,10 +59897,10 @@ diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
---- linux-3.0.4/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400
-@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
+diff -urNp linux-3.1.1/include/linux/ptrace.h linux-3.1.1/include/linux/ptrace.h
+--- linux-3.1.1/include/linux/ptrace.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/ptrace.h 2011-11-16 18:40:31.000000000 -0500
+@@ -129,10 +129,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
  #define PTRACE_MODE_ATTACH 2
@@ -57225,9 +59913,9 @@ diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
---- linux-3.0.4/include/linux/random.h 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/random.h linux-3.1.1/include/linux/random.h
+--- linux-3.1.1/include/linux/random.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/random.h 2011-11-16 18:39:08.000000000 -0500
 @@ -69,12 +69,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -57247,10 +59935,10 @@ diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
  }
  
  /**
-diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
---- linux-3.0.4/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400
-@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
+diff -urNp linux-3.1.1/include/linux/reboot.h linux-3.1.1/include/linux/reboot.h
+--- linux-3.1.1/include/linux/reboot.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reboot.h 2011-11-16 18:39:08.000000000 -0500
+@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
  
@@ -57263,7 +59951,7 @@ diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
  
  extern void machine_shutdown(void);
  struct pt_regs;
-@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc
+@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struc
   */
  
  extern void kernel_restart_prepare(char *cmd);
@@ -57276,7 +59964,7 @@ diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
  
  extern int C_A_D; /* for sysctl */
  void ctrl_alt_del(void);
-@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
+@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
   * Emergency restart, callable from an interrupt handler.
   */
  
@@ -57285,9 +59973,9 @@ diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/reiserfs_fs.h
---- linux-3.0.4/include/linux/reiserfs_fs.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reiserfs_fs.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/reiserfs_fs.h linux-3.1.1/include/linux/reiserfs_fs.h
+--- linux-3.1.1/include/linux/reiserfs_fs.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reiserfs_fs.h    2011-11-16 18:39:08.000000000 -0500
 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM             1       /* reiserfs user memory mode            */
  
@@ -57297,9 +59985,9 @@ diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/rei
  #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)             \
-diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/reiserfs_fs_sb.h
---- linux-3.0.4/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/reiserfs_fs_sb.h linux-3.1.1/include/linux/reiserfs_fs_sb.h
+--- linux-3.1.1/include/linux/reiserfs_fs_sb.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/reiserfs_fs_sb.h 2011-11-16 18:39:08.000000000 -0500
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
        /* Comment? -Hans */
        wait_queue_head_t s_wait;
@@ -57309,9 +59997,9 @@ diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/
        // tree gets re-balanced
        unsigned long s_properties;     /* File system properties. Currently holds
                                           on-disk FS format */
-diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
---- linux-3.0.4/include/linux/relay.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/relay.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/relay.h linux-3.1.1/include/linux/relay.h
+--- linux-3.1.1/include/linux/relay.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/relay.h  2011-11-16 18:39:08.000000000 -0500
 @@ -159,7 +159,7 @@ struct rchan_callbacks
         * The callback should return 0 if successful, negative if not.
         */
@@ -57321,9 +60009,9 @@ diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
---- linux-3.0.4/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/rfkill.h linux-3.1.1/include/linux/rfkill.h
+--- linux-3.1.1/include/linux/rfkill.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/rfkill.h 2011-11-16 18:39:08.000000000 -0500
 @@ -147,6 +147,7 @@ struct rfkill_ops {
        void    (*query)(struct rfkill *rfkill, void *data);
        int     (*set_block)(void *data, bool blocked);
@@ -57332,9 +60020,9 @@ diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
---- linux-3.0.4/include/linux/rmap.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/rmap.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/rmap.h linux-3.1.1/include/linux/rmap.h
+--- linux-3.1.1/include/linux/rmap.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/rmap.h   2011-11-16 18:39:08.000000000 -0500
 @@ -119,8 +119,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 *);
@@ -57346,9 +60034,9 @@ diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
  void __anon_vma_link(struct vm_area_struct *);
  
  static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
---- linux-3.0.4/include/linux/sched.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sched.h  2011-08-25 17:22:27.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/sched.h linux-3.1.1/include/linux/sched.h
+--- linux-3.1.1/include/linux/sched.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sched.h  2011-11-16 18:40:31.000000000 -0500
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -57455,7 +60143,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  #ifdef CONFIG_DEBUG_MUTEXES
        /* mutex deadlock detection */
        struct mutex_waiter *blocked_on;
-@@ -1538,6 +1564,21 @@ struct task_struct {
+@@ -1537,6 +1563,21 @@ struct task_struct {
        unsigned long default_timer_slack_ns;
  
        struct list_head        *scm_work_list;
@@ -57477,7 +60165,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /* Index of current stored address in ret_stack */
        int curr_ret_stack;
-@@ -1572,6 +1613,57 @@ struct task_struct {
+@@ -1571,6 +1612,57 @@ struct task_struct {
  #endif
  };
  
@@ -57522,7 +60210,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
 +#endif
 +
 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
-+extern void pax_report_insns(void *pc, void *sp);
++extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
 +extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
 +
@@ -57535,15 +60223,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -1768,6 +1860,7 @@ extern void thread_group_times(struct ta
- #define PF_DUMPCORE   0x00000200      /* dumped core */
- #define PF_SIGNALED   0x00000400      /* killed by a signal */
- #define PF_MEMALLOC   0x00000800      /* Allocating memory */
-+#define PF_NPROC_EXCEEDED 0x00001000  /* set_user noticed that RLIMIT_NPROC was exceeded */
- #define PF_USED_MATH  0x00002000      /* if unset the fpu must be initialized before use */
- #define PF_FREEZING   0x00004000      /* freeze in progress. do not account to load */
- #define PF_NOFREEZE   0x00008000      /* this thread should not be frozen */
-@@ -2056,7 +2149,9 @@ void yield(void);
+@@ -2074,7 +2166,9 @@ void yield(void);
  extern struct exec_domain     default_exec_domain;
  
  union thread_union {
@@ -57553,7 +60233,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
        unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2089,6 +2184,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2107,6 +2201,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -57561,7 +60241,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
                struct pid_namespace *ns);
  
-@@ -2225,7 +2321,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2243,7 +2338,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -57570,7 +60250,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2393,13 +2489,17 @@ static inline unsigned long *end_of_stac
+@@ -2408,13 +2503,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -57590,9 +60270,9 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/screen_info.h
---- linux-3.0.4/include/linux/screen_info.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/screen_info.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/screen_info.h linux-3.1.1/include/linux/screen_info.h
+--- linux-3.1.1/include/linux/screen_info.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/screen_info.h    2011-11-16 18:39:08.000000000 -0500
 @@ -43,7 +43,8 @@ struct screen_info {
        __u16 pages;            /* 0x32 */
        __u16 vesa_attributes;  /* 0x34 */
@@ -57603,9 +60283,9 @@ diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/scr
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA                0x10    /* Monochrome Text Display      */
-diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/security.h
---- linux-3.0.4/include/linux/security.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/security.h       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/security.h linux-3.1.1/include/linux/security.h
+--- linux-3.1.1/include/linux/security.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/security.h       2011-11-16 18:40:31.000000000 -0500
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -57614,10 +60294,10 @@ diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/securi
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_file.h
---- linux-3.0.4/include/linux/seq_file.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/seq_file.h       2011-08-23 21:47:56.000000000 -0400
-@@ -32,6 +32,7 @@ struct seq_operations {
+diff -urNp linux-3.1.1/include/linux/seq_file.h linux-3.1.1/include/linux/seq_file.h
+--- linux-3.1.1/include/linux/seq_file.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/seq_file.h       2011-11-16 18:39:08.000000000 -0500
+@@ -33,6 +33,7 @@ struct seq_operations {
        void * (*next) (struct seq_file *m, void *v, loff_t *pos);
        int (*show) (struct seq_file *m, void *v);
  };
@@ -57625,25 +60305,13 @@ diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_fi
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-3.0.4/include/linux/shmem_fs.h linux-3.0.4/include/linux/shmem_fs.h
---- linux-3.0.4/include/linux/shmem_fs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/shmem_fs.h       2011-08-23 21:47:56.000000000 -0400
-@@ -10,7 +10,7 @@
- 
- #define SHMEM_NR_DIRECT 16
- 
--#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
-+#define SHMEM_SYMLINK_INLINE_LEN 64
+diff -urNp linux-3.1.1/include/linux/shm.h linux-3.1.1/include/linux/shm.h
+--- linux-3.1.1/include/linux/shm.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/shm.h    2011-11-16 18:59:58.000000000 -0500
+@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the ke
  
- struct shmem_inode_info {
-       spinlock_t              lock;
-diff -urNp linux-3.0.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
---- linux-3.0.4/include/linux/shm.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/shm.h    2011-08-23 21:48:14.000000000 -0400
-@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
-       pid_t                   shm_cprid;
-       pid_t                   shm_lprid;
-       struct user_struct      *mlock_user;
+       /* The task created the shm object.  NULL if the task is dead. */
+       struct task_struct      *shm_creator;
 +#ifdef CONFIG_GRKERNSEC
 +      time_t                  shm_createtime;
 +      pid_t                   shm_lapid;
@@ -57651,10 +60319,10 @@ diff -urNp linux-3.0.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
---- linux-3.0.4/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400
-@@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
+diff -urNp linux-3.1.1/include/linux/skbuff.h linux-3.1.1/include/linux/skbuff.h
+--- linux-3.1.1/include/linux/skbuff.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/skbuff.h 2011-11-16 18:39:08.000000000 -0500
+@@ -610,7 +610,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
  {
@@ -57663,7 +60331,7 @@ diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
  }
  
  /**
-@@ -605,7 +605,7 @@ static inline int skb_queue_empty(const 
+@@ -623,7 +623,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)
  {
@@ -57672,7 +60340,7 @@ diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
  }
  
  /**
-@@ -618,7 +618,7 @@ static inline bool skb_queue_is_last(con
+@@ -636,7 +636,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)
  {
@@ -57681,7 +60349,7 @@ diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
  }
  
  /**
-@@ -1440,7 +1440,7 @@ static inline int pskb_network_may_pull(
+@@ -1458,7 +1458,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
@@ -57690,10 +60358,10 @@ diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.0.4/include/linux/slab_def.h linux-3.0.4/include/linux/slab_def.h
---- linux-3.0.4/include/linux/slab_def.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/slab_def.h       2011-08-23 21:47:56.000000000 -0400
-@@ -96,10 +96,10 @@ struct kmem_cache {
+diff -urNp linux-3.1.1/include/linux/slab_def.h linux-3.1.1/include/linux/slab_def.h
+--- linux-3.1.1/include/linux/slab_def.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slab_def.h       2011-11-16 18:39:08.000000000 -0500
+@@ -68,10 +68,10 @@ struct kmem_cache {
        unsigned long node_allocs;
        unsigned long node_frees;
        unsigned long node_overflow;
@@ -57708,9 +60376,9 @@ diff -urNp linux-3.0.4/include/linux/slab_def.h linux-3.0.4/include/linux/slab_d
  
        /*
         * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
---- linux-3.0.4/include/linux/slab.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/slab.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/slab.h linux-3.1.1/include/linux/slab.h
+--- linux-3.1.1/include/linux/slab.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slab.h   2011-11-16 18:39:08.000000000 -0500
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -57749,7 +60417,7 @@ diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
  
  /*
   * struct kmem_cache related prototypes
-@@ -141,6 +152,7 @@ void * __must_check krealloc(const void 
+@@ -161,6 +172,7 @@ void * __must_check krealloc(const void 
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -57757,7 +60425,7 @@ diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
  
  /*
   * Allocator specific definitions. These are mainly used to establish optimized
-@@ -333,4 +345,59 @@ static inline void *kzalloc_node(size_t 
+@@ -353,4 +365,59 @@ static inline void *kzalloc_node(size_t 
  
  void __init kmem_cache_init_late(void);
  
@@ -57817,10 +60485,10 @@ diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
 +})
 +
  #endif        /* _LINUX_SLAB_H */
-diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_def.h
---- linux-3.0.4/include/linux/slub_def.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/slub_def.h       2011-08-23 21:47:56.000000000 -0400
-@@ -82,7 +82,7 @@ struct kmem_cache {
+diff -urNp linux-3.1.1/include/linux/slub_def.h linux-3.1.1/include/linux/slub_def.h
+--- linux-3.1.1/include/linux/slub_def.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/slub_def.h       2011-11-16 18:39:08.000000000 -0500
+@@ -85,7 +85,7 @@ struct kmem_cache {
        struct kmem_cache_order_objects max;
        struct kmem_cache_order_objects min;
        gfp_t allocflags;       /* gfp flags to use on each alloc */
@@ -57829,7 +60497,7 @@ diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_d
        void (*ctor)(void *);
        int inuse;              /* Offset to metadata */
        int align;              /* Alignment */
-@@ -218,7 +218,7 @@ static __always_inline struct kmem_cache
+@@ -211,7 +211,7 @@ static __always_inline struct kmem_cache
  }
  
  void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
@@ -57838,11 +60506,11 @@ diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_d
  
  static __always_inline void *
  kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
---- linux-3.0.4/include/linux/sonet.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sonet.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/sonet.h linux-3.1.1/include/linux/sonet.h
+--- linux-3.1.1/include/linux/sonet.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sonet.h  2011-11-16 18:39:08.000000000 -0500
 @@ -61,7 +61,7 @@ struct sonet_stats {
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
  struct k_sonet_stats {
 -#define __HANDLE_ITEM(i) atomic_t i
@@ -57850,9 +60518,9 @@ diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sunrpc/clnt.h
---- linux-3.0.4/include/linux/sunrpc/clnt.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sunrpc/clnt.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/sunrpc/clnt.h linux-3.1.1/include/linux/sunrpc/clnt.h
+--- linux-3.1.1/include/linux/sunrpc/clnt.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/clnt.h    2011-11-16 18:39:08.000000000 -0500
 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
        switch (sap->sa_family) {
@@ -57883,9 +60551,20 @@ diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sun
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux/sunrpc/svc_rdma.h
---- linux-3.0.4/include/linux/sunrpc/svc_rdma.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sunrpc/svc_rdma.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/sunrpc/sched.h linux-3.1.1/include/linux/sunrpc/sched.h
+--- linux-3.1.1/include/linux/sunrpc/sched.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/sched.h   2011-11-16 18:39:08.000000000 -0500
+@@ -105,6 +105,7 @@ struct rpc_call_ops {
+       void (*rpc_call_done)(struct rpc_task *, void *);
+       void (*rpc_release)(void *);
+ };
++typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
+ 
+ struct rpc_task_setup {
+       struct rpc_task *task;
+diff -urNp linux-3.1.1/include/linux/sunrpc/svc_rdma.h linux-3.1.1/include/linux/sunrpc/svc_rdma.h
+--- linux-3.1.1/include/linux/sunrpc/svc_rdma.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sunrpc/svc_rdma.h        2011-11-16 18:39:08.000000000 -0500
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -57911,9 +60590,9 @@ diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
---- linux-3.0.4/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/sysctl.h linux-3.1.1/include/linux/sysctl.h
+--- linux-3.1.1/include/linux/sysctl.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/sysctl.h 2011-11-16 18:40:31.000000000 -0500
 @@ -155,7 +155,11 @@ enum
        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -57936,9 +60615,9 @@ diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
  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-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_ldisc.h
---- linux-3.0.4/include/linux/tty_ldisc.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/tty_ldisc.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/tty_ldisc.h linux-3.1.1/include/linux/tty_ldisc.h
+--- linux-3.1.1/include/linux/tty_ldisc.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/tty_ldisc.h      2011-11-16 18:39:08.000000000 -0500
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
        struct  module *owner;
@@ -57948,9 +60627,9 @@ diff -urNp linux-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_l
  };
  
  struct tty_ldisc {
-diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
---- linux-3.0.4/include/linux/types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/types.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/types.h linux-3.1.1/include/linux/types.h
+--- linux-3.1.1/include/linux/types.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/types.h  2011-11-16 18:39:08.000000000 -0500
 @@ -213,10 +213,26 @@ typedef struct {
        int counter;
  } atomic_t;
@@ -57978,26 +60657,27 @@ diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-3.0.4/include/linux/uaccess.h linux-3.0.4/include/linux/uaccess.h
---- linux-3.0.4/include/linux/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/uaccess.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/uaccess.h linux-3.1.1/include/linux/uaccess.h
+--- linux-3.1.1/include/linux/uaccess.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/uaccess.h        2011-11-16 18:39:08.000000000 -0500
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
                long ret;                               \
                mm_segment_t old_fs = get_fs();         \
                                                        \
 -              set_fs(KERNEL_DS);                      \
                pagefault_disable();                    \
-+              set_fs(KERNEL_DS);                      \
-               ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval));            \
+-              ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval));            \
 -              pagefault_enable();                     \
++              set_fs(KERNEL_DS);                      \
++              ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval));              \
                set_fs(old_fs);                         \
 +              pagefault_enable();                     \
                ret;                                    \
        })
  
-diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/linux/unaligned/access_ok.h
---- linux-3.0.4/include/linux/unaligned/access_ok.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/unaligned/access_ok.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/unaligned/access_ok.h linux-3.1.1/include/linux/unaligned/access_ok.h
+--- linux-3.1.1/include/linux/unaligned/access_ok.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/unaligned/access_ok.h    2011-11-16 18:39:08.000000000 -0500
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -58037,22 +60717,62 @@ diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/l
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc.h
---- linux-3.0.4/include/linux/vmalloc.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/vmalloc.h        2011-08-23 21:47:56.000000000 -0400
-@@ -13,6 +13,11 @@ struct vm_area_struct;              /* vma defining 
- #define VM_MAP                0x00000004      /* vmap()ed pages */
+diff -urNp linux-3.1.1/include/linux/vermagic.h linux-3.1.1/include/linux/vermagic.h
+--- linux-3.1.1/include/linux/vermagic.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vermagic.h       2011-11-16 18:54:54.000000000 -0500
+@@ -26,9 +26,35 @@
+ #define MODULE_ARCH_VERMAGIC ""
+ #endif
+ 
++#ifdef CONFIG_PAX_REFCOUNT
++#define MODULE_PAX_REFCOUNT "REFCOUNT "
++#else
++#define MODULE_PAX_REFCOUNT ""
++#endif
++
++#ifdef CONSTIFY_PLUGIN
++#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
++#else
++#define MODULE_CONSTIFY_PLUGIN ""
++#endif
++
++#ifdef STACKLEAK_PLUGIN
++#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
++#else
++#define MODULE_STACKLEAK_PLUGIN ""
++#endif
++
++#ifdef CONFIG_GRKERNSEC
++#define MODULE_GRSEC "GRSEC "
++#else
++#define MODULE_GRSEC ""
++#endif
++
+ #define VERMAGIC_STRING                                               \
+       UTS_RELEASE " "                                                 \
+       MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT                     \
+       MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS       \
+-      MODULE_ARCH_VERMAGIC
++      MODULE_ARCH_VERMAGIC                                            \
++      MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
++      MODULE_GRSEC
+ 
+diff -urNp linux-3.1.1/include/linux/vmalloc.h linux-3.1.1/include/linux/vmalloc.h
+--- linux-3.1.1/include/linux/vmalloc.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vmalloc.h        2011-11-16 18:39:08.000000000 -0500
+@@ -14,6 +14,11 @@ struct vm_area_struct;              /* vma defining 
  #define VM_USERMAP    0x00000008      /* suitable for remap_vmalloc_range */
  #define VM_VPAGES     0x00000010      /* buffer for pages was vmalloc'ed */
+ #define VM_UNLIST     0x00000020      /* vm_struct is not listed in vmlist */
 +
 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
-+#define VM_KERNEXEC   0x00000020      /* allocate from executable kernel memory range */
++#define VM_KERNEXEC   0x00000040      /* allocate from executable kernel memory range */
 +#endif
 +
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -155,4 +160,103 @@ pcpu_free_vm_areas(struct vm_struct **vm
+@@ -156,4 +161,103 @@ pcpu_free_vm_areas(struct vm_struct **vm
  # endif
  #endif
  
@@ -58156,9 +60876,9 @@ diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
---- linux-3.0.4/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/linux/vmstat.h linux-3.1.1/include/linux/vmstat.h
+--- linux-3.1.1/include/linux/vmstat.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/linux/vmstat.h 2011-11-16 18:39:08.000000000 -0500
 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -58222,9 +60942,9 @@ diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7146_vv.h
---- linux-3.0.4/include/media/saa7146_vv.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/media/saa7146_vv.h     2011-08-24 18:26:09.000000000 -0400
+diff -urNp linux-3.1.1/include/media/saa7146_vv.h linux-3.1.1/include/media/saa7146_vv.h
+--- linux-3.1.1/include/media/saa7146_vv.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/saa7146_vv.h     2011-11-16 18:39:08.000000000 -0500
 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
        int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -58234,20 +60954,53 @@ diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7
        /* pointer to the saa7146 core ops */
        const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-3.0.4/include/media/v4l2-ioctl.h linux-3.0.4/include/media/v4l2-ioctl.h
---- linux-3.0.4/include/media/v4l2-ioctl.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/media/v4l2-ioctl.h     2011-08-24 18:25:45.000000000 -0400
-@@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
+diff -urNp linux-3.1.1/include/media/v4l2-dev.h linux-3.1.1/include/media/v4l2-dev.h
+--- linux-3.1.1/include/media/v4l2-dev.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/v4l2-dev.h       2011-11-16 18:39:08.000000000 -0500
+@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
+ 
+ 
+ struct v4l2_file_operations {
+-      struct module *owner;
++      struct module * const owner;
+       ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+       ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+       unsigned int (*poll) (struct file *, struct poll_table_struct *);
+@@ -68,6 +68,7 @@ struct v4l2_file_operations {
+       int (*open) (struct file *);
+       int (*release) (struct file *);
+ };
++typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
+ 
+ /*
+  * Newer version of video_device, handled by videodev2.c
+diff -urNp linux-3.1.1/include/media/v4l2-ioctl.h linux-3.1.1/include/media/v4l2-ioctl.h
+--- linux-3.1.1/include/media/v4l2-ioctl.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/media/v4l2-ioctl.h     2011-11-17 18:44:20.000000000 -0500
+@@ -272,7 +272,7 @@ struct v4l2_ioctl_ops {
        long (*vidioc_default)         (struct file *file, void *fh,
                                        bool valid_prio, int cmd, void *arg);
  };
+-
 +typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
  
- 
  /* v4l debugging and diagnostics */
-diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cfctrl.h
---- linux-3.0.4/include/net/caif/cfctrl.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/caif/cfctrl.h      2011-08-23 21:47:56.000000000 -0400
+ 
+diff -urNp linux-3.1.1/include/net/caif/caif_hsi.h linux-3.1.1/include/net/caif/caif_hsi.h
+--- linux-3.1.1/include/net/caif/caif_hsi.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/caif/caif_hsi.h    2011-11-16 18:39:08.000000000 -0500
+@@ -94,7 +94,7 @@ struct cfhsi_drv {
+       void (*rx_done_cb) (struct cfhsi_drv *drv);
+       void (*wake_up_cb) (struct cfhsi_drv *drv);
+       void (*wake_down_cb) (struct cfhsi_drv *drv);
+-};
++} __no_const;
+ 
+ /* Structure implemented by HSI device. */
+ struct cfhsi_dev {
+diff -urNp linux-3.1.1/include/net/caif/cfctrl.h linux-3.1.1/include/net/caif/cfctrl.h
+--- linux-3.1.1/include/net/caif/cfctrl.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/caif/cfctrl.h      2011-11-16 18:39:08.000000000 -0500
 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
        void (*radioset_rsp)(void);
        void (*reject_rsp)(struct cflayer *layer, u8 linkid,
@@ -58268,10 +61021,10 @@ diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cf
        struct list_head list;
        /* Protects from simultaneous access to first_req list */
        spinlock_t info_list_lock;
-diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
---- linux-3.0.4/include/net/flow.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/flow.h     2011-08-23 21:47:56.000000000 -0400
-@@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca
+diff -urNp linux-3.1.1/include/net/flow.h linux-3.1.1/include/net/flow.h
+--- linux-3.1.1/include/net/flow.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/flow.h     2011-11-16 18:39:08.000000000 -0500
+@@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca
                u8 dir, flow_resolve_t resolver, void *ctx);
  
  extern void flow_cache_flush(void);
@@ -58279,10 +61032,10 @@ diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
---- linux-3.0.4/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400
-@@ -43,8 +43,8 @@ struct inet_peer {
+diff -urNp linux-3.1.1/include/net/inetpeer.h linux-3.1.1/include/net/inetpeer.h
+--- linux-3.1.1/include/net/inetpeer.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/inetpeer.h 2011-11-16 18:39:08.000000000 -0500
+@@ -47,8 +47,8 @@ struct inet_peer {
         */
        union {
                struct {
@@ -58292,19 +61045,24 @@ diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
 +                      atomic_unchecked_t              ip_id_count;    /* IP ID for the next packet */
                        __u32                           tcp_ts;
                        __u32                           tcp_ts_stamp;
-                       u32                             metrics[RTAX_MAX];
-@@ -108,7 +108,7 @@ static inline __u16        inet_getid(struct in
- {
+               };
+@@ -112,11 +112,11 @@ static inline int inet_getid(struct inet
        more++;
        inet_peer_refcheck(p);
--      return atomic_add_return(more, &p->ip_id_count) - more;
-+      return atomic_add_return_unchecked(more, &p->ip_id_count) - more;
- }
- 
- #endif /* _NET_INETPEER_H */
-diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
---- linux-3.0.4/include/net/ip_fib.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/ip_fib.h   2011-08-23 21:47:56.000000000 -0400
+       do {
+-              old = atomic_read(&p->ip_id_count);
++              old = atomic_read_unchecked(&p->ip_id_count);
+               new = old + more;
+               if (!new)
+                       new = 1;
+-      } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
++      } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
+       return new;
+ }
+ 
+diff -urNp linux-3.1.1/include/net/ip_fib.h linux-3.1.1/include/net/ip_fib.h
+--- linux-3.1.1/include/net/ip_fib.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/ip_fib.h   2011-11-16 18:39:08.000000000 -0500
 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
  
  #define FIB_RES_SADDR(net, res)                               \
@@ -58314,9 +61072,9 @@ diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
         FIB_RES_NH(res).nh_saddr :                     \
         fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
  #define FIB_RES_GW(res)                       (FIB_RES_NH(res).nh_gw)
-diff -urNp linux-3.0.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
---- linux-3.0.4/include/net/ip_vs.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/ip_vs.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/ip_vs.h linux-3.1.1/include/net/ip_vs.h
+--- linux-3.1.1/include/net/ip_vs.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/ip_vs.h    2011-11-16 18:39:08.000000000 -0500
 @@ -509,7 +509,7 @@ struct ip_vs_conn {
        struct ip_vs_conn       *control;       /* Master control connection */
        atomic_t                n_control;      /* Number of controlled ones */
@@ -58335,9 +61093,9 @@ diff -urNp linux-3.0.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
        atomic_t                weight;         /* server weight */
  
        atomic_t                refcnt;         /* reference counter */
-diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/irda/ircomm_core.h
---- linux-3.0.4/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/irda/ircomm_core.h linux-3.1.1/include/net/irda/ircomm_core.h
+--- linux-3.1.1/include/net/irda/ircomm_core.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/irda/ircomm_core.h 2011-11-16 18:39:08.000000000 -0500
 @@ -51,7 +51,7 @@ typedef struct {
        int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
        int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
@@ -58347,9 +61105,9 @@ diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/ir
  
  struct ircomm_cb {
        irda_queue_t queue;
-diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/irda/ircomm_tty.h
---- linux-3.0.4/include/net/irda/ircomm_tty.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/irda/ircomm_tty.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/irda/ircomm_tty.h linux-3.1.1/include/net/irda/ircomm_tty.h
+--- linux-3.1.1/include/net/irda/ircomm_tty.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/irda/ircomm_tty.h  2011-11-16 18:39:08.000000000 -0500
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -58369,9 +61127,9 @@ diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/ird
  
        /* Protect concurent access to :
         *      o self->open_count
-diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/af_iucv.h
---- linux-3.0.4/include/net/iucv/af_iucv.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/iucv/af_iucv.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/iucv/af_iucv.h linux-3.1.1/include/net/iucv/af_iucv.h
+--- linux-3.1.1/include/net/iucv/af_iucv.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/iucv/af_iucv.h     2011-11-16 18:39:08.000000000 -0500
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
        struct hlist_head head;
@@ -58381,9 +61139,9 @@ diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/a
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
---- linux-3.0.4/include/net/lapb.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/lapb.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/lapb.h linux-3.1.1/include/net/lapb.h
+--- linux-3.1.1/include/net/lapb.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/lapb.h     2011-11-16 18:39:08.000000000 -0500
 @@ -95,7 +95,7 @@ struct lapb_cb {
        struct sk_buff_head     write_queue;
        struct sk_buff_head     ack_queue;
@@ -58393,21 +61151,21 @@ diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
  
        /* FRMR control information */
        struct lapb_frame       frmr_data;
-diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour.h
---- linux-3.0.4/include/net/neighbour.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/neighbour.h        2011-08-31 18:39:25.000000000 -0400
-@@ -124,7 +124,7 @@ struct neigh_ops {
-       int                     (*connected_output)(struct sk_buff*);
-       int                     (*hh_output)(struct sk_buff*);
-       int                     (*queue_xmit)(struct sk_buff*);
+diff -urNp linux-3.1.1/include/net/neighbour.h linux-3.1.1/include/net/neighbour.h
+--- linux-3.1.1/include/net/neighbour.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/neighbour.h        2011-11-16 18:39:08.000000000 -0500
+@@ -122,7 +122,7 @@ struct neigh_ops {
+       void                    (*error_report)(struct neighbour *, struct sk_buff *);
+       int                     (*output)(struct neighbour *, struct sk_buff *);
+       int                     (*connected_output)(struct neighbour *, struct sk_buff *);
 -};
 +} __do_const;
  
  struct pneigh_entry {
        struct pneigh_entry     *next;
-diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
---- linux-3.0.4/include/net/netlink.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/netlink.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/netlink.h linux-3.1.1/include/net/netlink.h
+--- linux-3.1.1/include/net/netlink.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/netlink.h  2011-11-16 18:39:08.000000000 -0500
 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -58417,9 +61175,9 @@ diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
  }
  
  /**
-diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ipv4.h
---- linux-3.0.4/include/net/netns/ipv4.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/netns/ipv4.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/netns/ipv4.h linux-3.1.1/include/net/netns/ipv4.h
+--- linux-3.1.1/include/net/netns/ipv4.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/netns/ipv4.h       2011-11-16 18:39:08.000000000 -0500
 @@ -56,8 +56,8 @@ struct netns_ipv4 {
  
        unsigned int sysctl_ping_group_range[2];
@@ -58431,10 +61189,10 @@ diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ip
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp.h
---- linux-3.0.4/include/net/sctp/sctp.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/sctp/sctp.h        2011-08-23 21:47:56.000000000 -0400
-@@ -315,9 +315,9 @@ do {                                                                       \
+diff -urNp linux-3.1.1/include/net/sctp/sctp.h linux-3.1.1/include/net/sctp/sctp.h
+--- linux-3.1.1/include/net/sctp/sctp.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/sctp/sctp.h        2011-11-16 18:39:08.000000000 -0500
+@@ -318,9 +318,9 @@ do {                                                                       \
  
  #else /* SCTP_DEBUG */
  
@@ -58447,10 +61205,10 @@ diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
---- linux-3.0.4/include/net/sock.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/sock.h     2011-08-23 21:47:56.000000000 -0400
-@@ -277,7 +277,7 @@ struct sock {
+diff -urNp linux-3.1.1/include/net/sock.h linux-3.1.1/include/net/sock.h
+--- linux-3.1.1/include/net/sock.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/sock.h     2011-11-16 18:39:08.000000000 -0500
+@@ -278,7 +278,7 @@ struct sock {
  #ifdef CONFIG_RPS
        __u32                   sk_rxhash;
  #endif
@@ -58459,7 +61217,7 @@ diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
        int                     sk_rcvbuf;
  
        struct sk_filter __rcu  *sk_filter;
-@@ -1390,7 +1390,7 @@ static inline void sk_nocaps_add(struct 
+@@ -1391,7 +1391,7 @@ static inline void sk_nocaps_add(struct 
  }
  
  static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -58468,10 +61226,10 @@ diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
                                           int copy, int offset)
  {
        if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
---- linux-3.0.4/include/net/tcp.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/tcp.h      2011-08-23 21:47:56.000000000 -0400
-@@ -1374,8 +1374,8 @@ enum tcp_seq_states {
+diff -urNp linux-3.1.1/include/net/tcp.h linux-3.1.1/include/net/tcp.h
+--- linux-3.1.1/include/net/tcp.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/tcp.h      2011-11-16 18:39:08.000000000 -0500
+@@ -1401,8 +1401,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -58482,9 +61240,9 @@ diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
---- linux-3.0.4/include/net/udp.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/udp.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/udp.h linux-3.1.1/include/net/udp.h
+--- linux-3.1.1/include/net/udp.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/udp.h      2011-11-16 18:39:08.000000000 -0500
 @@ -234,8 +234,8 @@ struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -58496,9 +61254,9 @@ diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
---- linux-3.0.4/include/net/xfrm.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/xfrm.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/net/xfrm.h linux-3.1.1/include/net/xfrm.h
+--- linux-3.1.1/include/net/xfrm.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/net/xfrm.h     2011-11-16 18:39:08.000000000 -0500
 @@ -505,7 +505,7 @@ struct xfrm_policy {
        struct timer_list       timer;
  
@@ -58508,9 +61266,9 @@ diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
        u32                     priority;
        u32                     index;
        struct xfrm_mark        mark;
-diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
---- linux-3.0.4/include/rdma/iw_cm.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/rdma/iw_cm.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/rdma/iw_cm.h linux-3.1.1/include/rdma/iw_cm.h
+--- linux-3.1.1/include/rdma/iw_cm.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/rdma/iw_cm.h   2011-11-16 18:39:08.000000000 -0500
 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
                                         int backlog);
  
@@ -58520,10 +61278,10 @@ diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
---- linux-3.0.4/include/scsi/libfc.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/libfc.h   2011-08-23 21:47:56.000000000 -0400
-@@ -750,6 +750,7 @@ struct libfc_function_template {
+diff -urNp linux-3.1.1/include/scsi/libfc.h linux-3.1.1/include/scsi/libfc.h
+--- linux-3.1.1/include/scsi/libfc.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/libfc.h   2011-11-16 18:39:08.000000000 -0500
+@@ -758,6 +758,7 @@ struct libfc_function_template {
         */
        void (*disc_stop_final) (struct fc_lport *);
  };
@@ -58531,7 +61289,7 @@ diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
  
  /**
   * struct fc_disc - Discovery context
-@@ -853,7 +854,7 @@ struct fc_lport {
+@@ -861,7 +862,7 @@ struct fc_lport {
        struct fc_vport                *vport;
  
        /* Operational Information */
@@ -58540,9 +61298,9 @@ diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
        u8                             link_up;
        u8                             qfull;
        enum fc_lport_state            state;
-diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_device.h
---- linux-3.0.4/include/scsi/scsi_device.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/scsi_device.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/scsi/scsi_device.h linux-3.1.1/include/scsi/scsi_device.h
+--- linux-3.1.1/include/scsi/scsi_device.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/scsi_device.h     2011-11-16 18:39:08.000000000 -0500
 @@ -161,9 +161,9 @@ struct scsi_device {
        unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED   3
@@ -58556,9 +61314,9 @@ diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_
  
        struct device           sdev_gendev,
                                sdev_dev;
-diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi/scsi_transport_fc.h
---- linux-3.0.4/include/scsi/scsi_transport_fc.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/scsi_transport_fc.h       2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.1.1/include/scsi/scsi_transport_fc.h linux-3.1.1/include/scsi/scsi_transport_fc.h
+--- linux-3.1.1/include/scsi/scsi_transport_fc.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/scsi/scsi_transport_fc.h       2011-11-16 18:39:08.000000000 -0500
 @@ -711,7 +711,7 @@ struct fc_function_template {
        unsigned long   show_host_system_hostname:1;
  
@@ -58568,9 +61326,9 @@ diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi
  
  
  /**
-diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4xxx-adda.h
---- linux-3.0.4/include/sound/ak4xxx-adda.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/ak4xxx-adda.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/ak4xxx-adda.h linux-3.1.1/include/sound/ak4xxx-adda.h
+--- linux-3.1.1/include/sound/ak4xxx-adda.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/ak4xxx-adda.h    2011-11-16 18:39:08.000000000 -0500
 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
        void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
                      unsigned char val);
@@ -58580,9 +61338,9 @@ diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4
  
  #define AK4XXX_IMAGE_SIZE     (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
  
-diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
---- linux-3.0.4/include/sound/hwdep.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/hwdep.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/hwdep.h linux-3.1.1/include/sound/hwdep.h
+--- linux-3.1.1/include/sound/hwdep.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/hwdep.h  2011-11-16 18:39:08.000000000 -0500
 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
                          struct snd_hwdep_dsp_status *status);
        int (*dsp_load)(struct snd_hwdep *hw,
@@ -58592,9 +61350,9 @@ diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
  
  struct snd_hwdep {
        struct snd_card *card;
-diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
---- linux-3.0.4/include/sound/info.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/info.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/info.h linux-3.1.1/include/sound/info.h
+--- linux-3.1.1/include/sound/info.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/info.h   2011-11-16 18:39:08.000000000 -0500
 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
                     struct snd_info_buffer *buffer);
        void (*write)(struct snd_info_entry *entry,
@@ -58604,9 +61362,9 @@ diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
  
  struct snd_info_entry_ops {
        int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
---- linux-3.0.4/include/sound/pcm.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/pcm.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/pcm.h linux-3.1.1/include/sound/pcm.h
+--- linux-3.1.1/include/sound/pcm.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/pcm.h    2011-11-16 18:39:08.000000000 -0500
 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
        int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
        int (*ack)(struct snd_pcm_substream *substream);
@@ -58615,9 +61373,9 @@ diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
  
  /*
   *
-diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_csp.h
---- linux-3.0.4/include/sound/sb16_csp.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/sb16_csp.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/sb16_csp.h linux-3.1.1/include/sound/sb16_csp.h
+--- linux-3.1.1/include/sound/sb16_csp.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/sb16_csp.h       2011-11-16 18:39:08.000000000 -0500
 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
        int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
        int (*csp_stop) (struct snd_sb_csp * p);
@@ -58627,21 +61385,21 @@ diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_c
  
  /*
   * CSP private data
-diff -urNp linux-3.0.4/include/sound/soc.h linux-3.0.4/include/sound/soc.h
---- linux-3.0.4/include/sound/soc.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/soc.h    2011-08-26 19:49:56.000000000 -0400
-@@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
- 
-       /* platform stream ops */
-       struct snd_pcm_ops *ops;
+diff -urNp linux-3.1.1/include/sound/soc.h linux-3.1.1/include/sound/soc.h
+--- linux-3.1.1/include/sound/soc.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/soc.h    2011-11-16 18:39:08.000000000 -0500
+@@ -676,7 +676,7 @@ struct snd_soc_platform_driver {
+       /* platform IO - used for platform DAPM */
+       unsigned int (*read)(struct snd_soc_platform *, unsigned int);
+       int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
 -};
 +} __do_const;
  
  struct snd_soc_platform {
        const char *name;
-diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
---- linux-3.0.4/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/sound/ymfpci.h linux-3.1.1/include/sound/ymfpci.h
+--- linux-3.1.1/include/sound/ymfpci.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/sound/ymfpci.h 2011-11-16 18:39:08.000000000 -0500
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
        spinlock_t reg_lock;
        spinlock_t voice_lock;
@@ -58651,19 +61409,19 @@ diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
        struct snd_info_entry *proc_entry;
        const struct firmware *dsp_microcode;
        const struct firmware *controller_microcode;
-diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/target/target_core_base.h
---- linux-3.0.4/include/target/target_core_base.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/target/target_core_base.h      2011-08-23 21:47:56.000000000 -0400
-@@ -364,7 +364,7 @@ struct t10_reservation_ops {
+diff -urNp linux-3.1.1/include/target/target_core_base.h linux-3.1.1/include/target/target_core_base.h
+--- linux-3.1.1/include/target/target_core_base.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/target/target_core_base.h      2011-11-16 18:39:08.000000000 -0500
+@@ -356,7 +356,7 @@ struct t10_reservation_ops {
        int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
        int (*t10_pr_register)(struct se_cmd *);
        int (*t10_pr_clear)(struct se_cmd *);
 -};
 +} __no_const;
  
- struct t10_reservation_template {
+ struct t10_reservation {
        /* Reservation effects all target ports */
-@@ -432,8 +432,8 @@ struct se_transport_task {
+@@ -496,8 +496,8 @@ struct se_cmd {
        atomic_t                t_task_cdbs_left;
        atomic_t                t_task_cdbs_ex_left;
        atomic_t                t_task_cdbs_timeout_left;
@@ -58674,7 +61432,7 @@ diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/tar
        atomic_t                t_transport_active;
        atomic_t                t_transport_complete;
        atomic_t                t_transport_queue_active;
-@@ -774,7 +774,7 @@ struct se_device {
+@@ -744,7 +744,7 @@ struct se_device {
        atomic_t                active_cmds;
        atomic_t                simple_cmds;
        atomic_t                depth_left;
@@ -58683,9 +61441,9 @@ diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/tar
        atomic_t                dev_tur_active;
        atomic_t                execute_tasks;
        atomic_t                dev_status_thr_count;
-diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/events/irq.h
---- linux-3.0.4/include/trace/events/irq.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/trace/events/irq.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/trace/events/irq.h linux-3.1.1/include/trace/events/irq.h
+--- linux-3.1.1/include/trace/events/irq.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/trace/events/irq.h     2011-11-16 18:39:08.000000000 -0500
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -58704,9 +61462,9 @@ diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/even
  
        TP_ARGS(irq, action, ret),
  
-diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
---- linux-3.0.4/include/video/udlfb.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/video/udlfb.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/video/udlfb.h linux-3.1.1/include/video/udlfb.h
+--- linux-3.1.1/include/video/udlfb.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/video/udlfb.h  2011-11-16 18:39:08.000000000 -0500
 @@ -51,10 +51,10 @@ struct dlfb_data {
        int base8;
        u32 pseudo_palette[256];
@@ -58722,9 +61480,9 @@ diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb.h
---- linux-3.0.4/include/video/uvesafb.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/video/uvesafb.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/include/video/uvesafb.h linux-3.1.1/include/video/uvesafb.h
+--- linux-3.1.1/include/video/uvesafb.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/include/video/uvesafb.h        2011-11-16 18:39:08.000000000 -0500
 @@ -177,6 +177,7 @@ struct uvesafb_par {
        u8 ypan;                        /* 0 - nothing, 1 - ypan, 2 - ywrap */
        u8 pmi_setpal;                  /* PMI for palette changes */
@@ -58733,18 +61491,23 @@ diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb
        void *pmi_start;
        void *pmi_pal;
        u8 *vbe_state_orig;             /*
-diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
---- linux-3.0.4/init/do_mounts.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts.c       2011-08-23 21:47:56.000000000 -0400
-@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
+diff -urNp linux-3.1.1/init/do_mounts.c linux-3.1.1/init/do_mounts.c
+--- linux-3.1.1/init/do_mounts.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts.c       2011-11-16 18:39:08.000000000 -0500
+@@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
 -      int err = sys_mount(name, "/root", fs, flags, data);
-+      int err = sys_mount((__force char __user *)name, (__force char __user *)"/root", (__force char __user *)fs, flags, (__force void __user *)data);
++      int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
        if (err)
                return err;
  
+-      sys_chdir((const char __user __force *)"/root");
++      sys_chdir((const char __force_user*)"/root");
+       ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
+       printk(KERN_INFO
+              "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
 @@ -383,18 +383,18 @@ void __init change_floppy(char *fmt, ...
        va_start(args, fmt);
        vsprintf(buf, fmt, args);
@@ -58772,20 +61535,21 @@ diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
  out:
        devtmpfs_mount("dev");
 -      sys_mount(".", "/", NULL, MS_MOVE, NULL);
-+      sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
-       sys_chroot((const char __user __force *)".");
+-      sys_chroot((const char __user __force *)".");
++      sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
++      sys_chroot((const char __force_user *)".");
  }
-diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
---- linux-3.0.4/init/do_mounts.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/init/do_mounts.h linux-3.1.1/init/do_mounts.h
+--- linux-3.1.1/init/do_mounts.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts.h       2011-11-16 18:39:08.000000000 -0500
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
  {
 -      sys_unlink(name);
 -      return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
-+      sys_unlink((__force char __user *)name);
-+      return sys_mknod((__force char __user *)name, S_IFBLK|0600, new_encode_dev(dev));
++      sys_unlink((char __force_user *)name);
++      return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
  }
  
  #if BITS_PER_LONG == 32
@@ -58793,13 +61557,22 @@ diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
  {
        struct stat64 stat;
 -      if (sys_stat64(name, &stat) != 0)
-+      if (sys_stat64((__force char __user *)name, (__force struct stat64 __user *)&stat) != 0)
++      if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
+               return 0;
+       if (!S_ISBLK(stat.st_mode))
+               return 0;
+@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
+ static inline u32 bstat(char *name)
+ {
+       struct stat stat;
+-      if (sys_newstat(name, &stat) != 0)
++      if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
                return 0;
        if (!S_ISBLK(stat.st_mode))
                return 0;
-diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd.c
---- linux-3.0.4/init/do_mounts_initrd.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts_initrd.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/init/do_mounts_initrd.c linux-3.1.1/init/do_mounts_initrd.c
+--- linux-3.1.1/init/do_mounts_initrd.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts_initrd.c        2011-11-16 18:39:08.000000000 -0500
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
        create_dev("/dev/root.old", Root_RAM0);
        /* mount initrd on rootfs' /root */
@@ -58807,16 +61580,16 @@ diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd
 -      sys_mkdir("/old", 0700);
 -      root_fd = sys_open("/", 0, 0);
 -      old_fd = sys_open("/old", 0, 0);
-+      sys_mkdir((__force const char __user *)"/old", 0700);
-+      root_fd = sys_open((__force const char __user *)"/", 0, 0);
-+      old_fd = sys_open((__force const char __user *)"/old", 0, 0);
++      sys_mkdir((const char __force_user *)"/old", 0700);
++      root_fd = sys_open((const char __force_user *)"/", 0, 0);
++      old_fd = sys_open((const char __force_user *)"/old", 0, 0);
        /* move initrd over / and chdir/chroot in initrd root */
 -      sys_chdir("/root");
 -      sys_mount(".", "/", NULL, MS_MOVE, NULL);
 -      sys_chroot(".");
-+      sys_chdir((__force const char __user *)"/root");
-+      sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
-+      sys_chroot((__force const char __user *)".");
++      sys_chdir((const char __force_user *)"/root");
++      sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
++      sys_chroot((const char __force_user *)".");
  
        /*
         * In case that a resume from disk is carried out by linuxrc or one of
@@ -58825,17 +61598,17 @@ diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd
        /* move initrd to rootfs' /old */
        sys_fchdir(old_fd);
 -      sys_mount("/", ".", NULL, MS_MOVE, NULL);
-+      sys_mount((__force char __user *)"/", (__force char __user *)".", NULL, MS_MOVE, NULL);
++      sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
        /* switch root and cwd back to / of rootfs */
        sys_fchdir(root_fd);
 -      sys_chroot(".");
-+      sys_chroot((__force const char __user *)".");
++      sys_chroot((const char __force_user *)".");
        sys_close(old_fd);
        sys_close(root_fd);
  
        if (new_decode_dev(real_root_dev) == Root_RAM0) {
 -              sys_chdir("/old");
-+              sys_chdir((__force const char __user *)"/old");
++              sys_chdir((const char __force_user *)"/old");
                return;
        }
  
@@ -58844,19 +61617,19 @@ diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd
  
        printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
 -      error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
-+      error = sys_mount((__force char __user *)"/old", (__force char __user *)"/root/initrd", NULL, MS_MOVE, NULL);
++      error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
        if (!error)
                printk("okay\n");
        else {
 -              int fd = sys_open("/dev/root.old", O_RDWR, 0);
-+              int fd = sys_open((__force const char __user *)"/dev/root.old", O_RDWR, 0);
++              int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
                if (error == -ENOENT)
                        printk("/initrd does not exist. Ignored.\n");
                else
                        printk("failed\n");
                printk(KERN_NOTICE "Unmounting old root\n");
 -              sys_umount("/old", MNT_DETACH);
-+              sys_umount((__force char __user *)"/old", MNT_DETACH);
++              sys_umount((char __force_user *)"/old", MNT_DETACH);
                printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
                if (fd < 0) {
                        error = fd;
@@ -58865,24 +61638,24 @@ diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd
                 */
                if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
 -                      sys_unlink("/initrd.image");
-+                      sys_unlink((__force const char __user *)"/initrd.image");
++                      sys_unlink((const char __force_user *)"/initrd.image");
                        handle_initrd();
                        return 1;
                }
        }
 -      sys_unlink("/initrd.image");
-+      sys_unlink((__force const char __user *)"/initrd.image");
++      sys_unlink((const char __force_user *)"/initrd.image");
        return 0;
  }
-diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
---- linux-3.0.4/init/do_mounts_md.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts_md.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/init/do_mounts_md.c linux-3.1.1/init/do_mounts_md.c
+--- linux-3.1.1/init/do_mounts_md.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/do_mounts_md.c    2011-11-16 18:39:08.000000000 -0500
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
                        partitioned ? "_d" : "", minor,
                        md_setup_args[ent].device_names);
  
 -              fd = sys_open(name, 0, 0);
-+              fd = sys_open((__force char __user *)name, 0, 0);
++              fd = sys_open((char __force_user *)name, 0, 0);
                if (fd < 0) {
                        printk(KERN_ERR "md: open failed - cannot start "
                                        "array %s\n", name);
@@ -58891,13 +61664,22 @@ diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
                         */
                        sys_close(fd);
 -                      fd = sys_open(name, 0, 0);
-+                      fd = sys_open((__force char __user *)name, 0, 0);
++                      fd = sys_open((char __force_user *)name, 0, 0);
                        sys_ioctl(fd, BLKRRPART, 0);
                }
                sys_close(fd);
-diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
---- linux-3.0.4/init/initramfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/initramfs.c       2011-08-23 21:47:56.000000000 -0400
+@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
+ 
+       wait_for_device_probe();
+ 
+-      fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
++      fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
+       if (fd >= 0) {
+               sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
+               sys_close(fd);
+diff -urNp linux-3.1.1/init/initramfs.c linux-3.1.1/init/initramfs.c
+--- linux-3.1.1/init/initramfs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/initramfs.c       2011-11-16 18:39:08.000000000 -0500
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
        }
  }
@@ -58912,7 +61694,7 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
        list_for_each_entry_safe(de, tmp, &dir_list, list) {
                list_del(&de->list);
 -              do_utime(de->name, de->mtime);
-+              do_utime((__force char __user *)de->name, de->mtime);
++              do_utime((char __force_user *)de->name, de->mtime);
                kfree(de->name);
                kfree(de);
        }
@@ -58921,7 +61703,7 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
                char *old = find_link(major, minor, ino, mode, collected);
                if (old)
 -                      return (sys_link(old, collected) < 0) ? -1 : 1;
-+                      return (sys_link((__force char __user *)old, (__force char __user *)collected) < 0) ? -1 : 1;
++                      return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
        }
        return 0;
  }
@@ -58930,13 +61712,13 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
        struct stat st;
  
 -      if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
-+      if (!sys_newlstat((__force char __user *)path, (__force struct stat __user *)&st) && (st.st_mode^mode) & S_IFMT) {
++      if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
                if (S_ISDIR(st.st_mode))
 -                      sys_rmdir(path);
-+                      sys_rmdir((__force char __user *)path);
++                      sys_rmdir((char __force_user *)path);
                else
 -                      sys_unlink(path);
-+                      sys_unlink((__force char __user *)path);
++                      sys_unlink((char __force_user *)path);
        }
  }
  
@@ -58945,7 +61727,7 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
                        if (ml != 1)
                                openflags |= O_TRUNC;
 -                      wfd = sys_open(collected, openflags, mode);
-+                      wfd = sys_open((__force char __user *)collected, openflags, mode);
++                      wfd = sys_open((char __force_user *)collected, openflags, mode);
  
                        if (wfd >= 0) {
                                sys_fchown(wfd, uid, gid);
@@ -58956,9 +61738,9 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
 -              sys_mkdir(collected, mode);
 -              sys_chown(collected, uid, gid);
 -              sys_chmod(collected, mode);
-+              sys_mkdir((__force char __user *)collected, mode);
-+              sys_chown((__force char __user *)collected, uid, gid);
-+              sys_chmod((__force char __user *)collected, mode);
++              sys_mkdir((char __force_user *)collected, mode);
++              sys_chown((char __force_user *)collected, uid, gid);
++              sys_chmod((char __force_user *)collected, mode);
                dir_add(collected, mtime);
        } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
                   S_ISFIFO(mode) || S_ISSOCK(mode)) {
@@ -58967,10 +61749,10 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
 -                      sys_chown(collected, uid, gid);
 -                      sys_chmod(collected, mode);
 -                      do_utime(collected, mtime);
-+                      sys_mknod((__force char __user *)collected, mode, rdev);
-+                      sys_chown((__force char __user *)collected, uid, gid);
-+                      sys_chmod((__force char __user *)collected, mode);
-+                      do_utime((__force char __user *)collected, mtime);
++                      sys_mknod((char __force_user *)collected, mode, rdev);
++                      sys_chown((char __force_user *)collected, uid, gid);
++                      sys_chmod((char __force_user *)collected, mode);
++                      do_utime((char __force_user *)collected, mtime);
                }
        }
        return 0;
@@ -58979,17 +61761,17 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
  {
        if (count >= body_len) {
 -              sys_write(wfd, victim, body_len);
-+              sys_write(wfd, (__force char __user *)victim, body_len);
++              sys_write(wfd, (char __force_user *)victim, body_len);
                sys_close(wfd);
 -              do_utime(vcollected, mtime);
-+              do_utime((__force char __user *)vcollected, mtime);
++              do_utime((char __force_user *)vcollected, mtime);
                kfree(vcollected);
                eat(body_len);
                state = SkipIt;
                return 0;
        } else {
 -              sys_write(wfd, victim, count);
-+              sys_write(wfd, (__force char __user *)victim, count);
++              sys_write(wfd, (char __force_user *)victim, count);
                body_len -= count;
                eat(count);
                return 1;
@@ -59000,16 +61782,16 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
 -      sys_symlink(collected + N_ALIGN(name_len), collected);
 -      sys_lchown(collected, uid, gid);
 -      do_utime(collected, mtime);
-+      sys_symlink((__force char __user *)collected + N_ALIGN(name_len), (__force char __user *)collected);
-+      sys_lchown((__force char __user *)collected, uid, gid);
-+      do_utime((__force char __user *)collected, mtime);
++      sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
++      sys_lchown((char __force_user *)collected, uid, gid);
++      do_utime((char __force_user *)collected, mtime);
        state = SkipIt;
        next_state = Reset;
        return 0;
-diff -urNp linux-3.0.4/init/Kconfig linux-3.0.4/init/Kconfig
---- linux-3.0.4/init/Kconfig   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/Kconfig   2011-08-23 21:47:56.000000000 -0400
-@@ -1195,7 +1195,7 @@ config SLUB_DEBUG
+diff -urNp linux-3.1.1/init/Kconfig linux-3.1.1/init/Kconfig
+--- linux-3.1.1/init/Kconfig   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/Kconfig   2011-11-16 18:39:08.000000000 -0500
+@@ -1202,7 +1202,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
        bool "Disable heap randomization"
@@ -59018,9 +61800,9 @@ diff -urNp linux-3.0.4/init/Kconfig linux-3.0.4/init/Kconfig
        help
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
---- linux-3.0.4/init/main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/main.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/init/main.c linux-3.1.1/init/main.c
+--- linux-3.1.1/init/main.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/init/main.c    2011-11-16 18:40:44.000000000 -0500
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -59080,7 +61862,7 @@ diff -urNp linux-3.0.4/init/main.c linux-3.0.4/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;
-@@ -667,6 +712,7 @@ int __init_or_module do_one_initcall(ini
+@@ -678,6 +723,7 @@ int __init_or_module do_one_initcall(ini
  {
        int count = preempt_count();
        int ret;
@@ -59088,7 +61870,7 @@ diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
  
        if (initcall_debug)
                ret = do_one_initcall_debug(fn);
-@@ -679,15 +725,15 @@ int __init_or_module do_one_initcall(ini
+@@ -690,15 +736,15 @@ int __init_or_module do_one_initcall(ini
                sprintf(msgbuf, "error code %d ", ret);
  
        if (preempt_count() != count) {
@@ -59108,21 +61890,21 @@ diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
        }
  
        return ret;
-@@ -805,7 +851,7 @@ static int __init kernel_init(void * unu
+@@ -817,7 +863,7 @@ static int __init kernel_init(void * unu
        do_basic_setup();
  
        /* Open the /dev/console on the rootfs, this should never fail */
 -      if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-+      if (sys_open((__force const char __user *) "/dev/console", O_RDWR, 0) < 0)
++      if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
  
        (void) sys_dup(0);
-@@ -818,11 +864,13 @@ static int __init kernel_init(void * unu
+@@ -830,11 +876,13 @@ static int __init kernel_init(void * unu
        if (!ramdisk_execute_command)
                ramdisk_execute_command = "/init";
  
 -      if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
-+      if (sys_access((__force const char __user *) ramdisk_execute_command, 0) != 0) {
++      if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
                ramdisk_execute_command = NULL;
                prepare_namespace();
        }
@@ -59132,20 +61914,20 @@ diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
        /*
         * Ok, we have completed the initial bootup, and
         * we're essentially up and running. Get rid of the
-diff -urNp linux-3.0.4/ipc/mqueue.c linux-3.0.4/ipc/mqueue.c
---- linux-3.0.4/ipc/mqueue.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/ipc/mqueue.c   2011-08-23 21:48:14.000000000 -0400
-@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
-                       mq_bytes = (mq_msg_tblsz +
-                               (info->attr.mq_maxmsg * info->attr.mq_msgsize));
- 
-+                      gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
-                       spin_lock(&mq_lock);
-                       if (u->mq_bytes + mq_bytes < u->mq_bytes ||
-                           u->mq_bytes + mq_bytes >
-diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
---- linux-3.0.4/ipc/msg.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/ipc/msg.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/ipc/mqueue.c linux-3.1.1/ipc/mqueue.c
+--- linux-3.1.1/ipc/mqueue.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/mqueue.c   2011-11-16 18:40:44.000000000 -0500
+@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
+               mq_bytes = (mq_msg_tblsz +
+                       (info->attr.mq_maxmsg * info->attr.mq_msgsize));
+ 
++              gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
+               spin_lock(&mq_lock);
+               if (u->mq_bytes + mq_bytes < u->mq_bytes ||
+                   u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
+diff -urNp linux-3.1.1/ipc/msg.c linux-3.1.1/ipc/msg.c
+--- linux-3.1.1/ipc/msg.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/msg.c      2011-11-16 18:39:08.000000000 -0500
 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke
        return security_msg_queue_associate(msq, msgflg);
  }
@@ -59171,9 +61953,9 @@ diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
        msg_params.key = key;
        msg_params.flg = msgflg;
  
-diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
---- linux-3.0.4/ipc/sem.c      2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/ipc/sem.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/ipc/sem.c linux-3.1.1/ipc/sem.c
+--- linux-3.1.1/ipc/sem.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/sem.c      2011-11-16 18:40:44.000000000 -0500
 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
        return 0;
  }
@@ -59202,7 +61984,7 @@ diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
        sem_params.key = key;
        sem_params.flg = semflg;
        sem_params.u.nsems = nsems;
-@@ -854,6 +855,8 @@ static int semctl_main(struct ipc_namesp
+@@ -848,6 +849,8 @@ static int semctl_main(struct ipc_namesp
        int nsems;
        struct list_head tasks;
  
@@ -59211,7 +61993,7 @@ diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
        sma = sem_lock_check(ns, semid);
        if (IS_ERR(sma))
                return PTR_ERR(sma);
-@@ -1301,6 +1304,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+@@ -1295,6 +1298,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
        struct ipc_namespace *ns;
        struct list_head tasks;
  
@@ -59220,9 +62002,9 @@ diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
        ns = current->nsproxy->ipc_ns;
  
        if (nsops < 1 || semid < 0)
-diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
---- linux-3.0.4/ipc/shm.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/ipc/shm.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/ipc/shm.c linux-3.1.1/ipc/shm.c
+--- linux-3.1.1/ipc/shm.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/ipc/shm.c      2011-11-16 18:40:44.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
@@ -59238,7 +62020,7 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
  void shm_init_ns(struct ipc_namespace *ns)
  {
        ns->shm_ctlmax = SHMMAX;
-@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *
+@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *
        shp->shm_lprid = 0;
        shp->shm_atim = shp->shm_dtim = 0;
        shp->shm_ctim = get_seconds();
@@ -59253,7 +62035,7 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
        shp->shm_segsz = size;
        shp->shm_nattch = 0;
        shp->shm_file = file;
-@@ -451,18 +467,19 @@ static inline int shm_more_checks(struct
+@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct
        return 0;
  }
  
@@ -59278,7 +62060,7 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
        shm_params.key = key;
        shm_params.flg = shmflg;
        shm_params.u.size = size;
-@@ -762,8 +779,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
+@@ -870,8 +887,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
        case SHM_LOCK:
        case SHM_UNLOCK:
        {
@@ -59287,7 +62069,7 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
                lru_add_drain_all();  /* drain pagevecs to lru lists */
  
                shp = shm_lock_check(ns, shmid);
-@@ -896,9 +911,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -1004,9 +1019,21 @@ long do_shmat(int shmid, char __user *sh
        if (err)
                goto out_unlock;
  
@@ -59309,22 +62091,22 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
        size = i_size_read(path.dentry->d_inode);
        shm_unlock(shp);
  
-diff -urNp linux-3.0.4/kernel/acct.c linux-3.0.4/kernel/acct.c
---- linux-3.0.4/kernel/acct.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/acct.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/acct.c linux-3.1.1/kernel/acct.c
+--- linux-3.1.1/kernel/acct.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/acct.c  2011-11-16 18:39:08.000000000 -0500
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
         */
        flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
 -      file->f_op->write(file, (char *)&ac,
-+      file->f_op->write(file, (__force char __user *)&ac,
++      file->f_op->write(file, (char __force_user *)&ac,
                               sizeof(acct_t), &file->f_pos);
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
        set_fs(fs);
-diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
---- linux-3.0.4/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400
-@@ -112,7 +112,7 @@ u32                audit_sig_sid = 0;
+diff -urNp linux-3.1.1/kernel/audit.c linux-3.1.1/kernel/audit.c
+--- linux-3.1.1/kernel/audit.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/audit.c 2011-11-16 18:39:08.000000000 -0500
+@@ -115,7 +115,7 @@ u32                audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
  */
@@ -59333,7 +62115,7 @@ diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
  
  /* The netlink socket. */
  static struct sock *audit_sock;
-@@ -234,7 +234,7 @@ void audit_log_lost(const char *message)
+@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
        unsigned long           now;
        int                     print;
  
@@ -59342,7 +62124,7 @@ diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
  
        print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
  
-@@ -253,7 +253,7 @@ void audit_log_lost(const char *message)
+@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
                        printk(KERN_WARNING
                                "audit: audit_lost=%d audit_rate_limit=%d "
                                "audit_backlog_limit=%d\n",
@@ -59351,7 +62133,7 @@ diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
                                audit_rate_limit,
                                audit_backlog_limit);
                audit_panic(message);
-@@ -686,7 +686,7 @@ static int audit_receive_msg(struct sk_b
+@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_b
                status_set.pid           = audit_pid;
                status_set.rate_limit    = audit_rate_limit;
                status_set.backlog_limit = audit_backlog_limit;
@@ -59360,9 +62142,9 @@ diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
                status_set.backlog       = skb_queue_len(&audit_skb_queue);
                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
                                 &status_set, sizeof(status_set));
-diff -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
---- linux-3.0.4/kernel/auditsc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/auditsc.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/auditsc.c linux-3.1.1/kernel/auditsc.c
+--- linux-3.1.1/kernel/auditsc.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/auditsc.c       2011-11-16 18:39:08.000000000 -0500
 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -59381,9 +62163,9 @@ diff -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
        struct audit_context *context = task->audit_context;
  
        if (context && context->in_syscall) {
-diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
---- linux-3.0.4/kernel/capability.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/capability.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/capability.c linux-3.1.1/kernel/capability.c
+--- linux-3.1.1/kernel/capability.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/capability.c    2011-11-16 18:40:44.000000000 -0500
 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
                 * before modification is attempted and the application
                 * fails.
@@ -59444,10 +62226,10 @@ diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
  /**
   * nsown_capable - Check superior capability to one's own user_ns
   * @cap: The capability in question
-diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
---- linux-3.0.4/kernel/cgroup.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/cgroup.c        2011-08-23 21:48:14.000000000 -0400
-@@ -593,6 +593,8 @@ static struct css_set *find_css_set(
+diff -urNp linux-3.1.1/kernel/cgroup.c linux-3.1.1/kernel/cgroup.c
+--- linux-3.1.1/kernel/cgroup.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/cgroup.c        2011-11-16 18:40:44.000000000 -0500
+@@ -595,6 +595,8 @@ static struct css_set *find_css_set(
        struct hlist_head *hhead;
        struct cg_cgroup_link *link;
  
@@ -59456,9 +62238,9 @@ diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
        /* First see if we already have a cgroup group that matches
         * the desired set */
        read_lock(&css_set_lock);
-diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
---- linux-3.0.4/kernel/compat.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/compat.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/compat.c linux-3.1.1/kernel/compat.c
+--- linux-3.1.1/kernel/compat.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/compat.c        2011-11-16 18:40:44.000000000 -0500
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -59467,9 +62249,166 @@ diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
---- linux-3.0.4/kernel/configs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/configs.c       2011-08-23 21:48:14.000000000 -0400
+@@ -167,7 +168,7 @@ static long compat_nanosleep_restart(str
+       mm_segment_t oldfs;
+       long ret;
+ 
+-      restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
++      restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       ret = hrtimer_nanosleep_restart(restart);
+@@ -199,7 +200,7 @@ asmlinkage long compat_sys_nanosleep(str
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       ret = hrtimer_nanosleep(&tu,
+-                              rmtp ? (struct timespec __user *)&rmt : NULL,
++                              rmtp ? (struct timespec __force_user *)&rmt : NULL,
+                               HRTIMER_MODE_REL, CLOCK_MONOTONIC);
+       set_fs(oldfs);
+ 
+@@ -308,7 +309,7 @@ asmlinkage long compat_sys_sigpending(co
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_sigpending((old_sigset_t __user *) &s);
++      ret = sys_sigpending((old_sigset_t __force_user *) &s);
+       set_fs(old_fs);
+       if (ret == 0)
+               ret = put_user(s, set);
+@@ -331,8 +332,8 @@ asmlinkage long compat_sys_sigprocmask(i
+       old_fs = get_fs();
+       set_fs(KERNEL_DS);
+       ret = sys_sigprocmask(how,
+-                            set ? (old_sigset_t __user *) &s : NULL,
+-                            oset ? (old_sigset_t __user *) &s : NULL);
++                            set ? (old_sigset_t __force_user *) &s : NULL,
++                            oset ? (old_sigset_t __force_user *) &s : NULL);
+       set_fs(old_fs);
+       if (ret == 0)
+               if (oset)
+@@ -369,7 +370,7 @@ asmlinkage long compat_sys_old_getrlimit
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_old_getrlimit(resource, &r);
++      ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
+       set_fs(old_fs);
+ 
+       if (!ret) {
+@@ -441,7 +442,7 @@ asmlinkage long compat_sys_getrusage(int
+       mm_segment_t old_fs = get_fs();
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_getrusage(who, (struct rusage __user *) &r);
++      ret = sys_getrusage(who, (struct rusage __force_user *) &r);
+       set_fs(old_fs);
+ 
+       if (ret)
+@@ -468,8 +469,8 @@ compat_sys_wait4(compat_pid_t pid, compa
+               set_fs (KERNEL_DS);
+               ret = sys_wait4(pid,
+                               (stat_addr ?
+-                               (unsigned int __user *) &status : NULL),
+-                              options, (struct rusage __user *) &r);
++                               (unsigned int __force_user *) &status : NULL),
++                              options, (struct rusage __force_user *) &r);
+               set_fs (old_fs);
+ 
+               if (ret > 0) {
+@@ -494,8 +495,8 @@ asmlinkage long compat_sys_waitid(int wh
+       memset(&info, 0, sizeof(info));
+ 
+       set_fs(KERNEL_DS);
+-      ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
+-                       uru ? (struct rusage __user *)&ru : NULL);
++      ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
++                       uru ? (struct rusage __force_user *)&ru : NULL);
+       set_fs(old_fs);
+ 
+       if ((ret < 0) || (info.si_signo == 0))
+@@ -625,8 +626,8 @@ long compat_sys_timer_settime(timer_t ti
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_timer_settime(timer_id, flags,
+-                              (struct itimerspec __user *) &newts,
+-                              (struct itimerspec __user *) &oldts);
++                              (struct itimerspec __force_user *) &newts,
++                              (struct itimerspec __force_user *) &oldts);
+       set_fs(oldfs);
+       if (!err && old && put_compat_itimerspec(old, &oldts))
+               return -EFAULT;
+@@ -643,7 +644,7 @@ long compat_sys_timer_gettime(timer_t ti
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_timer_gettime(timer_id,
+-                              (struct itimerspec __user *) &ts);
++                              (struct itimerspec __force_user *) &ts);
+       set_fs(oldfs);
+       if (!err && put_compat_itimerspec(setting, &ts))
+               return -EFAULT;
+@@ -662,7 +663,7 @@ long compat_sys_clock_settime(clockid_t 
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_clock_settime(which_clock,
+-                              (struct timespec __user *) &ts);
++                              (struct timespec __force_user *) &ts);
+       set_fs(oldfs);
+       return err;
+ }
+@@ -677,7 +678,7 @@ long compat_sys_clock_gettime(clockid_t 
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_clock_gettime(which_clock,
+-                              (struct timespec __user *) &ts);
++                              (struct timespec __force_user *) &ts);
+       set_fs(oldfs);
+       if (!err && put_compat_timespec(&ts, tp))
+               return -EFAULT;
+@@ -697,7 +698,7 @@ long compat_sys_clock_adjtime(clockid_t 
+ 
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+-      ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
++      ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
+       set_fs(oldfs);
+ 
+       err = compat_put_timex(utp, &txc);
+@@ -717,7 +718,7 @@ long compat_sys_clock_getres(clockid_t w
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_clock_getres(which_clock,
+-                             (struct timespec __user *) &ts);
++                             (struct timespec __force_user *) &ts);
+       set_fs(oldfs);
+       if (!err && tp && put_compat_timespec(&ts, tp))
+               return -EFAULT;
+@@ -729,9 +730,9 @@ static long compat_clock_nanosleep_resta
+       long err;
+       mm_segment_t oldfs;
+       struct timespec tu;
+-      struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
++      struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
+ 
+-      restart->nanosleep.rmtp = (struct timespec __user *) &tu;
++      restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = clock_nanosleep_restart(restart);
+@@ -763,8 +764,8 @@ long compat_sys_clock_nanosleep(clockid_
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+       err = sys_clock_nanosleep(which_clock, flags,
+-                                (struct timespec __user *) &in,
+-                                (struct timespec __user *) &out);
++                                (struct timespec __force_user *) &in,
++                                (struct timespec __force_user *) &out);
+       set_fs(oldfs);
+ 
+       if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
+diff -urNp linux-3.1.1/kernel/configs.c linux-3.1.1/kernel/configs.c
+--- linux-3.1.1/kernel/configs.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/configs.c       2011-11-16 18:40:44.000000000 -0500
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
        struct proc_dir_entry *entry;
  
@@ -59490,9 +62429,9 @@ diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
        if (!entry)
                return -ENOMEM;
  
-diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
---- linux-3.0.4/kernel/cred.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/cred.c  2011-08-25 17:23:03.000000000 -0400
+diff -urNp linux-3.1.1/kernel/cred.c linux-3.1.1/kernel/cred.c
+--- linux-3.1.1/kernel/cred.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/cred.c  2011-11-16 18:40:44.000000000 -0500
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -59574,20 +62513,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        /* dumpability changes */
        if (old->euid != new->euid ||
            old->egid != new->egid ||
-@@ -508,10 +526,8 @@ int commit_creds(struct cred *new)
-               key_fsgid_changed(task);
- 
-       /* do it
--       * - What if a process setreuid()'s and this brings the
--       *   new uid over his NPROC rlimit?  We can check this now
--       *   cheaply with the new uid cache, so if it matters
--       *   we should be checking for it.  -DaveM
-+       * RLIMIT_NPROC limits on user->processes have already been checked
-+       * in set_user().
-        */
-       alter_cred_subscribers(new, 2);
-       if (new->user != old->user)
-@@ -551,6 +567,8 @@ EXPORT_SYMBOL(commit_creds);
+@@ -549,6 +567,8 @@ EXPORT_SYMBOL(commit_creds);
   */
  void abort_creds(struct cred *new)
  {
@@ -59596,7 +62522,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        kdebug("abort_creds(%p{%d,%d})", new,
               atomic_read(&new->usage),
               read_cred_subscribers(new));
-@@ -574,6 +592,8 @@ const struct cred *override_creds(const 
+@@ -572,6 +592,8 @@ const struct cred *override_creds(const 
  {
        const struct cred *old = current->cred;
  
@@ -59605,7 +62531,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        kdebug("override_creds(%p{%d,%d})", new,
               atomic_read(&new->usage),
               read_cred_subscribers(new));
-@@ -603,6 +623,8 @@ void revert_creds(const struct cred *old
+@@ -601,6 +623,8 @@ void revert_creds(const struct cred *old
  {
        const struct cred *override = current->cred;
  
@@ -59614,7 +62540,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        kdebug("revert_creds(%p{%d,%d})", old,
               atomic_read(&old->usage),
               read_cred_subscribers(old));
-@@ -649,6 +671,8 @@ struct cred *prepare_kernel_cred(struct 
+@@ -647,6 +671,8 @@ struct cred *prepare_kernel_cred(struct 
        const struct cred *old;
        struct cred *new;
  
@@ -59623,7 +62549,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
        if (!new)
                return NULL;
-@@ -703,6 +727,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
+@@ -701,6 +727,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
   */
  int set_security_override(struct cred *new, u32 secid)
  {
@@ -59632,7 +62558,7 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        return security_kernel_act_as(new, secid);
  }
  EXPORT_SYMBOL(set_security_override);
-@@ -722,6 +748,8 @@ int set_security_override_from_ctx(struc
+@@ -720,6 +748,8 @@ int set_security_override_from_ctx(struc
        u32 secid;
        int ret;
  
@@ -59641,9 +62567,9 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
        ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
        if (ret < 0)
                return ret;
-diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_core.c
---- linux-3.0.4/kernel/debug/debug_core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/debug/debug_core.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/debug/debug_core.c linux-3.1.1/kernel/debug/debug_core.c
+--- linux-3.1.1/kernel/debug/debug_core.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/debug/debug_core.c      2011-11-16 18:39:08.000000000 -0500
 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t                       masters_in_kgdb;
@@ -59704,9 +62630,9 @@ diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_
        tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/kdb_main.c
---- linux-3.0.4/kernel/debug/kdb/kdb_main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/debug/kdb/kdb_main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/debug/kdb/kdb_main.c linux-3.1.1/kernel/debug/kdb/kdb_main.c
+--- linux-3.1.1/kernel/debug/kdb/kdb_main.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/debug/kdb/kdb_main.c    2011-11-16 18:39:08.000000000 -0500
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
        list_for_each_entry(mod, kdb_modules, list) {
  
@@ -59725,10 +62651,10 @@ diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/
  
  #ifdef CONFIG_MODULE_UNLOAD
                {
-diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
---- linux-3.0.4/kernel/events/core.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/events/core.c   2011-09-14 09:08:05.000000000 -0400
-@@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
+diff -urNp linux-3.1.1/kernel/events/core.c linux-3.1.1/kernel/events/core.c
+--- linux-3.1.1/kernel/events/core.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/events/core.c   2011-11-16 18:39:08.000000000 -0500
+@@ -172,7 +172,7 @@ int perf_proc_update_handler(struct ctl_
        return 0;
  }
  
@@ -59737,7 +62663,7 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
  
  static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
                              enum event_type_t event_type);
-@@ -2488,7 +2488,7 @@ static void __perf_event_read(void *info
+@@ -2535,7 +2535,7 @@ static void __perf_event_read(void *info
  
  static inline u64 perf_event_count(struct perf_event *event)
  {
@@ -59746,7 +62672,7 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
  }
  
  static u64 perf_event_read(struct perf_event *event)
-@@ -3023,9 +3023,9 @@ u64 perf_event_read_value(struct perf_ev
+@@ -3060,9 +3060,9 @@ u64 perf_event_read_value(struct perf_ev
        mutex_lock(&event->child_mutex);
        total += perf_event_read(event);
        *enabled += event->total_time_enabled +
@@ -59758,20 +62684,20 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
  
        list_for_each_entry(child, &event->child_list, child_list) {
                total += perf_event_read(child);
-@@ -3388,10 +3388,10 @@ void perf_event_update_userpage(struct p
+@@ -3448,10 +3448,10 @@ void perf_event_update_userpage(struct p
                userpg->offset -= local64_read(&event->hw.prev_count);
  
-       userpg->time_enabled = event->total_time_enabled +
+       userpg->time_enabled = enabled +
 -                      atomic64_read(&event->child_total_time_enabled);
 +                      atomic64_read_unchecked(&event->child_total_time_enabled);
  
-       userpg->time_running = event->total_time_running +
+       userpg->time_running = running +
 -                      atomic64_read(&event->child_total_time_running);
 +                      atomic64_read_unchecked(&event->child_total_time_running);
  
        barrier();
        ++userpg->lock;
-@@ -4188,11 +4188,11 @@ static void perf_output_read_one(struct 
+@@ -3822,11 +3822,11 @@ static void perf_output_read_one(struct 
        values[n++] = perf_event_count(event);
        if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
                values[n++] = enabled +
@@ -59785,7 +62711,7 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
        }
        if (read_format & PERF_FORMAT_ID)
                values[n++] = primary_event_id(event);
-@@ -4833,12 +4833,12 @@ static void perf_event_mmap_event(struct
+@@ -4477,12 +4477,12 @@ static void perf_event_mmap_event(struct
                 * need to add enough zero bytes after the string to handle
                 * the 64bit alignment we do later.
                 */
@@ -59800,7 +62726,7 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
                if (IS_ERR(name)) {
                        name = strncpy(tmp, "//toolong", sizeof(tmp));
                        goto got_name;
-@@ -6190,7 +6190,7 @@ perf_event_alloc(struct perf_event_attr 
+@@ -5833,7 +5833,7 @@ perf_event_alloc(struct perf_event_attr 
        event->parent           = parent_event;
  
        event->ns               = get_pid_ns(current->nsproxy->pid_ns);
@@ -59809,7 +62735,7 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
  
        event->state            = PERF_EVENT_STATE_INACTIVE;
  
-@@ -6713,10 +6713,10 @@ static void sync_child_event(struct perf
+@@ -6355,10 +6355,10 @@ static void sync_child_event(struct perf
        /*
         * Add back the child's count to the parent's count:
         */
@@ -59823,9 +62749,9 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
                     &parent_event->child_total_time_running);
  
        /*
-diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
---- linux-3.0.4/kernel/exit.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/exit.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/exit.c linux-3.1.1/kernel/exit.c
+--- linux-3.1.1/kernel/exit.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/exit.c  2011-11-16 19:33:48.000000000 -0500
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -59837,7 +62763,7 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
  static void exit_mm(struct task_struct * tsk);
  
  static void __unhash_process(struct task_struct *p, bool group_dead)
-@@ -169,6 +173,10 @@ void release_task(struct task_struct * p
+@@ -168,6 +172,10 @@ void release_task(struct task_struct * p
        struct task_struct *leader;
        int zap_leader;
  repeat:
@@ -59845,10 +62771,10 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
 +      gr_del_task_from_ip_table(p);
 +#endif
 +
-       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 */
-@@ -338,11 +346,22 @@ static void reparent_to_kthreadd(void)
+       rcu_read_lock();
+@@ -324,11 +332,22 @@ static void reparent_to_kthreadd(void)
  {
        write_lock_irq(&tasklist_lock);
  
@@ -59871,7 +62797,7 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
        /* Set the exit signal to SIGCHLD so we signal init on exit */
        current->exit_signal = SIGCHLD;
  
-@@ -394,7 +413,7 @@ int allow_signal(int sig)
+@@ -380,7 +399,7 @@ int allow_signal(int sig)
         * know it'll be handled, so that they don't get converted to
         * SIGKILL or just silently dropped.
         */
@@ -59880,7 +62806,7 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
        return 0;
-@@ -430,6 +449,17 @@ void daemonize(const char *name, ...)
+@@ -416,6 +435,17 @@ void daemonize(const char *name, ...)
        vsnprintf(current->comm, sizeof(current->comm), name, args);
        va_end(args);
  
@@ -59898,38 +62824,24 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/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
-@@ -904,15 +934,8 @@ NORET_TYPE void do_exit(long code)
+@@ -895,6 +925,8 @@ 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));
--      WARN_ON(blk_needs_flush_plug(tsk));
--
-       if (unlikely(in_interrupt()))
-               panic("Aiee, killing interrupt handler!");
--      if (unlikely(!tsk->pid))
--              panic("Attempted to kill the idle task!");
++      set_fs(USER_DS);
++
+       profile_task_exit(tsk);
  
-       /*
-        * If do_exit is called because this processes oopsed, it's possible
-@@ -923,6 +946,14 @@ NORET_TYPE void do_exit(long code)
+       WARN_ON(blk_needs_flush_plug(tsk));
+@@ -911,7 +943,6 @@ NORET_TYPE void do_exit(long code)
+        * mm_release()->clear_child_tid() from writing to a user-controlled
+        * kernel address.
         */
-       set_fs(USER_DS);
+-      set_fs(USER_DS);
  
-+      profile_task_exit(tsk);
-+
-+      WARN_ON(atomic_read(&tsk->fs_excl));
-+      WARN_ON(blk_needs_flush_plug(tsk));
-+
-+      if (unlikely(!tsk->pid))
-+              panic("Attempted to kill the idle task!");
-+
-       tracehook_report_exit(&code);
+       ptrace_event(PTRACE_EVENT_EXIT, code);
  
-       validate_creds_for_do_exit(tsk);
-@@ -983,6 +1014,9 @@ NORET_TYPE void do_exit(long code)
+@@ -973,6 +1004,9 @@ NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        taskstats_exit(tsk, group_dead);
  
@@ -59939,10 +62851,10 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
        exit_mm(tsk);
  
        if (group_dead)
-diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
---- linux-3.0.4/kernel/fork.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/fork.c  2011-08-25 17:23:36.000000000 -0400
-@@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
+diff -urNp linux-3.1.1/kernel/fork.c linux-3.1.1/kernel/fork.c
+--- linux-3.1.1/kernel/fork.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/fork.c  2011-11-16 19:36:31.000000000 -0500
+@@ -285,7 +285,7 @@ static struct task_struct *dup_task_stru
        *stackend = STACK_END_MAGIC;    /* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -59950,8 +62862,8 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
 +      tsk->stack_canary = pax_get_random_long();
  #endif
  
-       /* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -308,13 +308,77 @@ out:
+       /*
+@@ -309,13 +309,77 @@ out:
  }
  
  #ifdef CONFIG_MMU
@@ -60031,7 +62943,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
  
        down_write(&oldmm->mmap_sem);
        flush_cache_dup_mm(oldmm);
-@@ -326,8 +390,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -327,8 +391,8 @@ static int dup_mmap(struct mm_struct *mm
        mm->locked_vm = 0;
        mm->mmap = NULL;
        mm->mmap_cache = NULL;
@@ -60042,7 +62954,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
        mm->map_count = 0;
        cpumask_clear(mm_cpumask(mm));
        mm->mm_rb = RB_ROOT;
-@@ -343,8 +407,6 @@ static int dup_mmap(struct mm_struct *mm
+@@ -344,8 +408,6 @@ static int dup_mmap(struct mm_struct *mm
  
        prev = NULL;
        for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -60051,7 +62963,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
                if (mpnt->vm_flags & VM_DONTCOPY) {
                        long pages = vma_pages(mpnt);
                        mm->total_vm -= pages;
-@@ -352,55 +414,13 @@ static int dup_mmap(struct mm_struct *mm
+@@ -353,55 +415,13 @@ static int dup_mmap(struct mm_struct *mm
                                                                -pages);
                        continue;
                }
@@ -60111,7 +63023,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
                 * Link in the new vma and copy the page table entries.
                 */
                *pprev = tmp;
-@@ -421,6 +441,31 @@ static int dup_mmap(struct mm_struct *mm
+@@ -422,6 +442,31 @@ static int dup_mmap(struct mm_struct *mm
                if (retval)
                        goto out;
        }
@@ -60143,7 +63055,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
        /* a new mm has just been created */
        arch_dup_mmap(oldmm, mm);
        retval = 0;
-@@ -429,14 +474,6 @@ out:
+@@ -430,14 +475,6 @@ out:
        flush_tlb_mm(oldmm);
        up_write(&oldmm->mmap_sem);
        return retval;
@@ -60157,8 +63069,8 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
 -      goto out;
  }
  
- static inline int mm_alloc_pgd(struct mm_struct * mm)
-@@ -836,13 +873,14 @@ static int copy_fs(unsigned long clone_f
+ static inline int mm_alloc_pgd(struct mm_struct *mm)
+@@ -837,13 +874,14 @@ static int copy_fs(unsigned long clone_f
                        spin_unlock(&fs->lock);
                        return -EAGAIN;
                }
@@ -60174,7 +63086,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
        return 0;
  }
  
-@@ -1104,12 +1142,16 @@ static struct task_struct *copy_process(
+@@ -1105,6 +1143,9 @@ static struct task_struct *copy_process(
        DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
        retval = -EAGAIN;
@@ -60183,17 +63095,8 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
 +
        if (atomic_read(&p->real_cred->user->processes) >=
                        task_rlimit(p, RLIMIT_NPROC)) {
--              if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
--                  p->real_cred->user != INIT_USER)
-+              if (p->real_cred->user != INIT_USER &&
-+                  !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE))
-                       goto bad_fork_free;
-       }
-+      current->flags &= ~PF_NPROC_EXCEEDED;
- 
-       retval = copy_creds(p, clone_flags);
-       if (retval < 0)
-@@ -1250,6 +1292,8 @@ static struct task_struct *copy_process(
+               if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -1264,6 +1305,8 @@ static struct task_struct *copy_process(
        if (clone_flags & CLONE_THREAD)
                p->tgid = current->tgid;
  
@@ -60202,7 +63105,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
        p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
        /*
         * Clear TID on mm_release()?
-@@ -1414,6 +1458,8 @@ bad_fork_cleanup_count:
+@@ -1428,6 +1471,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
        free_task(p);
  fork_out:
@@ -60211,7 +63114,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
        return ERR_PTR(retval);
  }
  
-@@ -1502,6 +1548,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1528,6 +1573,8 @@ long do_fork(unsigned long clone_flags,
                if (clone_flags & CLONE_PARENT_SETTID)
                        put_user(nr, parent_tidptr);
  
@@ -60220,7 +63123,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
                if (clone_flags & CLONE_VFORK) {
                        p->vfork_done = &vfork;
                        init_completion(&vfork);
-@@ -1610,7 +1658,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1637,7 +1684,7 @@ static int unshare_fs(unsigned long unsh
                return 0;
  
        /* don't need lock here; in the worst case we'll do useless copy */
@@ -60229,7 +63132,7 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
                return 0;
  
        *new_fsp = copy_fs_struct(fs);
-@@ -1697,7 +1745,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
+@@ -1726,7 +1773,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
                        fs = current->fs;
                        spin_lock(&fs->lock);
                        current->fs = new_fs;
@@ -60239,9 +63142,9 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
                                new_fs = NULL;
                        else
                                new_fs = fs;
-diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.c
---- linux-3.0.4/kernel/futex.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/futex.c linux-3.1.1/kernel/futex.c
+--- linux-3.1.1/kernel/futex.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/futex.c 2011-11-16 18:40:44.000000000 -0500
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -60328,10 +63231,10 @@ diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.c
 +      set_fs(oldfs);
  
        for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
-               plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
-diff -urNp linux-3.0.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
---- linux-3.0.4/kernel/futex_compat.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/futex_compat.c  2011-08-23 21:48:14.000000000 -0400
+               plist_head_init(&futex_queues[i].chain);
+diff -urNp linux-3.1.1/kernel/futex_compat.c linux-3.1.1/kernel/futex_compat.c
+--- linux-3.1.1/kernel/futex_compat.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/futex_compat.c  2011-11-16 18:40:44.000000000 -0500
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -60371,9 +63274,9 @@ diff -urNp linux-3.0.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
                head = p->compat_robust_list;
                rcu_read_unlock();
        }
-diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
---- linux-3.0.4/kernel/gcov/base.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/gcov/base.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/gcov/base.c linux-3.1.1/kernel/gcov/base.c
+--- linux-3.1.1/kernel/gcov/base.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/gcov/base.c     2011-11-16 18:39:08.000000000 -0500
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -60395,9 +63298,9 @@ diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
                        if (prev)
                                prev->next = info->next;
                        else
-diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
---- linux-3.0.4/kernel/hrtimer.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/hrtimer.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/hrtimer.c linux-3.1.1/kernel/hrtimer.c
+--- linux-3.1.1/kernel/hrtimer.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/hrtimer.c       2011-11-16 18:39:08.000000000 -0500
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
        local_irq_restore(flags);
  }
@@ -60407,9 +63310,9 @@ diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
  {
        hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
---- linux-3.0.4/kernel/jump_label.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/jump_label.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/jump_label.c linux-3.1.1/kernel/jump_label.c
+--- linux-3.1.1/kernel/jump_label.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/jump_label.c    2011-11-16 18:39:08.000000000 -0500
 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
  
        size = (((unsigned long)stop - (unsigned long)start)
@@ -60433,9 +63336,9 @@ diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
  }
  
  static int
-diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
---- linux-3.0.4/kernel/kallsyms.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kallsyms.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/kallsyms.c linux-3.1.1/kernel/kallsyms.c
+--- linux-3.1.1/kernel/kallsyms.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kallsyms.c      2011-11-16 18:40:44.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)
@@ -60538,9 +63441,22 @@ diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
        if (!iter)
                return -ENOMEM;
        reset_iter(iter, 0);
-diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
---- linux-3.0.4/kernel/kmod.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kmod.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/kexec.c linux-3.1.1/kernel/kexec.c
+--- linux-3.1.1/kernel/kexec.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kexec.c 2011-11-16 18:39:08.000000000 -0500
+@@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
+                               unsigned long flags)
+ {
+       struct compat_kexec_segment in;
+-      struct kexec_segment out, __user *ksegments;
++      struct kexec_segment out;
++      struct kexec_segment __user *ksegments;
+       unsigned long i, result;
+ 
+       /* Don't allow clients that don't understand the native
+diff -urNp linux-3.1.1/kernel/kmod.c linux-3.1.1/kernel/kmod.c
+--- linux-3.1.1/kernel/kmod.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kmod.c  2011-11-16 18:40:44.000000000 -0500
 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -60589,7 +63505,7 @@ diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/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
-@@ -131,6 +142,47 @@ int __request_module(bool wait, const ch
+@@ -133,6 +144,47 @@ int __request_module(bool wait, const ch
        atomic_dec(&kmod_concurrent);
        return ret;
  }
@@ -60637,9 +63553,18 @@ diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
---- linux-3.0.4/kernel/kprobes.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kprobes.c       2011-08-23 21:47:56.000000000 -0400
+@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
+                *
+                * Thus the __user pointer cast is valid here.
+                */
+-              sys_wait4(pid, (int __user *)&ret, 0, NULL);
++              sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
+ 
+               /*
+                * If ret is 0, either ____call_usermodehelper failed and the
+diff -urNp linux-3.1.1/kernel/kprobes.c linux-3.1.1/kernel/kprobes.c
+--- linux-3.1.1/kernel/kprobes.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/kprobes.c       2011-11-16 18:39:08.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.
@@ -60658,7 +63583,7 @@ diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
                        kfree(kip);
                }
                return 1;
-@@ -1936,7 +1936,7 @@ static int __init init_kprobes(void)
+@@ -1949,7 +1949,7 @@ static int __init init_kprobes(void)
  {
        int i, err = 0;
        unsigned long offset = 0, size = 0;
@@ -60667,7 +63592,7 @@ diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
        const char *symbol_name;
        void *addr;
        struct kprobe_blackpoint *kb;
-@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(st
+@@ -2075,7 +2075,7 @@ static int __kprobes show_kprobe_addr(st
        const char *sym = NULL;
        unsigned int i = *(loff_t *) v;
        unsigned long offset = 0;
@@ -60676,9 +63601,9 @@ diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
  
        head = &kprobe_table[i];
        preempt_disable();
-diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
---- linux-3.0.4/kernel/lockdep.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/lockdep.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/lockdep.c linux-3.1.1/kernel/lockdep.c
+--- linux-3.1.1/kernel/lockdep.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/lockdep.c       2011-11-16 18:39:08.000000000 -0500
 @@ -583,6 +583,10 @@ static int static_obj(void *obj)
                      end   = (unsigned long) &_end,
                      addr  = (unsigned long) obj;
@@ -60698,7 +63623,7 @@ diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
                printk("the code is fine but needs lockdep annotation.\n");
                printk("turning off the locking correctness validator.\n");
                dump_stack();
-@@ -2936,7 +2941,7 @@ static int __lock_acquire(struct lockdep
+@@ -2948,7 +2953,7 @@ static int __lock_acquire(struct lockdep
                if (!class)
                        return 0;
        }
@@ -60707,9 +63632,9 @@ diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
        if (very_verbose(class)) {
                printk("\nacquire class [%p] %s", class->key, class->name);
                if (class->name_version > 1)
-diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
---- linux-3.0.4/kernel/lockdep_proc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/lockdep_proc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/lockdep_proc.c linux-3.1.1/kernel/lockdep_proc.c
+--- linux-3.1.1/kernel/lockdep_proc.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/lockdep_proc.c  2011-11-16 18:39:08.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)
@@ -60719,9 +63644,9 @@ diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
        const char *name = class->name;
  
        if (!name) {
-diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
---- linux-3.0.4/kernel/module.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/module.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/module.c linux-3.1.1/kernel/module.c
+--- linux-3.1.1/kernel/module.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/module.c        2011-11-16 18:40:44.000000000 -0500
 @@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
@@ -60767,7 +63692,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
                       mod->name, align, PAGE_SIZE);
                align = PAGE_SIZE;
-@@ -1166,7 +1168,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
   */
  #ifdef CONFIG_SYSFS
  
@@ -60776,7 +63701,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  static inline bool sect_empty(const Elf_Shdr *sect)
  {
        return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1632,21 +1634,21 @@ static void set_section_ro_nx(void *base
+@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base
  
  static void unset_module_core_ro_nx(struct module *mod)
  {
@@ -60806,7 +63731,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                set_memory_rw);
  }
  
-@@ -1657,14 +1659,14 @@ void set_all_modules_text_rw(void)
+@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
  
        mutex_lock(&module_mutex);
        list_for_each_entry_rcu(mod, &modules, list) {
@@ -60827,7 +63752,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                                                set_memory_rw);
                }
        }
-@@ -1678,14 +1680,14 @@ void set_all_modules_text_ro(void)
+@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
  
        mutex_lock(&module_mutex);
        list_for_each_entry_rcu(mod, &modules, list) {
@@ -60848,7 +63773,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                                                set_memory_ro);
                }
        }
-@@ -1722,16 +1724,19 @@ static void free_module(struct module *m
+@@ -1748,16 +1750,19 @@ static void free_module(struct module *m
  
        /* This may be NULL, but that's OK */
        unset_module_init_ro_nx(mod);
@@ -60871,7 +63796,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
  #ifdef CONFIG_MPU
        update_protections(current->mm);
-@@ -1800,10 +1805,31 @@ static int simplify_symbols(struct modul
+@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct modul
        unsigned int i;
        int ret = 0;
        const struct kernel_symbol *ksym;
@@ -60903,7 +63828,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                switch (sym[i].st_shndx) {
                case SHN_COMMON:
                        /* We compiled with -fno-common.  These are not
-@@ -1824,7 +1850,9 @@ static int simplify_symbols(struct modul
+@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct modul
                        ksym = resolve_symbol_wait(mod, info, name);
                        /* Ok if resolved.  */
                        if (ksym && !IS_ERR(ksym)) {
@@ -60913,7 +63838,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                                break;
                        }
  
-@@ -1843,11 +1871,20 @@ static int simplify_symbols(struct modul
+@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct modul
                                secbase = (unsigned long)mod_percpu(mod);
                        else
                                secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -60934,7 +63859,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        return ret;
  }
  
-@@ -1931,22 +1968,12 @@ static void layout_sections(struct modul
+@@ -1977,22 +2014,12 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || strstarts(sname, ".init"))
                                continue;
@@ -60961,7 +63886,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        }
  
        DEBUGP("Init section allocation order:\n");
-@@ -1960,23 +1987,13 @@ static void layout_sections(struct modul
+@@ -2006,23 +2033,13 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || !strstarts(sname, ".init"))
                                continue;
@@ -60990,7 +63915,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        }
  }
  
-@@ -2141,7 +2158,7 @@ static void layout_symtab(struct module 
+@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module 
  
        /* Put symbol section at end of init part of module. */
        symsect->sh_flags |= SHF_ALLOC;
@@ -60999,7 +63924,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                                         info->index.sym) | INIT_OFFSET_MASK;
        DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -2158,19 +2175,19 @@ static void layout_symtab(struct module 
+@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module 
                }
  
        /* Append room for core symbols at end of core part. */
@@ -61024,7 +63949,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  }
  
  static void add_kallsyms(struct module *mod, const struct load_info *info)
-@@ -2186,11 +2203,13 @@ static void add_kallsyms(struct module *
+@@ -2232,11 +2249,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;
  
@@ -61039,7 +63964,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        src = mod->symtab;
        *dst = *src;
        for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2203,10 +2222,12 @@ static void add_kallsyms(struct module *
+@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *
        }
        mod->core_num_syms = ndst;
  
@@ -61053,8 +63978,8 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2235,17 +2256,33 @@ static void dynamic_debug_remove(struct 
-               ddebug_remove_module(debug->modname);
+@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long
+       return size == 0 ? NULL : vmalloc_exec(size);
  }
  
 -static void *module_alloc_update_bounds(unsigned long size)
@@ -61092,7 +64017,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                mutex_unlock(&module_mutex);
        }
        return ret;
-@@ -2538,7 +2575,7 @@ static int move_module(struct module *mo
+@@ -2589,7 +2626,7 @@ static int move_module(struct module *mo
        void *ptr;
  
        /* Do the allocs. */
@@ -61101,7 +64026,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/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
-@@ -2548,23 +2585,50 @@ static int move_module(struct module *mo
+@@ -2599,23 +2636,50 @@ static int move_module(struct module *mo
        if (!ptr)
                return -ENOMEM;
  
@@ -61160,7 +64085,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
        /* Transfer each section which specifies SHF_ALLOC */
        DEBUGP("final section addresses:\n");
-@@ -2575,16 +2639,45 @@ static int move_module(struct module *mo
+@@ -2626,16 +2690,45 @@ static int move_module(struct module *mo
                if (!(shdr->sh_flags & SHF_ALLOC))
                        continue;
  
@@ -61213,7 +64138,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                DEBUGP("\t0x%lx %s\n",
                       shdr->sh_addr, info->secstrings + shdr->sh_name);
        }
-@@ -2635,12 +2728,12 @@ static void flush_module_icache(const st
+@@ -2686,12 +2779,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.
         */
@@ -61232,7 +64157,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
        set_fs(old_fs);
  }
-@@ -2712,8 +2805,10 @@ static void module_deallocate(struct mod
+@@ -2771,8 +2864,10 @@ static void module_deallocate(struct mod
  {
        kfree(info->strmap);
        percpu_modfree(mod);
@@ -61244,8 +64169,8 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
 +      module_free(mod, mod->module_core_rw);
  }
  
- static int post_relocation(struct module *mod, const struct load_info *info)
-@@ -2770,9 +2865,38 @@ static struct module *load_module(void _
+ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2836,9 +2931,38 @@ static struct module *load_module(void _
        if (err)
                goto free_unload;
  
@@ -61284,7 +64209,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        /* Fix up syms, so that st_value is a pointer to location. */
        err = simplify_symbols(mod, &info);
        if (err < 0)
-@@ -2788,13 +2912,6 @@ static struct module *load_module(void _
+@@ -2854,13 +2978,6 @@ static struct module *load_module(void _
  
        flush_module_icache(mod);
  
@@ -61298,7 +64223,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        /* Mark state as coming so strong_try_module_get() ignores us. */
        mod->state = MODULE_STATE_COMING;
  
-@@ -2854,11 +2971,10 @@ static struct module *load_module(void _
+@@ -2920,11 +3037,10 @@ static struct module *load_module(void _
   unlock:
        mutex_unlock(&module_mutex);
        synchronize_sched();
@@ -61311,7 +64236,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
   free_unload:
        module_unload_free(mod);
   free_module:
-@@ -2899,16 +3015,16 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -2965,16 +3081,16 @@ SYSCALL_DEFINE3(init_module, void __user
                        MODULE_STATE_COMING, mod);
  
        /* Set RO and NX regions for core */
@@ -61336,7 +64261,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
        do_mod_ctors(mod);
        /* Start the module */
-@@ -2954,11 +3070,12 @@ SYSCALL_DEFINE3(init_module, void __user
+@@ -3020,11 +3136,12 @@ SYSCALL_DEFINE3(init_module, void __user
        mod->strtab = mod->core_strtab;
  #endif
        unset_module_init_ro_nx(mod);
@@ -61354,7 +64279,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        mutex_unlock(&module_mutex);
  
        return 0;
-@@ -2989,10 +3106,16 @@ static const char *get_ksymbol(struct mo
+@@ -3055,10 +3172,16 @@ static const char *get_ksymbol(struct mo
        unsigned long nextval;
  
        /* At worse, next value is at end of module */
@@ -61374,7 +64299,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
        /* Scan for closest preceding symbol, and next symbol. (ELF
           starts real symbols at 1). */
-@@ -3238,7 +3361,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3304,7 +3427,7 @@ static int m_show(struct seq_file *m, vo
        char buf[8];
  
        seq_printf(m, "%s %u",
@@ -61383,7 +64308,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        print_unload_info(m, mod);
  
        /* Informative for users. */
-@@ -3247,7 +3370,7 @@ static int m_show(struct seq_file *m, vo
+@@ -3313,7 +3436,7 @@ static int m_show(struct seq_file *m, vo
                   mod->state == MODULE_STATE_COMING ? "Loading":
                   "Live");
        /* Used by oprofile and other similar tools. */
@@ -61392,7 +64317,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  
        /* Taints info */
        if (mod->taints)
-@@ -3283,7 +3406,17 @@ static const struct file_operations proc
+@@ -3349,7 +3472,17 @@ static const struct file_operations proc
  
  static int __init proc_modules_init(void)
  {
@@ -61410,7 +64335,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
        return 0;
  }
  module_init(proc_modules_init);
-@@ -3342,12 +3475,12 @@ struct module *__module_address(unsigned
+@@ -3408,12 +3541,12 @@ struct module *__module_address(unsigned
  {
        struct module *mod;
  
@@ -61426,7 +64351,7 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                        return mod;
        return NULL;
  }
-@@ -3381,11 +3514,20 @@ bool is_module_text_address(unsigned lon
+@@ -3447,11 +3580,20 @@ bool is_module_text_address(unsigned lon
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -61450,9 +64375,9 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
                        mod = NULL;
        }
        return mod;
-diff -urNp linux-3.0.4/kernel/mutex.c linux-3.0.4/kernel/mutex.c
---- linux-3.0.4/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/mutex.c linux-3.1.1/kernel/mutex.c
+--- linux-3.1.1/kernel/mutex.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex.c 2011-11-16 18:39:08.000000000 -0500
 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, 
        spin_lock_mutex(&lock->wait_lock, flags);
  
@@ -61481,9 +64406,9 @@ diff -urNp linux-3.0.4/kernel/mutex.c linux-3.0.4/kernel/mutex.c
        mutex_set_owner(lock);
  
        /* set it to 0 if there are no waiters left: */
-diff -urNp linux-3.0.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
---- linux-3.0.4/kernel/mutex-debug.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/mutex-debug.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/mutex-debug.c linux-3.1.1/kernel/mutex-debug.c
+--- linux-3.1.1/kernel/mutex-debug.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex-debug.c   2011-11-16 18:39:08.000000000 -0500
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -61512,9 +64437,9 @@ diff -urNp linux-3.0.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
  
        list_del_init(&waiter->list);
        waiter->task = NULL;
-diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
---- linux-3.0.4/kernel/mutex-debug.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/mutex-debug.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/mutex-debug.h linux-3.1.1/kernel/mutex-debug.h
+--- linux-3.1.1/kernel/mutex-debug.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/mutex-debug.h   2011-11-16 18:39:08.000000000 -0500
 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -61527,9 +64452,9 @@ diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
  extern void debug_mutex_unlock(struct mutex *lock);
  extern void debug_mutex_init(struct mutex *lock, const char *name,
                             struct lock_class_key *key);
-diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
---- linux-3.0.4/kernel/padata.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/padata.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/padata.c linux-3.1.1/kernel/padata.c
+--- linux-3.1.1/kernel/padata.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/padata.c        2011-11-16 18:39:08.000000000 -0500
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
        padata->pd = pd;
        padata->cb_cpu = cb_cpu;
@@ -61553,10 +64478,10 @@ diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
        atomic_set(&pd->reorder_objects, 0);
        atomic_set(&pd->refcnt, 0);
        pd->pinst = pinst;
-diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
---- linux-3.0.4/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400
-@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
+diff -urNp linux-3.1.1/kernel/panic.c linux-3.1.1/kernel/panic.c
+--- linux-3.1.1/kernel/panic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/panic.c 2011-11-16 18:40:44.000000000 -0500
+@@ -371,7 +371,7 @@ static void warn_slowpath_common(const c
        const char *board;
  
        printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -61565,7 +64490,7 @@ diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
        board = dmi_get_system_info(DMI_PRODUCT_NAME);
        if (board)
                printk(KERN_WARNING "Hardware name: %s\n", board);
-@@ -424,7 +424,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+@@ -426,7 +426,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
@@ -61575,9 +64500,9 @@ diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
                __builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
---- linux-3.0.4/kernel/pid.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/pid.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/pid.c linux-3.1.1/kernel/pid.c
+--- linux-3.1.1/kernel/pid.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/pid.c   2011-11-16 18:40:44.000000000 -0500
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -61595,7 +64520,7 @@ diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -419,8 +420,15 @@ EXPORT_SYMBOL(pid_task);
+@@ -418,8 +419,15 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
@@ -61612,7 +64537,7 @@ diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -428,6 +436,12 @@ struct task_struct *find_task_by_vpid(pi
+@@ -427,6 +435,12 @@ struct task_struct *find_task_by_vpid(pi
        return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
  }
  
@@ -61625,9 +64550,9 @@ diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
        struct pid *pid;
-diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-timers.c
---- linux-3.0.4/kernel/posix-cpu-timers.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/posix-cpu-timers.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/posix-cpu-timers.c linux-3.1.1/kernel/posix-cpu-timers.c
+--- linux-3.1.1/kernel/posix-cpu-timers.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/posix-cpu-timers.c      2011-11-16 18:40:44.000000000 -0500
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -61636,7 +64561,7 @@ diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-ti
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -1604,14 +1605,14 @@ struct k_clock clock_posix_cpu = {
+@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
  
  static __init int init_posix_cpu_timers(void)
  {
@@ -61653,9 +64578,9 @@ diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-ti
                .clock_getres   = thread_cpu_clock_getres,
                .clock_get      = thread_cpu_clock_get,
                .timer_create   = thread_cpu_timer_create,
-diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
---- linux-3.0.4/kernel/posix-timers.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/posix-timers.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/posix-timers.c linux-3.1.1/kernel/posix-timers.c
+--- linux-3.1.1/kernel/posix-timers.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/posix-timers.c  2011-11-16 18:40:44.000000000 -0500
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -61759,9 +64684,9 @@ diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
        return kc->clock_set(which_clock, &new_tp);
  }
  
-diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff.c
---- linux-3.0.4/kernel/power/poweroff.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/power/poweroff.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/power/poweroff.c linux-3.1.1/kernel/power/poweroff.c
+--- linux-3.1.1/kernel/power/poweroff.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/power/poweroff.c        2011-11-16 18:39:08.000000000 -0500
 @@ -37,7 +37,7 @@ static struct sysrq_key_op   sysrq_powerof
        .enable_mask    = SYSRQ_ENABLE_BOOT,
  };
@@ -61771,9 +64696,9 @@ diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff
  {
        register_sysrq_key('o', &sysrq_poweroff_op);
        return 0;
-diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
---- linux-3.0.4/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/power/process.c linux-3.1.1/kernel/power/process.c
+--- linux-3.1.1/kernel/power/process.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/power/process.c 2011-11-16 18:39:08.000000000 -0500
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
        u64 elapsed_csecs64;
        unsigned int elapsed_csecs;
@@ -61816,10 +64741,10 @@ diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
                        break;
  
                if (pm_wakeup_pending()) {
-diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
---- linux-3.0.4/kernel/printk.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/printk.c        2011-08-23 21:48:14.000000000 -0400
-@@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
+diff -urNp linux-3.1.1/kernel/printk.c linux-3.1.1/kernel/printk.c
+--- linux-3.1.1/kernel/printk.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/printk.c        2011-11-16 19:38:11.000000000 -0500
+@@ -313,6 +313,11 @@ static int check_syslog_permissions(int 
        if (from_file && type != SYSLOG_ACTION_OPEN)
                return 0;
  
@@ -61831,16 +64756,9 @@ diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
        if (syslog_action_restricted(type)) {
                if (capable(CAP_SYSLOG))
                        return 0;
-               /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
-               if (capable(CAP_SYS_ADMIN)) {
--                      WARN_ONCE(1, "Attempt to access syslog with CAP_SYS_ADMIN "
-+                      printk_once(KERN_WARNING "Attempt to access syslog with CAP_SYS_ADMIN "
-                                "but no CAP_SYSLOG (deprecated).\n");
-                       return 0;
-               }
-diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
---- linux-3.0.4/kernel/profile.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/profile.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/profile.c linux-3.1.1/kernel/profile.c
+--- linux-3.1.1/kernel/profile.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/profile.c       2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -61898,10 +64816,10 @@ diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
        return count;
  }
  
-diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
---- linux-3.0.4/kernel/ptrace.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/ptrace.c        2011-08-23 21:48:14.000000000 -0400
-@@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
+diff -urNp linux-3.1.1/kernel/ptrace.c linux-3.1.1/kernel/ptrace.c
+--- linux-3.1.1/kernel/ptrace.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/ptrace.c        2011-11-16 19:50:22.000000000 -0500
+@@ -161,7 +161,8 @@ int ptrace_check_attach(struct task_stru
        return ret;
  }
  
@@ -61911,7 +64829,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
  {
        const struct cred *cred = current_cred(), *tcred;
  
-@@ -158,7 +159,8 @@ int __ptrace_may_access(struct task_stru
+@@ -187,7 +188,8 @@ int __ptrace_may_access(struct task_stru
             cred->gid == tcred->sgid &&
             cred->gid == tcred->gid))
                goto ok;
@@ -61921,7 +64839,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
                goto ok;
        rcu_read_unlock();
        return -EPERM;
-@@ -167,7 +169,9 @@ ok:
+@@ -196,7 +198,9 @@ ok:
        smp_rmb();
        if (task->mm)
                dumpable = get_dumpable(task->mm);
@@ -61932,7 +64850,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
                return -EPERM;
  
        return security_ptrace_access_check(task, mode);
-@@ -177,7 +181,16 @@ bool ptrace_may_access(struct task_struc
+@@ -206,7 +210,16 @@ bool ptrace_may_access(struct task_struc
  {
        int err;
        task_lock(task);
@@ -61950,7 +64868,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
        task_unlock(task);
        return !err;
  }
-@@ -205,7 +218,7 @@ static int ptrace_attach(struct task_str
+@@ -251,7 +264,7 @@ static int ptrace_attach(struct task_str
                goto out;
  
        task_lock(task);
@@ -61959,16 +64877,16 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
        task_unlock(task);
        if (retval)
                goto unlock_creds;
-@@ -218,7 +231,7 @@ static int ptrace_attach(struct task_str
-               goto unlock_tasklist;
- 
+@@ -266,7 +279,7 @@ static int ptrace_attach(struct task_str
        task->ptrace = PT_PTRACED;
+       if (seize)
+               task->ptrace |= PT_SEIZED;
 -      if (task_ns_capable(task, CAP_SYS_PTRACE))
 +      if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
                task->ptrace |= PT_PTRACE_CAP;
  
        __ptrace_link(task, current);
-@@ -406,6 +419,8 @@ int ptrace_readdata(struct task_struct *
+@@ -461,6 +474,8 @@ int ptrace_readdata(struct task_struct *
  {
        int copied = 0;
  
@@ -61977,7 +64895,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
        while (len > 0) {
                char buf[128];
                int this_len, retval;
-@@ -417,7 +432,7 @@ int ptrace_readdata(struct task_struct *
+@@ -472,7 +487,7 @@ int ptrace_readdata(struct task_struct *
                                break;
                        return -EIO;
                }
@@ -61986,7 +64904,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
                        return -EFAULT;
                copied += retval;
                src += retval;
-@@ -431,6 +446,8 @@ int ptrace_writedata(struct task_struct 
+@@ -486,6 +501,8 @@ int ptrace_writedata(struct task_struct 
  {
        int copied = 0;
  
@@ -61995,20 +64913,21 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
        while (len > 0) {
                char buf[128];
                int this_len, retval;
-@@ -613,9 +630,11 @@ int ptrace_request(struct task_struct *c
- {
+@@ -669,10 +686,12 @@ int ptrace_request(struct task_struct *c
+       bool seized = child->ptrace & PT_SEIZED;
        int ret = -EIO;
-       siginfo_t siginfo;
+       siginfo_t siginfo, *si;
 -      void __user *datavp = (void __user *) data;
 +      void __user *datavp = (__force void __user *) data;
        unsigned long __user *datalp = datavp;
+       unsigned long flags;
  
 +      pax_track_stack();
 +
        switch (request) {
        case PTRACE_PEEKTEXT:
        case PTRACE_PEEKDATA:
-@@ -761,14 +780,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -871,14 +890,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
                goto out;
        }
  
@@ -62017,8 +64936,8 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
 +              goto out_put_task_struct;
 +      }
 +
-       if (request == PTRACE_ATTACH) {
-               ret = ptrace_attach(child);
+       if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
+               ret = ptrace_attach(child, request, data);
                /*
                 * Some architectures need to do book-keeping after
                 * a ptrace attach.
@@ -62031,7 +64950,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
                goto out_put_task_struct;
        }
  
-@@ -793,7 +819,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -904,7 +930,7 @@ int generic_ptrace_peekdata(struct task_
        copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
        if (copied != sizeof(tmp))
                return -EIO;
@@ -62040,7 +64959,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -816,6 +842,8 @@ int compat_ptrace_request(struct task_st
+@@ -927,6 +953,8 @@ int compat_ptrace_request(struct task_st
        siginfo_t siginfo;
        int ret;
  
@@ -62049,7 +64968,7 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
        switch (request) {
        case PTRACE_PEEKTEXT:
        case PTRACE_PEEKDATA:
-@@ -903,14 +931,21 @@ asmlinkage long compat_sys_ptrace(compat
+@@ -1014,14 +1042,21 @@ asmlinkage long compat_sys_ptrace(compat
                goto out;
        }
  
@@ -62058,8 +64977,8 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
 +              goto out_put_task_struct;
 +      }
 +
-       if (request == PTRACE_ATTACH) {
-               ret = ptrace_attach(child);
+       if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
+               ret = ptrace_attach(child, request, data);
                /*
                 * Some architectures need to do book-keeping after
                 * a ptrace attach.
@@ -62072,9 +64991,9 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
                goto out_put_task_struct;
        }
  
-diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
---- linux-3.0.4/kernel/rcutorture.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutorture.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/rcutorture.c linux-3.1.1/kernel/rcutorture.c
+--- linux-3.1.1/kernel/rcutorture.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutorture.c    2011-11-16 18:39:08.000000000 -0500
 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
        { 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -62144,7 +65063,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
                        old_rp->rtort_pipe_count++;
                        cur_ops->deferred_free(old_rp);
                }
-@@ -951,7 +951,7 @@ static void rcu_torture_timer(unsigned l
+@@ -950,7 +950,7 @@ static void rcu_torture_timer(unsigned l
                return;
        }
        if (p->rtort_mbtest == 0)
@@ -62153,7 +65072,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
        spin_lock(&rand_lock);
        cur_ops->read_delay(&rand);
        n_rcu_torture_timers++;
-@@ -1013,7 +1013,7 @@ rcu_torture_reader(void *arg)
+@@ -1011,7 +1011,7 @@ rcu_torture_reader(void *arg)
                        continue;
                }
                if (p->rtort_mbtest == 0)
@@ -62162,7 +65081,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
                cur_ops->read_delay(&rand);
                preempt_disable();
                pipe_count = p->rtort_pipe_count;
-@@ -1072,16 +1072,16 @@ rcu_torture_printk(char *page)
+@@ -1070,16 +1070,16 @@ rcu_torture_printk(char *page)
                       rcu_torture_current,
                       rcu_torture_current_version,
                       list_empty(&rcu_torture_freelist),
@@ -62184,7 +65103,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
            n_rcu_torture_boost_ktrerror != 0 ||
            n_rcu_torture_boost_rterror != 0 ||
            n_rcu_torture_boost_failure != 0)
-@@ -1089,7 +1089,7 @@ rcu_torture_printk(char *page)
+@@ -1087,7 +1087,7 @@ rcu_torture_printk(char *page)
        cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
        if (i > 1) {
                cnt += sprintf(&page[cnt], "!!! ");
@@ -62193,7 +65112,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
                WARN_ON_ONCE(1);
        }
        cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1103,7 +1103,7 @@ rcu_torture_printk(char *page)
+@@ -1101,7 +1101,7 @@ rcu_torture_printk(char *page)
        cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
        for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
                cnt += sprintf(&page[cnt], " %d",
@@ -62202,7 +65121,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
        }
        cnt += sprintf(&page[cnt], "\n");
        if (cur_ops->stats)
-@@ -1412,7 +1412,7 @@ rcu_torture_cleanup(void)
+@@ -1410,7 +1410,7 @@ rcu_torture_cleanup(void)
  
        if (cur_ops->cleanup)
                cur_ops->cleanup();
@@ -62211,7 +65130,7 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
                rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
        else
                rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
-@@ -1476,17 +1476,17 @@ rcu_torture_init(void)
+@@ -1474,17 +1474,17 @@ rcu_torture_init(void)
  
        rcu_torture_current = NULL;
        rcu_torture_current_version = 0;
@@ -62235,9 +65154,9 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
        for_each_possible_cpu(cpu) {
                for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
                        per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
---- linux-3.0.4/kernel/rcutree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree.c       2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.1.1/kernel/rcutree.c linux-3.1.1/kernel/rcutree.c
+--- linux-3.1.1/kernel/rcutree.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree.c       2011-11-16 18:39:08.000000000 -0500
 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
        }
        /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
@@ -62320,9 +65239,9 @@ diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
  {
        __rcu_process_callbacks(&rcu_sched_state,
                                &__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.0.4/kernel/rcutree.h linux-3.0.4/kernel/rcutree.h
---- linux-3.0.4/kernel/rcutree.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree.h       2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.1.1/kernel/rcutree.h linux-3.1.1/kernel/rcutree.h
+--- linux-3.1.1/kernel/rcutree.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree.h       2011-11-16 18:39:08.000000000 -0500
 @@ -86,7 +86,7 @@
  struct rcu_dynticks {
        int dynticks_nesting;   /* Track irq/process nesting level. */
@@ -62332,9 +65251,9 @@ diff -urNp linux-3.0.4/kernel/rcutree.h linux-3.0.4/kernel/rcutree.h
  };
  
  /* RCU's kthread states for tracing. */
-diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin.h
---- linux-3.0.4/kernel/rcutree_plugin.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree_plugin.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/rcutree_plugin.h linux-3.1.1/kernel/rcutree_plugin.h
+--- linux-3.1.1/kernel/rcutree_plugin.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rcutree_plugin.h        2011-11-16 18:39:08.000000000 -0500
 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
  
        /* Clean up and exit. */
@@ -62397,9 +65316,9 @@ diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin
  
        put_online_cpus();
  }
-diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
---- linux-3.0.4/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/relay.c linux-3.1.1/kernel/relay.c
+--- linux-3.1.1/kernel/relay.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/relay.c 2011-11-16 18:40:44.000000000 -0500
 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
        };
        ssize_t ret;
@@ -62409,9 +65328,9 @@ diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
        if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
                return 0;
        if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
---- linux-3.0.4/kernel/resource.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/resource.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/resource.c linux-3.1.1/kernel/resource.c
+--- linux-3.1.1/kernel/resource.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/resource.c      2011-11-16 18:40:44.000000000 -0500
 @@ -141,8 +141,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -62431,9 +65350,9 @@ diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
        return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester.c
---- linux-3.0.4/kernel/rtmutex-tester.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rtmutex-tester.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/rtmutex-tester.c linux-3.1.1/kernel/rtmutex-tester.c
+--- linux-3.1.1/kernel/rtmutex-tester.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/rtmutex-tester.c        2011-11-16 18:39:08.000000000 -0500
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES   8
  
@@ -62524,9 +65443,9 @@ diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester
                return;
  
        default:
-diff -urNp linux-3.0.4/kernel/sched_autogroup.c linux-3.0.4/kernel/sched_autogroup.c
---- linux-3.0.4/kernel/sched_autogroup.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sched_autogroup.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/sched_autogroup.c linux-3.1.1/kernel/sched_autogroup.c
+--- linux-3.1.1/kernel/sched_autogroup.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched_autogroup.c       2011-11-16 18:39:08.000000000 -0500
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -62545,10 +65464,10 @@ diff -urNp linux-3.0.4/kernel/sched_autogroup.c linux-3.0.4/kernel/sched_autogro
        ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
        /*
-diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
---- linux-3.0.4/kernel/sched.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sched.c 2011-08-23 21:48:14.000000000 -0400
-@@ -4251,6 +4251,8 @@ asmlinkage void __sched schedule(void)
+diff -urNp linux-3.1.1/kernel/sched.c linux-3.1.1/kernel/sched.c
+--- linux-3.1.1/kernel/sched.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched.c 2011-11-16 18:40:44.000000000 -0500
+@@ -4264,6 +4264,8 @@ static void __sched __schedule(void)
        struct rq *rq;
        int cpu;
  
@@ -62557,7 +65476,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
  need_resched:
        preempt_disable();
        cpu = smp_processor_id();
-@@ -4934,6 +4936,8 @@ int can_nice(const struct task_struct *p
+@@ -4950,6 +4952,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;
  
@@ -62566,7 +65485,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
-@@ -4967,7 +4971,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4983,7 +4987,8 @@ SYSCALL_DEFINE1(nice, int, increment)
        if (nice > 19)
                nice = 19;
  
@@ -62576,7 +65495,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
                return -EPERM;
  
        retval = security_task_setnice(current, nice);
-@@ -5111,6 +5116,7 @@ recheck:
+@@ -5127,6 +5132,7 @@ recheck:
                        unsigned long rlim_rtprio =
                                        task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -62584,10 +65503,10 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
                        /* can't set/change the rt policy */
                        if (policy != p->policy && !rlim_rtprio)
                                return -EPERM;
-diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
---- linux-3.0.4/kernel/sched_fair.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sched_fair.c    2011-08-23 21:47:56.000000000 -0400
-@@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
+diff -urNp linux-3.1.1/kernel/sched_fair.c linux-3.1.1/kernel/sched_fair.c
+--- linux-3.1.1/kernel/sched_fair.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sched_fair.c    2011-11-16 18:39:08.000000000 -0500
+@@ -4062,7 +4062,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).
   */
@@ -62596,9 +65515,9 @@ diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
  {
        int this_cpu = smp_processor_id();
        struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
---- linux-3.0.4/kernel/signal.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/signal.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/signal.c linux-3.1.1/kernel/signal.c
+--- linux-3.1.1/kernel/signal.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/signal.c        2011-11-16 19:30:04.000000000 -0500
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -62623,7 +65542,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
  
        handler = sig_handler(t, sig);
  
-@@ -320,6 +320,9 @@ __sigqueue_alloc(int sig, struct task_st
+@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_st
        atomic_inc(&user->sigpending);
        rcu_read_unlock();
  
@@ -62633,7 +65552,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
        if (override_rlimit ||
            atomic_read(&user->sigpending) <=
                        task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -444,7 +447,7 @@ flush_signal_handlers(struct task_struct
+@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct
  
  int unhandled_signal(struct task_struct *tsk, int sig)
  {
@@ -62642,7 +65561,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
        if (is_global_init(tsk))
                return 1;
        if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -770,6 +773,13 @@ static int check_kill_permission(int sig
+@@ -815,6 +818,13 @@ static int check_kill_permission(int sig
                }
        }
  
@@ -62656,7 +65575,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
        return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1092,7 +1102,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct si
        return send_signal(sig, info, p, 1);
  }
  
@@ -62665,7 +65584,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
        return send_signal(sig, info, t, 0);
-@@ -1129,6 +1139,7 @@ force_sig_info(int sig, struct siginfo *
+@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *
        unsigned long int flags;
        int ret, blocked, ignored;
        struct k_sigaction *action;
@@ -62673,7 +65592,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
  
        spin_lock_irqsave(&t->sighand->siglock, flags);
        action = &t->sighand->action[sig-1];
-@@ -1143,9 +1154,18 @@ force_sig_info(int sig, struct siginfo *
+@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *
        }
        if (action->sa.sa_handler == SIG_DFL)
                t->signal->flags &= ~SIGNAL_UNKILLABLE;
@@ -62692,7 +65611,7 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
        return ret;
  }
  
-@@ -1212,8 +1232,11 @@ int group_send_sig_info(int sig, struct 
+@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct 
        ret = check_kill_permission(sig, info, p);
        rcu_read_unlock();
  
@@ -62705,16 +65624,16 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
  
        return ret;
  }
-@@ -1839,6 +1862,8 @@ void ptrace_notify(int exit_code)
+@@ -1909,6 +1932,8 @@ static void ptrace_do_notify(int signr, 
  {
        siginfo_t info;
  
 +      pax_track_stack();
 +
-       BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
- 
        memset(&info, 0, sizeof info);
-@@ -2639,7 +2664,15 @@ do_send_specific(pid_t tgid, pid_t pid, 
+       info.si_signo = signr;
+       info.si_code = exit_code;
+@@ -2748,7 +2773,15 @@ do_send_specific(pid_t tgid, pid_t pid, 
        int error = -ESRCH;
  
        rcu_read_lock();
@@ -62731,9 +65650,9 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
        if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
                error = check_kill_permission(sig, info, p);
                /*
-diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
---- linux-3.0.4/kernel/smp.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/smp.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/smp.c linux-3.1.1/kernel/smp.c
+--- linux-3.1.1/kernel/smp.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/smp.c   2011-11-16 18:39:08.000000000 -0500
 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -62761,9 +65680,9 @@ diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
  {
        raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
---- linux-3.0.4/kernel/softirq.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/softirq.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/softirq.c linux-3.1.1/kernel/softirq.c
+--- linux-3.1.1/kernel/softirq.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/softirq.c       2011-11-16 18:39:08.000000000 -0500
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -62814,10 +65733,10 @@ diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
  {
        struct tasklet_struct *list;
  
-diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
---- linux-3.0.4/kernel/sys.c   2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/kernel/sys.c   2011-08-29 23:26:27.000000000 -0400
-@@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-3.1.1/kernel/sys.c linux-3.1.1/kernel/sys.c
+--- linux-3.1.1/kernel/sys.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sys.c   2011-11-16 18:40:44.000000000 -0500
+@@ -157,6 +157,12 @@ static int set_one_prio(struct task_stru
                error = -EACCES;
                goto out;
        }
@@ -62830,7 +65749,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        no_nice = security_task_setnice(p, niceval);
        if (no_nice) {
                error = no_nice;
-@@ -541,6 +547,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -571,6 +577,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
                        goto error;
        }
  
@@ -62840,7 +65759,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (rgid != (gid_t) -1 ||
            (egid != (gid_t) -1 && egid != old->gid))
                new->sgid = new->egid;
-@@ -570,6 +579,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -600,6 +609,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
        old = current_cred();
  
        retval = -EPERM;
@@ -62851,30 +65770,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (nsown_capable(CAP_SETGID))
                new->gid = new->egid = new->sgid = new->fsgid = gid;
        else if (gid == old->gid || gid == old->sgid)
-@@ -595,11 +608,18 @@ static int set_user(struct cred *new)
-       if (!new_user)
-               return -EAGAIN;
- 
-+      /*
-+       * We don't fail in case of NPROC limit excess here because too many
-+       * poorly written programs don't check set*uid() return code, assuming
-+       * it never fails if called by root.  We may still enforce NPROC limit
-+       * for programs doing set*uid()+execve() by harmlessly deferring the
-+       * failure to the execve() stage.
-+       */
-       if (atomic_read(&new_user->processes) >= rlimit(RLIMIT_NPROC) &&
--                      new_user != INIT_USER) {
--              free_uid(new_user);
--              return -EAGAIN;
--      }
-+                      new_user != INIT_USER)
-+              current->flags |= PF_NPROC_EXCEEDED;
-+      else
-+              current->flags &= ~PF_NPROC_EXCEEDED;
- 
-       free_uid(new->user);
-       new->user = new_user;
-@@ -650,6 +670,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -687,6 +700,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
                        goto error;
        }
  
@@ -62884,7 +65780,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (new->uid != old->uid) {
                retval = set_user(new);
                if (retval < 0)
-@@ -694,6 +717,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -731,6 +747,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
        old = current_cred();
  
        retval = -EPERM;
@@ -62897,7 +65793,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (nsown_capable(CAP_SETUID)) {
                new->suid = new->uid = uid;
                if (uid != old->uid) {
-@@ -748,6 +777,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -785,6 +807,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
                        goto error;
        }
  
@@ -62907,7 +65803,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (ruid != (uid_t) -1) {
                new->uid = ruid;
                if (ruid != old->uid) {
-@@ -812,6 +844,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -849,6 +874,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
                        goto error;
        }
  
@@ -62917,7 +65813,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (rgid != (gid_t) -1)
                new->gid = rgid;
        if (egid != (gid_t) -1)
-@@ -858,6 +893,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -895,6 +923,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
        old = current_cred();
        old_fsuid = old->fsuid;
  
@@ -62927,7 +65823,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        if (uid == old->uid  || uid == old->euid  ||
            uid == old->suid || uid == old->fsuid ||
            nsown_capable(CAP_SETUID)) {
-@@ -868,6 +906,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -905,6 +936,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
                }
        }
  
@@ -62935,7 +65831,7 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        abort_creds(new);
        return old_fsuid;
  
-@@ -894,12 +933,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -931,12 +963,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
        if (gid == old->gid  || gid == old->egid  ||
            gid == old->sgid || gid == old->fsgid ||
            nsown_capable(CAP_SETGID)) {
@@ -62952,7 +65848,32 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
        abort_creds(new);
        return old_fsgid;
  
-@@ -1680,7 +1723,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1242,19 +1278,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_
+               return -EFAULT;
+ 
+       down_read(&uts_sem);
+-      error = __copy_to_user(&name->sysname, &utsname()->sysname,
++      error = __copy_to_user(name->sysname, &utsname()->sysname,
+                              __OLD_UTS_LEN);
+       error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
+-      error |= __copy_to_user(&name->nodename, &utsname()->nodename,
++      error |= __copy_to_user(name->nodename, &utsname()->nodename,
+                               __OLD_UTS_LEN);
+       error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
+-      error |= __copy_to_user(&name->release, &utsname()->release,
++      error |= __copy_to_user(name->release, &utsname()->release,
+                               __OLD_UTS_LEN);
+       error |= __put_user(0, name->release + __OLD_UTS_LEN);
+-      error |= __copy_to_user(&name->version, &utsname()->version,
++      error |= __copy_to_user(name->version, &utsname()->version,
+                               __OLD_UTS_LEN);
+       error |= __put_user(0, name->version + __OLD_UTS_LEN);
+-      error |= __copy_to_user(&name->machine, &utsname()->machine,
++      error |= __copy_to_user(name->machine, &utsname()->machine,
+                               __OLD_UTS_LEN);
+       error |= __put_user(0, name->machine + __OLD_UTS_LEN);
+       up_read(&uts_sem);
+@@ -1717,7 +1753,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
                        error = get_dumpable(me->mm);
                        break;
                case PR_SET_DUMPABLE:
@@ -62961,9 +65882,75 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
                                error = -EINVAL;
                                break;
                        }
-diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
---- linux-3.0.4/kernel/sysctl.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sysctl.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/sysctl_binary.c linux-3.1.1/kernel/sysctl_binary.c
+--- linux-3.1.1/kernel/sysctl_binary.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl_binary.c 2011-11-16 18:39:08.000000000 -0500
+@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
+               int i;
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++              result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out_kfree;
+@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *f
+               }
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_write(file, buffer, str - buffer, &pos);
++              result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out_kfree;
+@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file 
+               int i;
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++              result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out_kfree;
+@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file 
+               }
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_write(file, buffer, str - buffer, &pos);
++              result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out_kfree;
+@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *fil
+               int i;
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++              result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out;
+@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struc
+               __le16 dnaddr;
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++              result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out;
+@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struc
+                               le16_to_cpu(dnaddr) & 0x3ff);
+ 
+               set_fs(KERNEL_DS);
+-              result = vfs_write(file, buf, len, &pos);
++              result = vfs_write(file, (const char __force_user *)buf, len, &pos);
+               set_fs(old_fs);
+               if (result < 0)
+                       goto out;
+diff -urNp linux-3.1.1/kernel/sysctl.c linux-3.1.1/kernel/sysctl.c
+--- linux-3.1.1/kernel/sysctl.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl.c        2011-11-16 18:40:44.000000000 -0500
 @@ -85,6 +85,13 @@
  
  
@@ -63075,7 +66062,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  #else
        {
                .procname       = "nr_trim_pages",
-@@ -1714,6 +1763,17 @@ static int test_perm(int mode, int op)
+@@ -1709,6 +1758,17 @@ static int test_perm(int mode, int op)
  int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
  {
        int mode;
@@ -63093,7 +66080,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  
        if (root->permissions)
                mode = root->permissions(root, current->nsproxy, table);
-@@ -2118,6 +2178,16 @@ int proc_dostring(struct ctl_table *tabl
+@@ -2113,6 +2173,16 @@ int proc_dostring(struct ctl_table *tabl
                               buffer, lenp, ppos);
  }
  
@@ -63110,7 +66097,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  static size_t proc_skip_spaces(char **buf)
  {
        size_t ret;
-@@ -2223,6 +2293,8 @@ static int proc_put_long(void __user **b
+@@ -2218,6 +2288,8 @@ static int proc_put_long(void __user **b
        len = strlen(tmp);
        if (len > *size)
                len = *size;
@@ -63119,7 +66106,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
        if (copy_to_user(*buf, tmp, len))
                return -EFAULT;
        *size -= len;
-@@ -2539,8 +2611,11 @@ static int __do_proc_doulongvec_minmax(v
+@@ -2534,8 +2606,11 @@ static int __do_proc_doulongvec_minmax(v
                        *i = val;
                } else {
                        val = convdiv * (*i) / convmul;
@@ -63132,7 +66119,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
                        err = proc_put_long(&buffer, &left, val, false);
                        if (err)
                                break;
-@@ -2935,6 +3010,12 @@ int proc_dostring(struct ctl_table *tabl
+@@ -2930,6 +3005,12 @@ int proc_dostring(struct ctl_table *tabl
        return -ENOSYS;
  }
  
@@ -63145,7 +66132,7 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  int proc_dointvec(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2991,6 +3072,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2986,6 +3067,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
  EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
  EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
  EXPORT_SYMBOL(proc_dostring);
@@ -63153,9 +66140,9 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
---- linux-3.0.4/kernel/sysctl_check.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sysctl_check.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/sysctl_check.c linux-3.1.1/kernel/sysctl_check.c
+--- linux-3.1.1/kernel/sysctl_check.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/sysctl_check.c  2011-11-16 18:40:44.000000000 -0500
 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
                                set_fail(&fail, table, "Directory with extra2");
                } else {
@@ -63164,23 +66151,23 @@ diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
                            (table->proc_handler == proc_dointvec) ||
                            (table->proc_handler == proc_dointvec_minmax) ||
                            (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
---- linux-3.0.4/kernel/taskstats.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/taskstats.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/taskstats.c linux-3.1.1/kernel/taskstats.c
+--- linux-3.1.1/kernel/taskstats.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/taskstats.c     2011-11-16 19:35:09.000000000 -0500
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
  #include <linux/file.h>
 +#include <linux/grsecurity.h>
  #include <net/genetlink.h>
- #include <asm/atomic.h>
+ #include <linux/atomic.h>
  
 +extern int gr_is_taskstats_denied(int pid);
 +
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -558,6 +561,9 @@ err:
+@@ -556,6 +559,9 @@ err:
  
  static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
  {
@@ -63190,10 +66177,10 @@ diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
        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-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtimer.c
---- linux-3.0.4/kernel/time/alarmtimer.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/alarmtimer.c       2011-08-23 21:47:56.000000000 -0400
-@@ -685,7 +685,7 @@ static int __init alarmtimer_init(void)
+diff -urNp linux-3.1.1/kernel/time/alarmtimer.c linux-3.1.1/kernel/time/alarmtimer.c
+--- linux-3.1.1/kernel/time/alarmtimer.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/alarmtimer.c       2011-11-16 18:39:08.000000000 -0500
+@@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
  {
        int error = 0;
        int i;
@@ -63202,9 +66189,9 @@ diff -urNp linux-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtim
                .clock_getres   = alarm_clock_getres,
                .clock_get      = alarm_clock_get,
                .timer_create   = alarm_timer_create,
-diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick-broadcast.c
---- linux-3.0.4/kernel/time/tick-broadcast.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/tick-broadcast.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/time/tick-broadcast.c linux-3.1.1/kernel/time/tick-broadcast.c
+--- linux-3.1.1/kernel/time/tick-broadcast.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/tick-broadcast.c   2011-11-16 18:39:08.000000000 -0500
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
                 * then clear the broadcast bit.
                 */
@@ -63214,9 +66201,9 @@ diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick
  
                        cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
                        tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekeeping.c
---- linux-3.0.4/kernel/time/timekeeping.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timekeeping.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/time/timekeeping.c linux-3.1.1/kernel/time/timekeeping.c
+--- linux-3.1.1/kernel/time/timekeeping.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timekeeping.c      2011-11-16 18:40:44.000000000 -0500
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -63234,9 +66221,9 @@ diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekee
        write_seqlock_irqsave(&xtime_lock, flags);
  
        timekeeping_forward_now();
-diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_list.c
---- linux-3.0.4/kernel/time/timer_list.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timer_list.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/time/timer_list.c linux-3.1.1/kernel/time/timer_list.c
+--- linux-3.1.1/kernel/time/timer_list.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timer_list.c       2011-11-16 18:40:44.000000000 -0500
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -63278,9 +66265,9 @@ diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_li
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_stats.c
---- linux-3.0.4/kernel/time/timer_stats.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timer_stats.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/time/timer_stats.c linux-3.1.1/kernel/time/timer_stats.c
+--- linux-3.1.1/kernel/time/timer_stats.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time/timer_stats.c      2011-11-16 18:40:44.000000000 -0500
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -63349,9 +66336,9 @@ diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_s
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
---- linux-3.0.4/kernel/time.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/kernel/time.c linux-3.1.1/kernel/time.c
+--- linux-3.1.1/kernel/time.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/time.c  2011-11-16 18:40:44.000000000 -0500
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
                return error;
  
@@ -63364,9 +66351,9 @@ diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
                /* SMP safe, global irq locking makes it work. */
                sys_tz = *tz;
                update_vsyscall_tz();
-diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
---- linux-3.0.4/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/timer.c linux-3.1.1/kernel/timer.c
+--- linux-3.1.1/kernel/timer.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/timer.c 2011-11-16 18:39:08.000000000 -0500
 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -63376,10 +66363,10 @@ diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
  {
        struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace.c
---- linux-3.0.4/kernel/trace/blktrace.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/blktrace.c        2011-08-23 21:47:56.000000000 -0400
-@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
+diff -urNp linux-3.1.1/kernel/trace/blktrace.c linux-3.1.1/kernel/trace/blktrace.c
+--- linux-3.1.1/kernel/trace/blktrace.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/blktrace.c        2011-11-16 18:39:08.000000000 -0500
+@@ -323,7 +323,7 @@ static ssize_t blk_dropped_read(struct f
        struct blk_trace *bt = filp->private_data;
        char buf[16];
  
@@ -63388,7 +66375,7 @@ diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace
  
        return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
  }
-@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(str
+@@ -388,7 +388,7 @@ static int blk_subbuf_start_callback(str
                return 1;
  
        bt = buf->chan->private_data;
@@ -63397,7 +66384,7 @@ diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace
        return 0;
  }
  
-@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_qu
+@@ -489,7 +489,7 @@ int do_blk_trace_setup(struct request_qu
  
        bt->dir = dir;
        bt->dev = dev;
@@ -63406,10 +66393,10 @@ diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace
  
        ret = -EIO;
        bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
---- linux-3.0.4/kernel/trace/ftrace.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/ftrace.c  2011-08-23 21:47:56.000000000 -0400
-@@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
+diff -urNp linux-3.1.1/kernel/trace/ftrace.c linux-3.1.1/kernel/trace/ftrace.c
+--- linux-3.1.1/kernel/trace/ftrace.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/ftrace.c  2011-11-16 18:39:08.000000000 -0500
+@@ -1585,12 +1585,17 @@ ftrace_code_disable(struct module *mod, 
        if (unlikely(ftrace_disabled))
                return 0;
  
@@ -63429,7 +66416,7 @@ diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
  }
  
  /*
-@@ -2550,7 +2555,7 @@ static void ftrace_free_entry_rcu(struct
+@@ -2607,7 +2612,7 @@ static void ftrace_free_entry_rcu(struct
  
  int
  register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
@@ -63438,10 +66425,10 @@ diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
  {
        struct ftrace_func_probe *entry;
        struct ftrace_page *pg;
-diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
---- linux-3.0.4/kernel/trace/trace.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace.c   2011-08-23 21:48:14.000000000 -0400
-@@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
+diff -urNp linux-3.1.1/kernel/trace/trace.c linux-3.1.1/kernel/trace/trace.c
+--- linux-3.1.1/kernel/trace/trace.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace.c   2011-11-16 18:40:44.000000000 -0500
+@@ -3451,6 +3451,8 @@ static ssize_t tracing_splice_read_pipe(
        size_t rem;
        unsigned int i;
  
@@ -63450,7 +66437,7 @@ diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
        if (splice_grow_spd(pipe, &spd))
                return -ENOMEM;
  
-@@ -3822,6 +3824,8 @@ tracing_buffers_splice_read(struct file 
+@@ -3926,6 +3928,8 @@ tracing_buffers_splice_read(struct file 
        int entries, size, i;
        size_t ret;
  
@@ -63459,7 +66446,7 @@ diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
        if (splice_grow_spd(pipe, &spd))
                return -ENOMEM;
  
-@@ -3990,10 +3994,9 @@ static const struct file_operations trac
+@@ -4093,10 +4097,9 @@ static const struct file_operations trac
  };
  #endif
  
@@ -63471,7 +66458,7 @@ diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
        static int once;
  
        if (d_tracer)
-@@ -4013,10 +4016,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -4116,10 +4119,9 @@ struct dentry *tracing_init_dentry(void)
        return d_tracer;
  }
  
@@ -63483,10 +66470,10 @@ diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
        static int once;
        struct dentry *d_tracer;
  
-diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trace_events.c
---- linux-3.0.4/kernel/trace/trace_events.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_events.c    2011-08-23 21:47:56.000000000 -0400
-@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
+diff -urNp linux-3.1.1/kernel/trace/trace_events.c linux-3.1.1/kernel/trace/trace_events.c
+--- linux-3.1.1/kernel/trace/trace_events.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_events.c    2011-11-16 18:39:08.000000000 -0500
+@@ -1300,10 +1300,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
        struct list_head                list;
        struct module                   *mod;
@@ -63497,7 +66484,7 @@ diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trac
  };
  
  static struct ftrace_module_file_ops *
-@@ -1342,17 +1338,12 @@ trace_create_file_ops(struct module *mod
+@@ -1324,17 +1320,12 @@ trace_create_file_ops(struct module *mod
  
        file_ops->mod = mod;
  
@@ -63521,7 +66508,7 @@ diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trac
  
        list_add(&file_ops->list, &ftrace_module_file_list);
  
-@@ -1376,8 +1367,8 @@ static void trace_module_add_events(stru
+@@ -1358,8 +1349,8 @@ static void trace_module_add_events(stru
  
        for_each_event(call, start, end) {
                __trace_add_event_call(*call, mod,
@@ -63532,9 +66519,48 @@ diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trac
        }
  }
  
-diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/trace_mmiotrace.c
---- linux-3.0.4/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/trace/trace_kprobe.c linux-3.1.1/kernel/trace/trace_kprobe.c
+--- linux-3.1.1/kernel/trace/trace_kprobe.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_kprobe.c    2011-11-16 18:39:08.000000000 -0500
+@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
+       long ret;
+       int maxlen = get_rloc_len(*(u32 *)dest);
+       u8 *dst = get_rloc_data(dest);
+-      u8 *src = addr;
++      const u8 __user *src = (const u8 __force_user *)addr;
+       mm_segment_t old_fs = get_fs();
+       if (!maxlen)
+               return;
+@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(me
+       pagefault_disable();
+       do
+               ret = __copy_from_user_inatomic(dst++, src++, 1);
+-      while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
++      while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
+       dst[-1] = '\0';
+       pagefault_enable();
+       set_fs(old_fs);
+@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(me
+               ((u8 *)get_rloc_data(dest))[0] = '\0';
+               *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
+       } else
+-              *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
++              *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
+                                             get_rloc_offs(*(u32 *)dest));
+ }
+ /* Return the length of string -- including null terminal byte */
+@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(me
+       set_fs(KERNEL_DS);
+       pagefault_disable();
+       do {
+-              ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
++              ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
+               len++;
+       } while (c && ret == 0 && len < MAX_STRING_SIZE);
+       pagefault_enable();
+diff -urNp linux-3.1.1/kernel/trace/trace_mmiotrace.c linux-3.1.1/kernel/trace/trace_mmiotrace.c
+--- linux-3.1.1/kernel/trace/trace_mmiotrace.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_mmiotrace.c 2011-11-16 18:39:08.000000000 -0500
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -63571,9 +66597,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/t
                return;
        }
        entry   = ring_buffer_event_data(event);
-diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trace_output.c
---- linux-3.0.4/kernel/trace/trace_output.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_output.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/trace/trace_output.c linux-3.1.1/kernel/trace/trace_output.c
+--- linux-3.1.1/kernel/trace/trace_output.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_output.c    2011-11-16 18:39:08.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);
@@ -63583,9 +66609,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trac
                if (p) {
                        s->len = p - s->buffer;
                        return 1;
-diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace_stack.c
---- linux-3.0.4/kernel/trace/trace_stack.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_stack.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/trace/trace_stack.c linux-3.1.1/kernel/trace/trace_stack.c
+--- linux-3.1.1/kernel/trace/trace_stack.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_stack.c     2011-11-16 18:39:08.000000000 -0500
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
                return;
  
@@ -63595,9 +66621,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace
                return;
  
        local_irq_save(flags);
-diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/trace_workqueue.c
---- linux-3.0.4/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/kernel/trace/trace_workqueue.c linux-3.1.1/kernel/trace/trace_workqueue.c
+--- linux-3.1.1/kernel/trace/trace_workqueue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/kernel/trace/trace_workqueue.c 2011-11-16 18:39:08.000000000 -0500
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
        int                         cpu;
        pid_t                       pid;
@@ -63625,9 +66651,48 @@ diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/t
                                   tsk->comm);
                        put_task_struct(tsk);
                }
-diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
---- linux-3.0.4/lib/bug.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/bug.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/bitmap.c linux-3.1.1/lib/bitmap.c
+--- linux-3.1.1/lib/bitmap.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/bitmap.c   2011-11-16 18:39:08.000000000 -0500
+@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsi
+ {
+       int c, old_c, totaldigits, ndigits, nchunks, nbits;
+       u32 chunk;
+-      const char __user *ubuf = buf;
++      const char __user *ubuf = (const char __force_user *)buf;
+ 
+       bitmap_zero(maskp, nmaskbits);
+ 
+@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user 
+ {
+       if (!access_ok(VERIFY_READ, ubuf, ulen))
+               return -EFAULT;
+-      return __bitmap_parse((const char *)ubuf, ulen, 1, maskp, nmaskbits);
++      return __bitmap_parse((const char __force_kernel *)ubuf, ulen, 1, maskp, nmaskbits);
+ }
+ EXPORT_SYMBOL(bitmap_parse_user);
+ 
+@@ -594,7 +594,7 @@ static int __bitmap_parselist(const char
+ {
+       unsigned a, b;
+       int c, old_c, totaldigits;
+-      const char __user *ubuf = buf;
++      const char __user *ubuf = (const char __force_user *)buf;
+       int exp_digit, in_range;
+ 
+       totaldigits = c = 0;
+@@ -694,7 +694,7 @@ int bitmap_parselist_user(const char __u
+ {
+       if (!access_ok(VERIFY_READ, ubuf, ulen))
+               return -EFAULT;
+-      return __bitmap_parselist((const char *)ubuf,
++      return __bitmap_parselist((const char __force_kernel *)ubuf,
+                                       ulen, 1, maskp, nmaskbits);
+ }
+ EXPORT_SYMBOL(bitmap_parselist_user);
+diff -urNp linux-3.1.1/lib/bug.c linux-3.1.1/lib/bug.c
+--- linux-3.1.1/lib/bug.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/bug.c      2011-11-16 18:39:08.000000000 -0500
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
                return BUG_TRAP_TYPE_NONE;
  
@@ -63637,9 +66702,9 @@ diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
  
        file = NULL;
        line = 0;
-diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
---- linux-3.0.4/lib/debugobjects.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/debugobjects.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/debugobjects.c linux-3.1.1/lib/debugobjects.c
+--- linux-3.1.1/lib/debugobjects.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/debugobjects.c     2011-11-16 18:39:08.000000000 -0500
 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
        if (limit > 4)
                return;
@@ -63649,9 +66714,30 @@ diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
        if (is_on_stack == onstack)
                return;
  
-diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
---- linux-3.0.4/lib/dma-debug.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/dma-debug.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/devres.c linux-3.1.1/lib/devres.c
+--- linux-3.1.1/lib/devres.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/devres.c   2011-11-16 18:39:08.000000000 -0500
+@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
+ void devm_iounmap(struct device *dev, void __iomem *addr)
+ {
+       WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
+-                             (void *)addr));
++                             (void __force *)addr));
+       iounmap(addr);
+ }
+ EXPORT_SYMBOL(devm_iounmap);
+@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *de
+ {
+       ioport_unmap(addr);
+       WARN_ON(devres_destroy(dev, devm_ioport_map_release,
+-                             devm_ioport_map_match, (void *)addr));
++                             devm_ioport_map_match, (void __force *)addr));
+ }
+ EXPORT_SYMBOL(devm_ioport_unmap);
+ 
+diff -urNp linux-3.1.1/lib/dma-debug.c linux-3.1.1/lib/dma-debug.c
+--- linux-3.1.1/lib/dma-debug.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/dma-debug.c        2011-11-16 18:39:08.000000000 -0500
 @@ -870,7 +870,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -63661,9 +66747,9 @@ diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
                err_printk(dev, NULL, "DMA-API: device driver maps memory from"
                                "stack [addr=%p]\n", addr);
  }
-diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
---- linux-3.0.4/lib/extable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/extable.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/extable.c linux-3.1.1/lib/extable.c
+--- linux-3.1.1/lib/extable.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/extable.c  2011-11-16 18:39:08.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <linux/init.h>
  #include <linux/sort.h>
@@ -63683,9 +66769,9 @@ diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
  }
  
  #ifdef CONFIG_MODULES
-diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
---- linux-3.0.4/lib/inflate.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/inflate.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/inflate.c linux-3.1.1/lib/inflate.c
+--- linux-3.1.1/lib/inflate.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/inflate.c  2011-11-16 18:39:08.000000000 -0500
 @@ -269,7 +269,7 @@ static void free(void *where)
                malloc_ptr = free_mem_ptr;
  }
@@ -63695,10 +66781,10 @@ diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-3.0.4/lib/Kconfig.debug linux-3.0.4/lib/Kconfig.debug
---- linux-3.0.4/lib/Kconfig.debug      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/Kconfig.debug      2011-08-23 21:48:14.000000000 -0400
-@@ -1088,6 +1088,7 @@ config LATENCYTOP
+diff -urNp linux-3.1.1/lib/Kconfig.debug linux-3.1.1/lib/Kconfig.debug
+--- linux-3.1.1/lib/Kconfig.debug      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/Kconfig.debug      2011-11-16 18:40:44.000000000 -0500
+@@ -1091,6 +1091,7 @@ config LATENCYTOP
        depends on DEBUG_KERNEL
        depends on STACKTRACE_SUPPORT
        depends on PROC_FS
@@ -63706,9 +66792,9 @@ diff -urNp linux-3.0.4/lib/Kconfig.debug linux-3.0.4/lib/Kconfig.debug
        select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
        select KALLSYMS
        select KALLSYMS_ALL
-diff -urNp linux-3.0.4/lib/kref.c linux-3.0.4/lib/kref.c
---- linux-3.0.4/lib/kref.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/kref.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/kref.c linux-3.1.1/lib/kref.c
+--- linux-3.1.1/lib/kref.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/kref.c     2011-11-16 18:39:08.000000000 -0500
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -63718,9 +66804,9 @@ diff -urNp linux-3.0.4/lib/kref.c linux-3.0.4/lib/kref.c
        WARN_ON(release == (void (*)(struct kref *))kfree);
  
        if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
---- linux-3.0.4/lib/radix-tree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/radix-tree.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/lib/radix-tree.c linux-3.1.1/lib/radix-tree.c
+--- linux-3.1.1/lib/radix-tree.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/radix-tree.c       2011-11-16 18:39:08.000000000 -0500
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
        int nr;
        struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -63730,9 +66816,9 @@ diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
---- linux-3.0.4/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/lib/vsprintf.c linux-3.1.1/lib/vsprintf.c
+--- linux-3.1.1/lib/vsprintf.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/lib/vsprintf.c 2011-11-16 18:40:44.000000000 -0500
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -63743,7 +66829,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
  #include <stdarg.h>
  #include <linux/module.h>
  #include <linux/types.h>
-@@ -435,7 +438,7 @@ char *symbol_string(char *buf, char *end
+@@ -432,7 +435,7 @@ char *symbol_string(char *buf, char *end
        char sym[KSYM_SYMBOL_LEN];
        if (ext == 'B')
                sprint_backtrace(sym, value);
@@ -63752,7 +66838,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
                sprint_symbol(sym, value);
        else
                kallsyms_lookup(value, NULL, NULL, NULL, sym);
-@@ -799,7 +802,11 @@ char *uuid_string(char *buf, char *end, 
+@@ -796,7 +799,11 @@ char *uuid_string(char *buf, char *end, 
        return string(buf, end, uuid, spec);
  }
  
@@ -63764,7 +66850,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
  
  /*
   * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-@@ -813,6 +820,8 @@ int kptr_restrict __read_mostly;
+@@ -810,6 +817,8 @@ int kptr_restrict __read_mostly;
   * - 'S' For symbolic direct pointers with offset
   * - 's' For symbolic direct pointers without offset
   * - 'B' For backtraced symbolic direct pointers with offset
@@ -63773,7 +66859,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
   * - '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
-@@ -857,12 +866,12 @@ char *pointer(const char *fmt, char *buf
+@@ -854,12 +863,12 @@ char *pointer(const char *fmt, char *buf
  {
        if (!ptr && *fmt != 'K') {
                /*
@@ -63788,7 +66874,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
        }
  
        switch (*fmt) {
-@@ -872,6 +881,13 @@ char *pointer(const char *fmt, char *buf
+@@ -869,6 +878,13 @@ char *pointer(const char *fmt, char *buf
                /* Fallthrough */
        case 'S':
        case 's':
@@ -63802,7 +66888,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
        case 'B':
                return symbol_string(buf, end, ptr, spec, *fmt);
        case 'R':
-@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, 
+@@ -1627,11 +1643,11 @@ int bstr_printf(char *buf, size_t size, 
        typeof(type) value;                                             \
        if (sizeof(type) == 8) {                                        \
                args = PTR_ALIGN(args, sizeof(u32));                    \
@@ -63817,7 +66903,7 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
        }                                                               \
        args += sizeof(type);                                           \
        value;                                                          \
-@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, 
+@@ -1694,7 +1710,7 @@ int bstr_printf(char *buf, size_t size, 
                case FORMAT_TYPE_STR: {
                        const char *str_arg = args;
                        args += strlen(str_arg) + 1;
@@ -63826,14 +66912,14 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
                        break;
                }
  
-diff -urNp linux-3.0.4/localversion-grsec linux-3.0.4/localversion-grsec
---- linux-3.0.4/localversion-grsec     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/localversion-grsec     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/localversion-grsec linux-3.1.1/localversion-grsec
+--- linux-3.1.1/localversion-grsec     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/localversion-grsec     2011-11-16 18:40:44.000000000 -0500
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
---- linux-3.0.4/Makefile       2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/Makefile       2011-09-17 00:56:07.000000000 -0400
+diff -urNp linux-3.1.1/Makefile linux-3.1.1/Makefile
+--- linux-3.1.1/Makefile       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/Makefile       2011-11-17 18:56:01.000000000 -0500
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -63841,25 +66927,12 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
 -HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
 -HOSTCXXFLAGS = -O2
 +HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
-+HOSTCFLAGS  += $(call cc-option, -Wno-empty-body)
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
++HOSTCLFAGS  += $(call cc-option, -Wno-empty-body)
++HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
  
  # Decide whether to build built-in, modular, or both.
  # Normally, just do built-in.
-@@ -365,10 +366,12 @@ LINUXINCLUDE    := -I$(srctree)/arch/$(h
- KBUILD_CPPFLAGS := -D__KERNEL__
- 
- KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-+                 -W -Wno-unused-parameter -Wno-missing-field-initializers \
-                  -fno-strict-aliasing -fno-common \
-                  -Werror-implicit-function-declaration \
-                  -Wno-format-security \
-                  -fno-delete-null-pointer-checks
-+KBUILD_CFLAGS   += $(call cc-option, -Wno-empty-body)
- KBUILD_AFLAGS_KERNEL :=
- KBUILD_CFLAGS_KERNEL :=
- KBUILD_AFLAGS   := -D__ASSEMBLY__
-@@ -407,8 +410,8 @@ export RCS_TAR_IGNORE := --exclude SCCS 
+@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS 
  # Rules shared between *config targets and build targets
  
  # Basic helpers built in scripts/
@@ -63870,23 +66943,29 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
        $(Q)$(MAKE) $(build)=scripts/basic
        $(Q)rm -f .tmp_quiet_recordmcount
  
-@@ -564,6 +567,31 @@ else
+@@ -564,6 +565,37 @@ else
  KBUILD_CFLAGS += -O2
  endif
  
 +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
 +CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
-+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
++STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +ifdef CONFIG_KALLOCSTAT_PLUGIN
 +KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
 +endif
-+ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
++ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
++endif
++ifdef CONFIG_CHECKER_PLUGIN
++ifeq ($(call cc-ifversion, -ge, 0406, y), y)
++CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
++endif
 +endif
-+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN)
-+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN
++GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
 +gcc-plugins:
 +      $(Q)$(MAKE) $(build)=tools/gcc
 +else
@@ -63896,13 +66975,13 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
 +else
 +      $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
 +endif
-+      $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
++      $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
 +endif
 +
  include $(srctree)/arch/$(SRCARCH)/Makefile
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +736,7 @@ export mod_strip_cmd
+@@ -708,7 +740,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -63911,26 +66990,24 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -907,6 +935,8 @@ define rule_vmlinux-modpost
- endef
+@@ -932,6 +964,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+ 
+ # The actual objects are generated when descending, 
+ # make sure no implicit rule kicks in
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
+ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
  
- # vmlinux image - including updated kernel symbols
-+$(vmlinux-all): KBUILD_CFLAGS += $(GCC_PLUGINS)
-+$(vmlinux-all): gcc-plugins
- vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
- ifdef CONFIG_HEADERS_CHECK
-       $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
-@@ -941,7 +971,8 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Handle descending into subdirectories listed in $(vmlinux-dirs)
+@@ -941,7 +974,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
  # Error messages still appears in the original language
  
  PHONY += $(vmlinux-dirs)
 -$(vmlinux-dirs): prepare scripts
-+$(vmlinux-dirs): KBUILD_CFLAGS += $(GCC_PLUGINS)
 +$(vmlinux-dirs): gcc-plugins prepare scripts
        $(Q)$(MAKE) $(build)=$@
  
  # Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -986,6 +1017,7 @@ prepare0: archprepare FORCE
+@@ -986,6 +1019,7 @@ prepare0: archprepare FORCE
        $(Q)$(MAKE) $(build)=. missing-syscalls
  
  # All the preparing..
@@ -63938,7 +67015,15 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  prepare: prepare0
  
  # Generate some files
-@@ -1102,7 +1134,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
+@@ -1087,6 +1121,7 @@ all: modules
+ #     using awk while concatenating to the final file.
+ 
+ PHONY += modules
++modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
+ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
+       $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+       @$(kecho) '  Building modules, stage 2.';
+@@ -1102,7 +1137,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
  
  # Target to prepare building external modules
  PHONY += modules_prepare
@@ -63947,7 +67032,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  
  # Target to install modules
  PHONY += modules_install
-@@ -1198,7 +1230,7 @@ distclean: mrproper
+@@ -1198,7 +1233,7 @@ distclean: mrproper
        @find $(srctree) $(RCS_FIND_IGNORE) \
                \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
@@ -63956,7 +67041,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
                -type f -print | xargs rm -f
  
-@@ -1359,6 +1391,7 @@ PHONY += $(module-dirs) modules
+@@ -1360,6 +1395,7 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
        $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
  
@@ -63964,7 +67049,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
  modules: $(module-dirs)
        @$(kecho) '  Building modules, stage 2.';
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1485,17 +1518,19 @@ else
+@@ -1486,17 +1522,19 @@ else
          target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
  endif
  
@@ -63988,7 +67073,7 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
  %.symtypes: %.c prepare scripts FORCE
        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1505,11 +1540,13 @@ endif
+@@ -1506,11 +1544,13 @@ endif
        $(cmd_crmodverdir)
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
@@ -64004,10 +67089,10 @@ diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
        $(cmd_crmodverdir)
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
        $(build)=$(build-dir) $(@:.ko=.o)
-diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
---- linux-3.0.4/mm/filemap.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/filemap.c   2011-08-23 21:48:14.000000000 -0400
-@@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
+diff -urNp linux-3.1.1/mm/filemap.c linux-3.1.1/mm/filemap.c
+--- linux-3.1.1/mm/filemap.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/filemap.c   2011-11-16 18:40:44.000000000 -0500
+@@ -1784,7 +1784,7 @@ int generic_file_mmap(struct file * file
        struct address_space *mapping = file->f_mapping;
  
        if (!mapping->a_ops->readpage)
@@ -64016,7 +67101,7 @@ diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
        file_accessed(file);
        vma->vm_ops = &generic_file_vm_ops;
        vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2169,6 +2169,7 @@ inline int generic_write_checks(struct f
+@@ -2190,6 +2190,7 @@ inline int generic_write_checks(struct f
                          *pos = i_size_read(inode);
  
                if (limit != RLIM_INFINITY) {
@@ -64024,9 +67109,9 @@ diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
                        if (*pos >= limit) {
                                send_sig(SIGXFSZ, current, 0);
                                return -EFBIG;
-diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
---- linux-3.0.4/mm/fremap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/fremap.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/fremap.c linux-3.1.1/mm/fremap.c
+--- linux-3.1.1/mm/fremap.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/fremap.c    2011-11-16 18:39:08.000000000 -0500
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
        vma = find_vma(mm, start);
@@ -64039,9 +67124,9 @@ diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
        /*
         * Make sure the vma is shared, that it supports prefaulting,
         * and that the remapped range is valid and fully within
-diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
---- linux-3.0.4/mm/highmem.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/highmem.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/highmem.c linux-3.1.1/mm/highmem.c
+--- linux-3.1.1/mm/highmem.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/highmem.c   2011-11-16 18:39:08.000000000 -0500
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
                 * So no dangers, even with speculative execution.
                 */
@@ -64067,9 +67152,9 @@ diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
        pkmap_count[last_pkmap_nr] = 1;
        set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
---- linux-3.0.4/mm/huge_memory.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/huge_memory.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/huge_memory.c linux-3.1.1/mm/huge_memory.c
+--- linux-3.1.1/mm/huge_memory.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/huge_memory.c       2011-11-16 18:39:08.000000000 -0500
 @@ -702,7 +702,7 @@ out:
         * run pte_offset_map on the pmd, if an huge pmd could
         * materialize from under us from a different thread.
@@ -64079,10 +67164,10 @@ diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
                return VM_FAULT_OOM;
        /* if an huge pmd materialized from under us just retry later */
        if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
---- linux-3.0.4/mm/hugetlb.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/hugetlb.c   2011-08-23 21:47:56.000000000 -0400
-@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-3.1.1/mm/hugetlb.c linux-3.1.1/mm/hugetlb.c
+--- linux-3.1.1/mm/hugetlb.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/hugetlb.c   2011-11-16 18:39:08.000000000 -0500
+@@ -2346,6 +2346,27 @@ static int unmap_ref_private(struct mm_s
        return 1;
  }
  
@@ -64110,7 +67195,7 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   */
-@@ -2440,6 +2461,11 @@ retry_avoidcopy:
+@@ -2447,6 +2468,11 @@ retry_avoidcopy:
                                make_huge_pte(vma, new_page, 1));
                page_remove_rmap(old_page);
                hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -64122,7 +67207,7 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
                /* Make the old page be freed below */
                new_page = old_page;
                mmu_notifier_invalidate_range_end(mm,
-@@ -2591,6 +2617,10 @@ retry:
+@@ -2598,6 +2624,10 @@ retry:
                                && (vma->vm_flags & VM_SHARED)));
        set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -64133,7 +67218,7 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/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);
-@@ -2620,6 +2650,10 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2627,6 +2657,10 @@ int hugetlb_fault(struct mm_struct *mm, 
        static DEFINE_MUTEX(hugetlb_instantiation_mutex);
        struct hstate *h = hstate_vma(vma);
  
@@ -64144,7 +67229,7 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
        ptep = huge_pte_offset(mm, address);
        if (ptep) {
                entry = huge_ptep_get(ptep);
-@@ -2631,6 +2665,26 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2638,6 +2672,26 @@ int hugetlb_fault(struct mm_struct *mm, 
                               VM_FAULT_SET_HINDEX(h - hstates);
        }
  
@@ -64171,10 +67256,10 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
        ptep = huge_pte_alloc(mm, address, huge_page_size(h));
        if (!ptep)
                return VM_FAULT_OOM;
-diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
---- linux-3.0.4/mm/internal.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/internal.h  2011-08-23 21:47:56.000000000 -0400
-@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
+diff -urNp linux-3.1.1/mm/internal.h linux-3.1.1/mm/internal.h
+--- linux-3.1.1/mm/internal.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/internal.h  2011-11-16 18:39:08.000000000 -0500
+@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
  extern void __free_pages_bootmem(struct page *page, unsigned int order);
@@ -64182,21 +67267,26 @@ diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  #ifdef CONFIG_MEMORY_FAILURE
  extern bool is_free_buddy_page(struct page *page);
-diff -urNp linux-3.0.4/mm/Kconfig linux-3.0.4/mm/Kconfig
---- linux-3.0.4/mm/Kconfig     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/Kconfig     2011-08-23 21:48:14.000000000 -0400
-@@ -240,7 +240,7 @@ config KSM
+diff -urNp linux-3.1.1/mm/Kconfig linux-3.1.1/mm/Kconfig
+--- linux-3.1.1/mm/Kconfig     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/Kconfig     2011-11-17 18:57:00.000000000 -0500
+@@ -238,10 +238,10 @@ config KSM
+         root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
+ 
  config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
+-        int "Low address space to protect from user allocation"
++      int "Low address space to protect from user allocation"
        depends on MMU
 -        default 4096
-+        default 65536
-         help
+-        help
++      default 65536
++      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-3.0.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
---- linux-3.0.4/mm/kmemleak.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/kmemleak.c  2011-08-23 21:48:14.000000000 -0400
+         can help reduce the impact of kernel NULL pointer bugs.
+diff -urNp linux-3.1.1/mm/kmemleak.c linux-3.1.1/mm/kmemleak.c
+--- linux-3.1.1/mm/kmemleak.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/kmemleak.c  2011-11-16 18:40:44.000000000 -0500
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
        for (i = 0; i < object->trace_len; i++) {
@@ -64206,9 +67296,30 @@ diff -urNp linux-3.0.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
        }
  }
  
-diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
---- linux-3.0.4/mm/madvise.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/madvise.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/maccess.c linux-3.1.1/mm/maccess.c
+--- linux-3.1.1/mm/maccess.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/maccess.c   2011-11-16 18:39:08.000000000 -0500
+@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
+       set_fs(KERNEL_DS);
+       pagefault_disable();
+       ret = __copy_from_user_inatomic(dst,
+-                      (__force const void __user *)src, size);
++                      (const void __force_user *)src, size);
+       pagefault_enable();
+       set_fs(old_fs);
+ 
+@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, con
+ 
+       set_fs(KERNEL_DS);
+       pagefault_disable();
+-      ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
++      ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
+       pagefault_enable();
+       set_fs(old_fs);
+ 
+diff -urNp linux-3.1.1/mm/madvise.c linux-3.1.1/mm/madvise.c
+--- linux-3.1.1/mm/madvise.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/madvise.c   2011-11-16 18:39:08.000000000 -0500
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
        pgoff_t pgoff;
        unsigned long new_flags = vma->vm_flags;
@@ -64285,9 +67396,9 @@ diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
        error = 0;
        if (end == start)
                goto out;
-diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
---- linux-3.0.4/mm/memory.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/mm/memory.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/memory.c linux-3.1.1/mm/memory.c
+--- linux-3.1.1/mm/memory.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/memory.c    2011-11-16 18:39:08.000000000 -0500
 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
                return;
  
@@ -64314,7 +67425,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  }
  
  /*
-@@ -1577,12 +1584,6 @@ no_page_table:
+@@ -1566,12 +1573,6 @@ no_page_table:
        return page;
  }
  
@@ -64327,7 +67438,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  /**
   * __get_user_pages() - pin user pages in memory
   * @tsk:      task_struct of target task
-@@ -1655,10 +1656,10 @@ int __get_user_pages(struct task_struct 
+@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct 
                        (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
        i = 0;
  
@@ -64340,7 +67451,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                if (!vma && in_gate_area(mm, start)) {
                        unsigned long pg = start & PAGE_MASK;
                        pgd_t *pgd;
-@@ -1706,7 +1707,7 @@ int __get_user_pages(struct task_struct 
+@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct 
                        goto next_page;
                }
  
@@ -64349,7 +67460,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
                    !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;
-@@ -1733,11 +1734,6 @@ int __get_user_pages(struct task_struct 
+@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct 
                                int ret;
                                unsigned int fault_flags = 0;
  
@@ -64361,7 +67472,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                                if (foll_flags & FOLL_WRITE)
                                        fault_flags |= FAULT_FLAG_WRITE;
                                if (nonblocking)
-@@ -1811,7 +1807,7 @@ next_page:
+@@ -1800,7 +1796,7 @@ next_page:
                        start += PAGE_SIZE;
                        nr_pages--;
                } while (nr_pages && start < vma->vm_end);
@@ -64370,7 +67481,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        return i;
  }
  EXPORT_SYMBOL(__get_user_pages);
-@@ -2018,6 +2014,10 @@ static int insert_page(struct vm_area_st
+@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_st
        page_add_file_rmap(page);
        set_pte_at(mm, addr, pte, mk_pte(page, prot));
  
@@ -64381,7 +67492,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        retval = 0;
        pte_unmap_unlock(pte, ptl);
        return retval;
-@@ -2052,10 +2052,22 @@ out:
+@@ -2041,10 +2041,22 @@ out:
  int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
                        struct page *page)
  {
@@ -64404,7 +67515,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        vma->vm_flags |= VM_INSERTPAGE;
        return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -2141,6 +2153,7 @@ int vm_insert_mixed(struct vm_area_struc
+@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struc
                        unsigned long pfn)
  {
        BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -64412,7 +67523,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  
        if (addr < vma->vm_start || addr >= vma->vm_end)
                return -EFAULT;
-@@ -2456,6 +2469,186 @@ static inline void cow_user_page(struct 
+@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct 
                copy_user_highpage(dst, src, va, vma);
  }
  
@@ -64599,7 +67710,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/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
-@@ -2667,6 +2860,12 @@ gotten:
+@@ -2656,6 +2849,12 @@ gotten:
         */
        page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
        if (likely(pte_same(*page_table, orig_pte))) {
@@ -64612,7 +67723,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                if (old_page) {
                        if (!PageAnon(old_page)) {
                                dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2718,6 +2917,10 @@ gotten:
+@@ -2707,6 +2906,10 @@ gotten:
                        page_remove_rmap(old_page);
                }
  
@@ -64623,7 +67734,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                /* Free the old page.. */
                new_page = old_page;
                ret |= VM_FAULT_WRITE;
-@@ -2997,6 +3200,11 @@ static int do_swap_page(struct mm_struct
+@@ -2986,6 +3189,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);
@@ -64635,7 +67746,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        unlock_page(page);
        if (swapcache) {
                /*
-@@ -3020,6 +3228,11 @@ static int do_swap_page(struct mm_struct
+@@ -3009,6 +3217,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);
@@ -64647,7 +67758,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
  out:
-@@ -3039,40 +3252,6 @@ out_release:
+@@ -3028,40 +3241,6 @@ out_release:
  }
  
  /*
@@ -64688,7 +67799,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/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.
-@@ -3081,27 +3260,23 @@ static int do_anonymous_page(struct mm_s
+@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_s
                unsigned long address, pte_t *page_table, pmd_t *pmd,
                unsigned int flags)
  {
@@ -64721,7 +67832,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        if (unlikely(anon_vma_prepare(vma)))
                goto oom;
        page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3120,6 +3295,11 @@ static int do_anonymous_page(struct mm_s
+@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_s
        if (!pte_none(*page_table))
                goto release;
  
@@ -64733,7 +67844,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        inc_mm_counter_fast(mm, MM_ANONPAGES);
        page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -3127,6 +3307,12 @@ setpte:
+@@ -3116,6 +3296,12 @@ setpte:
  
        /* No need to invalidate - it was non-present before */
        update_mmu_cache(vma, address, page_table);
@@ -64746,7 +67857,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
        return 0;
-@@ -3264,6 +3450,12 @@ static int __do_fault(struct mm_struct *
+@@ -3259,6 +3445,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))) {
@@ -64759,7 +67870,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                flush_icache_page(vma, page);
                entry = mk_pte(page, vma->vm_page_prot);
                if (flags & FAULT_FLAG_WRITE)
-@@ -3283,6 +3475,14 @@ static int __do_fault(struct mm_struct *
+@@ -3278,6 +3470,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);
@@ -64772,9 +67883,9 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
 +#endif
 +
        } else {
-               if (charged)
-                       mem_cgroup_uncharge_page(page);
-@@ -3430,6 +3630,12 @@ int handle_pte_fault(struct mm_struct *m
+               if (cow_page)
+                       mem_cgroup_uncharge_page(cow_page);
+@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *m
                if (flags & FAULT_FLAG_WRITE)
                        flush_tlb_fix_spurious_fault(vma, address);
        }
@@ -64787,7 +67898,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  unlock:
        pte_unmap_unlock(pte, ptl);
        return 0;
-@@ -3446,6 +3652,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm
        pmd_t *pmd;
        pte_t *pte;
  
@@ -64798,7 +67909,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        __set_current_state(TASK_RUNNING);
  
        count_vm_event(PGFAULT);
-@@ -3457,6 +3667,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm
        if (unlikely(is_vm_hugetlb_page(vma)))
                return hugetlb_fault(mm, vma, address, flags);
  
@@ -64833,7 +67944,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        pgd = pgd_offset(mm, address);
        pud = pud_alloc(mm, pgd, address);
        if (!pud)
-@@ -3486,7 +3724,7 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm
         * run pte_offset_map on the pmd, if an huge pmd could
         * materialize from under us from a different thread.
         */
@@ -64842,7 +67953,7 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
                return VM_FAULT_OOM;
        /* if an huge pmd materialized from under us just retry later */
        if (unlikely(pmd_trans_huge(*pmd)))
-@@ -3590,7 +3828,7 @@ static int __init gate_vma_init(void)
+@@ -3591,7 +3829,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;
@@ -64851,10 +67962,10 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
        /*
         * Make sure the vDSO gets into every core dump.
         * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
---- linux-3.0.4/mm/memory-failure.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/memory-failure.c    2011-08-23 21:47:56.000000000 -0400
-@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
+diff -urNp linux-3.1.1/mm/memory-failure.c linux-3.1.1/mm/memory-failure.c
+--- linux-3.1.1/mm/memory-failure.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/memory-failure.c    2011-11-16 18:39:08.000000000 -0500
+@@ -60,7 +60,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
  
@@ -64863,7 +67974,16 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
  
  #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
  
-@@ -1008,7 +1008,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -201,7 +201,7 @@ static int kill_proc_ao(struct task_stru
+       si.si_signo = SIGBUS;
+       si.si_errno = 0;
+       si.si_code = BUS_MCEERR_AO;
+-      si.si_addr = (void *)addr;
++      si.si_addr = (void __user *)addr;
+ #ifdef __ARCH_SI_TRAPNO
+       si.si_trapno = trapno;
+ #endif
+@@ -1009,7 +1009,7 @@ int __memory_failure(unsigned long pfn, 
        }
  
        nr_pages = 1 << compound_trans_order(hpage);
@@ -64872,7 +67992,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
  
        /*
         * We need/can do nothing about count=0 pages.
-@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -1039,7 +1039,7 @@ int __memory_failure(unsigned long pfn, 
                        if (!PageHWPoison(hpage)
                            || (hwpoison_filter(p) && TestClearPageHWPoison(p))
                            || (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -64881,7 +68001,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
                                return 0;
                        }
                        set_page_hwpoison_huge_page(hpage);
-@@ -1096,7 +1096,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -1097,7 +1097,7 @@ int __memory_failure(unsigned long pfn, 
        }
        if (hwpoison_filter(p)) {
                if (TestClearPageHWPoison(p))
@@ -64890,7 +68010,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
                unlock_page(hpage);
                put_page(hpage);
                return 0;
-@@ -1222,7 +1222,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1314,7 +1314,7 @@ int unpoison_memory(unsigned long pfn)
                        return 0;
                }
                if (TestClearPageHWPoison(p))
@@ -64899,7 +68019,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
                pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
                return 0;
        }
-@@ -1236,7 +1236,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1328,7 +1328,7 @@ int unpoison_memory(unsigned long pfn)
         */
        if (TestClearPageHWPoison(page)) {
                pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
@@ -64908,7 +68028,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
                freeit = 1;
                if (PageHuge(page))
                        clear_page_hwpoison_huge_page(page);
-@@ -1349,7 +1349,7 @@ static int soft_offline_huge_page(struct
+@@ -1441,7 +1441,7 @@ static int soft_offline_huge_page(struct
        }
  done:
        if (!PageHWPoison(hpage))
@@ -64917,7 +68037,7 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
        set_page_hwpoison_huge_page(hpage);
        dequeue_hwpoisoned_huge_page(hpage);
        /* keep elevated page count for bad page */
-@@ -1480,7 +1480,7 @@ int soft_offline_page(struct page *page,
+@@ -1572,7 +1572,7 @@ int soft_offline_page(struct page *page,
                return ret;
  
  done:
@@ -64926,9 +68046,9 @@ diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
        SetPageHWPoison(page);
        /* keep elevated page count for bad page */
        return ret;
-diff -urNp linux-3.0.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
---- linux-3.0.4/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/mempolicy.c linux-3.1.1/mm/mempolicy.c
+--- linux-3.1.1/mm/mempolicy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mempolicy.c 2011-11-16 18:40:44.000000000 -0500
 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct 
        unsigned long vmstart;
        unsigned long vmend;
@@ -65000,9 +68120,9 @@ diff -urNp linux-3.0.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
---- linux-3.0.4/mm/migrate.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/migrate.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/migrate.c linux-3.1.1/mm/migrate.c
+--- linux-3.1.1/mm/migrate.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/migrate.c   2011-11-16 18:40:44.000000000 -0500
 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
        unsigned long chunk_start;
        int err;
@@ -65037,9 +68157,9 @@ diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
---- linux-3.0.4/mm/mlock.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mlock.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/mlock.c linux-3.1.1/mm/mlock.c
+--- linux-3.1.1/mm/mlock.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mlock.c     2011-11-16 18:40:44.000000000 -0500
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -65113,9 +68233,9 @@ diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
        if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
            capable(CAP_IPC_LOCK))
                ret = do_mlockall(flags);
-diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
---- linux-3.0.4/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mmap.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/mmap.c linux-3.1.1/mm/mmap.c
+--- linux-3.1.1/mm/mmap.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mmap.c      2011-11-16 18:40:44.000000000 -0500
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)            (addr)
  #endif
@@ -65169,7 +68289,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  /*
   * Make sure vm_committed_as in one cacheline and not cacheline shared with
   * other variables. It can be updated by several CPUs frequently.
-@@ -236,6 +256,7 @@ static struct vm_area_struct *remove_vma
+@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma
        struct vm_area_struct *next = vma->vm_next;
  
        might_sleep();
@@ -65177,7 +68297,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (vma->vm_ops && vma->vm_ops->close)
                vma->vm_ops->close(vma);
        if (vma->vm_file) {
-@@ -280,6 +301,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
         * not page aligned -Ram Gupta
         */
        rlim = rlimit(RLIMIT_DATA);
@@ -65185,7 +68305,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
                        (mm->end_data - mm->start_data) > rlim)
                goto out;
-@@ -697,6 +719,12 @@ static int
+@@ -689,6 +711,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)
  {
@@ -65198,7 +68318,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
                if (vma->vm_pgoff == vm_pgoff)
-@@ -716,6 +744,12 @@ static int
+@@ -708,6 +736,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)
  {
@@ -65211,7 +68331,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
                pgoff_t vm_pglen;
-@@ -758,13 +792,20 @@ can_vma_merge_after(struct vm_area_struc
+@@ -750,13 +784,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,
@@ -65233,7 +68353,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /*
         * We later require that vma->vm_flags == vm_flags,
         * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -780,6 +821,15 @@ struct vm_area_struct *vma_merge(struct 
+@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct 
        if (next && next->vm_end == end)                /* cases 6, 7, 8 */
                next = next->vm_next;
  
@@ -65249,7 +68369,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /*
         * Can it merge with the predecessor?
         */
-@@ -799,9 +849,24 @@ struct vm_area_struct *vma_merge(struct 
+@@ -791,9 +841,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);
@@ -65275,7 +68395,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (err)
                        return NULL;
                khugepaged_enter_vma_merge(prev);
-@@ -815,12 +880,27 @@ struct vm_area_struct *vma_merge(struct 
+@@ -807,12 +872,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)) {
@@ -65305,7 +68425,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (err)
                        return NULL;
                khugepaged_enter_vma_merge(area);
-@@ -929,14 +1009,11 @@ none:
+@@ -921,14 +1001,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
                                                struct file *file, long pages)
  {
@@ -65321,7 +68441,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                mm->stack_vm += pages;
        if (flags & (VM_RESERVED|VM_IO))
                mm->reserved_vm += pages;
-@@ -963,7 +1040,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -955,7 +1032,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.)
         */
@@ -65330,7 +68450,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
                        prot |= PROT_EXEC;
  
-@@ -989,7 +1066,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -981,7 +1058,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.
         */
@@ -65339,7 +68459,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (addr & ~PAGE_MASK)
                return addr;
  
-@@ -1000,6 +1077,36 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -992,6 +1069,36 @@ 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;
  
@@ -65376,7 +68496,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (flags & MAP_LOCKED)
                if (!can_do_mlock())
                        return -EPERM;
-@@ -1011,6 +1118,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file 
                locked += mm->locked_vm;
                lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
@@ -65384,7 +68504,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
                        return -EAGAIN;
        }
-@@ -1081,6 +1189,9 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file 
        if (error)
                return error;
  
@@ -65394,7 +68514,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1161,7 +1272,7 @@ int vma_wants_writenotify(struct vm_area
+@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area
        vm_flags_t vm_flags = vma->vm_flags;
  
        /* If it was private or non-writable, the write bit is already clear */
@@ -65403,7 +68523,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                return 0;
  
        /* The backer wishes to know when pages are first written to? */
-@@ -1210,14 +1321,24 @@ unsigned long mmap_region(struct file *f
+@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *f
        unsigned long charged = 0;
        struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -65430,7 +68550,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        }
  
        /* Check against address space limit. */
-@@ -1266,6 +1387,16 @@ munmap_back:
+@@ -1258,6 +1379,16 @@ munmap_back:
                goto unacct_error;
        }
  
@@ -65447,7 +68567,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        vma->vm_mm = mm;
        vma->vm_start = addr;
        vma->vm_end = addr + len;
-@@ -1289,6 +1420,19 @@ munmap_back:
+@@ -1281,6 +1412,19 @@ munmap_back:
                error = file->f_op->mmap(file, vma);
                if (error)
                        goto unmap_and_free_vma;
@@ -65467,7 +68587,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (vm_flags & VM_EXECUTABLE)
                        added_exe_file_vma(mm);
  
-@@ -1324,6 +1468,11 @@ munmap_back:
+@@ -1316,6 +1460,11 @@ munmap_back:
        vma_link(mm, vma, prev, rb_link, rb_parent);
        file = vma->vm_file;
  
@@ -65479,7 +68599,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /* Once vma denies write, undo our temporary denial count */
        if (correct_wcount)
                atomic_inc(&inode->i_writecount);
-@@ -1332,6 +1481,7 @@ out:
+@@ -1324,6 +1473,7 @@ out:
  
        mm->total_vm += len >> PAGE_SHIFT;
        vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -65487,7 +68607,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (vm_flags & VM_LOCKED) {
                if (!mlock_vma_pages_range(vma, addr, addr + len))
                        mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1349,6 +1499,12 @@ unmap_and_free_vma:
+@@ -1341,6 +1491,12 @@ unmap_and_free_vma:
        unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
        charged = 0;
  free_vma:
@@ -65500,7 +68620,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
        if (charged)
-@@ -1356,6 +1512,44 @@ unacct_error:
+@@ -1348,6 +1504,44 @@ unacct_error:
        return error;
  }
  
@@ -65545,7 +68665,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  /* Get an address range which is currently unmapped.
   * For shmat() with addr=0.
   *
-@@ -1382,18 +1576,23 @@ arch_get_unmapped_area(struct file *filp
+@@ -1374,18 +1568,23 @@ arch_get_unmapped_area(struct file *filp
        if (flags & MAP_FIXED)
                return addr;
  
@@ -65576,7 +68696,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        }
  
  full_search:
-@@ -1404,34 +1603,40 @@ full_search:
+@@ -1396,34 +1595,40 @@ full_search:
                         * Start a new search - just in case we missed
                         * some holes.
                         */
@@ -65628,7 +68748,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                mm->free_area_cache = addr;
                mm->cached_hole_size = ~0UL;
        }
-@@ -1449,7 +1654,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1441,7 +1646,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;
@@ -65637,7 +68757,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  
        /* requested length too big for entire address space */
        if (len > TASK_SIZE)
-@@ -1458,13 +1663,18 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1450,13 +1655,18 @@ arch_get_unmapped_area_topdown(struct fi
        if (flags & MAP_FIXED)
                return addr;
  
@@ -65660,7 +68780,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        }
  
        /* check if free_area_cache is useful for us */
-@@ -1479,7 +1689,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1471,7 +1681,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);
@@ -65669,7 +68789,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                        /* remember the address as a hint for next time */
                        return (mm->free_area_cache = addr-len);
        }
-@@ -1496,7 +1706,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1488,7 +1698,7 @@ arch_get_unmapped_area_topdown(struct fi
                 * return with success:
                 */
                vma = find_vma(mm, addr);
@@ -65678,7 +68798,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                        /* remember the address as a hint for next time */
                        return (mm->free_area_cache = addr);
  
-@@ -1505,8 +1715,8 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1497,8 +1707,8 @@ arch_get_unmapped_area_topdown(struct fi
                        mm->cached_hole_size = vma->vm_start - addr;
  
                /* try just below the current vma->vm_start */
@@ -65689,7 +68809,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  
  bottomup:
        /*
-@@ -1515,13 +1725,21 @@ bottomup:
+@@ -1507,13 +1717,21 @@ bottomup:
         * can happen with large stack limits and large mmap()
         * allocations.
         */
@@ -65713,7 +68833,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        mm->cached_hole_size = ~0UL;
  
        return addr;
-@@ -1530,6 +1748,12 @@ bottomup:
+@@ -1522,6 +1740,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -65726,7 +68846,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /*
         * Is this a new hole at the highest possible address?
         */
-@@ -1537,8 +1761,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1529,8 +1753,10 @@ void arch_unmap_area_topdown(struct mm_s
                mm->free_area_cache = addr;
  
        /* dont allow allocations above current base */
@@ -65738,7 +68858,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  }
  
  unsigned long
-@@ -1646,6 +1872,28 @@ out:
+@@ -1638,6 +1864,28 @@ out:
        return prev ? prev->vm_next : vma;
  }
  
@@ -65767,7 +68887,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1662,6 +1910,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1654,6 +1902,7 @@ static int acct_stack_growth(struct vm_a
                return -ENOMEM;
  
        /* Stack limit test */
@@ -65775,7 +68895,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
                return -ENOMEM;
  
-@@ -1672,6 +1921,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1664,6 +1913,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;
@@ -65783,7 +68903,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                if (locked > limit && !capable(CAP_IPC_LOCK))
                        return -ENOMEM;
        }
-@@ -1702,37 +1952,48 @@ static int acct_stack_growth(struct vm_a
+@@ -1694,37 +1944,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.
   */
@@ -65841,7 +68961,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                unsigned long size, grow;
  
                size = address - vma->vm_start;
-@@ -1747,6 +2008,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1739,6 +2000,8 @@ int expand_upwards(struct vm_area_struct
                        }
                }
        }
@@ -65850,7 +68970,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        vma_unlock_anon_vma(vma);
        khugepaged_enter_vma_merge(vma);
        return error;
-@@ -1760,6 +2023,8 @@ int expand_downwards(struct vm_area_stru
+@@ -1752,6 +2015,8 @@ int expand_downwards(struct vm_area_stru
                                   unsigned long address)
  {
        int error;
@@ -65859,7 +68979,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  
        /*
         * We must make sure the anon_vma is allocated
-@@ -1773,6 +2038,15 @@ int expand_downwards(struct vm_area_stru
+@@ -1765,6 +2030,15 @@ int expand_downwards(struct vm_area_stru
        if (error)
                return error;
  
@@ -65875,7 +68995,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        vma_lock_anon_vma(vma);
  
        /*
-@@ -1782,9 +2056,17 @@ int expand_downwards(struct vm_area_stru
+@@ -1774,9 +2048,17 @@ int expand_downwards(struct vm_area_stru
         */
  
        /* Somebody else might have raced and expanded it already */
@@ -65894,7 +69014,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                size = vma->vm_end - address;
                grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1794,11 +2076,22 @@ int expand_downwards(struct vm_area_stru
+@@ -1786,11 +2068,22 @@ int expand_downwards(struct vm_area_stru
                        if (!error) {
                                vma->vm_start = address;
                                vma->vm_pgoff -= grow;
@@ -65917,7 +69037,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        khugepaged_enter_vma_merge(vma);
        return error;
  }
-@@ -1868,6 +2161,13 @@ static void remove_vma_list(struct mm_st
+@@ -1860,6 +2153,13 @@ static void remove_vma_list(struct mm_st
        do {
                long nrpages = vma_pages(vma);
  
@@ -65931,7 +69051,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                mm->total_vm -= nrpages;
                vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
                vma = remove_vma(vma);
-@@ -1913,6 +2213,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1905,6 +2205,16 @@ detach_vmas_to_be_unmapped(struct mm_str
        insertion_point = (prev ? &prev->vm_next : &mm->mmap);
        vma->vm_prev = NULL;
        do {
@@ -65948,7 +69068,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                rb_erase(&vma->vm_rb, &mm->mm_rb);
                mm->map_count--;
                tail_vma = vma;
-@@ -1941,14 +2251,33 @@ static int __split_vma(struct mm_struct 
+@@ -1933,14 +2243,33 @@ static int __split_vma(struct mm_struct 
        struct vm_area_struct *new;
        int err = -ENOMEM;
  
@@ -65982,7 +69102,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /* most fields are the same, copy all, and then fixup */
        *new = *vma;
  
-@@ -1961,6 +2290,22 @@ static int __split_vma(struct mm_struct 
+@@ -1953,6 +2282,22 @@ static int __split_vma(struct mm_struct 
                new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
        }
  
@@ -66005,7 +69125,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        pol = mpol_dup(vma_policy(vma));
        if (IS_ERR(pol)) {
                err = PTR_ERR(pol);
-@@ -1986,6 +2331,42 @@ static int __split_vma(struct mm_struct 
+@@ -1978,6 +2323,42 @@ static int __split_vma(struct mm_struct 
        else
                err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
@@ -66048,7 +69168,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /* Success. */
        if (!err)
                return 0;
-@@ -1998,10 +2379,18 @@ static int __split_vma(struct mm_struct 
+@@ -1990,10 +2371,18 @@ static int __split_vma(struct mm_struct 
                        removed_exe_file_vma(mm);
                fput(new->vm_file);
        }
@@ -66068,7 +69188,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        kmem_cache_free(vm_area_cachep, new);
   out_err:
        return err;
-@@ -2014,6 +2403,15 @@ static int __split_vma(struct mm_struct 
+@@ -2006,6 +2395,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)
  {
@@ -66084,7 +69204,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (mm->map_count >= sysctl_max_map_count)
                return -ENOMEM;
  
-@@ -2025,11 +2423,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2017,11 +2415,30 @@ int split_vma(struct mm_struct *mm, stru
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -66115,7 +69235,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
                return -EINVAL;
  
-@@ -2104,6 +2521,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2096,6 +2513,8 @@ int do_munmap(struct mm_struct *mm, unsi
        /* Fix up all other VM information */
        remove_vma_list(mm, vma);
  
@@ -66124,7 +69244,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        return 0;
  }
  
-@@ -2116,22 +2535,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2108,22 +2527,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
  
        profile_munmap(addr);
  
@@ -66153,7 +69273,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2145,6 +2560,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2137,6 +2552,7 @@ unsigned long do_brk(unsigned long addr,
        struct rb_node ** rb_link, * rb_parent;
        pgoff_t pgoff = addr >> PAGE_SHIFT;
        int error;
@@ -66161,7 +69281,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  
        len = PAGE_ALIGN(len);
        if (!len)
-@@ -2156,16 +2572,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2148,16 +2564,30 @@ unsigned long do_brk(unsigned long addr,
  
        flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -66193,7 +69313,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                locked += mm->locked_vm;
                lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
-@@ -2182,22 +2612,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2174,22 +2604,22 @@ unsigned long do_brk(unsigned long addr,
        /*
         * Clear old maps.  this also does some error checking for us
         */
@@ -66220,7 +69340,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                return -ENOMEM;
  
        /* Can we just expand an old private anonymous mapping? */
-@@ -2211,7 +2641,7 @@ unsigned long do_brk(unsigned long addr,
+@@ -2203,7 +2633,7 @@ unsigned long do_brk(unsigned long addr,
         */
        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
        if (!vma) {
@@ -66229,7 +69349,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
                return -ENOMEM;
        }
  
-@@ -2225,11 +2655,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2217,11 +2647,12 @@ unsigned long do_brk(unsigned long addr,
        vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
        perf_event_mmap(vma);
@@ -66244,7 +69364,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        return addr;
  }
  
-@@ -2276,8 +2707,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2268,8 +2699,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.
         */
@@ -66256,7 +69376,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  
        BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2291,6 +2724,13 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2283,6 +2716,13 @@ int insert_vm_struct(struct mm_struct * 
        struct vm_area_struct * __vma, * prev;
        struct rb_node ** rb_link, * rb_parent;
  
@@ -66270,7 +69390,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /*
         * The vm_pgoff of a purely anonymous vma should be irrelevant
         * until its first write fault, when page's anon_vma and index
-@@ -2313,7 +2753,22 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2305,7 +2745,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;
@@ -66293,7 +69413,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        return 0;
  }
  
-@@ -2331,6 +2786,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2323,6 +2778,8 @@ struct vm_area_struct *copy_vma(struct v
        struct rb_node **rb_link, *rb_parent;
        struct mempolicy *pol;
  
@@ -66302,7 +69422,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        /*
         * If anonymous vma has not yet been faulted, update new pgoff
         * to match new location, to increase its chance of merging.
-@@ -2381,6 +2838,39 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2373,6 +2830,39 @@ struct vm_area_struct *copy_vma(struct v
        return NULL;
  }
  
@@ -66342,7 +69462,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  /*
   * Return true if the calling process may expand its vm space by the passed
   * number of pages
-@@ -2391,7 +2881,7 @@ int may_expand_vm(struct mm_struct *mm, 
+@@ -2383,7 +2873,7 @@ int may_expand_vm(struct mm_struct *mm, 
        unsigned long lim;
  
        lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -66351,7 +69471,7 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
        if (cur + npages > lim)
                return 0;
        return 1;
-@@ -2462,6 +2952,22 @@ int install_special_mapping(struct mm_st
+@@ -2454,6 +2944,22 @@ int install_special_mapping(struct mm_st
        vma->vm_start = addr;
        vma->vm_end = addr + len;
  
@@ -66374,9 +69494,9 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/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-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
---- linux-3.0.4/mm/mprotect.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mprotect.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/mprotect.c linux-3.1.1/mm/mprotect.c
+--- linux-3.1.1/mm/mprotect.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mprotect.c  2011-11-16 18:40:44.000000000 -0500
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -66603,9 +69723,9 @@ diff -urNp linux-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
                nstart = tmp;
  
                if (nstart < prev->vm_end)
-diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
---- linux-3.0.4/mm/mremap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mremap.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/mremap.c linux-3.1.1/mm/mremap.c
+--- linux-3.1.1/mm/mremap.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/mremap.c    2011-11-16 18:39:08.000000000 -0500
 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
                        continue;
                pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -66710,9 +69830,9 @@ diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
        }
  out:
        if (ret & ~PAGE_MASK)
-diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
---- linux-3.0.4/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/nobootmem.c linux-3.1.1/mm/nobootmem.c
+--- linux-3.1.1/mm/nobootmem.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/nobootmem.c 2011-11-16 18:39:08.000000000 -0500
 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -66746,10 +69866,10 @@ diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
  
        return count;
  }
-diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
---- linux-3.0.4/mm/nommu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/nommu.c     2011-08-23 21:47:56.000000000 -0400
-@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
+diff -urNp linux-3.1.1/mm/nommu.c linux-3.1.1/mm/nommu.c
+--- linux-3.1.1/mm/nommu.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/nommu.c     2011-11-16 18:39:08.000000000 -0500
+@@ -62,7 +62,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;
@@ -66757,7 +69877,7 @@ diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -826,15 +825,6 @@ struct vm_area_struct *find_vma(struct m
+@@ -825,15 +824,6 @@ struct vm_area_struct *find_vma(struct m
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -66773,7 +69893,7 @@ diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1554,6 +1544,7 @@ int split_vma(struct mm_struct *mm, stru
+@@ -1553,6 +1543,7 @@ int split_vma(struct mm_struct *mm, stru
  
        /* most fields are the same, copy all, and then fixup */
        *new = *vma;
@@ -66781,9 +69901,9 @@ diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
        *region = *vma->vm_region;
        new->vm_region = region;
  
-diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
---- linux-3.0.4/mm/page_alloc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/page_alloc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/page_alloc.c linux-3.1.1/mm/page_alloc.c
+--- linux-3.1.1/mm/page_alloc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/page_alloc.c        2011-11-16 18:40:44.000000000 -0500
 @@ -340,7 +340,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -66828,7 +69948,7 @@ diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
  
        if (order && (gfp_flags & __GFP_COMP))
                prep_compound_page(page, order);
-@@ -2525,6 +2537,8 @@ void show_free_areas(unsigned int filter
+@@ -2539,6 +2551,8 @@ void show_free_areas(unsigned int filter
        int cpu;
        struct zone *zone;
  
@@ -66837,9 +69957,23 @@ diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
        for_each_populated_zone(zone) {
                if (skip_free_areas_node(filter, zone_to_nid(zone)))
                        continue;
-diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
---- linux-3.0.4/mm/percpu.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/percpu.c    2011-08-23 21:47:56.000000000 -0400
+@@ -3350,7 +3364,13 @@ static int pageblock_is_reserved(unsigne
+       unsigned long pfn;
+ 
+       for (pfn = start_pfn; pfn < end_pfn; pfn++) {
++#ifdef CONFIG_X86_32
++              /* boot failures in VMware 8 on 32bit vanilla since
++                 this change */
++              if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
++#else
+               if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
++#endif
+                       return 1;
+       }
+       return 0;
+diff -urNp linux-3.1.1/mm/percpu.c linux-3.1.1/mm/percpu.c
+--- linux-3.1.1/mm/percpu.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/percpu.c    2011-11-16 18:39:08.000000000 -0500
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -66849,10 +69983,10 @@ diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;                /* cpu -> unit */
-diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
---- linux-3.0.4/mm/rmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/rmap.c      2011-08-23 21:47:56.000000000 -0400
-@@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff -urNp linux-3.1.1/mm/rmap.c linux-3.1.1/mm/rmap.c
+--- linux-3.1.1/mm/rmap.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/rmap.c      2011-11-16 18:39:08.000000000 -0500
+@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_stru
        struct anon_vma *anon_vma = vma->anon_vma;
        struct anon_vma_chain *avc;
  
@@ -66863,7 +69997,7 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
        might_sleep();
        if (unlikely(!anon_vma)) {
                struct mm_struct *mm = vma->vm_mm;
-@@ -162,6 +166,12 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_stru
                if (!avc)
                        goto out_enomem;
  
@@ -66876,7 +70010,7 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
                anon_vma = find_mergeable_anon_vma(vma);
                allocated = NULL;
                if (!anon_vma) {
-@@ -175,6 +185,21 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_stru
                /* page_table_lock to protect against threads */
                spin_lock(&mm->page_table_lock);
                if (likely(!vma->anon_vma)) {
@@ -66898,7 +70032,7 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
                        vma->anon_vma = anon_vma;
                        avc->anon_vma = anon_vma;
                        avc->vma = vma;
-@@ -188,12 +213,24 @@ int anon_vma_prepare(struct vm_area_stru
+@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_stru
  
                if (unlikely(allocated))
                        put_anon_vma(allocated);
@@ -66923,7 +70057,7 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
        anon_vma_chain_free(avc);
   out_enomem:
        return -ENOMEM;
-@@ -244,7 +281,7 @@ static void anon_vma_chain_link(struct v
+@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct v
   * Attach the anon_vmas from src to dst.
   * Returns 0 on success, -ENOMEM on failure.
   */
@@ -66932,7 +70066,7 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
  {
        struct anon_vma_chain *avc, *pavc;
        struct anon_vma *root = NULL;
-@@ -277,7 +314,7 @@ int anon_vma_clone(struct vm_area_struct
+@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct
   * the corresponding VMA in the parent process is attached to.
   * Returns 0 on success, non-zero on failure.
   */
@@ -66941,11 +70075,11 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
  {
        struct anon_vma_chain *avc;
        struct anon_vma *anon_vma;
-diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
---- linux-3.0.4/mm/shmem.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/shmem.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/shmem.c linux-3.1.1/mm/shmem.c
+--- linux-3.1.1/mm/shmem.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/shmem.c     2011-11-16 19:28:28.000000000 -0500
 @@ -31,7 +31,7 @@
- #include <linux/percpu_counter.h>
+ #include <linux/module.h>
  #include <linux/swap.h>
  
 -static struct vfsmount *shm_mnt;
@@ -66953,25 +70087,25 @@ diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
  
  #ifdef CONFIG_SHMEM
  /*
-@@ -1101,6 +1101,8 @@ static int shmem_writepage(struct page *
-               goto unlock;
-       }
-       entry = shmem_swp_entry(info, index, NULL);
-+      if (!entry)
-+              goto unlock;
-       if (entry->val) {
-               /*
-                * The more uptodate page coming down from a stacked
-@@ -1172,6 +1174,8 @@ static struct page *shmem_swapin(swp_ent
+@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
+ #define BOGO_DIRENT_SIZE 20
+ 
+ /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
+-#define SHORT_SYMLINK_LEN 128
++#define SHORT_SYMLINK_LEN 64
+ 
+ struct shmem_xattr {
+       struct list_head list;  /* anchored by shmem_inode_info->xattr_list */
+@@ -769,6 +769,8 @@ static struct page *shmem_swapin(swp_ent
+       struct mempolicy mpol, *spol;
        struct vm_area_struct pvma;
-       struct page *page;
  
 +      pax_track_stack();
 +
        spol = mpol_cond_copy(&mpol,
-                               mpol_shared_policy_lookup(&info->policy, idx));
+                       mpol_shared_policy_lookup(&info->policy, index));
  
-@@ -2568,8 +2572,7 @@ int shmem_fill_super(struct super_block 
+@@ -2149,8 +2151,7 @@ int shmem_fill_super(struct super_block 
        int err = -ENOMEM;
  
        /* Round up to L1_CACHE_BYTES to resist false sharing */
@@ -66981,9 +70115,9 @@ diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
        if (!sbinfo)
                return -ENOMEM;
  
-diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
---- linux-3.0.4/mm/slab.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slab.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/slab.c linux-3.1.1/mm/slab.c
+--- linux-3.1.1/mm/slab.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slab.c      2011-11-16 18:40:44.000000000 -0500
 @@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -67044,7 +70178,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
  #undef CACHE
  };
  
-@@ -1530,7 +1530,7 @@ void __init kmem_cache_init(void)
+@@ -1571,7 +1571,7 @@ void __init kmem_cache_init(void)
        sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
                                        sizes[INDEX_AC].cs_size,
                                        ARCH_KMALLOC_MINALIGN,
@@ -67053,7 +70187,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
                                        NULL);
  
        if (INDEX_AC != INDEX_L3) {
-@@ -1538,7 +1538,7 @@ void __init kmem_cache_init(void)
+@@ -1579,7 +1579,7 @@ void __init kmem_cache_init(void)
                        kmem_cache_create(names[INDEX_L3].name,
                                sizes[INDEX_L3].cs_size,
                                ARCH_KMALLOC_MINALIGN,
@@ -67062,7 +70196,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
                                NULL);
        }
  
-@@ -1556,7 +1556,7 @@ void __init kmem_cache_init(void)
+@@ -1597,7 +1597,7 @@ void __init kmem_cache_init(void)
                        sizes->cs_cachep = kmem_cache_create(names->name,
                                        sizes->cs_size,
                                        ARCH_KMALLOC_MINALIGN,
@@ -67071,7 +70205,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
                                        NULL);
                }
  #ifdef CONFIG_ZONE_DMA
-@@ -4272,10 +4272,10 @@ static int s_show(struct seq_file *m, vo
+@@ -4324,10 +4324,10 @@ static int s_show(struct seq_file *m, vo
        }
        /* cpu stats */
        {
@@ -67086,7 +70220,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
  
                seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
                           allochit, allocmiss, freehit, freemiss);
-@@ -4532,15 +4532,66 @@ static const struct file_operations proc
+@@ -4584,15 +4584,70 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -67116,10 +70250,12 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
 +      struct slab *slabp;
 +      unsigned int objnr;
 +      unsigned long offset;
++      const char *type;
 +
 +      if (!n)
 +              return;
 +
++      type = "<null>";
 +      if (ZERO_OR_NULL_PTR(ptr))
 +              goto report;
 +
@@ -67128,6 +70264,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
 +
 +      page = virt_to_head_page(ptr);
 +
++      type = "<process stack>";
 +      if (!PageSlab(page)) {
 +              if (object_is_on_stack(ptr, n) == -1)
 +                      goto report;
@@ -67135,6 +70272,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
 +      }
 +
 +      cachep = page_get_cache(page);
++      type = cachep->name;
 +      if (!(cachep->flags & SLAB_USERCOPY))
 +              goto report;
 +
@@ -67146,7 +70284,7 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
 +              return;
 +
 +report:
-+      pax_report_usercopy(ptr, n, to, cachep ? cachep->name : NULL);
++      pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -67155,9 +70293,9 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
---- linux-3.0.4/mm/slob.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slob.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/slob.c linux-3.1.1/mm/slob.c
+--- linux-3.1.1/mm/slob.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slob.c      2011-11-16 18:39:08.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
@@ -67263,8 +70401,8 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
 +      slob_t *m;
        void *ret;
  
-       lockdep_trace_alloc(gfp);
-@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t 
+       gfp &= gfp_allowed_mask;
+@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t 
  
                if (!m)
                        return NULL;
@@ -67276,7 +70414,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
                ret = (void *)m + align;
  
                trace_kmalloc_node(_RET_IP_, ret,
-@@ -504,16 +509,25 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t 
                        gfp |= __GFP_COMP;
                ret = slob_new_pages(gfp, order, node);
                if (ret) {
@@ -67306,7 +70444,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
        return ret;
  }
  EXPORT_SYMBOL(__kmalloc_node);
-@@ -531,13 +545,88 @@ void kfree(const void *block)
+@@ -533,13 +547,92 @@ void kfree(const void *block)
        sp = slob_page(block);
        if (is_slob_page(sp)) {
                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -67332,16 +70470,19 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
 +      const slob_t *free;
 +      const void *base;
 +      unsigned long flags;
++      const char *type;
 +
 +      if (!n)
 +              return;
 +
++      type = "<null>";
 +      if (ZERO_OR_NULL_PTR(ptr))
 +              goto report;
 +
 +      if (!virt_addr_valid(ptr))
 +              return;
 +
++      type = "<process stack>";
 +      sp = slob_page(ptr);
 +      if (!PageSlab((struct page*)sp)) {
 +              if (object_is_on_stack(ptr, n) == -1)
@@ -67349,6 +70490,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
 +              return;
 +      }
 +
++      type = "<slob>";
 +      if (sp->size) {
 +              base = page_address(&sp->page);
 +              if (base <= ptr && n <= sp->size - (ptr - base))
@@ -67389,7 +70531,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
 +
 +      spin_unlock_irqrestore(&slob_lock, flags);
 +report:
-+      pax_report_usercopy(ptr, n, to, NULL);
++      pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -67398,7 +70540,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
  size_t ksize(const void *block)
  {
-@@ -550,10 +639,10 @@ size_t ksize(const void *block)
+@@ -552,10 +645,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);
@@ -67412,7 +70554,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  }
  EXPORT_SYMBOL(ksize);
  
-@@ -569,8 +658,13 @@ struct kmem_cache *kmem_cache_create(con
+@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(con
  {
        struct kmem_cache *c;
  
@@ -67426,9 +70568,9 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  
        if (c) {
                c->name = name;
-@@ -608,17 +702,25 @@ void *kmem_cache_alloc_node(struct kmem_
- {
-       void *b;
+@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_
+ 
+       lockdep_trace_alloc(flags);
  
 +#ifdef CONFIG_PAX_USERCOPY
 +      b = __kmalloc_node_align(c->size, flags, node, c->align);
@@ -67452,7 +70594,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  
        if (c->ctor)
                c->ctor(b);
-@@ -630,10 +732,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -67471,7 +70613,7 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -646,17 +754,31 @@ static void kmem_rcu_free(struct rcu_hea
+@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_hea
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -67506,10 +70648,10 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
---- linux-3.0.4/mm/slub.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slub.c      2011-09-25 22:15:40.000000000 -0400
-@@ -200,7 +200,7 @@ struct track {
+diff -urNp linux-3.1.1/mm/slub.c linux-3.1.1/mm/slub.c
+--- linux-3.1.1/mm/slub.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/slub.c      2011-11-16 19:27:25.000000000 -0500
+@@ -208,7 +208,7 @@ struct track {
  
  enum track_item { TRACK_ALLOC, TRACK_FREE };
  
@@ -67518,16 +70660,16 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  static int sysfs_slab_add(struct kmem_cache *);
  static int sysfs_slab_alias(struct kmem_cache *, const char *);
  static void sysfs_slab_remove(struct kmem_cache *);
-@@ -442,7 +442,7 @@ static void print_track(const char *s, s
+@@ -556,7 +556,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);
- }
- 
-@@ -2137,6 +2137,8 @@ void kmem_cache_free(struct kmem_cache *
+ #ifdef CONFIG_STACKTRACE
+       {
+@@ -2456,6 +2456,8 @@ void kmem_cache_free(struct kmem_cache *
  
        page = virt_to_head_page(x);
  
@@ -67536,7 +70678,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
        slab_free(s, page, x, _RET_IP_);
  
        trace_kmem_cache_free(_RET_IP_, x);
-@@ -2170,7 +2172,7 @@ static int slub_min_objects;
+@@ -2489,7 +2491,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.)
   */
@@ -67545,7 +70687,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2594,7 +2596,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2912,7 +2914,7 @@ static int kmem_cache_open(struct kmem_c
         * list to avoid pounding the page allocator excessively.
         */
        set_min_partial(s, ilog2(s->size));
@@ -67554,7 +70696,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  #ifdef CONFIG_NUMA
        s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2699,8 +2701,7 @@ static inline int kmem_cache_close(struc
+@@ -3017,8 +3019,7 @@ static inline int kmem_cache_close(struc
  void kmem_cache_destroy(struct kmem_cache *s)
  {
        down_write(&slub_lock);
@@ -67564,7 +70706,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
                list_del(&s->list);
                if (kmem_cache_close(s)) {
                        printk(KERN_ERR "SLUB %s: %s called for cache that "
-@@ -2910,6 +2911,46 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -3228,6 +3229,50 @@ void *__kmalloc_node(size_t size, gfp_t 
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -67575,10 +70717,12 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
 +      struct page *page;
 +      struct kmem_cache *s = NULL;
 +      unsigned long offset;
++      const char *type;
 +
 +      if (!n)
 +              return;
 +
++      type = "<null>";
 +      if (ZERO_OR_NULL_PTR(ptr))
 +              goto report;
 +
@@ -67587,6 +70731,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
 +
 +      page = virt_to_head_page(ptr);
 +
++      type = "<process stack>";
 +      if (!PageSlab(page)) {
 +              if (object_is_on_stack(ptr, n) == -1)
 +                      goto report;
@@ -67594,6 +70739,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
 +      }
 +
 +      s = page->slab;
++      type = s->name;
 +      if (!(s->flags & SLAB_USERCOPY))
 +              goto report;
 +
@@ -67602,7 +70748,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
 +              return;
 +
 +report:
-+      pax_report_usercopy(ptr, n, to, s ? s->name : NULL);
++      pax_report_usercopy(ptr, n, to, type);
 +#endif
 +
 +}
@@ -67611,7 +70757,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  size_t ksize(const void *object)
  {
        struct page *page;
-@@ -3154,7 +3195,7 @@ static void __init kmem_cache_bootstrap_
+@@ -3502,7 +3547,7 @@ static void __init kmem_cache_bootstrap_
        int node;
  
        list_add(&s->list, &slab_caches);
@@ -67620,7 +70766,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  
        for_each_node_state(node, N_NORMAL_MEMORY) {
                struct kmem_cache_node *n = get_node(s, node);
-@@ -3271,17 +3312,17 @@ void __init kmem_cache_init(void)
+@@ -3619,17 +3664,17 @@ void __init kmem_cache_init(void)
  
        /* Caches that are not of the two-to-the-power-of size */
        if (KMALLOC_MIN_SIZE <= 32) {
@@ -67641,7 +70787,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
                caches++;
        }
  
-@@ -3349,7 +3390,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3697,7 +3742,7 @@ static int slab_unmergeable(struct kmem_
        /*
         * We may have set a slab to be unmergeable during bootstrap.
         */
@@ -67650,7 +70796,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
                return 1;
  
        return 0;
-@@ -3408,7 +3449,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3756,7 +3801,7 @@ struct kmem_cache *kmem_cache_create(con
        down_write(&slub_lock);
        s = find_mergeable(size, align, flags, name, ctor);
        if (s) {
@@ -67659,7 +70805,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
                /*
                 * Adjust the object sizes so that we clear
                 * the complete object on kzalloc.
-@@ -3417,7 +3458,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3765,7 +3810,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)) {
@@ -67668,7 +70814,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
                        goto err;
                }
                up_write(&slub_lock);
-@@ -3545,7 +3586,7 @@ void *__kmalloc_node_track_caller(size_t
+@@ -3893,7 +3938,7 @@ void *__kmalloc_node_track_caller(size_t
  }
  #endif
  
@@ -67677,7 +70823,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  static int count_inuse(struct page *page)
  {
        return page->inuse;
-@@ -3935,12 +3976,12 @@ static void resiliency_test(void)
+@@ -4280,12 +4325,12 @@ static void resiliency_test(void)
        validate_slab_cache(kmalloc_caches[9]);
  }
  #else
@@ -67692,7 +70838,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  enum slab_stat_type {
        SL_ALL,                 /* All slabs */
        SL_PARTIAL,             /* Only partially allocated slabs */
-@@ -4150,7 +4191,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4495,7 +4540,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -67701,7 +70847,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4662,6 +4703,7 @@ static char *create_unique_id(struct kme
+@@ -5025,6 +5070,7 @@ static char *create_unique_id(struct kme
        return name;
  }
  
@@ -67709,7 +70855,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  static int sysfs_slab_add(struct kmem_cache *s)
  {
        int err;
-@@ -4724,6 +4766,7 @@ static void sysfs_slab_remove(struct kme
+@@ -5087,6 +5133,7 @@ static void sysfs_slab_remove(struct kme
        kobject_del(&s->kobj);
        kobject_put(&s->kobj);
  }
@@ -67717,7 +70863,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  
  /*
   * Need to buffer aliases during bootup until sysfs becomes
-@@ -4737,6 +4780,7 @@ struct saved_alias {
+@@ -5100,6 +5147,7 @@ struct saved_alias {
  
  static struct saved_alias *alias_list;
  
@@ -67725,7 +70871,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  {
        struct saved_alias *al;
-@@ -4759,6 +4803,7 @@ static int sysfs_slab_alias(struct kmem_
+@@ -5122,6 +5170,7 @@ static int sysfs_slab_alias(struct kmem_
        alias_list = al;
        return 0;
  }
@@ -67733,7 +70879,7 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  
  static int __init slab_sysfs_init(void)
  {
-@@ -4894,7 +4939,13 @@ static const struct file_operations proc
+@@ -5257,7 +5306,13 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -67748,9 +70894,9 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
        return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
---- linux-3.0.4/mm/swap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/swap.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/swap.c linux-3.1.1/mm/swap.c
+--- linux-3.1.1/mm/swap.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/swap.c      2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -67768,9 +70914,9 @@ diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
        (*dtor)(page);
  }
  
-diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
---- linux-3.0.4/mm/swapfile.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/swapfile.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/swapfile.c linux-3.1.1/mm/swapfile.c
+--- linux-3.1.1/mm/swapfile.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/swapfile.c  2011-11-16 18:39:08.000000000 -0500
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -67789,27 +70935,27 @@ diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
        wake_up_interruptible(&proc_poll_wait);
  
  out_dput:
-@@ -1692,8 +1692,8 @@ static unsigned swaps_poll(struct file *
+@@ -1687,8 +1687,8 @@ static unsigned swaps_poll(struct file *
  
        poll_wait(file, &proc_poll_wait, wait);
  
--      if (s->event != atomic_read(&proc_poll_event)) {
--              s->event = atomic_read(&proc_poll_event);
-+      if (s->event != atomic_read_unchecked(&proc_poll_event)) {
-+              s->event = atomic_read_unchecked(&proc_poll_event);
+-      if (seq->poll_event != atomic_read(&proc_poll_event)) {
+-              seq->poll_event = atomic_read(&proc_poll_event);
++      if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
++              seq->poll_event = atomic_read_unchecked(&proc_poll_event);
                return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
        }
  
-@@ -1799,7 +1799,7 @@ static int swaps_open(struct inode *inod
-       }
+@@ -1786,7 +1786,7 @@ static int swaps_open(struct inode *inod
+               return ret;
  
-       s->seq.private = s;
--      s->event = atomic_read(&proc_poll_event);
-+      s->event = atomic_read_unchecked(&proc_poll_event);
-       return ret;
+       seq = file->private_data;
+-      seq->poll_event = atomic_read(&proc_poll_event);
++      seq->poll_event = atomic_read_unchecked(&proc_poll_event);
+       return 0;
  }
  
-@@ -2133,7 +2133,7 @@ SYSCALL_DEFINE2(swapon, const char __use
+@@ -2124,7 +2124,7 @@ SYSCALL_DEFINE2(swapon, const char __use
                (p->flags & SWP_DISCARDABLE) ? "D" : "");
  
        mutex_unlock(&swapon_mutex);
@@ -67818,9 +70964,9 @@ diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
        wake_up_interruptible(&proc_poll_wait);
  
        if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
---- linux-3.0.4/mm/util.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/util.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/util.c linux-3.1.1/mm/util.c
+--- linux-3.1.1/mm/util.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/util.c      2011-11-16 18:39:08.000000000 -0500
 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
   * allocated buffer. Use this if you don't want to free the buffer immediately
   * like, for example, with RCU.
@@ -67850,9 +70996,9 @@ diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
        mm->get_unmapped_area = arch_get_unmapped_area;
        mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
---- linux-3.0.4/mm/vmalloc.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/mm/vmalloc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/mm/vmalloc.c linux-3.1.1/mm/vmalloc.c
+--- linux-3.1.1/mm/vmalloc.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/vmalloc.c   2011-11-16 18:40:44.000000000 -0500
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
        pte = pte_offset_kernel(pmd, addr);
@@ -67956,7 +71102,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
                        if (!pmd_none(*pmd)) {
                                pte_t *ptep, pte;
  
-@@ -1297,6 +1337,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_n
        struct vm_struct *area;
  
        BUG_ON(in_interrupt());
@@ -67973,7 +71119,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
        if (flags & VM_IOREMAP) {
                int bit = fls(size);
  
-@@ -1515,6 +1565,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned
        if (count > totalram_pages)
                return NULL;
  
@@ -67985,21 +71131,21 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
                                        __builtin_return_address(0));
        if (!area)
-@@ -1616,6 +1671,13 @@ void *__vmalloc_node_range(unsigned long
+@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long
        if (!size || (size >> PAGE_SHIFT) > totalram_pages)
                return NULL;
  
 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +      if (!(pgprot_val(prot) & _PAGE_NX))
-+              area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END,
-+                                              node, gfp_mask, caller);
++              area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
++                                        VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
 +      else
 +#endif
 +
-       area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node,
-                                 gfp_mask, caller);
+       area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
+                                 start, end, node, gfp_mask, caller);
  
-@@ -1655,6 +1717,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1672,6 +1734,7 @@ static void *__vmalloc_node(unsigned lon
                                gfp_mask, prot, node, caller);
  }
  
@@ -68007,7 +71153,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
        return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1678,6 +1741,7 @@ static inline void *__vmalloc_node_flags
+@@ -1695,6 +1758,7 @@ static inline void *__vmalloc_node_flags
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -68015,7 +71161,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vmalloc(unsigned long size)
  {
        return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
-@@ -1694,6 +1758,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1711,6 +1775,7 @@ EXPORT_SYMBOL(vmalloc);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -68023,7 +71169,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vzalloc(unsigned long size)
  {
        return __vmalloc_node_flags(size, -1,
-@@ -1708,6 +1773,7 @@ EXPORT_SYMBOL(vzalloc);
+@@ -1725,6 +1790,7 @@ EXPORT_SYMBOL(vzalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -68031,7 +71177,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
        struct vm_struct *area;
-@@ -1735,6 +1801,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1752,6 +1818,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -68039,7 +71185,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
        return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1754,6 +1821,7 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1771,6 +1838,7 @@ EXPORT_SYMBOL(vmalloc_node);
   * For tight control over page level allocator and protection flags
   * use __vmalloc_node() instead.
   */
@@ -68047,7 +71193,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vzalloc_node(unsigned long size, int node)
  {
        return __vmalloc_node_flags(size, node,
-@@ -1776,10 +1844,10 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1793,10 +1861,10 @@ EXPORT_SYMBOL(vzalloc_node);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -68060,7 +71206,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
                              -1, __builtin_return_address(0));
  }
  
-@@ -1798,6 +1866,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1815,6 +1883,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.
   */
@@ -68068,7 +71214,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
        return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1812,6 +1881,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1829,6 +1898,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -68076,7 +71222,7 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
        struct vm_struct *area;
-@@ -2074,6 +2144,8 @@ int remap_vmalloc_range(struct vm_area_s
+@@ -2091,6 +2161,8 @@ int remap_vmalloc_range(struct vm_area_s
        unsigned long uaddr = vma->vm_start;
        unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -68085,9 +71231,9 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
        if ((PAGE_SIZE-1) & (unsigned long)addr)
                return -EINVAL;
  
-diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
---- linux-3.0.4/mm/vmstat.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/vmstat.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/mm/vmstat.c linux-3.1.1/mm/vmstat.c
+--- linux-3.1.1/mm/vmstat.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/mm/vmstat.c    2011-11-16 18:40:44.000000000 -0500
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -68140,10 +71286,10 @@ diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
  #endif
        return 0;
  }
-diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
---- linux-3.0.4/net/8021q/vlan.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/8021q/vlan.c       2011-08-23 21:47:56.000000000 -0400
-@@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
+diff -urNp linux-3.1.1/net/8021q/vlan.c linux-3.1.1/net/8021q/vlan.c
+--- linux-3.1.1/net/8021q/vlan.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/8021q/vlan.c       2011-11-16 18:39:08.000000000 -0500
+@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net
                err = -EPERM;
                if (!capable(CAP_NET_ADMIN))
                        break;
@@ -68153,9 +71299,42 @@ diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
                        struct vlan_net *vn;
  
                        vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
---- linux-3.0.4/net/atm/atm_misc.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/atm_misc.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/9p/trans_fd.c linux-3.1.1/net/9p/trans_fd.c
+--- linux-3.1.1/net/9p/trans_fd.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/9p/trans_fd.c      2011-11-16 18:39:08.000000000 -0500
+@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client 
+       oldfs = get_fs();
+       set_fs(get_ds());
+       /* The cast to a user pointer is valid due to the set_fs() */
+-      ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
++      ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
+       set_fs(oldfs);
+ 
+       if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
+diff -urNp linux-3.1.1/net/9p/trans_virtio.c linux-3.1.1/net/9p/trans_virtio.c
+--- linux-3.1.1/net/9p/trans_virtio.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/9p/trans_virtio.c  2011-11-16 18:39:08.000000000 -0500
+@@ -327,7 +327,7 @@ req_retry_pinned:
+               } else {
+                       char *pbuf;
+                       if (req->tc->pubuf)
+-                              pbuf = (__force char *) req->tc->pubuf;
++                              pbuf = (char __force_kernel *) req->tc->pubuf;
+                       else
+                               pbuf = req->tc->pkbuf;
+                       outp = pack_sg_list(chan->sg, out, VIRTQUEUE_NUM, pbuf,
+@@ -357,7 +357,7 @@ req_retry_pinned:
+               } else {
+                       char *pbuf;
+                       if (req->tc->pubuf)
+-                              pbuf = (__force char *) req->tc->pubuf;
++                              pbuf = (char __force_kernel *) req->tc->pubuf;
+                       else
+                               pbuf = req->tc->pkbuf;
+ 
+diff -urNp linux-3.1.1/net/atm/atm_misc.c linux-3.1.1/net/atm/atm_misc.c
+--- linux-3.1.1/net/atm/atm_misc.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/atm_misc.c     2011-11-16 18:39:08.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;
@@ -68192,9 +71371,9 @@ diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
---- linux-3.0.4/net/atm/lec.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/lec.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/atm/lec.h linux-3.1.1/net/atm/lec.h
+--- linux-3.1.1/net/atm/lec.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/lec.h  2011-11-16 18:39:08.000000000 -0500
 @@ -48,7 +48,7 @@ struct lane2_ops {
                              const u8 *tlvs, u32 sizeoftlvs);
        void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -68204,9 +71383,9 @@ diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
---- linux-3.0.4/net/atm/mpc.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/mpc.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/atm/mpc.h linux-3.1.1/net/atm/mpc.h
+--- linux-3.1.1/net/atm/mpc.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/mpc.h  2011-11-16 18:39:08.000000000 -0500
 @@ -33,7 +33,7 @@ struct mpoa_client {
        struct mpc_parameters parameters;  /* parameters for this client    */
  
@@ -68216,9 +71395,9 @@ diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
  };
  
  
-diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
---- linux-3.0.4/net/atm/mpoa_caches.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/mpoa_caches.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/atm/mpoa_caches.c linux-3.1.1/net/atm/mpoa_caches.c
+--- linux-3.1.1/net/atm/mpoa_caches.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/mpoa_caches.c  2011-11-16 18:40:44.000000000 -0500
 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
        struct timeval now;
        struct k_message msg;
@@ -68228,9 +71407,9 @@ diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
        do_gettimeofday(&now);
  
        read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
---- linux-3.0.4/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/atm/proc.c linux-3.1.1/net/atm/proc.c
+--- linux-3.1.1/net/atm/proc.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/proc.c 2011-11-16 18:39:08.000000000 -0500
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -68244,9 +71423,9 @@ diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
---- linux-3.0.4/net/atm/resources.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/resources.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/atm/resources.c linux-3.1.1/net/atm/resources.c
+--- linux-3.1.1/net/atm/resources.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/atm/resources.c    2011-11-16 18:39:08.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)
@@ -68265,10 +71444,10 @@ diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-adv/hard-interface.c
---- linux-3.0.4/net/batman-adv/hard-interface.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/hard-interface.c        2011-08-23 21:47:56.000000000 -0400
-@@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
+diff -urNp linux-3.1.1/net/batman-adv/hard-interface.c linux-3.1.1/net/batman-adv/hard-interface.c
+--- linux-3.1.1/net/batman-adv/hard-interface.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/hard-interface.c        2011-11-16 18:39:08.000000000 -0500
+@@ -347,8 +347,8 @@ int hardif_enable_interface(struct hard_
        hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
        dev_add_pack(&hard_iface->batman_adv_ptype);
  
@@ -68279,10 +71458,10 @@ diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-ad
        bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
                 hard_iface->net_dev->name);
  
-diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routing.c
---- linux-3.0.4/net/batman-adv/routing.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/routing.c       2011-08-23 21:47:56.000000000 -0400
-@@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
+diff -urNp linux-3.1.1/net/batman-adv/routing.c linux-3.1.1/net/batman-adv/routing.c
+--- linux-3.1.1/net/batman-adv/routing.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/routing.c       2011-11-16 18:39:08.000000000 -0500
+@@ -656,7 +656,7 @@ void receive_bat_packet(const struct eth
                return;
  
        /* could be changed by schedule_own_packet() */
@@ -68291,51 +71470,51 @@ diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routi
  
        has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-3.0.4/net/batman-adv/send.c linux-3.0.4/net/batman-adv/send.c
---- linux-3.0.4/net/batman-adv/send.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/send.c  2011-08-23 21:47:56.000000000 -0400
-@@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
+diff -urNp linux-3.1.1/net/batman-adv/send.c linux-3.1.1/net/batman-adv/send.c
+--- linux-3.1.1/net/batman-adv/send.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/send.c  2011-11-16 18:39:08.000000000 -0500
+@@ -326,7 +326,7 @@ void schedule_own_packet(struct hard_ifa
  
        /* change sequence number to network order */
        batman_packet->seqno =
 -              htonl((uint32_t)atomic_read(&hard_iface->seqno));
 +              htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
  
-       if (vis_server == VIS_TYPE_SERVER_SYNC)
-               batman_packet->flags |= VIS_SERVER;
-@@ -293,7 +293,7 @@ void schedule_own_packet(struct hard_ifa
+       batman_packet->ttvn = atomic_read(&bat_priv->ttvn);
+       batman_packet->tt_crc = htons((uint16_t)atomic_read(&bat_priv->tt_crc));
+@@ -343,7 +343,7 @@ void schedule_own_packet(struct hard_ifa
        else
-               batman_packet->gw_flags = 0;
+               batman_packet->gw_flags = NO_FLAGS;
  
 -      atomic_inc(&hard_iface->seqno);
 +      atomic_inc_unchecked(&hard_iface->seqno);
  
        slide_own_bcast_window(hard_iface);
        send_time = own_send_time(bat_priv);
-diff -urNp linux-3.0.4/net/batman-adv/soft-interface.c linux-3.0.4/net/batman-adv/soft-interface.c
---- linux-3.0.4/net/batman-adv/soft-interface.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/soft-interface.c        2011-08-23 21:47:56.000000000 -0400
-@@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
+diff -urNp linux-3.1.1/net/batman-adv/soft-interface.c linux-3.1.1/net/batman-adv/soft-interface.c
+--- linux-3.1.1/net/batman-adv/soft-interface.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/soft-interface.c        2011-11-16 18:39:08.000000000 -0500
+@@ -632,7 +632,7 @@ static int interface_tx(struct sk_buff *
  
                /* set broadcast sequence number */
                bcast_packet->seqno =
 -                      htonl(atomic_inc_return(&bat_priv->bcast_seqno));
 +                      htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
  
-               add_bcast_packet_to_list(bat_priv, skb);
+               add_bcast_packet_to_list(bat_priv, skb, 1);
  
-@@ -830,7 +830,7 @@ struct net_device *softif_create(char *n
+@@ -824,7 +824,7 @@ struct net_device *softif_create(const c
        atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
  
        atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
 -      atomic_set(&bat_priv->bcast_seqno, 1);
 +      atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
-       atomic_set(&bat_priv->tt_local_changed, 0);
- 
-       bat_priv->primary_if = NULL;
-diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
---- linux-3.0.4/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400
+       atomic_set(&bat_priv->ttvn, 0);
+       atomic_set(&bat_priv->tt_local_changes, 0);
+       atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
+diff -urNp linux-3.1.1/net/batman-adv/types.h linux-3.1.1/net/batman-adv/types.h
+--- linux-3.1.1/net/batman-adv/types.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/types.h 2011-11-16 18:39:08.000000000 -0500
 @@ -38,8 +38,8 @@ struct hard_iface {
        int16_t if_num;
        char if_status;
@@ -68347,7 +71526,7 @@ diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
        unsigned char *packet_buff;
        int packet_len;
        struct kobject *hardif_obj;
-@@ -142,7 +142,7 @@ struct bat_priv {
+@@ -153,7 +153,7 @@ struct bat_priv {
        atomic_t orig_interval;         /* uint */
        atomic_t hop_penalty;           /* uint */
        atomic_t log_level;             /* uint */
@@ -68355,11 +71534,11 @@ diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
 +      atomic_unchecked_t bcast_seqno;
        atomic_t bcast_queue_left;
        atomic_t batman_queue_left;
-       char num_ifaces;
-diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unicast.c
---- linux-3.0.4/net/batman-adv/unicast.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/unicast.c       2011-08-23 21:47:56.000000000 -0400
-@@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
+       atomic_t ttvn; /* tranlation table version number */
+diff -urNp linux-3.1.1/net/batman-adv/unicast.c linux-3.1.1/net/batman-adv/unicast.c
+--- linux-3.1.1/net/batman-adv/unicast.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/batman-adv/unicast.c       2011-11-16 18:39:08.000000000 -0500
+@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, s
        frag1->flags = UNI_FRAG_HEAD | large_tail;
        frag2->flags = large_tail;
  
@@ -68368,9 +71547,30 @@ diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unica
        frag1->seqno = htons(seqno - 1);
        frag2->seqno = htons(seqno);
  
-diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multicast.c
---- linux-3.0.4/net/bridge/br_multicast.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/bridge/br_multicast.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/bluetooth/hci_conn.c linux-3.1.1/net/bluetooth/hci_conn.c
+--- linux-3.1.1/net/bluetooth/hci_conn.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bluetooth/hci_conn.c       2011-11-16 18:39:08.000000000 -0500
+@@ -218,7 +218,7 @@ void hci_le_start_enc(struct hci_conn *c
+       cp.handle = cpu_to_le16(conn->handle);
+       memcpy(cp.ltk, ltk, sizeof(cp.ltk));
+       cp.ediv = ediv;
+-      memcpy(cp.rand, rand, sizeof(rand));
++      memcpy(cp.rand, rand, sizeof(cp.rand));
+ 
+       hci_send_cmd(hdev, HCI_OP_LE_START_ENC, sizeof(cp), &cp);
+ }
+@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *c
+       memset(&cp, 0, sizeof(cp));
+ 
+       cp.handle = cpu_to_le16(conn->handle);
+-      memcpy(cp.ltk, ltk, sizeof(ltk));
++      memcpy(cp.ltk, ltk, sizeof(cp.ltk));
+ 
+       hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
+ }
+diff -urNp linux-3.1.1/net/bridge/br_multicast.c linux-3.1.1/net/bridge/br_multicast.c
+--- linux-3.1.1/net/bridge/br_multicast.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bridge/br_multicast.c      2011-11-16 18:39:08.000000000 -0500
 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
        nexthdr = ip6h->nexthdr;
        offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -68380,10 +71580,10 @@ diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multi
                return 0;
  
        /* Okay, we found ICMPv6 header */
-diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/netfilter/ebtables.c
---- linux-3.0.4/net/bridge/netfilter/ebtables.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/bridge/netfilter/ebtables.c        2011-08-23 21:48:14.000000000 -0400
-@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
+diff -urNp linux-3.1.1/net/bridge/netfilter/ebtables.c linux-3.1.1/net/bridge/netfilter/ebtables.c
+--- linux-3.1.1/net/bridge/netfilter/ebtables.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/bridge/netfilter/ebtables.c        2011-11-16 18:40:44.000000000 -0500
+@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *s
                        tmp.valid_hooks = t->table->valid_hooks;
                }
                mutex_unlock(&ebt_mutex);
@@ -68392,7 +71592,7 @@ diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/ne
                        BUGPRINT("c2u Didn't work\n");
                        ret = -EFAULT;
                        break;
-@@ -1780,6 +1780,8 @@ static int compat_copy_everything_to_use
+@@ -1781,6 +1781,8 @@ static int compat_copy_everything_to_use
        int ret;
        void __user *pos;
  
@@ -68401,9 +71601,9 @@ diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/ne
        memset(&tinfo, 0, sizeof(tinfo));
  
        if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
---- linux-3.0.4/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/caif/caif_socket.c linux-3.1.1/net/caif/caif_socket.c
+--- linux-3.1.1/net/caif/caif_socket.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/caif/caif_socket.c 2011-11-16 18:39:08.000000000 -0500
 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -68533,9 +71733,9 @@ diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
  #ifdef CONFIG_DEBUG_FS
        if (!IS_ERR(debugfsdir)) {
  
-diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
---- linux-3.0.4/net/caif/cfctrl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/caif/cfctrl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/caif/cfctrl.c linux-3.1.1/net/caif/cfctrl.c
+--- linux-3.1.1/net/caif/cfctrl.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/caif/cfctrl.c      2011-11-16 18:40:44.000000000 -0500
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -68583,9 +71783,139 @@ diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
  
        cfpkt_extr_head(pkt, &cmdrsp, 1);
        cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
---- linux-3.0.4/net/core/datagram.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/datagram.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/compat.c linux-3.1.1/net/compat.c
+--- linux-3.1.1/net/compat.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/compat.c   2011-11-16 18:39:08.000000000 -0500
+@@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms
+           __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
+           __get_user(kmsg->msg_flags, &umsg->msg_flags))
+               return -EFAULT;
+-      kmsg->msg_name = compat_ptr(tmp1);
+-      kmsg->msg_iov = compat_ptr(tmp2);
+-      kmsg->msg_control = compat_ptr(tmp3);
++      kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
++      kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
++      kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
+       return 0;
+ }
+ 
+@@ -84,7 +84,7 @@ int verify_compat_iovec(struct msghdr *k
+ 
+       if (kern_msg->msg_namelen) {
+               if (mode == VERIFY_READ) {
+-                      int err = move_addr_to_kernel(kern_msg->msg_name,
++                      int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
+                                                     kern_msg->msg_namelen,
+                                                     kern_address);
+                       if (err < 0)
+@@ -95,7 +95,7 @@ int verify_compat_iovec(struct msghdr *k
+               kern_msg->msg_name = NULL;
+ 
+       tot_len = iov_from_user_compat_to_kern(kern_iov,
+-                                        (struct compat_iovec __user *)kern_msg->msg_iov,
++                                        (struct compat_iovec __force_user *)kern_msg->msg_iov,
+                                         kern_msg->msg_iovlen);
+       if (tot_len >= 0)
+               kern_msg->msg_iov = kern_iov;
+@@ -115,20 +115,20 @@ int verify_compat_iovec(struct msghdr *k
+ 
+ #define CMSG_COMPAT_FIRSTHDR(msg)                     \
+       (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ?     \
+-       (struct compat_cmsghdr __user *)((msg)->msg_control) :         \
++       (struct compat_cmsghdr __force_user *)((msg)->msg_control) :           \
+        (struct compat_cmsghdr __user *)NULL)
+ 
+ #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
+       ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
+        (ucmlen) <= (unsigned long) \
+        ((mhdr)->msg_controllen - \
+-        ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
++        ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
+ 
+ static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
+               struct compat_cmsghdr __user *cmsg, int cmsg_len)
+ {
+       char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
+-      if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
++      if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
+                       msg->msg_controllen)
+               return NULL;
+       return (struct compat_cmsghdr __user *)ptr;
+@@ -220,7 +220,7 @@ int put_cmsg_compat(struct msghdr *kmsg,
+ {
+       struct compat_timeval ctv;
+       struct compat_timespec cts[3];
+-      struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
++      struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
+       struct compat_cmsghdr cmhdr;
+       int cmlen;
+ 
+@@ -272,7 +272,7 @@ int put_cmsg_compat(struct msghdr *kmsg,
+ 
+ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
+ {
+-      struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
++      struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
+       int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
+       int fdnum = scm->fp->count;
+       struct file **fp = scm->fp->fp;
+@@ -369,7 +369,7 @@ static int do_set_sock_timeout(struct so
+               return -EFAULT;
+       old_fs = get_fs();
+       set_fs(KERNEL_DS);
+-      err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
++      err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
+       set_fs(old_fs);
+ 
+       return err;
+@@ -430,7 +430,7 @@ static int do_get_sock_timeout(struct so
+       len = sizeof(ktime);
+       old_fs = get_fs();
+       set_fs(KERNEL_DS);
+-      err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
++      err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
+       set_fs(old_fs);
+ 
+       if (!err) {
+@@ -565,7 +565,7 @@ int compat_mc_setsockopt(struct sock *so
+       case MCAST_JOIN_GROUP:
+       case MCAST_LEAVE_GROUP:
+       {
+-              struct compat_group_req __user *gr32 = (void *)optval;
++              struct compat_group_req __user *gr32 = (void __user *)optval;
+               struct group_req __user *kgr =
+                       compat_alloc_user_space(sizeof(struct group_req));
+               u32 interface;
+@@ -586,7 +586,7 @@ int compat_mc_setsockopt(struct sock *so
+       case MCAST_BLOCK_SOURCE:
+       case MCAST_UNBLOCK_SOURCE:
+       {
+-              struct compat_group_source_req __user *gsr32 = (void *)optval;
++              struct compat_group_source_req __user *gsr32 = (void __user *)optval;
+               struct group_source_req __user *kgsr = compat_alloc_user_space(
+                       sizeof(struct group_source_req));
+               u32 interface;
+@@ -607,7 +607,7 @@ int compat_mc_setsockopt(struct sock *so
+       }
+       case MCAST_MSFILTER:
+       {
+-              struct compat_group_filter __user *gf32 = (void *)optval;
++              struct compat_group_filter __user *gf32 = (void __user *)optval;
+               struct group_filter __user *kgf;
+               u32 interface, fmode, numsrc;
+ 
+@@ -645,7 +645,7 @@ int compat_mc_getsockopt(struct sock *so
+       char __user *optval, int __user *optlen,
+       int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
+ {
+-      struct compat_group_filter __user *gf32 = (void *)optval;
++      struct compat_group_filter __user *gf32 = (void __user *)optval;
+       struct group_filter __user *kgf;
+       int __user      *koptlen;
+       u32 interface, fmode, numsrc;
+diff -urNp linux-3.1.1/net/core/datagram.c linux-3.1.1/net/core/datagram.c
+--- linux-3.1.1/net/core/datagram.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/datagram.c    2011-11-16 18:39:08.000000000 -0500
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
        }
  
@@ -68595,10 +71925,10 @@ diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
        sk_mem_reclaim_partial(sk);
  
        return err;
-diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
---- linux-3.0.4/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400
-@@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
+diff -urNp linux-3.1.1/net/core/dev.c linux-3.1.1/net/core/dev.c
+--- linux-3.1.1/net/core/dev.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/dev.c 2011-11-16 18:40:44.000000000 -0500
+@@ -1135,10 +1135,14 @@ void dev_load(struct net *net, const cha
        if (no_module && capable(CAP_NET_ADMIN))
                no_module = request_module("netdev-%s", name);
        if (no_module && capable(CAP_SYS_MODULE)) {
@@ -68613,7 +71943,7 @@ diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
        }
  }
  EXPORT_SYMBOL(dev_load);
-@@ -1959,7 +1963,7 @@ static int illegal_highdma(struct net_de
+@@ -1977,7 +1981,7 @@ static int illegal_highdma(struct net_de
  
  struct dev_gso_cb {
        void (*destructor)(struct sk_buff *skb);
@@ -68622,7 +71952,7 @@ diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
  
  #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  
-@@ -2912,7 +2916,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -2930,7 +2934,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -68631,7 +71961,7 @@ diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3761,7 +3765,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3779,7 +3783,7 @@ void netif_napi_del(struct napi_struct *
  }
  EXPORT_SYMBOL(netif_napi_del);
  
@@ -68640,10 +71970,10 @@ diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
        unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
---- linux-3.0.4/net/core/flow.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/flow.c        2011-08-23 21:47:56.000000000 -0400
-@@ -60,7 +60,7 @@ struct flow_cache {
+diff -urNp linux-3.1.1/net/core/flow.c linux-3.1.1/net/core/flow.c
+--- linux-3.1.1/net/core/flow.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/flow.c        2011-11-16 18:39:08.000000000 -0500
+@@ -61,7 +61,7 @@ struct flow_cache {
        struct timer_list               rnd_timer;
  };
  
@@ -68652,7 +71982,7 @@ diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
  EXPORT_SYMBOL(flow_cache_genid);
  static struct flow_cache flow_cache_global;
  static struct kmem_cache *flow_cachep __read_mostly;
-@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsig
+@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsig
  
  static int flow_entry_valid(struct flow_cache_entry *fle)
  {
@@ -68661,7 +71991,7 @@ diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
                return 0;
        if (fle->object && !fle->object->ops->check(fle->object))
                return 0;
-@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, const
+@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const
                        hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
                        fcp->hash_count++;
                }
@@ -68670,7 +72000,7 @@ diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
                flo = fle->object;
                if (!flo)
                        goto ret_object;
-@@ -274,7 +274,7 @@ nocache:
+@@ -280,7 +280,7 @@ nocache:
        }
        flo = resolver(net, key, family, dir, flo, ctx);
        if (fle) {
@@ -68679,22 +72009,82 @@ diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
                if (!IS_ERR(flo))
                        fle->object = flo;
                else
-diff -urNp linux-3.0.4/net/core/rtnetlink.c linux-3.0.4/net/core/rtnetlink.c
---- linux-3.0.4/net/core/rtnetlink.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/rtnetlink.c   2011-08-23 21:47:56.000000000 -0400
-@@ -56,7 +56,7 @@
- struct rtnl_link {
+diff -urNp linux-3.1.1/net/core/iovec.c linux-3.1.1/net/core/iovec.c
+--- linux-3.1.1/net/core/iovec.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/iovec.c       2011-11-16 18:39:08.000000000 -0500
+@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
+       if (m->msg_namelen) {
+               if (mode == VERIFY_READ) {
+                       void __user *namep;
+-                      namep = (void __user __force *) m->msg_name;
++                      namep = (void __force_user *) m->msg_name;
+                       err = move_addr_to_kernel(namep, m->msg_namelen,
+                                                 address);
+                       if (err < 0)
+@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struc
+       }
+ 
+       size = m->msg_iovlen * sizeof(struct iovec);
+-      if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
++      if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
+               return -EFAULT;
+ 
+       m->msg_iov = iov;
+diff -urNp linux-3.1.1/net/core/rtnetlink.c linux-3.1.1/net/core/rtnetlink.c
+--- linux-3.1.1/net/core/rtnetlink.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/rtnetlink.c   2011-11-16 18:39:08.000000000 -0500
+@@ -57,7 +57,7 @@ struct rtnl_link {
        rtnl_doit_func          doit;
        rtnl_dumpit_func        dumpit;
+       rtnl_calcit_func        calcit;
 -};
 +} __no_const;
  
  static DEFINE_MUTEX(rtnl_mutex);
- 
-diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
---- linux-3.0.4/net/core/skbuff.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/skbuff.c      2011-08-23 21:48:14.000000000 -0400
-@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
+ static u16 min_ifinfo_dump_size;
+diff -urNp linux-3.1.1/net/core/scm.c linux-3.1.1/net/core/scm.c
+--- linux-3.1.1/net/core/scm.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/scm.c 2011-11-16 18:39:08.000000000 -0500
+@@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
+ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
+ {
+       struct cmsghdr __user *cm
+-              = (__force struct cmsghdr __user *)msg->msg_control;
++              = (struct cmsghdr __force_user *)msg->msg_control;
+       struct cmsghdr cmhdr;
+       int cmlen = CMSG_LEN(len);
+       int err;
+@@ -241,7 +241,7 @@ int put_cmsg(struct msghdr * msg, int le
+       err = -EFAULT;
+       if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
+               goto out;
+-      if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
++      if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
+               goto out;
+       cmlen = CMSG_SPACE(len);
+       if (msg->msg_controllen < cmlen)
+@@ -257,7 +257,7 @@ EXPORT_SYMBOL(put_cmsg);
+ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
+ {
+       struct cmsghdr __user *cm
+-              = (__force struct cmsghdr __user*)msg->msg_control;
++              = (struct cmsghdr __force_user *)msg->msg_control;
+ 
+       int fdmax = 0;
+       int fdnum = scm->fp->count;
+@@ -277,7 +277,7 @@ void scm_detach_fds(struct msghdr *msg, 
+       if (fdnum < fdmax)
+               fdmax = fdnum;
+ 
+-      for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
++      for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
+            i++, cmfptr++)
+       {
+               int new_fd;
+diff -urNp linux-3.1.1/net/core/skbuff.c linux-3.1.1/net/core/skbuff.c
+--- linux-3.1.1/net/core/skbuff.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/skbuff.c      2011-11-16 18:40:44.000000000 -0500
+@@ -1650,6 +1650,8 @@ int skb_splice_bits(struct sk_buff *skb,
        struct sock *sk = skb->sk;
        int ret = 0;
  
@@ -68703,19 +72093,19 @@ diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
        if (splice_grow_spd(pipe, &spd))
                return -ENOMEM;
  
-diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
---- linux-3.0.4/net/core/sock.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/sock.c        2011-08-23 21:48:14.000000000 -0400
-@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+diff -urNp linux-3.1.1/net/core/sock.c linux-3.1.1/net/core/sock.c
+--- linux-3.1.1/net/core/sock.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/core/sock.c        2011-11-16 18:40:44.000000000 -0500
+@@ -293,7 +293,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
         */
        if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
            (unsigned)sk->sk_rcvbuf) {
 -              atomic_inc(&sk->sk_drops);
 +              atomic_inc_unchecked(&sk->sk_drops);
+               trace_sock_rcvqueue_full(sk, skb);
                return -ENOMEM;
        }
- 
-@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+@@ -303,7 +303,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
                return err;
  
        if (!sk_rmem_schedule(sk, skb->truesize)) {
@@ -68724,7 +72114,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                return -ENOBUFS;
        }
  
-@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
+@@ -323,7 +323,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
        skb_dst_force(skb);
  
        spin_lock_irqsave(&list->lock, flags);
@@ -68733,7 +72123,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
        __skb_queue_tail(list, skb);
        spin_unlock_irqrestore(&list->lock, flags);
  
-@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, stru
+@@ -343,7 +343,7 @@ int sk_receive_skb(struct sock *sk, stru
        skb->dev = NULL;
  
        if (sk_rcvqueues_full(sk, skb)) {
@@ -68742,7 +72132,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                goto discard_and_relse;
        }
        if (nested)
-@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, stru
+@@ -361,7 +361,7 @@ int sk_receive_skb(struct sock *sk, stru
                mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
        } else if (sk_add_backlog(sk, skb)) {
                bh_unlock_sock(sk);
@@ -68751,7 +72141,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                goto discard_and_relse;
        }
  
-@@ -921,7 +921,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -924,7 +924,7 @@ int sock_getsockopt(struct socket *sock,
                if (len > sizeof(peercred))
                        len = sizeof(peercred);
                cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
@@ -68760,7 +72150,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                        return -EFAULT;
                goto lenout;
        }
-@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -937,7 +937,7 @@ int sock_getsockopt(struct socket *sock,
                        return -ENOTCONN;
                if (lv < len)
                        return -EINVAL;
@@ -68769,7 +72159,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                        return -EFAULT;
                goto lenout;
        }
-@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -970,7 +970,7 @@ int sock_getsockopt(struct socket *sock,
  
        if (len > lv)
                len = lv;
@@ -68778,7 +72168,7 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
                return -EFAULT;
  lenout:
        if (put_user(len, optlen))
-@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock,
+@@ -2029,7 +2029,7 @@ void sock_init_data(struct socket *sock,
         */
        smp_wmb();
        atomic_set(&sk->sk_refcnt, 1);
@@ -68787,10 +72177,10 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sysctl_net_decnet.c
---- linux-3.0.4/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400
-@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
+diff -urNp linux-3.1.1/net/decnet/sysctl_net_decnet.c linux-3.1.1/net/decnet/sysctl_net_decnet.c
+--- linux-3.1.1/net/decnet/sysctl_net_decnet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/decnet/sysctl_net_decnet.c 2011-11-16 18:39:08.000000000 -0500
+@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_t
  
        if (len > *lenp) len = *lenp;
  
@@ -68799,7 +72189,7 @@ diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sys
                return -EFAULT;
  
        *lenp = len;
-@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table 
+@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table 
  
        if (len > *lenp) len = *lenp;
  
@@ -68808,9 +72198,9 @@ diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sys
                return -EFAULT;
  
        *lenp = len;
-diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
---- linux-3.0.4/net/econet/Kconfig     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/econet/Kconfig     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/econet/Kconfig linux-3.1.1/net/econet/Kconfig
+--- linux-3.1.1/net/econet/Kconfig     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/econet/Kconfig     2011-11-16 18:40:44.000000000 -0500
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -68820,9 +72210,9 @@ diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
        ---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-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend.c
---- linux-3.0.4/net/ipv4/fib_frontend.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/fib_frontend.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/fib_frontend.c linux-3.1.1/net/ipv4/fib_frontend.c
+--- linux-3.1.1/net/ipv4/fib_frontend.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/fib_frontend.c        2011-11-16 18:39:08.000000000 -0500
 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
                fib_sync_up(dev);
@@ -68847,10 +72237,10 @@ diff -urNp linux-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semantics.c
---- linux-3.0.4/net/ipv4/fib_semantics.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/fib_semantics.c       2011-08-23 21:47:56.000000000 -0400
-@@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
+diff -urNp linux-3.1.1/net/ipv4/fib_semantics.c linux-3.1.1/net/ipv4/fib_semantics.c
+--- linux-3.1.1/net/ipv4/fib_semantics.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/fib_semantics.c       2011-11-16 18:39:08.000000000 -0500
+@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct n
        nh->nh_saddr = inet_select_addr(nh->nh_dev,
                                        nh->nh_gw,
                                        nh->nh_parent->fib_scope);
@@ -68859,9 +72249,9 @@ diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semanti
  
        return nh->nh_saddr;
  }
-diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
---- linux-3.0.4/net/ipv4/inet_diag.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inet_diag.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/inet_diag.c linux-3.1.1/net/ipv4/inet_diag.c
+--- linux-3.1.1/net/ipv4/inet_diag.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inet_diag.c   2011-11-16 18:40:44.000000000 -0500
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
        r->idiag_retrans = 0;
  
@@ -68923,9 +72313,9 @@ diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
  
        tmo = req->expires - jiffies;
        if (tmo < 0)
-diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hashtables.c
---- linux-3.0.4/net/ipv4/inet_hashtables.c     2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inet_hashtables.c     2011-08-23 21:55:24.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/inet_hashtables.c linux-3.1.1/net/ipv4/inet_hashtables.c
+--- linux-3.1.1/net/ipv4/inet_hashtables.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inet_hashtables.c     2011-11-16 18:40:44.000000000 -0500
 @@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -68951,33 +72341,63 @@ diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hash
                if (tw) {
                        inet_twsk_deschedule(tw, death_row);
                        while (twrefcnt) {
-diff -urNp linux-3.0.4/net/ipv4/inetpeer.c linux-3.0.4/net/ipv4/inetpeer.c
---- linux-3.0.4/net/ipv4/inetpeer.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inetpeer.c    2011-08-23 21:48:14.000000000 -0400
-@@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
+diff -urNp linux-3.1.1/net/ipv4/inetpeer.c linux-3.1.1/net/ipv4/inetpeer.c
+--- linux-3.1.1/net/ipv4/inetpeer.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/inetpeer.c    2011-11-16 19:18:22.000000000 -0500
+@@ -400,6 +400,8 @@ struct inet_peer *inet_getpeer(const str
        unsigned int sequence;
-       int invalidated, newrefcnt = 0;
+       int invalidated, gccnt = 0;
  
 +      pax_track_stack();
 +
-       /* Look up for the address quickly, lockless.
+       /* Attempt a lockless lookup first.
         * Because of a concurrent writer, we might not find an existing entry.
         */
-@@ -517,8 +519,8 @@ found:             /* The existing node has been fo
+@@ -436,8 +438,8 @@ relookup:
        if (p) {
                p->daddr = *daddr;
                atomic_set(&p->refcnt, 1);
 -              atomic_set(&p->rid, 0);
--              atomic_set(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
+-              atomic_set(&p->ip_id_count,
 +              atomic_set_unchecked(&p->rid, 0);
-+              atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
-               p->tcp_ts_stamp = 0;
-               p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
-               p->rate_tokens = 0;
-diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
---- linux-3.0.4/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400
-@@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
++              atomic_set_unchecked(&p->ip_id_count,
+                               (daddr->family == AF_INET) ?
+                                       secure_ip_id(daddr->addr.a4) :
+                                       secure_ipv6_id(daddr->addr.a6));
+diff -urNp linux-3.1.1/net/ipv4/ipconfig.c linux-3.1.1/net/ipv4/ipconfig.c
+--- linux-3.1.1/net/ipv4/ipconfig.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ipconfig.c    2011-11-16 18:39:08.000000000 -0500
+@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
+ 
+       mm_segment_t oldfs = get_fs();
+       set_fs(get_ds());
+-      res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++      res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+       set_fs(oldfs);
+       return res;
+ }
+@@ -324,7 +324,7 @@ static int __init ic_dev_ioctl(unsigned 
+ 
+       mm_segment_t oldfs = get_fs();
+       set_fs(get_ds());
+-      res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++      res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+       set_fs(oldfs);
+       return res;
+ }
+@@ -335,7 +335,7 @@ static int __init ic_route_ioctl(unsigne
+ 
+       mm_segment_t oldfs = get_fs();
+       set_fs(get_ds());
+-      res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
++      res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
+       set_fs(oldfs);
+       return res;
+ }
+diff -urNp linux-3.1.1/net/ipv4/ip_fragment.c linux-3.1.1/net/ipv4/ip_fragment.c
+--- linux-3.1.1/net/ipv4/ip_fragment.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ip_fragment.c 2011-11-16 18:39:08.000000000 -0500
+@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct
                return 0;
  
        start = qp->rid;
@@ -68986,9 +72406,9 @@ diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
        qp->rid = end;
  
        rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
---- linux-3.0.4/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ip_sockglue.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/ip_sockglue.c linux-3.1.1/net/ipv4/ip_sockglue.c
+--- linux-3.1.1/net/ipv4/ip_sockglue.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ip_sockglue.c 2011-11-16 18:40:44.000000000 -0500
 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
        int val;
        int len;
@@ -69008,9 +72428,18 @@ diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
                        return -EFAULT;
                return 0;
        }
-diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400
+@@ -1238,7 +1241,7 @@ static int do_ip_getsockopt(struct sock 
+               if (sk->sk_type != SOCK_STREAM)
+                       return -ENOPROTOOPT;
+ 
+-              msg.msg_control = optval;
++              msg.msg_control = (void __force_kernel *)optval;
+               msg.msg_controllen = len;
+               msg.msg_flags = flags;
+ 
+diff -urNp linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-16 18:39:08.000000000 -0500
 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
        *len = 0;
@@ -69020,9 +72449,9 @@ diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ip
        if (*octets == NULL) {
                if (net_ratelimit())
                        pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
---- linux-3.0.4/net/ipv4/ping.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ping.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/ping.c linux-3.1.1/net/ipv4/ping.c
+--- linux-3.1.1/net/ipv4/ping.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/ping.c        2011-11-16 18:39:08.000000000 -0500
 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
                sk_rmem_alloc_get(sp),
                0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -69032,9 +72461,9 @@ diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
  }
  
  static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
---- linux-3.0.4/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/raw.c linux-3.1.1/net/ipv4/raw.c
+--- linux-3.1.1/net/ipv4/raw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/raw.c 2011-11-17 18:58:40.000000000 -0500
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -69044,7 +72473,7 @@ diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
                kfree_skb(skb);
                return NET_RX_DROP;
        }
-@@ -736,16 +736,20 @@ static int raw_init(struct sock *sk)
+@@ -737,16 +737,20 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
  {
@@ -69066,19 +72495,18 @@ diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
  
        if (get_user(len, optlen))
                goto out;
-@@ -755,8 +759,9 @@ static int raw_geticmpfilter(struct sock
+@@ -756,8 +760,8 @@ static int raw_geticmpfilter(struct sock
        if (len > sizeof(struct icmp_filter))
                len = sizeof(struct icmp_filter);
        ret = -EFAULT;
 -      if (put_user(len, optlen) ||
 -          copy_to_user(optval, &raw_sk(sk)->filter, len))
 +      filter = raw_sk(sk)->filter;
-+      if (put_user(len, optlen) || len > sizeof filter ||
-+          copy_to_user(optval, &filter, len))
++      if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
                goto out;
        ret = 0;
  out:  return ret;
-@@ -984,7 +989,13 @@ static void raw_sock_seq_show(struct seq
+@@ -985,7 +989,13 @@ static void raw_sock_seq_show(struct seq
                sk_wmem_alloc_get(sp),
                sk_rmem_alloc_get(sp),
                0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -69093,10 +72521,10 @@ diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
---- linux-3.0.4/net/ipv4/route.c       2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/route.c       2011-08-23 21:47:56.000000000 -0400
-@@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
+diff -urNp linux-3.1.1/net/ipv4/route.c linux-3.1.1/net/ipv4/route.c
+--- linux-3.1.1/net/ipv4/route.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/route.c       2011-11-16 18:39:08.000000000 -0500
+@@ -308,7 +308,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
  {
@@ -69105,7 +72533,7 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
  }
  
  #ifdef CONFIG_PROC_FS
-@@ -833,7 +833,7 @@ static void rt_cache_invalidate(struct n
+@@ -837,7 +837,7 @@ static void rt_cache_invalidate(struct n
        unsigned char shuffle;
  
        get_random_bytes(&shuffle, sizeof(shuffle));
@@ -69114,7 +72542,7 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
  }
  
  /*
-@@ -2834,7 +2834,7 @@ static int rt_fill_info(struct net *net,
+@@ -2872,7 +2872,7 @@ static int rt_fill_info(struct net *net,
        error = rt->dst.error;
        if (peer) {
                inet_peer_refcheck(rt->peer);
@@ -69123,9 +72551,9 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
                if (peer->tcp_ts_stamp) {
                        ts = peer->tcp_ts;
                        tsage = get_seconds() - peer->tcp_ts_stamp;
-diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
---- linux-3.0.4/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp.c linux-3.1.1/net/ipv4/tcp.c
+--- linux-3.1.1/net/ipv4/tcp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp.c 2011-11-16 18:40:44.000000000 -0500
 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
        int val;
        int err = 0;
@@ -69144,9 +72572,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
        if (get_user(len, optlen))
                return -EFAULT;
  
-diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
---- linux-3.0.4/net/ipv4/tcp_ipv4.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_ipv4.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp_ipv4.c linux-3.1.1/net/ipv4/tcp_ipv4.c
+--- linux-3.1.1/net/ipv4/tcp_ipv4.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_ipv4.c    2011-11-16 18:40:44.000000000 -0500
 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -69157,7 +72585,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1607,6 +1610,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
+@@ -1622,6 +1625,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
        return 0;
  
  reset:
@@ -69167,7 +72595,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
        tcp_v4_send_reset(rsk, skb);
  discard:
        kfree_skb(skb);
-@@ -1669,12 +1675,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1684,12 +1690,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);
@@ -69190,7 +72618,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
  
        if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
                NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1724,6 +1737,10 @@ no_tcp_socket:
+@@ -1739,6 +1752,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
@@ -69201,7 +72629,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
                tcp_v4_send_reset(NULL, skb);
        }
  
-@@ -2388,7 +2405,11 @@ static void get_openreq4(struct sock *sk
+@@ -2403,7 +2420,11 @@ static void get_openreq4(struct sock *sk
                0,  /* non standard timer */
                0, /* open_requests have no inode */
                atomic_read(&sk->sk_refcnt),
@@ -69213,7 +72641,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
                len);
  }
  
-@@ -2438,7 +2459,12 @@ static void get_tcp4_sock(struct sock *s
+@@ -2453,7 +2474,12 @@ static void get_tcp4_sock(struct sock *s
                sock_i_uid(sk),
                icsk->icsk_probes_out,
                sock_i_ino(sk),
@@ -69227,7 +72655,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/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,
-@@ -2466,7 +2492,13 @@ static void get_timewait4_sock(struct in
+@@ -2481,7 +2507,13 @@ static void get_timewait4_sock(struct in
                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
                i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
                3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -69242,9 +72670,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisocks.c
---- linux-3.0.4/net/ipv4/tcp_minisocks.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_minisocks.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp_minisocks.c linux-3.1.1/net/ipv4/tcp_minisocks.c
+--- linux-3.1.1/net/ipv4/tcp_minisocks.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_minisocks.c       2011-11-16 18:40:44.000000000 -0500
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -69256,7 +72684,7 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisoc
  int sysctl_tcp_syncookies __read_mostly = 1;
  EXPORT_SYMBOL(sysctl_tcp_syncookies);
  
-@@ -745,6 +749,10 @@ listen_overflow:
+@@ -750,6 +754,10 @@ listen_overflow:
  
  embryonic_reset:
        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
@@ -69267,9 +72695,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisoc
        if (!(flg & TCP_FLAG_RST))
                req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
---- linux-3.0.4/net/ipv4/tcp_output.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_output.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp_output.c linux-3.1.1/net/ipv4/tcp_output.c
+--- linux-3.1.1/net/ipv4/tcp_output.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_output.c  2011-11-16 18:40:44.000000000 -0500
 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
        int mss;
        int s_data_desired = 0;
@@ -69279,9 +72707,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
        if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
                s_data_desired = cvp->s_data_desired;
        skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-diff -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
---- linux-3.0.4/net/ipv4/tcp_probe.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_probe.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp_probe.c linux-3.1.1/net/ipv4/tcp_probe.c
+--- linux-3.1.1/net/ipv4/tcp_probe.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_probe.c   2011-11-16 18:39:08.000000000 -0500
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
                if (cnt + width >= len)
                        break;
@@ -69291,9 +72719,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
                        return -EFAULT;
                cnt += width;
        }
-diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
---- linux-3.0.4/net/ipv4/tcp_timer.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_timer.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/tcp_timer.c linux-3.1.1/net/ipv4/tcp_timer.c
+--- linux-3.1.1/net/ipv4/tcp_timer.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/tcp_timer.c   2011-11-16 18:40:44.000000000 -0500
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -69319,9 +72747,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
        if (retransmits_timed_out(sk, retry_until,
                                  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
                /* Has it gone just too far? */
-diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
---- linux-3.0.4/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv4/udp.c linux-3.1.1/net/ipv4/udp.c
+--- linux-3.1.1/net/ipv4/udp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv4/udp.c 2011-11-16 19:17:54.000000000 -0500
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -69330,8 +72758,8 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
  #include <linux/socket.h>
  #include <linux/sockios.h>
  #include <linux/igmp.h>
-@@ -107,6 +108,10 @@
- #include <net/xfrm.h>
+@@ -108,6 +109,10 @@
+ #include <trace/events/udp.h>
  #include "udp_impl.h"
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -69341,7 +72769,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
  struct udp_table udp_table __read_mostly;
  EXPORT_SYMBOL(udp_table);
  
-@@ -564,6 +569,9 @@ found:
+@@ -565,6 +570,9 @@ found:
        return s;
  }
  
@@ -69351,7 +72779,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
  /*
   * This routine is called by the ICMP module when it gets some
   * sort of error condition.  If err < 0 then the socket should
-@@ -855,9 +863,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
                dport = usin->sin_port;
                if (dport == 0)
                        return -EINVAL;
@@ -69370,7 +72798,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
                daddr = inet->inet_daddr;
                dport = inet->inet_dport;
                /* Open fast path for connected socket.
-@@ -1098,7 +1115,7 @@ static unsigned int first_packet_length(
+@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(
                udp_lib_checksum_complete(skb)) {
                UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
                                 IS_UDPLITE(sk));
@@ -69379,7 +72807,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
                __skb_unlink(skb, rcvq);
                __skb_queue_tail(&list_kill, skb);
        }
-@@ -1184,6 +1201,10 @@ try_again:
+@@ -1185,6 +1202,10 @@ try_again:
        if (!skb)
                goto out;
  
@@ -69390,7 +72818,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
        ulen = skb->len - sizeof(struct udphdr);
        if (len > ulen)
                len = ulen;
-@@ -1483,7 +1504,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
+@@ -1485,7 +1506,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
  
  drop:
        UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -69399,7 +72827,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
        kfree_skb(skb);
        return -1;
  }
-@@ -1502,7 +1523,7 @@ static void flush_stack(struct sock **st
+@@ -1504,7 +1525,7 @@ static void flush_stack(struct sock **st
                        skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
  
                if (!skb1) {
@@ -69408,7 +72836,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
                        UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
                                         IS_UDPLITE(sk));
                        UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1671,6 +1692,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
+@@ -1673,6 +1694,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
                goto csum_error;
  
        UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -69418,7 +72846,7 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
        /*
-@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock
+@@ -2100,8 +2124,13 @@ 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),
@@ -69434,9 +72862,21 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/inet6_connection_sock.c
---- linux-3.0.4/net/ipv6/inet6_connection_sock.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/inet6_connection_sock.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv6/addrconf.c linux-3.1.1/net/ipv6/addrconf.c
+--- linux-3.1.1/net/ipv6/addrconf.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/addrconf.c    2011-11-16 18:39:08.000000000 -0500
+@@ -2083,7 +2083,7 @@ int addrconf_set_dstaddr(struct net *net
+               p.iph.ihl = 5;
+               p.iph.protocol = IPPROTO_IPV6;
+               p.iph.ttl = 64;
+-              ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
++              ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
+ 
+               if (ops->ndo_do_ioctl) {
+                       mm_segment_t oldfs = get_fs();
+diff -urNp linux-3.1.1/net/ipv6/inet6_connection_sock.c linux-3.1.1/net/ipv6/inet6_connection_sock.c
+--- linux-3.1.1/net/ipv6/inet6_connection_sock.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/inet6_connection_sock.c       2011-11-16 18:39:08.000000000 -0500
 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
        {
@@ -69455,9 +72895,9 @@ diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/ine
                        __sk_dst_reset(sk);
                        dst = NULL;
                }
-diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockglue.c
---- linux-3.0.4/net/ipv6/ipv6_sockglue.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/ipv6_sockglue.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv6/ipv6_sockglue.c linux-3.1.1/net/ipv6/ipv6_sockglue.c
+--- linux-3.1.1/net/ipv6/ipv6_sockglue.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/ipv6_sockglue.c       2011-11-16 18:40:44.000000000 -0500
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
        int val, valbool;
        int retv = -ENOPROTOOPT;
@@ -69476,9 +72916,18 @@ diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockgl
        if (ip6_mroute_opt(optname))
                return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
---- linux-3.0.4/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400
+@@ -960,7 +964,7 @@ static int do_ipv6_getsockopt(struct soc
+               if (sk->sk_type != SOCK_STREAM)
+                       return -ENOPROTOOPT;
+ 
+-              msg.msg_control = optval;
++              msg.msg_control = (void __force_kernel *)optval;
+               msg.msg_controllen = len;
+               msg.msg_flags = flags;
+ 
+diff -urNp linux-3.1.1/net/ipv6/raw.c linux-3.1.1/net/ipv6/raw.c
+--- linux-3.1.1/net/ipv6/raw.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/raw.c 2011-11-16 18:40:44.000000000 -0500
 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
        if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -69559,7 +73008,7 @@ diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
                        return -EFAULT;
                return 0;
        default:
-@@ -1252,7 +1259,13 @@ static void raw6_sock_seq_show(struct se
+@@ -1245,7 +1252,13 @@ static void raw6_sock_seq_show(struct se
                   0, 0L, 0,
                   sock_i_uid(sp), 0,
                   sock_i_ino(sp),
@@ -69574,9 +73023,9 @@ diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
---- linux-3.0.4/net/ipv6/tcp_ipv6.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv6/tcp_ipv6.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv6/tcp_ipv6.c linux-3.1.1/net/ipv6/tcp_ipv6.c
+--- linux-3.1.1/net/ipv6/tcp_ipv6.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/tcp_ipv6.c    2011-11-16 18:40:44.000000000 -0500
 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -69588,7 +73037,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
  static void tcp_v6_hash(struct sock *sk)
  {
        if (sk->sk_state != TCP_CLOSE) {
-@@ -1662,6 +1666,9 @@ static int tcp_v6_do_rcv(struct sock *sk
+@@ -1647,6 +1651,9 @@ static int tcp_v6_do_rcv(struct sock *sk
        return 0;
  
  reset:
@@ -69598,7 +73047,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
        tcp_v6_send_reset(sk, skb);
  discard:
        if (opt_skb)
-@@ -1741,12 +1748,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+@@ -1726,12 +1733,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);
@@ -69621,7 +73070,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
  
        if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
                NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1794,6 +1809,10 @@ no_tcp_socket:
+@@ -1779,6 +1794,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
@@ -69632,7 +73081,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
                tcp_v6_send_reset(NULL, skb);
        }
  
-@@ -2054,7 +2073,13 @@ static void get_openreq6(struct seq_file
+@@ -2039,7 +2058,13 @@ static void get_openreq6(struct seq_file
                   uid,
                   0,  /* non standard timer */
                   0, /* open_requests have no inode */
@@ -69647,7 +73096,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
  }
  
  static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -2104,7 +2129,12 @@ static void get_tcp6_sock(struct seq_fil
+@@ -2089,7 +2114,12 @@ static void get_tcp6_sock(struct seq_fil
                   sock_i_uid(sp),
                   icsk->icsk_probes_out,
                   sock_i_ino(sp),
@@ -69661,7 +73110,7 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/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,
-@@ -2139,7 +2169,13 @@ static void get_timewait6_sock(struct se
+@@ -2124,7 +2154,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,
@@ -69676,9 +73125,9 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
---- linux-3.0.4/net/ipv6/udp.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv6/udp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/ipv6/udp.c linux-3.1.1/net/ipv6/udp.c
+--- linux-3.1.1/net/ipv6/udp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/ipv6/udp.c 2011-11-16 18:40:44.000000000 -0500
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -69743,9 +73192,9 @@ diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/ircomm_tty.c
---- linux-3.0.4/net/irda/ircomm/ircomm_tty.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/irda/ircomm/ircomm_tty.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/irda/ircomm/ircomm_tty.c linux-3.1.1/net/irda/ircomm/ircomm_tty.c
+--- linux-3.1.1/net/irda/ircomm/ircomm_tty.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/irda/ircomm/ircomm_tty.c   2011-11-16 18:39:08.000000000 -0500
 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
        add_wait_queue(&self->open_wait, &wait);
  
@@ -69868,9 +73317,9 @@ diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/
        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-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
---- linux-3.0.4/net/iucv/af_iucv.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/iucv/af_iucv.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/iucv/af_iucv.c linux-3.1.1/net/iucv/af_iucv.c
+--- linux-3.1.1/net/iucv/af_iucv.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/iucv/af_iucv.c     2011-11-16 18:39:08.000000000 -0500
 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
  
        write_lock_bh(&iucv_sk_list.lock);
@@ -69884,9 +73333,9 @@ diff -urNp linux-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
        }
  
        write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
---- linux-3.0.4/net/key/af_key.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/key/af_key.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/key/af_key.c linux-3.1.1/net/key/af_key.c
+--- linux-3.1.1/net/key/af_key.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/key/af_key.c       2011-11-16 18:40:44.000000000 -0500
 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
        struct xfrm_migrate m[XFRM_MAX_DEPTH];
        struct xfrm_kmaddress k;
@@ -69909,9 +73358,9 @@ diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
        } while (!res);
        return res;
  }
-diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
---- linux-3.0.4/net/lapb/lapb_iface.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/lapb/lapb_iface.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/lapb/lapb_iface.c linux-3.1.1/net/lapb/lapb_iface.c
+--- linux-3.1.1/net/lapb/lapb_iface.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/lapb/lapb_iface.c  2011-11-16 18:39:08.000000000 -0500
 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
                goto out;
  
@@ -69975,9 +73424,9 @@ diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
                used = 1;
        }
  
-diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debugfs_sta.c
---- linux-3.0.4/net/mac80211/debugfs_sta.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/debugfs_sta.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/debugfs_sta.c linux-3.1.1/net/mac80211/debugfs_sta.c
+--- linux-3.1.1/net/mac80211/debugfs_sta.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/debugfs_sta.c     2011-11-16 18:40:44.000000000 -0500
 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
        struct tid_ampdu_rx *tid_rx;
        struct tid_ampdu_tx *tid_tx;
@@ -69996,9 +73445,9 @@ diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debug
        p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
                        htc->ht_supported ? "" : "not ");
        if (htc->ht_supported) {
-diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee80211_i.h
---- linux-3.0.4/net/mac80211/ieee80211_i.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/ieee80211_i.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/ieee80211_i.h linux-3.1.1/net/mac80211/ieee80211_i.h
+--- linux-3.1.1/net/mac80211/ieee80211_i.h     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/ieee80211_i.h     2011-11-16 18:39:08.000000000 -0500
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -70007,7 +73456,7 @@ diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee8
  #include "key.h"
  #include "sta_info.h"
  
-@@ -721,7 +722,7 @@ struct ieee80211_local {
+@@ -754,7 +755,7 @@ struct ieee80211_local {
        /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
        spinlock_t queue_stop_reason_lock;
  
@@ -70016,9 +73465,9 @@ diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee8
        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-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
---- linux-3.0.4/net/mac80211/iface.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/mac80211/iface.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/iface.c linux-3.1.1/net/mac80211/iface.c
+--- linux-3.1.1/net/mac80211/iface.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/iface.c   2011-11-16 18:39:08.000000000 -0500
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
                break;
        }
@@ -70055,7 +73504,7 @@ diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
                drv_stop(local);
   err_del_bss:
        sdata->bss = NULL;
-@@ -475,7 +475,7 @@ static void ieee80211_do_stop(struct iee
+@@ -474,7 +474,7 @@ static void ieee80211_do_stop(struct iee
        }
  
        if (going_down)
@@ -70064,7 +73513,7 @@ diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
  
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_AP_VLAN:
-@@ -534,7 +534,7 @@ static void ieee80211_do_stop(struct iee
+@@ -533,7 +533,7 @@ static void ieee80211_do_stop(struct iee
  
        ieee80211_recalc_ps(local, -1);
  
@@ -70073,9 +73522,9 @@ diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
                if (local->ops->napi_poll)
                        napi_disable(&local->napi);
                ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
---- linux-3.0.4/net/mac80211/main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/main.c linux-3.1.1/net/mac80211/main.c
+--- linux-3.1.1/net/mac80211/main.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/main.c    2011-11-16 18:39:08.000000000 -0500
 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
                local->hw.conf.power_level = power;
        }
@@ -70085,10 +73534,10 @@ diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
                ret = drv_config(local, changed);
                /*
                 * Goal:
-diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
---- linux-3.0.4/net/mac80211/mlme.c    2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/mac80211/mlme.c    2011-08-23 21:48:14.000000000 -0400
-@@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru
+diff -urNp linux-3.1.1/net/mac80211/mlme.c linux-3.1.1/net/mac80211/mlme.c
+--- linux-3.1.1/net/mac80211/mlme.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/mlme.c    2011-11-16 18:40:44.000000000 -0500
+@@ -1464,6 +1464,8 @@ static bool ieee80211_assoc_success(stru
        bool have_higher_than_11mbit = false;
        u16 ap_ht_cap_flags;
  
@@ -70097,10 +73546,19 @@ diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
        /* AssocResp and ReassocResp have identical structure */
  
        aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
---- linux-3.0.4/net/mac80211/pm.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/pm.c      2011-08-23 21:47:56.000000000 -0400
-@@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
+diff -urNp linux-3.1.1/net/mac80211/pm.c linux-3.1.1/net/mac80211/pm.c
+--- linux-3.1.1/net/mac80211/pm.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/pm.c      2011-11-16 18:39:08.000000000 -0500
+@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211
+       struct ieee80211_sub_if_data *sdata;
+       struct sta_info *sta;
+ 
+-      if (!local->open_count)
++      if (!local_read(&local->open_count))
+               goto suspend;
+ 
+       ieee80211_scan_cancel(local);
+@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211
        cancel_work_sync(&local->dynamic_ps_enable_work);
        del_timer_sync(&local->dynamic_ps_timer);
  
@@ -70108,8 +73566,8 @@ diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
 +      local->wowlan = wowlan && local_read(&local->open_count);
        if (local->wowlan) {
                int err = drv_suspend(local, wowlan);
-               if (err) {
-@@ -111,7 +111,7 @@ int __ieee80211_suspend(struct ieee80211
+               if (err < 0) {
+@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211
        }
  
        /* stop hardware - this must stop RX */
@@ -70118,9 +73576,9 @@ diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
                ieee80211_stop_device(local);
  
   suspend:
-diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
---- linux-3.0.4/net/mac80211/rate.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/rate.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/rate.c linux-3.1.1/net/mac80211/rate.c
+--- linux-3.1.1/net/mac80211/rate.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/rate.c    2011-11-16 18:39:08.000000000 -0500
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
        ASSERT_RTNL();
@@ -70130,9 +73588,9 @@ diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
                return -EBUSY;
  
        if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/rc80211_pid_debugfs.c     2011-11-16 18:39:08.000000000 -0500
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
        spin_unlock_irqrestore(&events->lock, status);
@@ -70142,21 +73600,21 @@ diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac802
                return -EFAULT;
  
        return p;
-diff -urNp linux-3.0.4/net/mac80211/util.c linux-3.0.4/net/mac80211/util.c
---- linux-3.0.4/net/mac80211/util.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/util.c    2011-08-23 21:47:56.000000000 -0400
-@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
- #endif
+diff -urNp linux-3.1.1/net/mac80211/util.c linux-3.1.1/net/mac80211/util.c
+--- linux-3.1.1/net/mac80211/util.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/mac80211/util.c    2011-11-16 18:39:08.000000000 -0500
+@@ -1166,7 +1166,7 @@ int ieee80211_reconfig(struct ieee80211_
+       drv_set_coverage_class(local, hw->wiphy->coverage_class);
  
-       /* restart hardware */
--      if (local->open_count) {
-+      if (local_read(&local->open_count)) {
-               /*
-                * Upon resume hardware can sometimes be goofy due to
-                * various platform / driver / bus issues, so restarting
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c        2011-08-23 21:47:56.000000000 -0400
+       /* everything else happens only if HW was up & running */
+-      if (!local->open_count)
++      if (!local_read(&local->open_count))
+               goto wake_up;
+ 
+       /*
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_conn.c        2011-11-16 18:39:08.000000000 -0500
 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
        /* Increase the refcnt counter of the dest */
        atomic_inc(&dest->refcnt);
@@ -70184,9 +73642,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter
        if (i > 8 || i < 0) return 0;
  
        if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_core.c        2011-11-16 18:39:08.000000000 -0500
 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
                ret = cp->packet_xmit(skb, cp, pd->pp);
                /* do not touch skb anymore */
@@ -70196,7 +73654,7 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter
                ip_vs_conn_put(cp);
                return ret;
        }
-@@ -1613,7 +1613,7 @@ ip_vs_in(unsigned int hooknum, struct sk
+@@ -1612,7 +1612,7 @@ ip_vs_in(unsigned int hooknum, struct sk
        if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
                pkts = sysctl_sync_threshold(ipvs);
        else
@@ -70205,9 +73663,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter
  
        if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
            cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-16 19:13:12.000000000 -0500
 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
                ip_vs_rs_hash(ipvs, dest);
                write_unlock_bh(&ipvs->rs_lock);
@@ -70235,16 +73693,16 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/
                                           atomic_read(&dest->weight),
                                           atomic_read(&dest->activeconns),
                                           atomic_read(&dest->inactconns));
-@@ -2284,6 +2284,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
-       struct ip_vs_dest_user *udest_compat;
+@@ -2285,6 +2285,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
        struct ip_vs_dest_user_kern udest;
+       struct netns_ipvs *ipvs = net_ipvs(net);
  
 +      pax_track_stack();
 +
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
  
-@@ -2498,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net
+@@ -2508,7 +2510,7 @@ __ip_vs_get_dest_entries(struct net *net
  
                        entry.addr = dest->addr.ip;
                        entry.port = dest->port;
@@ -70253,7 +73711,7 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/
                        entry.weight = atomic_read(&dest->weight);
                        entry.u_threshold = dest->u_threshold;
                        entry.l_threshold = dest->l_threshold;
-@@ -3026,7 +3028,7 @@ static int ip_vs_genl_fill_dest(struct s
+@@ -3041,7 +3043,7 @@ static int ip_vs_genl_fill_dest(struct s
        NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
  
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
@@ -70262,10 +73720,10 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c        2011-08-23 21:47:56.000000000 -0400
-@@ -648,7 +648,7 @@ control:
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_sync.c        2011-11-16 18:39:08.000000000 -0500
+@@ -649,7 +649,7 @@ control:
         * i.e only increment in_pkts for Templates.
         */
        if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
@@ -70274,7 +73732,7 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter
  
                if (pkts % sysctl_sync_period(ipvs) != 1)
                        return;
-@@ -794,7 +794,7 @@ static void ip_vs_proc_conn(struct net *
+@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *
  
        if (opt)
                memcpy(&cp->in_seq, opt, sizeof(*opt));
@@ -70283,9 +73741,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter
        cp->state = state;
        cp->old_state = cp->state;
        /*
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/ipvs/ip_vs_xmit.c        2011-11-16 18:39:08.000000000 -0500
 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
                else
                        rc = NF_ACCEPT;
@@ -70304,9 +73762,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter
                goto out;
        }
  
-diff -urNp linux-3.0.4/net/netfilter/Kconfig linux-3.0.4/net/netfilter/Kconfig
---- linux-3.0.4/net/netfilter/Kconfig  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/Kconfig  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/Kconfig linux-3.1.1/net/netfilter/Kconfig
+--- linux-3.1.1/net/netfilter/Kconfig  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/Kconfig  2011-11-16 18:40:44.000000000 -0500
 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
  
          To compile it as a module, choose M here.  If unsure, say N.
@@ -70324,9 +73782,9 @@ diff -urNp linux-3.0.4/net/netfilter/Kconfig linux-3.0.4/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_HASHLIMIT
        tristate '"hashlimit" match support'
        depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-3.0.4/net/netfilter/Makefile linux-3.0.4/net/netfilter/Makefile
---- linux-3.0.4/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/Makefile linux-3.1.1/net/netfilter/Makefile
+--- linux-3.1.1/net/netfilter/Makefile 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/Makefile 2011-11-16 18:40:44.000000000 -0500
 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
  obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -70335,9 +73793,9 @@ diff -urNp linux-3.0.4/net/netfilter/Makefile linux-3.0.4/net/netfilter/Makefile
  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-3.0.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/nfnetlink_log.c
---- linux-3.0.4/net/netfilter/nfnetlink_log.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/nfnetlink_log.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/nfnetlink_log.c linux-3.1.1/net/netfilter/nfnetlink_log.c
+--- linux-3.1.1/net/netfilter/nfnetlink_log.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/nfnetlink_log.c  2011-11-16 18:39:08.000000000 -0500
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -70356,39 +73814,9 @@ diff -urNp linux-3.0.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/n
  
        if (data_len) {
                struct nlattr *nla;
-diff -urNp linux-3.0.4/net/netfilter/nfnetlink_queue.c linux-3.0.4/net/netfilter/nfnetlink_queue.c
---- linux-3.0.4/net/netfilter/nfnetlink_queue.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/nfnetlink_queue.c        2011-08-23 21:47:56.000000000 -0400
-@@ -58,7 +58,7 @@ struct nfqnl_instance {
-  */
-       spinlock_t      lock;
-       unsigned int    queue_total;
--      atomic_t        id_sequence;            /* 'sequence' of pkt ids */
-+      atomic_unchecked_t      id_sequence;    /* 'sequence' of pkt ids */
-       struct list_head queue_list;            /* packets in queue */
- };
- 
-@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_
-       nfmsg->version = NFNETLINK_V0;
-       nfmsg->res_id = htons(queue->queue_num);
- 
--      entry->id = atomic_inc_return(&queue->id_sequence);
-+      entry->id = atomic_inc_return_unchecked(&queue->id_sequence);
-       pmsg.packet_id          = htonl(entry->id);
-       pmsg.hw_protocol        = entskb->protocol;
-       pmsg.hook               = entry->hook;
-@@ -870,7 +870,7 @@ static int seq_show(struct seq_file *s, 
-                         inst->peer_pid, inst->queue_total,
-                         inst->copy_mode, inst->copy_range,
-                         inst->queue_dropped, inst->queue_user_dropped,
--                        atomic_read(&inst->id_sequence), 1);
-+                        atomic_read_unchecked(&inst->id_sequence), 1);
- }
- 
- static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gradm.c
---- linux-3.0.4/net/netfilter/xt_gradm.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/net/netfilter/xt_gradm.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/xt_gradm.c linux-3.1.1/net/netfilter/xt_gradm.c
+--- linux-3.1.1/net/netfilter/xt_gradm.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/net/netfilter/xt_gradm.c       2011-11-16 18:40:44.000000000 -0500
 @@ -0,0 +1,51 @@
 +/*
 + *    gradm match for netfilter
@@ -70441,9 +73869,9 @@ diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gra
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt_statistic.c
---- linux-3.0.4/net/netfilter/xt_statistic.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/xt_statistic.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/netfilter/xt_statistic.c linux-3.1.1/net/netfilter/xt_statistic.c
+--- linux-3.1.1/net/netfilter/xt_statistic.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netfilter/xt_statistic.c   2011-11-16 18:39:08.000000000 -0500
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -70474,9 +73902,9 @@ diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt
  
        return 0;
  }
-diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netlink.c
---- linux-3.0.4/net/netlink/af_netlink.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netlink/af_netlink.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/netlink/af_netlink.c linux-3.1.1/net/netlink/af_netlink.c
+--- linux-3.1.1/net/netlink/af_netlink.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netlink/af_netlink.c       2011-11-16 18:39:08.000000000 -0500
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
                        sk->sk_error_report(sk);
                }
@@ -70486,7 +73914,7 @@ diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netli
  }
  
  static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
-@@ -1994,7 +1994,7 @@ static int netlink_seq_show(struct seq_f
+@@ -2000,7 +2000,7 @@ static int netlink_seq_show(struct seq_f
                           sk_wmem_alloc_get(s),
                           nlk->cb,
                           atomic_read(&s->sk_refcnt),
@@ -70495,9 +73923,9 @@ diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netli
                           sock_i_ino(s)
                        );
  
-diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
---- linux-3.0.4/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/netrom/af_netrom.c linux-3.1.1/net/netrom/af_netrom.c
+--- linux-3.1.1/net/netrom/af_netrom.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/netrom/af_netrom.c 2011-11-16 18:40:44.000000000 -0500
 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
        struct sock *sk = sock->sk;
        struct nr_sock *nr = nr_sk(sk);
@@ -70514,10 +73942,10 @@ diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
                sax->fsa_ax25.sax25_call   = nr->source_addr;
                *uaddr_len = sizeof(struct sockaddr_ax25);
        }
-diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
---- linux-3.0.4/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400
-@@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
+diff -urNp linux-3.1.1/net/packet/af_packet.c linux-3.1.1/net/packet/af_packet.c
+--- linux-3.1.1/net/packet/af_packet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/packet/af_packet.c 2011-11-16 18:39:08.000000000 -0500
+@@ -954,7 +954,7 @@ static int packet_rcv(struct sk_buff *sk
  
        spin_lock(&sk->sk_receive_queue.lock);
        po->stats.tp_packets++;
@@ -70526,15 +73954,16 @@ diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
        __skb_queue_tail(&sk->sk_receive_queue, skb);
        spin_unlock(&sk->sk_receive_queue.lock);
        sk->sk_data_ready(sk, skb->len);
-       return 0;
- 
+@@ -963,7 +963,7 @@ static int packet_rcv(struct sk_buff *sk
  drop_n_acct:
--      po->stats.tp_drops = atomic_inc_return(&sk->sk_drops);
-+      po->stats.tp_drops = atomic_inc_return_unchecked(&sk->sk_drops);
+       spin_lock(&sk->sk_receive_queue.lock);
+       po->stats.tp_drops++;
+-      atomic_inc(&sk->sk_drops);
++      atomic_inc_unchecked(&sk->sk_drops);
+       spin_unlock(&sk->sk_receive_queue.lock);
  
  drop_n_restore:
-       if (skb_head != skb->data && skb_shared(skb)) {
-@@ -2168,7 +2168,7 @@ static int packet_getsockopt(struct sock
+@@ -2479,7 +2479,7 @@ static int packet_getsockopt(struct sock
        case PACKET_HDRLEN:
                if (len > sizeof(int))
                        len = sizeof(int);
@@ -70543,7 +73972,7 @@ diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
                        return -EFAULT;
                switch (val) {
                case TPACKET_V1:
-@@ -2206,7 +2206,7 @@ static int packet_getsockopt(struct sock
+@@ -2526,7 +2526,7 @@ static int packet_getsockopt(struct sock
  
        if (put_user(len, optlen))
                return -EFAULT;
@@ -70552,9 +73981,9 @@ diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
                return -EFAULT;
        return 0;
  }
-diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
---- linux-3.0.4/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/phonet/af_phonet.c linux-3.1.1/net/phonet/af_phonet.c
+--- linux-3.1.1/net/phonet/af_phonet.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/af_phonet.c 2011-11-16 18:40:44.000000000 -0500
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
        struct phonet_protocol *pp;
@@ -70573,9 +74002,9 @@ diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
                return -EINVAL;
  
        err = proto_register(pp->prot, 1);
-diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
---- linux-3.0.4/net/phonet/pep.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/pep.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/phonet/pep.c linux-3.1.1/net/phonet/pep.c
+--- linux-3.1.1/net/phonet/pep.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/pep.c       2011-11-16 18:39:08.000000000 -0500
 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
        case PNS_PEP_CTRL_REQ:
@@ -70603,9 +74032,9 @@ diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
                        err = NET_RX_DROP;
                        break;
                }
-diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
---- linux-3.0.4/net/phonet/socket.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/socket.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/phonet/socket.c linux-3.1.1/net/phonet/socket.c
+--- linux-3.1.1/net/phonet/socket.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/phonet/socket.c    2011-11-16 18:40:44.000000000 -0500
 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
                        pn->resource, sk->sk_state,
                        sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -70622,9 +74051,9 @@ diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
        }
        seq_printf(seq, "%*s\n", 127 - len, "");
        return 0;
-diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
---- linux-3.0.4/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rds/cong.c linux-3.1.1/net/rds/cong.c
+--- linux-3.1.1/net/rds/cong.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/cong.c 2011-11-16 18:39:08.000000000 -0500
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -70652,9 +74081,9 @@ diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
  
        if (likely(*recent == gen))
                return 0;
-diff -urNp linux-3.0.4/net/rds/ib_cm.c linux-3.0.4/net/rds/ib_cm.c
---- linux-3.0.4/net/rds/ib_cm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/ib_cm.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rds/ib_cm.c linux-3.1.1/net/rds/ib_cm.c
+--- linux-3.1.1/net/rds/ib_cm.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib_cm.c        2011-11-16 18:39:08.000000000 -0500
 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
        /* Clear the ACK state */
        clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -70664,10 +74093,10 @@ diff -urNp linux-3.0.4/net/rds/ib_cm.c linux-3.0.4/net/rds/ib_cm.c
  #else
        ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
---- linux-3.0.4/net/rds/ib.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/ib.h   2011-08-23 21:47:56.000000000 -0400
-@@ -127,7 +127,7 @@ struct rds_ib_connection {
+diff -urNp linux-3.1.1/net/rds/ib.h linux-3.1.1/net/rds/ib.h
+--- linux-3.1.1/net/rds/ib.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib.h   2011-11-16 18:39:08.000000000 -0500
+@@ -128,7 +128,7 @@ struct rds_ib_connection {
        /* sending acks */
        unsigned long           i_ack_flags;
  #ifdef KERNEL_HAS_ATOMIC64
@@ -70676,9 +74105,9 @@ diff -urNp linux-3.0.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
  #else
        spinlock_t              i_ack_lock;     /* protect i_ack_next */
        u64                     i_ack_next;     /* next ACK to send */
-diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
---- linux-3.0.4/net/rds/ib_recv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/ib_recv.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rds/ib_recv.c linux-3.1.1/net/rds/ib_recv.c
+--- linux-3.1.1/net/rds/ib_recv.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/ib_recv.c      2011-11-16 18:39:08.000000000 -0500
 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
  static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
                                int ack_required)
@@ -70697,10 +74126,10 @@ diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.4/net/rds/iw_cm.c linux-3.0.4/net/rds/iw_cm.c
---- linux-3.0.4/net/rds/iw_cm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw_cm.c        2011-08-23 21:47:56.000000000 -0400
-@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
+diff -urNp linux-3.1.1/net/rds/iw_cm.c linux-3.1.1/net/rds/iw_cm.c
+--- linux-3.1.1/net/rds/iw_cm.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_cm.c        2011-11-16 18:39:08.000000000 -0500
+@@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_con
        /* Clear the ACK state */
        clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
  #ifdef KERNEL_HAS_ATOMIC64
@@ -70709,10 +74138,10 @@ diff -urNp linux-3.0.4/net/rds/iw_cm.c linux-3.0.4/net/rds/iw_cm.c
  #else
        ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
---- linux-3.0.4/net/rds/iw.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw.h   2011-08-23 21:47:56.000000000 -0400
-@@ -133,7 +133,7 @@ struct rds_iw_connection {
+diff -urNp linux-3.1.1/net/rds/iw.h linux-3.1.1/net/rds/iw.h
+--- linux-3.1.1/net/rds/iw.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw.h   2011-11-16 18:39:08.000000000 -0500
+@@ -134,7 +134,7 @@ struct rds_iw_connection {
        /* sending acks */
        unsigned long           i_ack_flags;
  #ifdef KERNEL_HAS_ATOMIC64
@@ -70721,10 +74150,10 @@ diff -urNp linux-3.0.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
  #else
        spinlock_t              i_ack_lock;     /* protect i_ack_next */
        u64                     i_ack_next;     /* next ACK to send */
-diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
---- linux-3.0.4/net/rds/iw_rdma.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw_rdma.c      2011-08-23 21:48:14.000000000 -0400
-@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
+diff -urNp linux-3.1.1/net/rds/iw_rdma.c linux-3.1.1/net/rds/iw_rdma.c
+--- linux-3.1.1/net/rds/iw_rdma.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_rdma.c      2011-11-16 18:40:44.000000000 -0500
+@@ -184,6 +184,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
        struct rdma_cm_id *pcm_id;
        int rc;
  
@@ -70733,9 +74162,9 @@ diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
        src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
        dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
---- linux-3.0.4/net/rds/iw_recv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw_recv.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rds/iw_recv.c linux-3.1.1/net/rds/iw_recv.c
+--- linux-3.1.1/net/rds/iw_recv.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/iw_recv.c      2011-11-16 18:39:08.000000000 -0500
 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
  static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
                                int ack_required)
@@ -70754,9 +74183,33 @@ diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
---- linux-3.0.4/net/rxrpc/af_rxrpc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/af_rxrpc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rds/tcp.c linux-3.1.1/net/rds/tcp.c
+--- linux-3.1.1/net/rds/tcp.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/tcp.c  2011-11-16 18:39:08.000000000 -0500
+@@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
+       int val = 1;
+ 
+       set_fs(KERNEL_DS);
+-      sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
++      sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
+                             sizeof(val));
+       set_fs(oldfs);
+ }
+diff -urNp linux-3.1.1/net/rds/tcp_send.c linux-3.1.1/net/rds/tcp_send.c
+--- linux-3.1.1/net/rds/tcp_send.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rds/tcp_send.c     2011-11-16 18:39:08.000000000 -0500
+@@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
+ 
+       oldfs = get_fs();
+       set_fs(KERNEL_DS);
+-      sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
++      sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
+                             sizeof(val));
+       set_fs(oldfs);
+ }
+diff -urNp linux-3.1.1/net/rxrpc/af_rxrpc.c linux-3.1.1/net/rxrpc/af_rxrpc.c
+--- linux-3.1.1/net/rxrpc/af_rxrpc.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/af_rxrpc.c   2011-11-16 18:39:08.000000000 -0500
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -70766,9 +74219,9 @@ diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
---- linux-3.0.4/net/rxrpc/ar-ack.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-ack.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-ack.c linux-3.1.1/net/rxrpc/ar-ack.c
+--- linux-3.1.1/net/rxrpc/ar-ack.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-ack.c     2011-11-16 18:40:44.000000000 -0500
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
        _enter("{%d,%d,%d,%d},",
@@ -70841,9 +74294,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
        _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
---- linux-3.0.4/net/rxrpc/ar-call.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-call.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-call.c linux-3.1.1/net/rxrpc/ar-call.c
+--- linux-3.1.1/net/rxrpc/ar-call.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-call.c    2011-11-16 18:39:08.000000000 -0500
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
        spin_lock_init(&call->lock);
        rwlock_init(&call->state_lock);
@@ -70853,9 +74306,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
        call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
        memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connection.c
---- linux-3.0.4/net/rxrpc/ar-connection.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-connection.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-connection.c linux-3.1.1/net/rxrpc/ar-connection.c
+--- linux-3.1.1/net/rxrpc/ar-connection.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-connection.c      2011-11-16 18:39:08.000000000 -0500
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
                rwlock_init(&conn->lock);
                spin_lock_init(&conn->state_lock);
@@ -70865,9 +74318,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connec
                conn->avail_calls = RXRPC_MAXCALLS;
                conn->size_align = 4;
                conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-connevent.c
---- linux-3.0.4/net/rxrpc/ar-connevent.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-connevent.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-connevent.c linux-3.1.1/net/rxrpc/ar-connevent.c
+--- linux-3.1.1/net/rxrpc/ar-connevent.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-connevent.c       2011-11-16 18:39:08.000000000 -0500
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
        len = iov[0].iov_len + iov[1].iov_len;
@@ -70877,9 +74330,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-conneve
        _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
        ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
---- linux-3.0.4/net/rxrpc/ar-input.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-input.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-input.c linux-3.1.1/net/rxrpc/ar-input.c
+--- linux-3.1.1/net/rxrpc/ar-input.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-input.c   2011-11-16 18:39:08.000000000 -0500
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
        /* track the latest serial number on this connection for ACK packet
         * information */
@@ -70892,9 +74345,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
                                           serial);
  
        /* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal.h
---- linux-3.0.4/net/rxrpc/ar-internal.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-internal.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-internal.h linux-3.1.1/net/rxrpc/ar-internal.h
+--- linux-3.1.1/net/rxrpc/ar-internal.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-internal.h        2011-11-16 18:39:08.000000000 -0500
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
        int                     error;          /* error code for local abort */
        int                     debug_id;       /* debug ID for printks */
@@ -70924,9 +74377,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
---- linux-3.0.4/net/rxrpc/ar-local.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-local.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-local.c linux-3.1.1/net/rxrpc/ar-local.c
+--- linux-3.1.1/net/rxrpc/ar-local.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-local.c   2011-11-16 18:39:08.000000000 -0500
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
                spin_lock_init(&local->lock);
                rwlock_init(&local->services_lock);
@@ -70936,9 +74389,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
                memcpy(&local->srx, srx, sizeof(*srx));
        }
  
-diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
---- linux-3.0.4/net/rxrpc/ar-output.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-output.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-output.c linux-3.1.1/net/rxrpc/ar-output.c
+--- linux-3.1.1/net/rxrpc/ar-output.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-output.c  2011-11-16 18:39:08.000000000 -0500
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
                        sp->hdr.cid = call->cid;
                        sp->hdr.callNumber = call->call_id;
@@ -70951,9 +74404,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
                        sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
                        sp->hdr.userStatus = 0;
                        sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
---- linux-3.0.4/net/rxrpc/ar-peer.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-peer.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-peer.c linux-3.1.1/net/rxrpc/ar-peer.c
+--- linux-3.1.1/net/rxrpc/ar-peer.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-peer.c    2011-11-16 18:39:08.000000000 -0500
 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
                INIT_LIST_HEAD(&peer->error_targets);
                spin_lock_init(&peer->lock);
@@ -70963,9 +74416,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
                memcpy(&peer->srx, srx, sizeof(*srx));
  
                rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
---- linux-3.0.4/net/rxrpc/ar-proc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-proc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-proc.c linux-3.1.1/net/rxrpc/ar-proc.c
+--- linux-3.1.1/net/rxrpc/ar-proc.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-proc.c    2011-11-16 18:39:08.000000000 -0500
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
                   atomic_read(&conn->usage),
                   rxrpc_conn_states[conn->state],
@@ -70977,9 +74430,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
  
        return 0;
  }
-diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transport.c
---- linux-3.0.4/net/rxrpc/ar-transport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-transport.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/ar-transport.c linux-3.1.1/net/rxrpc/ar-transport.c
+--- linux-3.1.1/net/rxrpc/ar-transport.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/ar-transport.c       2011-11-16 18:39:08.000000000 -0500
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
                spin_lock_init(&trans->client_lock);
                rwlock_init(&trans->conn_lock);
@@ -70989,9 +74442,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transpo
  
                if (peer->srx.transport.family == AF_INET) {
                        switch (peer->srx.transport_type) {
-diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
---- linux-3.0.4/net/rxrpc/rxkad.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/rxkad.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/rxrpc/rxkad.c linux-3.1.1/net/rxrpc/rxkad.c
+--- linux-3.1.1/net/rxrpc/rxkad.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/rxrpc/rxkad.c      2011-11-16 18:40:44.000000000 -0500
 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
        u16 check;
        int nsg;
@@ -71028,9 +74481,9 @@ diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
        _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
        ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
---- linux-3.0.4/net/sctp/proc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sctp/proc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/sctp/proc.c linux-3.1.1/net/sctp/proc.c
+--- linux-3.1.1/net/sctp/proc.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sctp/proc.c        2011-11-16 18:40:44.000000000 -0500
 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
                seq_printf(seq,
                           "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -71041,10 +74494,10 @@ diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
                           assoc->state, hash,
                           assoc->assoc_id,
                           assoc->sndbuf_used,
-diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
---- linux-3.0.4/net/sctp/socket.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sctp/socket.c      2011-08-23 21:47:56.000000000 -0400
-@@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
+diff -urNp linux-3.1.1/net/sctp/socket.c linux-3.1.1/net/sctp/socket.c
+--- linux-3.1.1/net/sctp/socket.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sctp/socket.c      2011-11-16 18:39:08.000000000 -0500
+@@ -4575,7 +4575,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;
@@ -71053,9 +74506,9 @@ diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
                        return -EFAULT;
                to += addrlen;
                cnt++;
-diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
---- linux-3.0.4/net/socket.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/socket.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/socket.c linux-3.1.1/net/socket.c
+--- linux-3.1.1/net/socket.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/socket.c   2011-11-16 18:40:44.000000000 -0500
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -71215,10 +74668,118 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
        err = -EFAULT;
        if (MSG_CMSG_COMPAT & flags) {
                if (get_compat_msghdr(msg_sys, msg_compat))
-diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
---- linux-3.0.4/net/sunrpc/sched.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/sched.c     2011-08-23 21:47:56.000000000 -0400
-@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
+@@ -1950,7 +2012,7 @@ static int __sys_sendmsg(struct socket *
+                * checking falls down on this.
+                */
+               if (copy_from_user(ctl_buf,
+-                                 (void __user __force *)msg_sys->msg_control,
++                                 (void __force_user *)msg_sys->msg_control,
+                                  ctl_len))
+                       goto out_freectl;
+               msg_sys->msg_control = ctl_buf;
+@@ -2120,7 +2182,7 @@ static int __sys_recvmsg(struct socket *
+        *      kernel msghdr to use the kernel address space)
+        */
+ 
+-      uaddr = (__force void __user *)msg_sys->msg_name;
++      uaddr = (void __force_user *)msg_sys->msg_name;
+       uaddr_len = COMPAT_NAMELEN(msg);
+       if (MSG_CMSG_COMPAT & flags) {
+               err = verify_compat_iovec(msg_sys, iov,
+@@ -2748,7 +2810,7 @@ static int ethtool_ioctl(struct net *net
+       }
+ 
+       ifr = compat_alloc_user_space(buf_size);
+-      rxnfc = (void *)ifr + ALIGN(sizeof(struct ifreq), 8);
++      rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
+ 
+       if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
+               return -EFAULT;
+@@ -2772,12 +2834,12 @@ static int ethtool_ioctl(struct net *net
+                       offsetof(struct ethtool_rxnfc, fs.ring_cookie));
+ 
+               if (copy_in_user(rxnfc, compat_rxnfc,
+-                               (void *)(&rxnfc->fs.m_ext + 1) -
+-                               (void *)rxnfc) ||
++                               (void __user *)(&rxnfc->fs.m_ext + 1) -
++                               (void __user *)rxnfc) ||
+                   copy_in_user(&rxnfc->fs.ring_cookie,
+                                &compat_rxnfc->fs.ring_cookie,
+-                               (void *)(&rxnfc->fs.location + 1) -
+-                               (void *)&rxnfc->fs.ring_cookie) ||
++                               (void __user *)(&rxnfc->fs.location + 1) -
++                               (void __user *)&rxnfc->fs.ring_cookie) ||
+                   copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
+                                sizeof(rxnfc->rule_cnt)))
+                       return -EFAULT;
+@@ -2789,12 +2851,12 @@ static int ethtool_ioctl(struct net *net
+ 
+       if (convert_out) {
+               if (copy_in_user(compat_rxnfc, rxnfc,
+-                               (const void *)(&rxnfc->fs.m_ext + 1) -
+-                               (const void *)rxnfc) ||
++                               (const void __user *)(&rxnfc->fs.m_ext + 1) -
++                               (const void __user *)rxnfc) ||
+                   copy_in_user(&compat_rxnfc->fs.ring_cookie,
+                                &rxnfc->fs.ring_cookie,
+-                               (const void *)(&rxnfc->fs.location + 1) -
+-                               (const void *)&rxnfc->fs.ring_cookie) ||
++                               (const void __user *)(&rxnfc->fs.location + 1) -
++                               (const void __user *)&rxnfc->fs.ring_cookie) ||
+                   copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
+                                sizeof(rxnfc->rule_cnt)))
+                       return -EFAULT;
+@@ -2864,7 +2926,7 @@ static int bond_ioctl(struct net *net, u
+               old_fs = get_fs();
+               set_fs(KERNEL_DS);
+               err = dev_ioctl(net, cmd,
+-                              (struct ifreq __user __force *) &kifr);
++                              (struct ifreq __force_user *) &kifr);
+               set_fs(old_fs);
+ 
+               return err;
+@@ -2973,7 +3035,7 @@ static int compat_sioc_ifmap(struct net 
+ 
+       old_fs = get_fs();
+       set_fs(KERNEL_DS);
+-      err = dev_ioctl(net, cmd, (void  __user __force *)&ifr);
++      err = dev_ioctl(net, cmd, (void  __force_user *)&ifr);
+       set_fs(old_fs);
+ 
+       if (cmd == SIOCGIFMAP && !err) {
+@@ -3078,7 +3140,7 @@ static int routing_ioctl(struct net *net
+               ret |= __get_user(rtdev, &(ur4->rt_dev));
+               if (rtdev) {
+                       ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
+-                      r4.rt_dev = (char __user __force *)devname;
++                      r4.rt_dev = (char __force_user *)devname;
+                       devname[15] = 0;
+               } else
+                       r4.rt_dev = NULL;
+@@ -3318,8 +3380,8 @@ int kernel_getsockopt(struct socket *soc
+       int __user *uoptlen;
+       int err;
+ 
+-      uoptval = (char __user __force *) optval;
+-      uoptlen = (int __user __force *) optlen;
++      uoptval = (char __force_user *) optval;
++      uoptlen = (int __force_user *) optlen;
+ 
+       set_fs(KERNEL_DS);
+       if (level == SOL_SOCKET)
+@@ -3339,7 +3401,7 @@ int kernel_setsockopt(struct socket *soc
+       char __user *uoptval;
+       int err;
+ 
+-      uoptval = (char __user __force *) optval;
++      uoptval = (char __force_user *) optval;
+ 
+       set_fs(KERNEL_DS);
+       if (level == SOL_SOCKET)
+diff -urNp linux-3.1.1/net/sunrpc/sched.c linux-3.1.1/net/sunrpc/sched.c
+--- linux-3.1.1/net/sunrpc/sched.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/sched.c     2011-11-16 18:39:08.000000000 -0500
+@@ -238,9 +238,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
  {
@@ -71230,9 +74791,21 @@ diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/sunrpc/svcsock.c linux-3.1.1/net/sunrpc/svcsock.c
+--- linux-3.1.1/net/sunrpc/svcsock.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/svcsock.c   2011-11-16 18:39:08.000000000 -0500
+@@ -394,7 +394,7 @@ static int svc_partial_recvfrom(struct s
+                               int buflen, unsigned int base)
+ {
+       size_t save_iovlen;
+-      void __user *save_iovbase;
++      void *save_iovbase;
+       unsigned int i;
+       int ret;
+ 
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-16 18:39:08.000000000 -0500
 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -71340,9 +74913,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xpr
                .mode           = 0644,
                .proc_handler   = read_reset_stat,
        },
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-11-16 18:39:08.000000000 -0500
 @@ -499,7 +499,7 @@ next_sge:
                        svc_rdma_put_context(ctxt, 0);
                        goto out;
@@ -71370,9 +74943,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/s
  
        /* Build up the XDR from the receive buffers. */
        rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-11-16 18:39:08.000000000 -0500
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
        write_wr.wr.rdma.remote_addr = to;
  
@@ -71382,10 +74955,10 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sun
        if (svc_rdma_send(xprt, &write_wr))
                goto err;
        return 0;
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-08-23 21:47:56.000000000 -0400
-@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
+diff -urNp linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-11-16 18:39:08.000000000 -0500
+@@ -299,7 +299,7 @@ static void rq_cq_reap(struct svcxprt_rd
                return;
  
        ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -71394,7 +74967,7 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
  
        while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
                ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rd
+@@ -321,7 +321,7 @@ static void rq_cq_reap(struct svcxprt_rd
        }
  
        if (ctxt)
@@ -71403,7 +74976,7 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
  
        set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
        /*
-@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rd
+@@ -393,7 +393,7 @@ static void sq_cq_reap(struct svcxprt_rd
                return;
  
        ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
@@ -71412,7 +74985,7 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
        while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
                if (wc.status != IB_WC_SUCCESS)
                        /* Close the transport */
-@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rd
+@@ -411,7 +411,7 @@ static void sq_cq_reap(struct svcxprt_rd
        }
  
        if (ctxt)
@@ -71421,7 +74994,7 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
  }
  
  static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1272,7 +1272,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
+@@ -1273,7 +1273,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
                spin_lock_bh(&xprt->sc_lock);
                if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
                        spin_unlock_bh(&xprt->sc_lock);
@@ -71430,9 +75003,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
  
                        /* See if we can opportunistically reap SQ WR to make room */
                        sq_cq_reap(xprt);
-diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
---- linux-3.0.4/net/sysctl_net.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sysctl_net.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/sysctl_net.c linux-3.1.1/net/sysctl_net.c
+--- linux-3.1.1/net/sysctl_net.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/sysctl_net.c       2011-11-16 18:40:44.000000000 -0500
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
                               struct ctl_table *table)
  {
@@ -71442,9 +75015,63 @@ diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
                int mode = (table->mode >> 6) & 7;
                return (mode << 6) | (mode << 3) | mode;
        }
-diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
---- linux-3.0.4/net/unix/af_unix.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/unix/af_unix.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/tipc/link.c linux-3.1.1/net/tipc/link.c
+--- linux-3.1.1/net/tipc/link.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/link.c        2011-11-16 18:39:08.000000000 -0500
+@@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
+       struct tipc_msg fragm_hdr;
+       struct sk_buff *buf, *buf_chain, *prev;
+       u32 fragm_crs, fragm_rest, hsz, sect_rest;
+-      const unchar *sect_crs;
++      const unchar __user *sect_crs;
+       int curr_sect;
+       u32 fragm_no;
+ 
+@@ -1214,7 +1214,7 @@ again:
+ 
+               if (!sect_rest) {
+                       sect_rest = msg_sect[++curr_sect].iov_len;
+-                      sect_crs = (const unchar *)msg_sect[curr_sect].iov_base;
++                      sect_crs = (const unchar __user *)msg_sect[curr_sect].iov_base;
+               }
+ 
+               if (sect_rest < fragm_rest)
+@@ -1233,7 +1233,7 @@ error:
+                       }
+               } else
+                       skb_copy_to_linear_data_offset(buf, fragm_crs,
+-                                                     sect_crs, sz);
++                                                     (const void __force_kernel *)sect_crs, sz);
+               sect_crs += sz;
+               sect_rest -= sz;
+               fragm_crs += sz;
+diff -urNp linux-3.1.1/net/tipc/msg.c linux-3.1.1/net/tipc/msg.c
+--- linux-3.1.1/net/tipc/msg.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/msg.c 2011-11-16 18:39:08.000000000 -0500
+@@ -99,7 +99,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
+                                             msg_sect[cnt].iov_len);
+               else
+                       skb_copy_to_linear_data_offset(*buf, pos,
+-                                                     msg_sect[cnt].iov_base,
++                                                     (const void __force_kernel *)msg_sect[cnt].iov_base,
+                                                      msg_sect[cnt].iov_len);
+               pos += msg_sect[cnt].iov_len;
+       }
+diff -urNp linux-3.1.1/net/tipc/subscr.c linux-3.1.1/net/tipc/subscr.c
+--- linux-3.1.1/net/tipc/subscr.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/tipc/subscr.c      2011-11-16 18:39:08.000000000 -0500
+@@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
+ {
+       struct iovec msg_sect;
+ 
+-      msg_sect.iov_base = (void *)&sub->evt;
++      msg_sect.iov_base = (void __force_user *)&sub->evt;
+       msg_sect.iov_len = sizeof(struct tipc_event);
+ 
+       sub->evt.event = htohl(event, sub->swap);
+diff -urNp linux-3.1.1/net/unix/af_unix.c linux-3.1.1/net/unix/af_unix.c
+--- linux-3.1.1/net/unix/af_unix.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/unix/af_unix.c     2011-11-16 19:17:17.000000000 -0500
 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
                err = -ECONNREFUSED;
                if (!S_ISSOCK(inode->i_mode))
@@ -71472,28 +75099,28 @@ diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
                        if (dentry)
                                touch_atime(unix_sk(u)->mnt, dentry);
                } else
-@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock
-               err = security_path_mknod(&nd.path, dentry, mode, 0);
+@@ -869,11 +882,18 @@ static int unix_bind(struct socket *sock
+               err = security_path_mknod(&path, dentry, mode, 0);
                if (err)
                        goto out_mknod_drop_write;
-+              if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
++              if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
 +                      err = -EACCES;
 +                      goto out_mknod_drop_write;
 +              }
-               err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
+               err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
  out_mknod_drop_write:
-               mnt_drop_write(nd.path.mnt);
+               mnt_drop_write(path.mnt);
                if (err)
                        goto out_mknod_dput;
 +
-+              gr_handle_create(dentry, nd.path.mnt);
++              gr_handle_create(dentry, path.mnt);
 +
-               mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
-               dput(nd.path.dentry);
-               nd.path.dentry = dentry;
-diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
---- linux-3.0.4/net/wireless/core.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/wireless/core.h    2011-08-23 21:47:56.000000000 -0400
+               mutex_unlock(&path.dentry->d_inode->i_mutex);
+               dput(path.dentry);
+               path.dentry = dentry;
+diff -urNp linux-3.1.1/net/wireless/core.h linux-3.1.1/net/wireless/core.h
+--- linux-3.1.1/net/wireless/core.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/wireless/core.h    2011-11-16 18:39:08.000000000 -0500
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
        struct mutex mtx;
  
@@ -71503,9 +75130,9 @@ diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
        struct rfkill *rfkill;
        struct work_struct rfkill_sync;
  
-diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-core.c
---- linux-3.0.4/net/wireless/wext-core.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/wireless/wext-core.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/wireless/wext-core.c linux-3.1.1/net/wireless/wext-core.c
+--- linux-3.1.1/net/wireless/wext-core.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/wireless/wext-core.c       2011-11-16 18:39:08.000000000 -0500
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
                 */
  
@@ -71539,9 +75166,9 @@ diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-co
        err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
        iwp->length += essid_compat;
-diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
---- linux-3.0.4/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/net/xfrm/xfrm_policy.c linux-3.1.1/net/xfrm/xfrm_policy.c
+--- linux-3.1.1/net/xfrm/xfrm_policy.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/xfrm/xfrm_policy.c 2011-11-16 18:39:08.000000000 -0500
 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
        policy->walk.dead = 1;
@@ -71560,7 +75187,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
        if (delpol)
                __xfrm_policy_unlink(delpol, dir);
        policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
-@@ -1528,7 +1528,7 @@ free_dst:
+@@ -1530,7 +1530,7 @@ free_dst:
        goto out;
  }
  
@@ -71569,7 +75196,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
  xfrm_dst_alloc_copy(void **target, const void *src, int size)
  {
        if (!*target) {
-@@ -1540,7 +1540,7 @@ xfrm_dst_alloc_copy(void **target, const
+@@ -1542,7 +1542,7 @@ xfrm_dst_alloc_copy(void **target, const
        return 0;
  }
  
@@ -71578,7 +75205,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
  xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1552,7 +1552,7 @@ xfrm_dst_update_parent(struct dst_entry 
+@@ -1554,7 +1554,7 @@ xfrm_dst_update_parent(struct dst_entry 
  #endif
  }
  
@@ -71587,7 +75214,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
  xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1646,7 +1646,7 @@ xfrm_resolve_and_create_bundle(struct xf
+@@ -1648,7 +1648,7 @@ xfrm_resolve_and_create_bundle(struct xf
  
        xdst->num_pols = num_pols;
        memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
@@ -71596,7 +75223,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
  
        return xdst;
  }
-@@ -2333,7 +2333,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
+@@ -2335,7 +2335,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
                if (xdst->xfrm_genid != dst->xfrm->genid)
                        return 0;
                if (xdst->num_pols > 0 &&
@@ -71605,7 +75232,7 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
                        return 0;
  
                mtu = dst_mtu(dst->child);
-@@ -2861,7 +2861,7 @@ static int xfrm_policy_migrate(struct xf
+@@ -2870,7 +2870,7 @@ static int xfrm_policy_migrate(struct xf
                               sizeof(pol->xfrm_vec[i].saddr));
                        pol->xfrm_vec[i].encap_family = mp->new_family;
                        /* flush bundles */
@@ -71614,9 +75241,9 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
                }
        }
  
-diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
---- linux-3.0.4/net/xfrm/xfrm_user.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/xfrm/xfrm_user.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/net/xfrm/xfrm_user.c linux-3.1.1/net/xfrm/xfrm_user.c
+--- linux-3.1.1/net/xfrm/xfrm_user.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/net/xfrm/xfrm_user.c   2011-11-16 18:40:44.000000000 -0500
 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
        struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
        int i;
@@ -71635,9 +75262,31 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
        if (attrs[XFRMA_MIGRATE] == NULL)
                return -EINVAL;
  
-diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
---- linux-3.0.4/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/basic/fixdep.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/basic/fixdep.c linux-3.1.1/scripts/basic/fixdep.c
+--- linux-3.1.1/scripts/basic/fixdep.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/basic/fixdep.c 2011-11-16 18:39:08.000000000 -0500
+@@ -161,7 +161,7 @@ static unsigned int strhash(const char *
+ /*
+  * Lookup a value in the configuration string.
+  */
+-static int is_defined_config(const char *name, int len, unsigned int hash)
++static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
+ {
+       struct item *aux;
+ 
+@@ -211,10 +211,10 @@ static void clear_config(void)
+ /*
+  * Record the use of a CONFIG_* word.
+  */
+-static void use_config(const char *m, int slen)
++static void use_config(const char *m, unsigned int slen)
+ {
+       unsigned int hash = strhash(m, slen);
+-      int c, i;
++      unsigned int c, i;
+ 
+       if (is_defined_config(m, slen, hash))
+           return;
 @@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
@@ -71659,15 +75308,15 @@ diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
  
        if (*p != INT_CONF) {
                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plugin.sh
---- linux-3.0.4/scripts/gcc-plugin.sh  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/scripts/gcc-plugin.sh  2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.1.1/scripts/gcc-plugin.sh linux-3.1.1/scripts/gcc-plugin.sh
+--- linux-3.1.1/scripts/gcc-plugin.sh  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/scripts/gcc-plugin.sh  2011-11-16 18:39:08.000000000 -0500
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
---- linux-3.0.4/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/Makefile.build linux-3.1.1/scripts/Makefile.build
+--- linux-3.1.1/scripts/Makefile.build 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.build 2011-11-16 18:40:44.000000000 -0500
 @@ -109,7 +109,7 @@ endif
  endif
  
@@ -71677,9 +75326,9 @@ diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-3.0.4/scripts/Makefile.clean linux-3.0.4/scripts/Makefile.clean
---- linux-3.0.4/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/Makefile.clean linux-3.1.1/scripts/Makefile.clean
+--- linux-3.1.1/scripts/Makefile.clean 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.clean 2011-11-16 18:39:08.000000000 -0500
 @@ -43,7 +43,8 @@ subdir-ymn   := $(addprefix $(obj)/,$(subd
  __clean-files := $(extra-y) $(always)                  \
                   $(targets) $(clean-files)             \
@@ -71690,9 +75339,9 @@ diff -urNp linux-3.0.4/scripts/Makefile.clean linux-3.0.4/scripts/Makefile.clean
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
-diff -urNp linux-3.0.4/scripts/Makefile.host linux-3.0.4/scripts/Makefile.host
---- linux-3.0.4/scripts/Makefile.host  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/Makefile.host  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/Makefile.host linux-3.1.1/scripts/Makefile.host
+--- linux-3.1.1/scripts/Makefile.host  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/Makefile.host  2011-11-16 18:39:08.000000000 -0500
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -71709,9 +75358,9 @@ diff -urNp linux-3.0.4/scripts/Makefile.host linux-3.0.4/scripts/Makefile.host
  # Remove .so files from "xxx-objs"
  host-cobjs    := $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2alias.c
---- linux-3.0.4/scripts/mod/file2alias.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/file2alias.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/mod/file2alias.c linux-3.1.1/scripts/mod/file2alias.c
+--- linux-3.1.1/scripts/mod/file2alias.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/file2alias.c       2011-11-16 18:39:08.000000000 -0500
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
                            unsigned long size, unsigned long id_size,
                            void *symval)
@@ -71730,6 +75379,15 @@ diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2ali
                         unsigned char range_lo, unsigned char range_hi,
                         unsigned char max, struct module *mod)
  {
+@@ -203,7 +203,7 @@ static void do_usb_entry_multi(struct us
+ {
+       unsigned int devlo, devhi;
+       unsigned char chi, clo, max;
+-      int ndigits;
++      unsigned int ndigits;
+ 
+       id->match_flags = TO_NATIVE(id->match_flags);
+       id->idVendor = TO_NATIVE(id->idVendor);
 @@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *sy
        for (i = 0; i < count; i++) {
                const char *id = (char *)devs[i].id;
@@ -71766,10 +75424,10 @@ diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2ali
  
        sprintf(alias, "dmi*");
  
-diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
---- linux-3.0.4/scripts/mod/modpost.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/modpost.c  2011-08-23 21:47:56.000000000 -0400
-@@ -892,6 +892,7 @@ enum mismatch {
+diff -urNp linux-3.1.1/scripts/mod/modpost.c linux-3.1.1/scripts/mod/modpost.c
+--- linux-3.1.1/scripts/mod/modpost.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/modpost.c  2011-11-16 18:39:08.000000000 -0500
+@@ -919,6 +919,7 @@ enum mismatch {
        ANY_INIT_TO_ANY_EXIT,
        ANY_EXIT_TO_ANY_INIT,
        EXPORT_TO_INIT_EXIT,
@@ -71777,7 +75435,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
  };
  
  struct sectioncheck {
-@@ -1000,6 +1001,12 @@ const struct sectioncheck sectioncheck[]
+@@ -1027,6 +1028,12 @@ const struct sectioncheck sectioncheck[]
        .tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
        .mismatch = EXPORT_TO_INIT_EXIT,
        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -71790,7 +75448,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
  }
  };
  
-@@ -1122,10 +1129,10 @@ static Elf_Sym *find_elf_symbol(struct e
+@@ -1149,10 +1156,10 @@ static Elf_Sym *find_elf_symbol(struct e
                        continue;
                if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
                        continue;
@@ -71803,7 +75461,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
                if (d < 0)
                        d = addr - sym->st_value;
                if (d < distance) {
-@@ -1404,6 +1411,14 @@ static void report_sec_mismatch(const ch
+@@ -1431,6 +1438,14 @@ static void report_sec_mismatch(const ch
                tosym, prl_to, prl_to, tosym);
                free(prl_to);
                break;
@@ -71818,7 +75476,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
        }
        fprintf(stderr, "\n");
  }
-@@ -1629,7 +1644,7 @@ static void section_rel(const char *modn
+@@ -1656,7 +1671,7 @@ static void section_rel(const char *modn
  static void check_sec_ref(struct module *mod, const char *modname,
                            struct elf_info *elf)
  {
@@ -71827,7 +75485,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
        Elf_Shdr *sechdrs = elf->sechdrs;
  
        /* Walk through all sections */
-@@ -1727,7 +1742,7 @@ void __attribute__((format(printf, 2, 3)
+@@ -1754,7 +1769,7 @@ void __attribute__((format(printf, 2, 3)
        va_end(ap);
  }
  
@@ -71836,7 +75494,7 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
  {
        if (buf->size - buf->pos < len) {
                buf->size += len + SZ;
-@@ -1939,7 +1954,7 @@ static void write_if_changed(struct buff
+@@ -1966,7 +1981,7 @@ static void write_if_changed(struct buff
        if (fstat(fileno(file), &st) < 0)
                goto close_write;
  
@@ -71845,9 +75503,9 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
                goto close_write;
  
        tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
---- linux-3.0.4/scripts/mod/modpost.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/modpost.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/mod/modpost.h linux-3.1.1/scripts/mod/modpost.h
+--- linux-3.1.1/scripts/mod/modpost.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/modpost.h  2011-11-16 18:39:08.000000000 -0500
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -71867,9 +75525,9 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
  
  struct module {
        struct module *next;
-diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversion.c
---- linux-3.0.4/scripts/mod/sumversion.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/sumversion.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/mod/sumversion.c linux-3.1.1/scripts/mod/sumversion.c
+--- linux-3.1.1/scripts/mod/sumversion.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/mod/sumversion.c       2011-11-16 18:39:08.000000000 -0500
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
                goto out;
        }
@@ -71879,9 +75537,9 @@ diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversi
                warn("writing sum in %s failed: %s\n",
                        filename, strerror(errno));
                goto out;
-diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
---- linux-3.0.4/scripts/pnmtologo.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/pnmtologo.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/scripts/pnmtologo.c linux-3.1.1/scripts/pnmtologo.c
+--- linux-3.1.1/scripts/pnmtologo.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/scripts/pnmtologo.c    2011-11-16 18:39:08.000000000 -0500
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -71908,9 +75566,9 @@ diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
            logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.0.4/security/apparmor/lsm.c linux-3.0.4/security/apparmor/lsm.c
---- linux-3.0.4/security/apparmor/lsm.c        2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/security/apparmor/lsm.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/apparmor/lsm.c linux-3.1.1/security/apparmor/lsm.c
+--- linux-3.1.1/security/apparmor/lsm.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/apparmor/lsm.c        2011-11-16 18:40:44.000000000 -0500
 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
        return error;
  }
@@ -71920,9 +75578,9 @@ diff -urNp linux-3.0.4/security/apparmor/lsm.c linux-3.0.4/security/apparmor/lsm
        .name =                         "apparmor",
  
        .ptrace_access_check =          apparmor_ptrace_access_check,
-diff -urNp linux-3.0.4/security/commoncap.c linux-3.0.4/security/commoncap.c
---- linux-3.0.4/security/commoncap.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/commoncap.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/commoncap.c linux-3.1.1/security/commoncap.c
+--- linux-3.1.1/security/commoncap.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/commoncap.c   2011-11-16 18:40:44.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
@@ -71950,9 +75608,9 @@ diff -urNp linux-3.0.4/security/commoncap.c linux-3.0.4/security/commoncap.c
        if (cred->uid != 0) {
                if (bprm->cap_effective)
                        return 1;
-diff -urNp linux-3.0.4/security/integrity/ima/ima_api.c linux-3.0.4/security/integrity/ima/ima_api.c
---- linux-3.0.4/security/integrity/ima/ima_api.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/integrity/ima/ima_api.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/security/integrity/ima/ima_api.c linux-3.1.1/security/integrity/ima/ima_api.c
+--- linux-3.1.1/security/integrity/ima/ima_api.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_api.c       2011-11-16 18:39:08.000000000 -0500
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
        int result;
  
@@ -71962,9 +75620,9 @@ diff -urNp linux-3.0.4/security/integrity/ima/ima_api.c linux-3.0.4/security/int
  
        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
-diff -urNp linux-3.0.4/security/integrity/ima/ima_fs.c linux-3.0.4/security/integrity/ima/ima_fs.c
---- linux-3.0.4/security/integrity/ima/ima_fs.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/integrity/ima/ima_fs.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/security/integrity/ima/ima_fs.c linux-3.1.1/security/integrity/ima/ima_fs.c
+--- linux-3.1.1/security/integrity/ima/ima_fs.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_fs.c        2011-11-16 18:39:08.000000000 -0500
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -71980,9 +75638,9 @@ diff -urNp linux-3.0.4/security/integrity/ima/ima_fs.c linux-3.0.4/security/inte
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-3.0.4/security/integrity/ima/ima.h linux-3.0.4/security/integrity/ima/ima.h
---- linux-3.0.4/security/integrity/ima/ima.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/integrity/ima/ima.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/security/integrity/ima/ima.h linux-3.1.1/security/integrity/ima/ima.h
+--- linux-3.1.1/security/integrity/ima/ima.h   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima.h   2011-11-16 18:39:08.000000000 -0500
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -71994,9 +75652,9 @@ diff -urNp linux-3.0.4/security/integrity/ima/ima.h linux-3.0.4/security/integri
        struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-3.0.4/security/integrity/ima/ima_queue.c linux-3.0.4/security/integrity/ima/ima_queue.c
---- linux-3.0.4/security/integrity/ima/ima_queue.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/integrity/ima/ima_queue.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/security/integrity/ima/ima_queue.c linux-3.1.1/security/integrity/ima/ima_queue.c
+--- linux-3.1.1/security/integrity/ima/ima_queue.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/integrity/ima/ima_queue.c     2011-11-16 18:39:08.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);
@@ -72006,9 +75664,9 @@ diff -urNp linux-3.0.4/security/integrity/ima/ima_queue.c linux-3.0.4/security/i
        key = ima_hash_key(entry->digest);
        hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
        return 0;
-diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
---- linux-3.0.4/security/Kconfig       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/Kconfig       2011-09-17 00:58:04.000000000 -0400
+diff -urNp linux-3.1.1/security/Kconfig linux-3.1.1/security/Kconfig
+--- linux-3.1.1/security/Kconfig       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/Kconfig       2011-11-16 18:40:44.000000000 -0500
 @@ -4,6 +4,558 @@
  
  menu "Security options"
@@ -72331,7 +75989,7 @@ diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
 +
 +config PAX_KERNEXEC
 +      bool "Enforce non-executable kernel pages"
-+      depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
++      depends on (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
 +      select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
 +      select PAX_KERNEXEC_PLUGIN if X86_64
 +      help
@@ -72399,7 +76057,7 @@ diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
 +
 +config PAX_RANDKSTACK
 +      bool "Randomize kernel stack base"
-+      depends on PAX_ASLR && X86_TSC && X86
++      depends on X86_TSC && X86
 +      help
 +        By saying Y here the kernel will randomize every task's kernel
 +        stack on every system call.  This will not only force an attacker
@@ -72577,10 +76235,61 @@ diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
        default 65536
        help
          This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring.c
---- linux-3.0.4/security/keys/keyring.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/keys/keyring.c        2011-08-23 21:47:56.000000000 -0400
-@@ -215,15 +215,15 @@ static long keyring_read(const struct ke
+diff -urNp linux-3.1.1/security/keys/compat.c linux-3.1.1/security/keys/compat.c
+--- linux-3.1.1/security/keys/compat.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/compat.c 2011-11-16 18:39:08.000000000 -0500
+@@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
+       if (ret == 0)
+               goto no_payload_free;
+ 
+-      ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
++      ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
+ 
+       if (iov != iovstack)
+               kfree(iov);
+diff -urNp linux-3.1.1/security/keys/keyctl.c linux-3.1.1/security/keys/keyctl.c
+--- linux-3.1.1/security/keys/keyctl.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/keyctl.c 2011-11-16 18:39:08.000000000 -0500
+@@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
+ /*
+  * Copy the iovec data from userspace
+  */
+-static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
++static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
+                                unsigned ioc)
+ {
+       for (; ioc > 0; ioc--) {
+@@ -943,7 +943,7 @@ static long copy_from_user_iovec(void *b
+  * If successful, 0 will be returned.
+  */
+ long keyctl_instantiate_key_common(key_serial_t id,
+-                                 const struct iovec *payload_iov,
++                                 const struct iovec __user *payload_iov,
+                                  unsigned ioc,
+                                  size_t plen,
+                                  key_serial_t ringid)
+@@ -1038,7 +1038,7 @@ long keyctl_instantiate_key(key_serial_t
+                       [0].iov_len  = plen
+               };
+ 
+-              return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
++              return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
+       }
+ 
+       return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
+@@ -1071,7 +1071,7 @@ long keyctl_instantiate_key_iov(key_seri
+       if (ret == 0)
+               goto no_payload_free;
+ 
+-      ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
++      ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
+ 
+       if (iov != iovstack)
+               kfree(iov);
+diff -urNp linux-3.1.1/security/keys/keyring.c linux-3.1.1/security/keys/keyring.c
+--- linux-3.1.1/security/keys/keyring.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/keys/keyring.c        2011-11-16 18:39:08.000000000 -0500
+@@ -214,15 +214,15 @@ static long keyring_read(const struct ke
                        ret = -EFAULT;
  
                        for (loop = 0; loop < klist->nkeys; loop++) {
@@ -72599,9 +76308,9 @@ diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring
                                        goto error;
  
                                buflen -= tmp;
-diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
---- linux-3.0.4/security/min_addr.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/min_addr.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/min_addr.c linux-3.1.1/security/min_addr.c
+--- linux-3.1.1/security/min_addr.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/min_addr.c    2011-11-16 18:40:44.000000000 -0500
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -72618,9 +76327,9 @@ diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
  }
  
  /*
-diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
---- linux-3.0.4/security/security.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/security.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/security.c linux-3.1.1/security/security.c
+--- linux-3.1.1/security/security.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/security.c    2011-11-16 18:40:44.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);
@@ -72642,9 +76351,9 @@ diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hooks.c
---- linux-3.0.4/security/selinux/hooks.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/hooks.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/selinux/hooks.c linux-3.1.1/security/selinux/hooks.c
+--- linux-3.1.1/security/selinux/hooks.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/hooks.c       2011-11-16 18:40:44.000000000 -0500
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -72653,7 +76362,7 @@ diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hoo
  
  /* SECMARK reference count */
  atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5454,7 +5453,7 @@ static int selinux_key_getsecurity(struc
+@@ -5455,7 +5454,7 @@ static int selinux_key_getsecurity(struc
  
  #endif
  
@@ -72662,9 +76371,9 @@ diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hoo
        .name =                         "selinux",
  
        .ptrace_access_check =          selinux_ptrace_access_check,
-diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/selinux/include/xfrm.h
---- linux-3.0.4/security/selinux/include/xfrm.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/include/xfrm.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/security/selinux/include/xfrm.h linux-3.1.1/security/selinux/include/xfrm.h
+--- linux-3.1.1/security/selinux/include/xfrm.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/include/xfrm.h        2011-11-16 18:39:08.000000000 -0500
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -72674,9 +76383,9 @@ diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/seli
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selinux/ss/services.c
---- linux-3.0.4/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.1.1/security/selinux/ss/services.c linux-3.1.1/security/selinux/ss/services.c
+--- linux-3.1.1/security/selinux/ss/services.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/selinux/ss/services.c 2011-11-16 18:40:44.000000000 -0500
 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
        int rc = 0;
        struct policy_file file = { data, len }, *fp = &file;
@@ -72686,10 +76395,10 @@ diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selin
        if (!ss_initialized) {
                avtab_cache_init();
                rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/smack_lsm.c
---- linux-3.0.4/security/smack/smack_lsm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/smack/smack_lsm.c     2011-08-23 21:47:56.000000000 -0400
-@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct 
+diff -urNp linux-3.1.1/security/smack/smack_lsm.c linux-3.1.1/security/smack/smack_lsm.c
+--- linux-3.1.1/security/smack/smack_lsm.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/smack/smack_lsm.c     2011-11-16 18:39:08.000000000 -0500
+@@ -3393,7 +3393,7 @@ static int smack_inode_getsecctx(struct 
        return 0;
  }
  
@@ -72698,10 +76407,10 @@ diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/sma
        .name =                         "smack",
  
        .ptrace_access_check =          smack_ptrace_access_check,
-diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomoyo.c
---- linux-3.0.4/security/tomoyo/tomoyo.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/tomoyo/tomoyo.c       2011-08-23 21:47:56.000000000 -0400
-@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
+diff -urNp linux-3.1.1/security/tomoyo/tomoyo.c linux-3.1.1/security/tomoyo/tomoyo.c
+--- linux-3.1.1/security/tomoyo/tomoyo.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/security/tomoyo/tomoyo.c       2011-11-16 18:39:08.000000000 -0500
+@@ -446,7 +446,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
   */
@@ -72710,9 +76419,9 @@ diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomo
        .name                = "tomoyo",
        .cred_alloc_blank    = tomoyo_cred_alloc_blank,
        .cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx.c
---- linux-3.0.4/sound/aoa/codecs/onyx.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/aoa/codecs/onyx.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.c linux-3.1.1/sound/aoa/codecs/onyx.c
+--- linux-3.1.1/sound/aoa/codecs/onyx.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/aoa/codecs/onyx.c        2011-11-16 18:39:08.000000000 -0500
 @@ -54,7 +54,7 @@ struct onyx {
                                spdif_locked:1,
                                analog_locked:1,
@@ -72741,9 +76450,9 @@ diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx
                onyx->spdif_locked = onyx->analog_locked = 0;
        mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx.h
---- linux-3.0.4/sound/aoa/codecs/onyx.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/aoa/codecs/onyx.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/aoa/codecs/onyx.h linux-3.1.1/sound/aoa/codecs/onyx.h
+--- linux-3.1.1/sound/aoa/codecs/onyx.h        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/aoa/codecs/onyx.h        2011-11-16 18:39:08.000000000 -0500
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -72752,9 +76461,112 @@ diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/seq_device.c
---- linux-3.0.4/sound/core/seq/seq_device.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/core/seq/seq_device.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/core/oss/pcm_oss.c linux-3.1.1/sound/core/oss/pcm_oss.c
+--- linux-3.1.1/sound/core/oss/pcm_oss.c       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/oss/pcm_oss.c       2011-11-16 18:39:08.000000000 -0500
+@@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
+               if (in_kernel) {
+                       mm_segment_t fs;
+                       fs = snd_enter_user();
+-                      ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
++                      ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
+                       snd_leave_user(fs);
+               } else {
+-                      ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
++                      ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
+               }
+               if (ret != -EPIPE && ret != -ESTRPIPE)
+                       break;
+@@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(stru
+               if (in_kernel) {
+                       mm_segment_t fs;
+                       fs = snd_enter_user();
+-                      ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
++                      ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
+                       snd_leave_user(fs);
+               } else {
+-                      ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
++                      ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
+               }
+               if (ret == -EPIPE) {
+                       if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
+@@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct
+               struct snd_pcm_plugin_channel *channels;
+               size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
+               if (!in_kernel) {
+-                      if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
++                      if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
+                               return -EFAULT;
+                       buf = runtime->oss.buffer;
+               }
+@@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct
+                       }
+               } else {
+                       tmp = snd_pcm_oss_write2(substream,
+-                                               (const char __force *)buf,
++                                               (const char __force_kernel *)buf,
+                                                runtime->oss.period_bytes, 0);
+                       if (tmp <= 0)
+                               goto err;
+@@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct 
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       snd_pcm_sframes_t frames, frames1;
+ #ifdef CONFIG_SND_PCM_OSS_PLUGINS
+-      char __user *final_dst = (char __force __user *)buf;
++      char __user *final_dst = (char __force_user *)buf;
+       if (runtime->oss.plugin_first) {
+               struct snd_pcm_plugin_channel *channels;
+               size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
+@@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct 
+                       xfer += tmp;
+                       runtime->oss.buffer_used -= tmp;
+               } else {
+-                      tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
++                      tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
+                                               runtime->oss.period_bytes, 0);
+                       if (tmp <= 0)
+                               goto err;
+@@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_p
+                                                                  size1);
+                                       size1 /= runtime->channels; /* frames */
+                                       fs = snd_enter_user();
+-                                      snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
++                                      snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
+                                       snd_leave_user(fs);
+                               }
+                       } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
+diff -urNp linux-3.1.1/sound/core/pcm_compat.c linux-3.1.1/sound/core/pcm_compat.c
+--- linux-3.1.1/sound/core/pcm_compat.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/pcm_compat.c        2011-11-16 18:39:08.000000000 -0500
+@@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
+       int err;
+ 
+       fs = snd_enter_user();
+-      err = snd_pcm_delay(substream, &delay);
++      err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
+       snd_leave_user(fs);
+       if (err < 0)
+               return err;
+diff -urNp linux-3.1.1/sound/core/pcm_native.c linux-3.1.1/sound/core/pcm_native.c
+--- linux-3.1.1/sound/core/pcm_native.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/pcm_native.c        2011-11-16 18:39:08.000000000 -0500
+@@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
+       switch (substream->stream) {
+       case SNDRV_PCM_STREAM_PLAYBACK:
+               result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
+-                                               (void __user *)arg);
++                                               (void __force_user *)arg);
+               break;
+       case SNDRV_PCM_STREAM_CAPTURE:
+               result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
+-                                              (void __user *)arg);
++                                              (void __force_user *)arg);
+               break;
+       default:
+               result = -EINVAL;
+diff -urNp linux-3.1.1/sound/core/seq/seq_device.c linux-3.1.1/sound/core/seq/seq_device.c
+--- linux-3.1.1/sound/core/seq/seq_device.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/core/seq/seq_device.c    2011-11-16 18:39:08.000000000 -0500
 @@ -63,7 +63,7 @@ struct ops_list {
        int argsize;            /* argument size */
  
@@ -72791,9 +76603,9 @@ diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/se
                dev->status = SNDRV_SEQ_DEVICE_FREE;
                dev->driver_data = NULL;
                ops->num_init_devices--;
-diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
---- linux-3.0.4/sound/drivers/mts64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/mts64.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/drivers/mts64.c linux-3.1.1/sound/drivers/mts64.c
+--- linux-3.1.1/sound/drivers/mts64.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/mts64.c  2011-11-16 18:39:08.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -72850,9 +76662,9 @@ diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
  
        return 0;
  }
-diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/opl4/opl4_lib.c
---- linux-3.0.4/sound/drivers/opl4/opl4_lib.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/opl4/opl4_lib.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/drivers/opl4/opl4_lib.c linux-3.1.1/sound/drivers/opl4/opl4_lib.c
+--- linux-3.1.1/sound/drivers/opl4/opl4_lib.c  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/opl4/opl4_lib.c  2011-11-16 18:39:08.000000000 -0500
 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
@@ -72862,9 +76674,9 @@ diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/o
  {
        int timeout = 10;
        while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/portman2x4.c
---- linux-3.0.4/sound/drivers/portman2x4.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/portman2x4.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/drivers/portman2x4.c linux-3.1.1/sound/drivers/portman2x4.c
+--- linux-3.1.1/sound/drivers/portman2x4.c     2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/drivers/portman2x4.c     2011-11-16 18:39:08.000000000 -0500
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -72882,9 +76694,9 @@ diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/port
        int mode[PORTMAN_NUM_INPUT_PORTS];
        struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
---- linux-3.0.4/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/firewire/amdtp.c linux-3.1.1/sound/firewire/amdtp.c
+--- linux-3.1.1/sound/firewire/amdtp.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/amdtp.c 2011-11-16 18:39:08.000000000 -0500
 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
                ptr = s->pcm_buffer_pointer + data_blocks;
                if (ptr >= pcm->runtime->buffer_size)
@@ -72903,9 +76715,9 @@ diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
                (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
---- linux-3.0.4/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/firewire/amdtp.h linux-3.1.1/sound/firewire/amdtp.h
+--- linux-3.1.1/sound/firewire/amdtp.h 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/amdtp.h 2011-11-16 18:39:08.000000000 -0500
 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
  static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
                                                struct snd_pcm_substream *pcm)
@@ -72915,9 +76727,9 @@ diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
  }
  
  /**
-diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight.c
---- linux-3.0.4/sound/firewire/isight.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/isight.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/firewire/isight.c linux-3.1.1/sound/firewire/isight.c
+--- linux-3.1.1/sound/firewire/isight.c        2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/firewire/isight.c        2011-11-16 18:39:08.000000000 -0500
 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc
        ptr += count;
        if (ptr >= runtime->buffer_size)
@@ -72958,9 +76770,9 @@ diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight
                break;
        default:
                return -EINVAL;
-diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
---- linux-3.0.4/sound/isa/cmi8330.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/isa/cmi8330.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/isa/cmi8330.c linux-3.1.1/sound/isa/cmi8330.c
+--- linux-3.1.1/sound/isa/cmi8330.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/isa/cmi8330.c    2011-11-16 18:39:08.000000000 -0500
 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
        struct snd_pcm *pcm;
@@ -72970,9 +76782,9 @@ diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
                snd_pcm_open_callback_t open;
                void *private_data; /* sb or wss */
        } streams[2];
-diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
---- linux-3.0.4/sound/oss/sb_audio.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/oss/sb_audio.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/oss/sb_audio.c linux-3.1.1/sound/oss/sb_audio.c
+--- linux-3.1.1/sound/oss/sb_audio.c   2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/oss/sb_audio.c   2011-11-16 18:39:08.000000000 -0500
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
                buf16 = (signed short *)(localbuf + localoffs);
                while (c)
@@ -72982,9 +76794,9 @@ diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
                        if (copy_from_user(lbuf8,
                                           userbuf+useroffs + p,
                                           locallen))
-diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4297a.c
---- linux-3.0.4/sound/oss/swarm_cs4297a.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/oss/swarm_cs4297a.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/oss/swarm_cs4297a.c linux-3.1.1/sound/oss/swarm_cs4297a.c
+--- linux-3.1.1/sound/oss/swarm_cs4297a.c      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/oss/swarm_cs4297a.c      2011-11-16 18:39:08.000000000 -0500
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
        struct cs4297a_state *s;
@@ -73019,10 +76831,10 @@ diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_codec.h
---- linux-3.0.4/sound/pci/hda/hda_codec.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/hda/hda_codec.h      2011-08-23 21:47:56.000000000 -0400
-@@ -615,7 +615,7 @@ struct hda_bus_ops {
+diff -urNp linux-3.1.1/sound/pci/hda/hda_codec.h linux-3.1.1/sound/pci/hda/hda_codec.h
+--- linux-3.1.1/sound/pci/hda/hda_codec.h      2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/hda/hda_codec.h      2011-11-16 18:39:08.000000000 -0500
+@@ -611,7 +611,7 @@ struct hda_bus_ops {
        /* notify power-up/down from codec to controller */
        void (*pm_notify)(struct hda_bus *bus);
  #endif
@@ -73057,9 +76869,9 @@ diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_c
  
        /* PCM to create, set by patch_ops.build_pcms callback */
        unsigned int num_pcms;
-diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712/ice1712.h
---- linux-3.0.4/sound/pci/ice1712/ice1712.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/ice1712/ice1712.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/pci/ice1712/ice1712.h linux-3.1.1/sound/pci/ice1712/ice1712.h
+--- linux-3.1.1/sound/pci/ice1712/ice1712.h    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/ice1712/ice1712.h    2011-11-16 18:39:08.000000000 -0500
 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
        unsigned int mask_flags;        /* total mask bits */
        struct snd_akm4xxx_ops {
@@ -73078,9 +76890,9 @@ diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712
  };
  
  
-diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/pci/ymfpci/ymfpci_main.c 2011-11-16 18:39:08.000000000 -0500
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
                if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
                        break;
@@ -73121,29 +76933,21 @@ diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfp
        chip->card = card;
        chip->pci = pci;
        chip->irq = -1;
-diff -urNp linux-3.0.4/sound/soc/soc-core.c linux-3.0.4/sound/soc/soc-core.c
---- linux-3.0.4/sound/soc/soc-core.c   2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/sound/soc/soc-core.c   2011-08-23 21:47:56.000000000 -0400
-@@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
+diff -urNp linux-3.1.1/sound/soc/soc-pcm.c linux-3.1.1/sound/soc/soc-pcm.c
+--- linux-3.1.1/sound/soc/soc-pcm.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/soc/soc-pcm.c    2011-11-16 18:39:08.000000000 -0500
+@@ -568,7 +568,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
  }
  
  /* ASoC PCM operations */
 -static struct snd_pcm_ops soc_pcm_ops = {
 +static snd_pcm_ops_no_const soc_pcm_ops = {
        .open           = soc_pcm_open,
-       .close          = soc_codec_close,
+       .close          = soc_pcm_close,
        .hw_params      = soc_pcm_hw_params,
-@@ -2128,6 +2128,7 @@ static int soc_new_pcm(struct snd_soc_pc
-       rtd->pcm = pcm;
-       pcm->private_data = rtd;
-       if (platform->driver->ops) {
-+              /* this whole logic is broken... */
-               soc_pcm_ops.mmap = platform->driver->ops->mmap;
-               soc_pcm_ops.pointer = platform->driver->ops->pointer;
-               soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
-diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
---- linux-3.0.4/sound/usb/card.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/usb/card.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/sound/usb/card.h linux-3.1.1/sound/usb/card.h
+--- linux-3.1.1/sound/usb/card.h       2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/sound/usb/card.h       2011-11-16 18:39:08.000000000 -0500
 @@ -44,6 +44,7 @@ struct snd_urb_ops {
        int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
        int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
@@ -73161,10 +76965,185 @@ diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
  };
  
  struct snd_usb_stream {
-diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constify_plugin.c
---- linux-3.0.4/tools/gcc/constify_plugin.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/constify_plugin.c    2011-08-30 18:23:52.000000000 -0400
-@@ -0,0 +1,293 @@
+diff -urNp linux-3.1.1/tools/gcc/checker_plugin.c linux-3.1.1/tools/gcc/checker_plugin.c
+--- linux-3.1.1/tools/gcc/checker_plugin.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/checker_plugin.c     2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,171 @@
++/*
++ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
++ * Licensed under the GPL v2
++ *
++ * Note: the choice of the license means that the compilation process is
++ *       NOT 'eligible' as defined by gcc's library exception to the GPL v3,
++ *       but for the kernel it doesn't matter since it doesn't link against
++ *       any of the gcc libraries
++ *
++ * gcc plugin to implement various sparse (source code checker) features
++ *
++ * TODO:
++ * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
++ *
++ * BUGS:
++ * - none known
++ */
++#include "gcc-plugin.h"
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tree.h"
++#include "tree-pass.h"
++#include "flags.h"
++#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
++#include "plugin-version.h"
++#include "tm.h"
++#include "function.h"
++#include "basic-block.h"
++#include "gimple.h"
++#include "rtl.h"
++#include "emit-rtl.h"
++#include "tree-flow.h"
++#include "target.h"
++
++extern void c_register_addr_space (const char *str, addr_space_t as);
++extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
++extern enum machine_mode default_addr_space_address_mode (addr_space_t);
++extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
++extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
++extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
++
++extern void print_gimple_stmt(FILE *, gimple, int, int);
++extern rtx emit_move_insn(rtx x, rtx y);
++
++int plugin_is_GPL_compatible;
++
++static struct plugin_info checker_plugin_info = {
++      .version        = "201111150100",
++};
++
++#define ADDR_SPACE_KERNEL             0
++#define ADDR_SPACE_FORCE_KERNEL               1
++#define ADDR_SPACE_USER                       2
++#define ADDR_SPACE_FORCE_USER         3
++#define ADDR_SPACE_IOMEM              0
++#define ADDR_SPACE_FORCE_IOMEM                0
++#define ADDR_SPACE_PERCPU             0
++#define ADDR_SPACE_FORCE_PERCPU               0
++#define ADDR_SPACE_RCU                        0
++#define ADDR_SPACE_FORCE_RCU          0
++
++static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
++{
++      return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
++}
++
++static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
++{
++      return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
++}
++
++static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
++{
++      return default_addr_space_valid_pointer_mode(mode, as);
++}
++
++static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
++{
++      return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
++}
++
++static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
++{
++      return default_addr_space_legitimize_address(x, oldx, mode, as);
++}
++
++static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
++{
++      if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
++              return true;
++
++      if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
++              return true;
++
++      if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
++              return true;
++
++      if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
++              return true;
++
++      if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
++              return true;
++
++      if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
++              return true;
++
++      if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
++              return true;
++
++      return subset == superset;
++}
++
++static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
++{
++//    addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
++//    addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
++
++      return op;
++}
++
++static void register_checker_address_spaces(void *event_data, void *data)
++{
++      c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
++      c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
++      c_register_addr_space("__user", ADDR_SPACE_USER);
++      c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
++//    c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
++//    c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
++//    c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
++//    c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
++//    c_register_addr_space("__rcu", ADDR_SPACE_RCU);
++//    c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
++
++      targetm.addr_space.pointer_mode         = checker_addr_space_pointer_mode;
++      targetm.addr_space.address_mode         = checker_addr_space_address_mode;
++      targetm.addr_space.valid_pointer_mode   = checker_addr_space_valid_pointer_mode;
++      targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
++//    targetm.addr_space.legitimize_address   = checker_addr_space_legitimize_address;
++      targetm.addr_space.subset_p             = checker_addr_space_subset_p;
++      targetm.addr_space.convert              = checker_addr_space_convert;
++}
++
++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
++{
++      const char * const plugin_name = plugin_info->base_name;
++      const int argc = plugin_info->argc;
++      const struct plugin_argument * const argv = plugin_info->argv;
++      int i;
++
++      if (!plugin_default_version_check(version, &gcc_version)) {
++              error(G_("incompatible gcc/plugin versions"));
++              return 1;
++      }
++
++      register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
++
++      for (i = 0; i < argc; ++i)
++              error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++
++      if (TARGET_64BIT == 0)
++              return 0;
++
++      register_callback (plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
++
++      return 0;
++}
+diff -urNp linux-3.1.1/tools/gcc/constify_plugin.c linux-3.1.1/tools/gcc/constify_plugin.c
+--- linux-3.1.1/tools/gcc/constify_plugin.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/constify_plugin.c    2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,303 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
 + * Copyright 2011 by PaX Team <pageexec@freemail.hu>
@@ -73186,22 +77165,26 @@ diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constif
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
 +#include "function.h"
++#include "basic-block.h"
++#include "gimple.h"
++#include "rtl.h"
++#include "emit-rtl.h"
 +#include "tree-flow.h"
-+#include "plugin.h"
-+#include "diagnostic.h"
-+//#include "c-tree.h"
 +
 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
 +
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info const_plugin_info = {
-+      .version        = "20110826",
++      .version        = "201111150100",
 +      .help           = "no-constify\tturn off constification\n",
 +};
 +
@@ -73295,7 +77278,10 @@ diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constif
 +      .decl_required          = false,
 +      .type_required          = false,
 +      .function_type_required = false,
-+      .handler                = handle_no_const_attribute
++      .handler                = handle_no_const_attribute,
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++      .affects_type_identity  = true
++#endif
 +};
 +
 +static struct attribute_spec do_const_attr = {
@@ -73305,7 +77291,10 @@ diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constif
 +      .decl_required          = false,
 +      .type_required          = false,
 +      .function_type_required = false,
-+      .handler                = handle_do_const_attribute
++      .handler                = handle_do_const_attribute,
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++      .affects_type_identity  = true
++#endif
 +};
 +
 +static void register_attributes(void *event_data, void *data)
@@ -73458,10 +77447,10 @@ diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constif
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallocstat_plugin.c
---- linux-3.0.4/tools/gcc/kallocstat_plugin.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/kallocstat_plugin.c  2011-09-17 00:53:44.000000000 -0400
-@@ -0,0 +1,165 @@
+diff -urNp linux-3.1.1/tools/gcc/kallocstat_plugin.c linux-3.1.1/tools/gcc/kallocstat_plugin.c
+--- linux-3.1.1/tools/gcc/kallocstat_plugin.c  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/kallocstat_plugin.c  2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,167 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -73484,17 +77473,19 @@ diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallo
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
 +
 +extern void print_gimple_stmt(FILE *, gimple, int, int);
 +
@@ -73513,7 +77504,7 @@ diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallo
 +};
 +
 +static struct plugin_info kallocstat_plugin_info = {
-+      .version        = "201109121100",
++      .version        = "201111150100",
 +};
 +
 +static unsigned int execute_kallocstat(void);
@@ -73549,10 +77540,10 @@ diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallo
 +static unsigned int execute_kallocstat(void)
 +{
 +      basic_block bb;
-+      gimple_stmt_iterator gsi;
 +
 +      // 1. loop through BBs and GIMPLE statements
 +      FOR_EACH_BB(bb) {
++              gimple_stmt_iterator gsi;
 +              for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
 +                      // gimple match: 
 +                      tree fndecl, size;
@@ -73627,10 +77618,10 @@ diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallo
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexec_plugin.c
---- linux-3.0.4/tools/gcc/kernexec_plugin.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/kernexec_plugin.c    2011-09-19 09:16:58.000000000 -0400
-@@ -0,0 +1,265 @@
+diff -urNp linux-3.1.1/tools/gcc/kernexec_plugin.c linux-3.1.1/tools/gcc/kernexec_plugin.c
+--- linux-3.1.1/tools/gcc/kernexec_plugin.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/kernexec_plugin.c    2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,275 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -73653,35 +77644,39 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
 +#include "tree-flow.h"
 +
 +extern void print_gimple_stmt(FILE *, gimple, int, int);
++extern rtx emit_move_insn(rtx x, rtx y);
 +
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info kernexec_plugin_info = {
-+      .version        = "201109191200",
++      .version        = "201111150100",
 +};
 +
 +static unsigned int execute_kernexec_fptr(void);
 +static unsigned int execute_kernexec_retaddr(void);
++static bool kernexec_cmodel_check(void);
 +
 +static struct gimple_opt_pass kernexec_fptr_pass = {
 +      .pass = {
 +              .type                   = GIMPLE_PASS,
 +              .name                   = "kernexec_fptr",
-+              .gate                   = NULL,
++              .gate                   = kernexec_cmodel_check,
 +              .execute                = execute_kernexec_fptr,
 +              .sub                    = NULL,
 +              .next                   = NULL,
@@ -73699,7 +77694,7 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +      .pass = {
 +              .type                   = RTL_PASS,
 +              .name                   = "kernexec_retaddr",
-+              .gate                   = NULL,
++              .gate                   = kernexec_cmodel_check,
 +              .execute                = execute_kernexec_retaddr,
 +              .sub                    = NULL,
 +              .next                   = NULL,
@@ -73709,10 +77704,28 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +              .properties_provided    = 0,
 +              .properties_destroyed   = 0,
 +              .todo_flags_start       = 0,
-+              .todo_flags_finish      = TODO_dump_func
++              .todo_flags_finish      = TODO_dump_func | TODO_ggc_collect
 +      }
 +};
 +
++static bool kernexec_cmodel_check(void)
++{
++      tree section;
++
++      if (ix86_cmodel != CM_KERNEL)
++              return false;
++
++      section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
++      if (!section || !TREE_VALUE(section))
++              return true;
++
++      section = TREE_VALUE(TREE_VALUE(section));
++      if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
++              return true;
++
++      return false;
++}
++
 +/*
 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
@@ -73731,18 +77744,14 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +      mark_sym_for_renaming(intptr);
 +      assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
 +      update_stmt(assign_intptr);
-+      gsi_insert_before(&gsi, assign_intptr, GSI_NEW_STMT);
-+
-+      gsi_next(&gsi);
++      gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
 +
 +      // apply logical or to temporary unsigned long and bitmask
 +      kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
 +//    kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
 +      assign_intptr = gimple_build_assign(intptr, fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask));
 +      update_stmt(assign_intptr);
-+      gsi_insert_before(&gsi, assign_intptr, GSI_NEW_STMT);
-+
-+      gsi_next(&gsi);
++      gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
 +
 +      // cast temporary unsigned long back to a temporary fptr variable
 +      new_fptr = create_tmp_var(TREE_TYPE(old_fptr), NULL);
@@ -73750,9 +77759,7 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +      mark_sym_for_renaming(new_fptr);
 +      assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
 +      update_stmt(assign_new_fptr);
-+      gsi_insert_before(&gsi, assign_new_fptr, GSI_NEW_STMT);
-+
-+      gsi_next(&gsi);
++      gsi_insert_before(&gsi, assign_new_fptr, GSI_SAME_STMT);
 +
 +      // replace call stmt fn with the new fptr
 +      gimple_call_set_fn(call_stmt, new_fptr);
@@ -73805,28 +77812,22 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +      return 0;
 +}
 +
-+// add special KERNEXEC instrumentation: orb $0x80,7(%rsp) just before retn
++// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
 +static void kernexec_instrument_retaddr(rtx insn)
 +{
-+      rtx ret_addr, clob, or;
-+
-+      start_sequence();
-+
-+      // compute 7(%rsp)
-+      ret_addr = gen_rtx_MEM(QImode, gen_rtx_PLUS(Pmode, stack_pointer_rtx, GEN_INT(7)));
-+      MEM_VOLATILE_P(ret_addr) = 1;
-+
-+      // create orb $0x80,7(%rsp)
-+      or = gen_rtx_SET(VOIDmode, ret_addr, gen_rtx_IOR(QImode, ret_addr, GEN_INT(0xffffffffffffff80)));
-+      clob = gen_rtx_CLOBBER(VOIDmode, gen_rtx_REG(CCmode, FLAGS_REG));
-+
-+      // put everything together
-+      or = emit_insn(gen_rtx_PARALLEL(VOIDmode, gen_rtvec(2, or, clob)));
-+      RTX_FRAME_RELATED_P(or) = 1;
++      rtx btsq;
++      rtvec argvec, constraintvec, labelvec;
++      int line;
 +
-+      end_sequence();
-+
-+      emit_insn_before(or, insn);
++      // create asm volatile("btsq $63,(%%rsp)":::)
++      argvec = rtvec_alloc(0);
++      constraintvec = rtvec_alloc(0);
++      labelvec = rtvec_alloc(0);
++      line = expand_location(RTL_LOCATION(insn)).line;
++      btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
++      MEM_VOLATILE_P(btsq) = 1;
++      RTX_FRAME_RELATED_P(btsq) = 1;
++      emit_insn_before(btsq, insn);
 +}
 +
 +/*
@@ -73888,7 +77889,7 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +      for (i = 0; i < argc; ++i)
 +              error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
 +
-+      if (TARGET_64BIT == 0 || ix86_cmodel != CM_KERNEL)
++      if (TARGET_64BIT == 0)
 +              return 0;
 +
 +      register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
@@ -73896,28 +77897,35 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/Makefile linux-3.0.4/tools/gcc/Makefile
---- linux-3.0.4/tools/gcc/Makefile     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/Makefile     2011-09-17 00:53:44.000000000 -0400
-@@ -0,0 +1,14 @@
+diff -urNp linux-3.1.1/tools/gcc/Makefile linux-3.1.1/tools/gcc/Makefile
+--- linux-3.1.1/tools/gcc/Makefile     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/Makefile     2011-11-16 20:37:08.000000000 -0500
+@@ -0,0 +1,21 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
-+GCCPLUGINS_DIR := $(shell $(HOSTCC) -print-file-name=plugin)
++GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W
 +
 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
 +
-+hostlibs-y := stackleak_plugin.so constify_plugin.so kallocstat_plugin.so kernexec_plugin.so
++hostlibs-y := constify_plugin.so
++hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
++hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
++hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
++hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
++
 +always := $(hostlibs-y)
-+stackleak_plugin-objs := stackleak_plugin.o
++
 +constify_plugin-objs := constify_plugin.o
++stackleak_plugin-objs := stackleak_plugin.o
 +kallocstat_plugin-objs := kallocstat_plugin.o
 +kernexec_plugin-objs := kernexec_plugin.o
-diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackleak_plugin.c
---- linux-3.0.4/tools/gcc/stackleak_plugin.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/stackleak_plugin.c   2011-09-17 00:53:44.000000000 -0400
-@@ -0,0 +1,251 @@
++checker_plugin-objs := checker_plugin.o
+diff -urNp linux-3.1.1/tools/gcc/stackleak_plugin.c linux-3.1.1/tools/gcc/stackleak_plugin.c
+--- linux-3.1.1/tools/gcc/stackleak_plugin.c   1969-12-31 19:00:00.000000000 -0500
++++ linux-3.1.1/tools/gcc/stackleak_plugin.c   2011-11-16 18:39:08.000000000 -0500
+@@ -0,0 +1,291 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -73943,26 +77951,31 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +#include "coretypes.h"
 +#include "tree.h"
 +#include "tree-pass.h"
++#include "flags.h"
 +#include "intl.h"
++#include "toplev.h"
++#include "plugin.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
 +#include "plugin-version.h"
 +#include "tm.h"
-+#include "toplev.h"
++#include "function.h"
 +#include "basic-block.h"
 +#include "gimple.h"
-+//#include "expr.h" where are you...
-+#include "diagnostic.h"
 +#include "rtl.h"
 +#include "emit-rtl.h"
-+#include "function.h"
++
++extern void print_gimple_stmt(FILE *, gimple, int, int);
 +
 +int plugin_is_GPL_compatible;
 +
 +static int track_frame_size = -1;
 +static const char track_function[] = "pax_track_stack";
++static const char check_function[] = "pax_check_alloca";
 +static bool init_locals;
 +
 +static struct plugin_info stackleak_plugin_info = {
-+      .version        = "201109112100",
++      .version        = "201111150100",
 +      .help           = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
 +//                      "initialize-locals\t\tforcibly initialize all stack frames\n"
 +};
@@ -73985,7 +77998,7 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +              .properties_provided    = 0,
 +              .properties_destroyed   = 0,
 +              .todo_flags_start       = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
-+              .todo_flags_finish      = TODO_verify_stmts | TODO_dump_func
++              .todo_flags_finish      = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
 +      }
 +};
 +
@@ -74012,63 +78025,94 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +      return track_frame_size >= 0;
 +}
 +
-+static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
++static void stackleak_check_alloca(gimple_stmt_iterator gsi)
++{
++      gimple check_alloca;
++      tree fndecl, fntype, alloca_size;
++
++      // insert call to void pax_check_alloca(unsigned long size)
++      fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
++      fndecl = build_fn_decl(check_function, fntype);
++      DECL_ASSEMBLER_NAME(fndecl); // for LTO
++      alloca_size = gimple_call_arg(gsi_stmt(gsi), 0);
++      check_alloca = gimple_build_call(fndecl, 1, alloca_size);
++      gsi_insert_before(&gsi, check_alloca, GSI_CONTINUE_LINKING);
++}
++
++static void stackleak_add_instrumentation(gimple_stmt_iterator gsi)
 +{
-+      gimple call;
-+      tree fndecl, type;
++      gimple track_stack;
++      tree fndecl, fntype;
 +
 +      // insert call to void pax_track_stack(void)
-+      type = build_function_type_list(void_type_node, NULL_TREE);
-+      fndecl = build_fn_decl(track_function, type);
++      fntype = build_function_type_list(void_type_node, NULL_TREE);
++      fndecl = build_fn_decl(track_function, fntype);
 +      DECL_ASSEMBLER_NAME(fndecl); // for LTO
-+      call = gimple_build_call(fndecl, 0);
-+      if (before)
-+              gsi_insert_before(gsi, call, GSI_CONTINUE_LINKING);
-+      else
-+              gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING);
++      track_stack = gimple_build_call(fndecl, 0);
++      gsi_insert_after(&gsi, track_stack, GSI_CONTINUE_LINKING);
++}
++
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 5
++static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
++{
++      tree fndecl;
++
++      if (!is_gimple_call(stmt))
++              return false;
++      fndecl = gimple_call_fndecl(stmt);
++      if (!fndecl)
++              return false;
++      if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
++              return false;
++//    print_node(stderr, "pax", fndecl, 4);
++      return DECL_FUNCTION_CODE(fndecl) == code;
++}
++#endif
++
++static bool is_alloca(gimple stmt)
++{
++      if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
++              return true;
++
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++      if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
++              return true;
++#endif
++
++      return false;
 +}
 +
 +static unsigned int execute_stackleak_tree_instrument(void)
 +{
 +      basic_block bb, entry_bb;
-+      gimple_stmt_iterator gsi;
 +      bool prologue_instrumented = false;
 +
 +      entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
 +
 +      // 1. loop through BBs and GIMPLE statements
 +      FOR_EACH_BB(bb) {
++              gimple_stmt_iterator gsi;
 +              for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
 +                      // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
-+                      tree fndecl;
-+                      gimple stmt = gsi_stmt(gsi);
-+
-+                      if (!is_gimple_call(stmt))
-+                              continue;
-+                      fndecl = gimple_call_fndecl(stmt);
-+                      if (!fndecl)
-+                              continue;
-+                      if (TREE_CODE(fndecl) != FUNCTION_DECL)
-+                              continue;
-+                      if (!DECL_BUILT_IN(fndecl))
-+                              continue;
-+                      if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
-+                              continue;
-+                      if (DECL_FUNCTION_CODE(fndecl) != BUILT_IN_ALLOCA)
++                      if (!is_alloca(gsi_stmt(gsi)))
 +                              continue;
 +
-+                      // 2. insert track call after each __builtin_alloca call
-+                      stackleak_add_instrumentation(&gsi, false);
++                      // 2. insert stack overflow check before each __builtin_alloca call
++                      stackleak_check_alloca(gsi);
++
++                      // 3. insert track call after each __builtin_alloca call
++                      stackleak_add_instrumentation(gsi);
 +                      if (bb == entry_bb)
 +                              prologue_instrumented = true;
-+//                    print_node(stderr, "pax", fndecl, 4);
 +              }
 +      }
 +
-+      // 3. insert track call at the beginning
++      // 4. insert track call at the beginning
 +      if (!prologue_instrumented) {
-+              gsi = gsi_start_bb(entry_bb);
-+              stackleak_add_instrumentation(&gsi, true);
++              bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
++              if (dom_info_available_p(CDI_DOMINATORS))
++                      set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
++              stackleak_add_instrumentation(gsi_start_bb(bb));
 +      }
 +
 +      return 0;
@@ -74105,7 +78149,11 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +                      continue;
 +//            warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
 +              // 2. delete call
-+              delete_insn_and_edges(insn);
++              insn = delete_insn_and_edges(insn);
++#if __GNUC__ > 4 || __GNUC_MINOR__ >= 7
++              if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
++                      insn = delete_insn_and_edges(insn);
++#endif
 +      }
 +
 +//    print_simple_rtl(stderr, get_insns());
@@ -74169,9 +78217,20 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
---- linux-3.0.4/usr/gen_init_cpio.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/usr/gen_init_cpio.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h
+--- linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h  2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/tools/perf/util/include/asm/alternative-asm.h  2011-11-16 18:39:08.000000000 -0500
+@@ -5,4 +5,7 @@
+ 
+ #define altinstruction_entry #
+ 
++      .macro pax_force_retaddr rip=0
++      .endm
++
+ #endif
+diff -urNp linux-3.1.1/usr/gen_init_cpio.c linux-3.1.1/usr/gen_init_cpio.c
+--- linux-3.1.1/usr/gen_init_cpio.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/usr/gen_init_cpio.c    2011-11-16 18:39:08.000000000 -0500
 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
        int retval;
        int rc = -1;
@@ -74194,9 +78253,9 @@ diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
---- linux-3.0.4/virt/kvm/kvm_main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/virt/kvm/kvm_main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.1.1/virt/kvm/kvm_main.c linux-3.1.1/virt/kvm/kvm_main.c
+--- linux-3.1.1/virt/kvm/kvm_main.c    2011-11-11 15:19:27.000000000 -0500
++++ linux-3.1.1/virt/kvm/kvm_main.c    2011-11-16 18:39:08.000000000 -0500
 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
@@ -74206,7 +78265,7 @@ diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
  
  struct kmem_cache *kvm_vcpu_cache;
  EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -2176,7 +2176,7 @@ static void hardware_enable_nolock(void 
+@@ -2266,7 +2266,7 @@ static void hardware_enable_nolock(void 
  
        if (r) {
                cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -74215,7 +78274,7 @@ diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
                printk(KERN_INFO "kvm: enabling virtualization on "
                                 "CPU%d failed\n", cpu);
        }
-@@ -2230,10 +2230,10 @@ static int hardware_enable_all(void)
+@@ -2320,10 +2320,10 @@ static int hardware_enable_all(void)
  
        kvm_usage_count++;
        if (kvm_usage_count == 1) {
@@ -74228,7 +78287,7 @@ diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
                        hardware_disable_all_nolock();
                        r = -EBUSY;
                }
-@@ -2498,7 +2498,7 @@ static void kvm_sched_out(struct preempt
+@@ -2588,7 +2588,7 @@ static void kvm_sched_out(struct preempt
        kvm_arch_vcpu_put(vcpu);
  }
  
@@ -74237,7 +78296,7 @@ diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
                  struct module *module)
  {
        int r;
-@@ -2561,7 +2561,7 @@ int kvm_init(void *opaque, unsigned vcpu
+@@ -2651,7 +2651,7 @@ int kvm_init(void *opaque, unsigned vcpu
        if (!vcpu_align)
                vcpu_align = __alignof__(struct kvm_vcpu);
        kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -74246,7 +78305,7 @@ diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
        if (!kvm_vcpu_cache) {
                r = -ENOMEM;
                goto out_free_3;
-@@ -2571,9 +2571,11 @@ int kvm_init(void *opaque, unsigned vcpu
+@@ -2661,9 +2661,11 @@ int kvm_init(void *opaque, unsigned vcpu
        if (r)
                goto out_free;
  

diff --git a/kernel/patches/linux-3.0-bridge-no-carrier.patch b/kernel/patches/linux-3.0-bridge-no-carrier.patch
deleted file mode 100644 (file)
index 42f2010..0000000
--- a/kernel/patches/linux-3.0-bridge-no-carrier.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b64b73d7d0c480f75684519c6134e79d50c1b341 Mon Sep 17 00:00:00 2001
-From: stephen hemminger <shemminger@vyatta.com>
-Date: Mon, 3 Oct 2011 18:14:45 +0000
-Subject: [PATCH] bridge: leave carrier on for empty bridge
-
-This resolves a regression seen by some users of bridging.
-Some users use the bridge like a dummy device.
-They expect to be able to put an IPv6 address on the device
-with no ports attached. Although there are better ways of doing
-this, there is no reason to not allow it.
-
-Note: the bridge still will reflect the state of ports in the
-bridge if there are any added.
-
-Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/bridge/br_device.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
-index 32b8f9f..ff3ed60 100644
---- a/net/bridge/br_device.c
-+++ b/net/bridge/br_device.c
-@@ -91,7 +91,6 @@ static int br_dev_open(struct net_device *dev)
- {
-       struct net_bridge *br = netdev_priv(dev);
- 
--      netif_carrier_off(dev);
-       netdev_update_features(dev);
-       netif_start_queue(dev);
-       br_stp_enable_bridge(br);
-@@ -108,8 +107,6 @@ static int br_dev_stop(struct net_device *dev)
- {
-       struct net_bridge *br = netdev_priv(dev);
- 
--      netif_carrier_off(dev);
--
-       br_stp_disable_bridge(br);
-       br_multicast_stop(br);
- 
--- 
-1.7.6.2
-

diff --git a/kernel/systemd/cpupower.service b/kernel/systemd/cpupower.service
new file mode 100644 (file)
index 0000000..73d1038
--- /dev/null
+++ b/kernel/systemd/cpupower.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Configure CPU power related settings
+After=syslog.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/cpupower frequency-set -g performance
+ExecStop=/usr/bin/cpupower frequency-set -g ondemand
+
+[Install]
+WantedBy=multi-user.target