kernel: Update patches and configuration for 2.6.34.

diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config
index 7c4f9e5d5d768c9b50026bca7fba5d2009552d21..08ddcc66de24c8dbc4c46cbbbf90d271cdb0adf0 100644 (file)
--- a/pkgs/core/kernel/config
+++ b/pkgs/core/kernel/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33.1
-# Mon Apr  5 15:20:41 2010
+# Linux kernel version: 2.6.34
+# Sun Jul  4 22:17:32 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -19,6 +19,7 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
@@ -44,6 +45,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
@@ -91,16 +93,12 @@ CONFIG_TREE_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_USER_SCHED=y
-# CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
@@ -153,7 +151,6 @@ CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
-CONFIG_OPROFILE_IBS=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
@@ -162,8 +159,10 @@ CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
@@ -175,7 +174,7 @@ CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_SLOW_WORK=y
 # CONFIG_SLOW_WORK_DEBUG is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-# CONFIG_SLABINFO is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -201,6 +200,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
 # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK is not set
@@ -251,6 +251,7 @@ CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
@@ -439,6 +440,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 #
 # CPUFreq processor drivers
 #
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_POWERNOW_K6=m
 CONFIG_X86_POWERNOW_K7=m
@@ -489,7 +491,6 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
 CONFIG_PCI_IOV=y
@@ -503,7 +504,6 @@ CONFIG_K8_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
 CONFIG_CARDBUS=y
 
 #
@@ -535,7 +535,6 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
@@ -620,6 +619,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
@@ -639,6 +639,7 @@ CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
@@ -788,6 +789,7 @@ CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_STP=m
 CONFIG_GARP=m
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
@@ -889,7 +891,7 @@ CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
@@ -981,9 +983,12 @@ CONFIG_ICS932S401=m
 # CONFIG_ENCLOSURE_SERVICES is not set
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
 CONFIG_HP_ILO=m
 CONFIG_ISL29003=m
+CONFIG_SENSORS_TSL2550=m
 CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
 CONFIG_C2PORT=m
 # CONFIG_C2PORT_DURAMAR_2150 is not set
 
@@ -1003,7 +1008,8 @@ CONFIG_HAVE_IDE=y
 #
 # SCSI device support
 #
-# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_TGT=m
@@ -1183,6 +1189,7 @@ CONFIG_PATA_HPT3X3_DMA=y
 CONFIG_PATA_IT821X=m
 CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
+CONFIG_PATA_LEGACY=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_MARVELL=m
 CONFIG_PATA_MPIIX=m
@@ -1271,6 +1278,7 @@ CONFIG_IFB=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_VETH is not set
@@ -1294,6 +1302,7 @@ CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
@@ -1332,6 +1341,7 @@ CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
@@ -1397,10 +1407,13 @@ CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4_DEPENDS=y
+CONFIG_CHELSIO_T4=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
+CONFIG_IXGBEVF=m
 CONFIG_IXGB=m
 CONFIG_S2IO=m
 CONFIG_VXGE=m
@@ -1414,6 +1427,7 @@ CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
 CONFIG_QLGE=m
 CONFIG_SFC=m
 CONFIG_BE2NET=m
@@ -1486,17 +1500,16 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLAGN=m
 CONFIG_IWL4965=y
 CONFIG_IWL5000=y
 CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
 CONFIG_HERMES=m
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_PLX_HERMES=m
@@ -1513,11 +1526,16 @@ CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=m
+CONFIG_RT2800PCI_PCI=y
 CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT30XX is not set
+# CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT30XX is not set
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
 CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
@@ -1553,6 +1571,7 @@ CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
@@ -1569,6 +1588,8 @@ CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -1638,23 +1659,6 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
@@ -1730,8 +1734,6 @@ CONFIG_HISAX_FRITZ_PCIPNP=m
 #
 # Active cards
 #
-CONFIG_HYSDN=m
-CONFIG_ISDN_HDLC=m
 # CONFIG_ISDN_CAPI is not set
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_I4L=y
@@ -1740,6 +1742,25 @@ CONFIG_GIGASET_BASE=m
 CONFIG_GIGASET_M105=m
 CONFIG_GIGASET_M101=m
 # CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
 # CONFIG_PHONE is not set
 
 #
@@ -1826,9 +1847,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_LEGACY_PTYS=y
@@ -1880,6 +1903,7 @@ CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 
@@ -1918,6 +1942,7 @@ CONFIG_I2C_SCMI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -1933,15 +1958,9 @@ CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_STUB=m
 CONFIG_SCx200_ACB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_SENSORS_TSL2550=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_SPI is not set
 
 #
@@ -1951,17 +1970,22 @@ CONFIG_SENSORS_TSL2550=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO expanders:
 #
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
 
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_WM8994=m
 CONFIG_GPIO_ADP5588=m
 
 #
@@ -1969,6 +1993,7 @@ CONFIG_GPIO_ADP5588=m
 #
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_LANGWELL=y
+CONFIG_GPIO_TIMBERDALE=y
 
 #
 # SPI GPIO expanders:
@@ -2001,7 +2026,6 @@ CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
-CONFIG_WM8350_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_OLPC=m
@@ -2025,10 +2049,11 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
@@ -2089,7 +2114,6 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
@@ -2107,7 +2131,6 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -2178,26 +2201,26 @@ CONFIG_MFD_CORE=m
 CONFIG_TPS65010=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_WM8994=m
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DUMMY=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_BQ24022=m
 CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
 CONFIG_REGULATOR_PCF50633=m
 CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_AB3100=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_MEDIA_SUPPORT=m
@@ -2255,6 +2278,9 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
@@ -2296,6 +2322,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
@@ -2309,6 +2336,7 @@ CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_SOC_CAMERA=m
@@ -2329,7 +2357,9 @@ CONFIG_USB_GSPCA=m
 CONFIG_USB_M5602=m
 CONFIG_USB_STV06XX=m
 CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
 CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
@@ -2337,9 +2367,11 @@ CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_USB_GSPCA_SONIXB=m
@@ -2362,6 +2394,7 @@ CONFIG_USB_GSPCA_ZC3XX=m
 # CONFIG_VIDEO_PVRUSB2 is not set
 CONFIG_VIDEO_HDPVR=m
 # CONFIG_VIDEO_EM28XX is not set
+CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
@@ -2383,7 +2416,9 @@ CONFIG_RADIO_SI4713=m
 # CONFIG_RADIO_SI470X is not set
 # CONFIG_USB_MR800 is not set
 # CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_TEF6862 is not set
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -2433,6 +2468,7 @@ CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -2481,12 +2517,19 @@ CONFIG_MANTIS_CORE=m
 CONFIG_DVB_MANTIS=m
 CONFIG_DVB_HOPPER=m
 
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
 #
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
@@ -2565,6 +2608,8 @@ CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
 CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
 # CONFIG_DRM is not set
 CONFIG_VGASTATE=m
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -2847,6 +2892,7 @@ CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
@@ -2864,6 +2910,7 @@ CONFIG_SND_SOC_AK4535=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_DA7210=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_PCM3008=m
 CONFIG_SND_SOC_SPDIF=m
@@ -2873,7 +2920,6 @@ CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
-CONFIG_SND_SOC_WM8350=m
 CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
@@ -2887,17 +2933,22 @@ CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8900=m
 CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8961=m
 CONFIG_SND_SOC_WM8971=m
 CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8988=m
 CONFIG_SND_SOC_WM8990=m
 CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM8994=m
 CONFIG_SND_SOC_WM9081=m
 CONFIG_SND_SOC_MAX9877=m
 CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_WM2000=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
@@ -2914,6 +2965,7 @@ CONFIG_USB_HIDDEV=y
 #
 # Special HID drivers
 #
+CONFIG_HID_3M_PCT=m
 CONFIG_HID_A4TECH=m
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
@@ -2930,14 +2982,19 @@ CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LOGITECH=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGIG940_FF is not set
 CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 # CONFIG_PANTHERLORD_FF is not set
 CONFIG_HID_PETALYNX=m
+CONFIG_HID_QUANTA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
+CONFIG_HID_STANTUM=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 # CONFIG_GREENASIA_FF is not set
@@ -2962,8 +3019,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_OTG is not set
 # CONFIG_USB_MON is not set
 CONFIG_USB_WUSB=m
 # CONFIG_USB_WUSB_CBAF is not set
@@ -3049,7 +3104,6 @@ CONFIG_USB_SEVSEG=m
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
-# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -3062,7 +3116,6 @@ CONFIG_USB_SEVSEG=m
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_VST is not set
 # CONFIG_USB_ATM is not set
 # CONFIG_USB_GADGET is not set
 
@@ -3093,16 +3146,16 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
-CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_TIMER is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
@@ -3167,15 +3220,13 @@ CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM8350=m
 CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
 
 #
 # on-CPU RTC drivers
 #
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
 CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
 
 #
 # DMA Devices
@@ -3196,10 +3247,10 @@ CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
 # CONFIG_UIO_PDRV is not set
 # CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_SMX is not set
 # CONFIG_UIO_AEC is not set
 # CONFIG_UIO_SERCOS3 is not set
 CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
 
 #
 # TI VLYNQ
@@ -3226,6 +3277,7 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
 CONFIG_ACPI_ASUS=m
@@ -3351,6 +3403,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+CONFIG_LOGFS=m
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -3398,6 +3451,7 @@ CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
+# CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 CONFIG_CIFS_STATS2=y
@@ -3478,6 +3532,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LKDTM is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -3699,6 +3754,7 @@ CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
@@ -3793,10 +3849,12 @@ CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
 CONFIG_LGUEST=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
@@ -3830,6 +3888,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y

diff --git a/pkgs/core/kernel/patches/aufs2-2.6.33.1-1.patch b/pkgs/core/kernel/patches/aufs2-2.6.33.1-1.patch
index ef625f495fa4143a5abe75389134ccca6465c0b5..80377b2d5b4f70e0bdd64cd5992c490daafb410c 100644 (file)
--- a/pkgs/core/kernel/patches/aufs2-2.6.33.1-1.patch
+++ b/pkgs/core/kernel/patches/aufs2-2.6.33.1-1.patch
@@ -25730,9 +25730,9 @@ diff -Nur linux-2.6.33.1-vanilla/fs/Makefile linux-2.6.33.1/fs/Makefile
 --- linux-2.6.33.1-vanilla/fs/Makefile 2010-03-15 17:09:39.000000000 +0100
 +++ linux-2.6.33.1/fs/Makefile 2010-04-05 16:54:40.000000000 +0200
 @@ -124,3 +124,4 @@
- obj-$(CONFIG_BTRFS_FS)                += btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-$(CONFIG_EXOFS_FS)          += exofs/
+ obj-$(CONFIG_CEPH_FS)         += ceph/
 +obj-$(CONFIG_AUFS_FS)           += aufs/
 diff -Nur linux-2.6.33.1-vanilla/fs/namei.c linux-2.6.33.1/fs/namei.c
 --- linux-2.6.33.1-vanilla/fs/namei.c  2010-03-15 17:09:39.000000000 +0100

diff --git a/pkgs/core/kernel/patches/grsecurity-2.1.14-2.6.33.1-201003201735.patch b/pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.34-201007031927.patch
similarity index 76%
rename from pkgs/core/kernel/patches/grsecurity-2.1.14-2.6.33.1-201003201735.patch
rename to pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.34-201007031927.patch
index 1f037ba5a417fc0c59a7168970cadfe1dfe6e5f4..96b4d7e470be1c81175a8f5da95146c00d181a6e 100644 (file)
--- a/pkgs/core/kernel/patches/grsecurity-2.1.14-2.6.33.1-201003201735.patch
+++ b/pkgs/core/kernel/patches/grsecurity-2.2.0-2.6.34-201007031927.patch
@@ -1,6 +1,21 @@
-diff -urNp linux-2.6.33.1/arch/alpha/include/asm/elf.h linux-2.6.33.1/arch/alpha/include/asm/elf.h
---- linux-2.6.33.1/arch/alpha/include/asm/elf.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/alpha/include/asm/elf.h        2010-03-20 16:58:38.417757561 -0400
+diff -urNp linux-2.6.34/arch/alpha/include/asm/dma-mapping.h linux-2.6.34/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/alpha/include/asm/dma-mapping.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/dma-mapping.h  2010-07-01 20:45:13.000000000 -0400
+@@ -3,9 +3,9 @@
+ 
+ #include <linux/dma-attrs.h>
+ 
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+       return dma_ops;
+ }
+diff -urNp linux-2.6.34/arch/alpha/include/asm/elf.h linux-2.6.34/arch/alpha/include/asm/elf.h
+--- linux-2.6.34/arch/alpha/include/asm/elf.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/elf.h  2010-07-01 20:45:13.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +30,9 @@ diff -urNp linux-2.6.33.1/arch/alpha/include/asm/elf.h linux-2.6.33.1/arch/alpha
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.33.1/arch/alpha/include/asm/pgtable.h linux-2.6.33.1/arch/alpha/include/asm/pgtable.h
---- linux-2.6.33.1/arch/alpha/include/asm/pgtable.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/alpha/include/asm/pgtable.h    2010-03-20 16:58:38.417757561 -0400
+diff -urNp linux-2.6.34/arch/alpha/include/asm/pgtable.h linux-2.6.34/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.34/arch/alpha/include/asm/pgtable.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/include/asm/pgtable.h      2010-07-01 20:45:13.000000000 -0400
 @@ -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,9 +51,9 @@ diff -urNp linux-2.6.33.1/arch/alpha/include/asm/pgtable.h linux-2.6.33.1/arch/a
  #define PAGE_KERNEL   __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.33.1/arch/alpha/kernel/module.c linux-2.6.33.1/arch/alpha/kernel/module.c
---- linux-2.6.33.1/arch/alpha/kernel/module.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/alpha/kernel/module.c  2010-03-20 16:58:38.417757561 -0400
+diff -urNp linux-2.6.34/arch/alpha/kernel/module.c linux-2.6.34/arch/alpha/kernel/module.c
+--- linux-2.6.34/arch/alpha/kernel/module.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/module.c    2010-07-01 20:45:13.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
        /* The small sections were sorted to the end of the segment.
@@ -48,10 +63,10 @@ diff -urNp linux-2.6.33.1/arch/alpha/kernel/module.c linux-2.6.33.1/arch/alpha/k
        got = sechdrs[me->arch.gotsecindex].sh_addr;
  
        for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.33.1/arch/alpha/kernel/osf_sys.c linux-2.6.33.1/arch/alpha/kernel/osf_sys.c
---- linux-2.6.33.1/arch/alpha/kernel/osf_sys.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/alpha/kernel/osf_sys.c 2010-03-20 16:58:38.417757561 -0400
-@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.34/arch/alpha/kernel/osf_sys.c linux-2.6.34/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.34/arch/alpha/kernel/osf_sys.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/osf_sys.c   2010-07-01 20:45:13.000000000 -0400
+@@ -1206,6 +1206,10 @@ arch_get_unmapped_area(struct file *filp
           merely specific addresses, but regions of memory -- perhaps
           this feature should be incorporated into all ports?  */
  
@@ -62,7 +77,7 @@ diff -urNp linux-2.6.33.1/arch/alpha/kernel/osf_sys.c linux-2.6.33.1/arch/alpha/
        if (addr) {
                addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
                if (addr != (unsigned long) -ENOMEM)
-@@ -1212,8 +1216,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1213,8 +1217,8 @@ arch_get_unmapped_area(struct file *filp
        }
  
        /* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -73,9 +88,49 @@ diff -urNp linux-2.6.33.1/arch/alpha/kernel/osf_sys.c linux-2.6.33.1/arch/alpha/
        if (addr != (unsigned long) -ENOMEM)
                return addr;
  
-diff -urNp linux-2.6.33.1/arch/alpha/mm/fault.c linux-2.6.33.1/arch/alpha/mm/fault.c
---- linux-2.6.33.1/arch/alpha/mm/fault.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/alpha/mm/fault.c       2010-03-20 16:58:38.420782159 -0400
+diff -urNp linux-2.6.34/arch/alpha/kernel/pci_iommu.c linux-2.6.34/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.34/arch/alpha/kernel/pci_iommu.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/pci_iommu.c 2010-07-01 20:45:13.000000000 -0400
+@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
+       return 0;
+ }
+ 
+-struct dma_map_ops alpha_pci_ops = {
++const struct dma_map_ops alpha_pci_ops = {
+       .alloc_coherent         = alpha_pci_alloc_coherent,
+       .free_coherent          = alpha_pci_free_coherent,
+       .map_page               = alpha_pci_map_page,
+@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
+       .set_dma_mask           = alpha_pci_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_pci_ops;
++const struct dma_map_ops *dma_ops = &alpha_pci_ops;
+ EXPORT_SYMBOL(dma_ops);
+diff -urNp linux-2.6.34/arch/alpha/kernel/pci-noop.c linux-2.6.34/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.34/arch/alpha/kernel/pci-noop.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/kernel/pci-noop.c  2010-07-01 20:45:13.000000000 -0400
+@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
+       return 0;
+ }
+ 
+-struct dma_map_ops alpha_noop_ops = {
++const struct dma_map_ops alpha_noop_ops = {
+       .alloc_coherent         = alpha_noop_alloc_coherent,
+       .free_coherent          = alpha_noop_free_coherent,
+       .map_page               = alpha_noop_map_page,
+@@ -183,7 +183,7 @@ struct dma_map_ops alpha_noop_ops = {
+       .set_dma_mask           = alpha_noop_set_mask,
+ };
+ 
+-struct dma_map_ops *dma_ops = &alpha_noop_ops;
++const struct dma_map_ops *dma_ops = &alpha_noop_ops;
+ EXPORT_SYMBOL(dma_ops);
+ 
+ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+diff -urNp linux-2.6.34/arch/alpha/mm/fault.c linux-2.6.34/arch/alpha/mm/fault.c
+--- linux-2.6.34/arch/alpha/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/alpha/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
        __reload_thread(pcb);
  }
@@ -232,10 +287,10 @@ diff -urNp linux-2.6.33.1/arch/alpha/mm/fault.c linux-2.6.33.1/arch/alpha/mm/fau
        } else if (!cause) {
                /* Allow reads even for write-only mappings */
                if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.33.1/arch/arm/include/asm/elf.h linux-2.6.33.1/arch/arm/include/asm/elf.h
---- linux-2.6.33.1/arch/arm/include/asm/elf.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/include/asm/elf.h  2010-03-20 16:58:38.440745685 -0400
-@@ -108,7 +108,14 @@ int dump_task_regs(struct task_struct *t
+diff -urNp linux-2.6.34/arch/arm/include/asm/elf.h linux-2.6.34/arch/arm/include/asm/elf.h
+--- linux-2.6.34/arch/arm/include/asm/elf.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/elf.h    2010-07-01 20:45:13.000000000 -0400
+@@ -111,7 +111,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.  */
  
@@ -251,20 +306,20 @@ diff -urNp linux-2.6.33.1/arch/arm/include/asm/elf.h linux-2.6.33.1/arch/arm/inc
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.33.1/arch/arm/include/asm/kmap_types.h linux-2.6.33.1/arch/arm/include/asm/kmap_types.h
---- linux-2.6.33.1/arch/arm/include/asm/kmap_types.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/include/asm/kmap_types.h   2010-03-20 16:58:38.444581130 -0400
-@@ -19,6 +19,7 @@ enum km_type {
-       KM_SOFTIRQ0,
+diff -urNp linux-2.6.34/arch/arm/include/asm/kmap_types.h linux-2.6.34/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.34/arch/arm/include/asm/kmap_types.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/kmap_types.h     2010-07-01 20:45:13.000000000 -0400
+@@ -20,6 +20,7 @@ enum km_type {
        KM_SOFTIRQ1,
+       KM_L1_CACHE,
        KM_L2_CACHE,
 +      KM_CLEARPAGE,
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.1/arch/arm/include/asm/uaccess.h linux-2.6.33.1/arch/arm/include/asm/uaccess.h
---- linux-2.6.33.1/arch/arm/include/asm/uaccess.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/include/asm/uaccess.h      2010-03-20 16:58:38.444581130 -0400
+diff -urNp linux-2.6.34/arch/arm/include/asm/uaccess.h linux-2.6.34/arch/arm/include/asm/uaccess.h
+--- linux-2.6.34/arch/arm/include/asm/uaccess.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/include/asm/uaccess.h        2010-07-01 20:45:13.000000000 -0400
 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,10 +340,10 @@ diff -urNp linux-2.6.33.1/arch/arm/include/asm/uaccess.h linux-2.6.33.1/arch/arm
        if (access_ok(VERIFY_WRITE, to, n))
                n = __copy_to_user(to, from, n);
        return n;
-diff -urNp linux-2.6.33.1/arch/arm/kernel/kgdb.c linux-2.6.33.1/arch/arm/kernel/kgdb.c
---- linux-2.6.33.1/arch/arm/kernel/kgdb.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/kernel/kgdb.c      2010-03-20 16:58:38.468885430 -0400
-@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.34/arch/arm/kernel/kgdb.c linux-2.6.34/arch/arm/kernel/kgdb.c
+--- linux-2.6.34/arch/arm/kernel/kgdb.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/kernel/kgdb.c        2010-07-01 20:45:13.000000000 -0400
+@@ -203,7 +203,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
   */
@@ -297,9 +352,9 @@ diff -urNp linux-2.6.33.1/arch/arm/kernel/kgdb.c linux-2.6.33.1/arch/arm/kernel/
  #ifndef __ARMEB__
        .gdb_bpt_instr          = {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.33.1/arch/arm/mach-at91/pm.c linux-2.6.33.1/arch/arm/mach-at91/pm.c
---- linux-2.6.33.1/arch/arm/mach-at91/pm.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-at91/pm.c     2010-03-20 16:58:38.468885430 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-at91/pm.c linux-2.6.34/arch/arm/mach-at91/pm.c
+--- linux-2.6.34/arch/arm/mach-at91/pm.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-at91/pm.c       2010-07-01 20:45:13.000000000 -0400
 @@ -294,7 +294,7 @@ static void at91_pm_end(void)
  }
  
@@ -309,9 +364,21 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-at91/pm.c linux-2.6.33.1/arch/arm/mach-a
        .valid  = at91_pm_valid_state,
        .begin  = at91_pm_begin,
        .enter  = at91_pm_enter,
-diff -urNp linux-2.6.33.1/arch/arm/mach-omap1/pm.c linux-2.6.33.1/arch/arm/mach-omap1/pm.c
---- linux-2.6.33.1/arch/arm/mach-omap1/pm.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-omap1/pm.c    2010-03-20 16:58:38.472778666 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-davinci/pm.c linux-2.6.34/arch/arm/mach-davinci/pm.c
+--- linux-2.6.34/arch/arm/mach-davinci/pm.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-davinci/pm.c    2010-07-01 20:45:13.000000000 -0400
+@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
+       return ret;
+ }
+ 
+-static struct platform_suspend_ops davinci_pm_ops = {
++static const struct platform_suspend_ops davinci_pm_ops = {
+       .enter          = davinci_pm_enter,
+       .valid          = suspend_valid_only_mem,
+ };
+diff -urNp linux-2.6.34/arch/arm/mach-omap1/pm.c linux-2.6.34/arch/arm/mach-omap1/pm.c
+--- linux-2.6.34/arch/arm/mach-omap1/pm.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap1/pm.c      2010-07-01 20:45:13.000000000 -0400
 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
  
  
@@ -321,10 +388,10 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-omap1/pm.c linux-2.6.33.1/arch/arm/mach-
        .prepare        = omap_pm_prepare,
        .enter          = omap_pm_enter,
        .finish         = omap_pm_finish,
-diff -urNp linux-2.6.33.1/arch/arm/mach-omap2/pm24xx.c linux-2.6.33.1/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.33.1/arch/arm/mach-omap2/pm24xx.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-omap2/pm24xx.c        2010-03-20 16:58:38.476775080 -0400
-@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
+diff -urNp linux-2.6.34/arch/arm/mach-omap2/pm24xx.c linux-2.6.34/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.34/arch/arm/mach-omap2/pm24xx.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap2/pm24xx.c  2010-07-01 20:45:13.000000000 -0400
+@@ -324,7 +324,7 @@ static void omap2_pm_finish(void)
        enable_hlt();
  }
  
@@ -333,10 +400,10 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-omap2/pm24xx.c linux-2.6.33.1/arch/arm/m
        .prepare        = omap2_pm_prepare,
        .enter          = omap2_pm_enter,
        .finish         = omap2_pm_finish,
-diff -urNp linux-2.6.33.1/arch/arm/mach-omap2/pm34xx.c linux-2.6.33.1/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.33.1/arch/arm/mach-omap2/pm34xx.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-omap2/pm34xx.c        2010-03-20 16:58:38.484767476 -0400
-@@ -650,7 +650,7 @@ static void omap3_pm_end(void)
+diff -urNp linux-2.6.34/arch/arm/mach-omap2/pm34xx.c linux-2.6.34/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.34/arch/arm/mach-omap2/pm34xx.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-omap2/pm34xx.c  2010-07-01 20:45:13.000000000 -0400
+@@ -651,7 +651,7 @@ static void omap3_pm_end(void)
        return;
  }
  
@@ -345,10 +412,10 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-omap2/pm34xx.c linux-2.6.33.1/arch/arm/m
        .begin          = omap3_pm_begin,
        .end            = omap3_pm_end,
        .prepare        = omap3_pm_prepare,
-diff -urNp linux-2.6.33.1/arch/arm/mach-pnx4008/pm.c linux-2.6.33.1/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.33.1/arch/arm/mach-pnx4008/pm.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-pnx4008/pm.c  2010-03-20 16:58:38.488749331 -0400
-@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
+diff -urNp linux-2.6.34/arch/arm/mach-pnx4008/pm.c linux-2.6.34/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.34/arch/arm/mach-pnx4008/pm.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pnx4008/pm.c    2010-07-01 20:45:13.000000000 -0400
+@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
               (state == PM_SUSPEND_MEM);
  }
  
@@ -357,10 +424,10 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-pnx4008/pm.c linux-2.6.33.1/arch/arm/mac
        .enter = pnx4008_pm_enter,
        .valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.33.1/arch/arm/mach-pxa/pm.c linux-2.6.33.1/arch/arm/mach-pxa/pm.c
---- linux-2.6.33.1/arch/arm/mach-pxa/pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-pxa/pm.c      2010-03-20 16:58:38.492744784 -0400
-@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
+diff -urNp linux-2.6.34/arch/arm/mach-pxa/pm.c linux-2.6.34/arch/arm/mach-pxa/pm.c
+--- linux-2.6.34/arch/arm/mach-pxa/pm.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pxa/pm.c        2010-07-01 20:45:13.000000000 -0400
+@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
                pxa_cpu_pm_fns->finish();
  }
  
@@ -369,9 +436,9 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-pxa/pm.c linux-2.6.33.1/arch/arm/mach-px
        .valid          = pxa_pm_valid,
        .enter          = pxa_pm_enter,
        .prepare        = pxa_pm_prepare,
-diff -urNp linux-2.6.33.1/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.33.1/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.33.1/arch/arm/mach-pxa/sharpsl_pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-pxa/sharpsl_pm.c      2010-03-20 16:58:38.500761827 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-pxa/sharpsl_pm.c        2010-07-01 20:45:13.000000000 -0400
 @@ -892,7 +892,7 @@ static void sharpsl_apm_get_power_status
  }
  
@@ -381,9 +448,9 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.33.1/arch/arm
        .prepare        = pxa_pm_prepare,
        .finish         = pxa_pm_finish,
        .enter          = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.33.1/arch/arm/mach-sa1100/pm.c linux-2.6.33.1/arch/arm/mach-sa1100/pm.c
---- linux-2.6.33.1/arch/arm/mach-sa1100/pm.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mach-sa1100/pm.c   2010-03-20 16:58:38.504745508 -0400
+diff -urNp linux-2.6.34/arch/arm/mach-sa1100/pm.c linux-2.6.34/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.34/arch/arm/mach-sa1100/pm.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mach-sa1100/pm.c     2010-07-01 20:45:13.000000000 -0400
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
        return virt_to_phys(sp);
  }
@@ -393,10 +460,10 @@ diff -urNp linux-2.6.33.1/arch/arm/mach-sa1100/pm.c linux-2.6.33.1/arch/arm/mach
        .enter          = sa11x0_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.33.1/arch/arm/mm/fault.c linux-2.6.33.1/arch/arm/mm/fault.c
---- linux-2.6.33.1/arch/arm/mm/fault.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mm/fault.c 2010-03-20 16:58:38.512762145 -0400
-@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
+diff -urNp linux-2.6.34/arch/arm/mm/fault.c linux-2.6.34/arch/arm/mm/fault.c
+--- linux-2.6.34/arch/arm/mm/fault.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mm/fault.c   2010-07-01 20:45:13.000000000 -0400
+@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
        }
  #endif
  
@@ -410,7 +477,7 @@ diff -urNp linux-2.6.33.1/arch/arm/mm/fault.c linux-2.6.33.1/arch/arm/mm/fault.c
        tsk->thread.address = addr;
        tsk->thread.error_code = fsr;
        tsk->thread.trap_no = 14;
-@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
+@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif                                        /* CONFIG_MMU */
  
@@ -444,9 +511,9 @@ diff -urNp linux-2.6.33.1/arch/arm/mm/fault.c linux-2.6.33.1/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.33.1/arch/arm/mm/mmap.c linux-2.6.33.1/arch/arm/mm/mmap.c
---- linux-2.6.33.1/arch/arm/mm/mmap.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/mm/mmap.c  2010-03-20 16:58:38.512762145 -0400
+diff -urNp linux-2.6.34/arch/arm/mm/mmap.c linux-2.6.34/arch/arm/mm/mmap.c
+--- linux-2.6.34/arch/arm/mm/mmap.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/mm/mmap.c    2010-07-01 20:45:13.000000000 -0400
 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
        if (len > TASK_SIZE)
                return -ENOMEM;
@@ -483,9 +550,9 @@ diff -urNp linux-2.6.33.1/arch/arm/mm/mmap.c linux-2.6.33.1/arch/arm/mm/mmap.c
                                mm->cached_hole_size = 0;
                                goto full_search;
                        }
-diff -urNp linux-2.6.33.1/arch/arm/plat-s3c/pm.c linux-2.6.33.1/arch/arm/plat-s3c/pm.c
---- linux-2.6.33.1/arch/arm/plat-s3c/pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/arm/plat-s3c/pm.c      2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/arm/plat-samsung/pm.c linux-2.6.34/arch/arm/plat-samsung/pm.c
+--- linux-2.6.34/arch/arm/plat-samsung/pm.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/arm/plat-samsung/pm.c    2010-07-01 20:45:13.000000000 -0400
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
        s3c_pm_check_cleanup();
  }
@@ -495,9 +562,9 @@ diff -urNp linux-2.6.33.1/arch/arm/plat-s3c/pm.c linux-2.6.33.1/arch/arm/plat-s3
        .enter          = s3c_pm_enter,
        .prepare        = s3c_pm_prepare,
        .finish         = s3c_pm_finish,
-diff -urNp linux-2.6.33.1/arch/avr32/include/asm/elf.h linux-2.6.33.1/arch/avr32/include/asm/elf.h
---- linux-2.6.33.1/arch/avr32/include/asm/elf.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/avr32/include/asm/elf.h        2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/avr32/include/asm/elf.h linux-2.6.34/arch/avr32/include/asm/elf.h
+--- linux-2.6.34/arch/avr32/include/asm/elf.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/include/asm/elf.h  2010-07-01 20:45:13.000000000 -0400
 @@ -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.  */
@@ -514,9 +581,9 @@ diff -urNp linux-2.6.33.1/arch/avr32/include/asm/elf.h linux-2.6.33.1/arch/avr32
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.33.1/arch/avr32/include/asm/kmap_types.h linux-2.6.33.1/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.33.1/arch/avr32/include/asm/kmap_types.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/avr32/include/asm/kmap_types.h 2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/avr32/include/asm/kmap_types.h linux-2.6.34/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.34/arch/avr32/include/asm/kmap_types.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/include/asm/kmap_types.h   2010-07-01 20:45:13.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)        KM_IRQ0,
  D(11) KM_IRQ1,
  D(12) KM_SOFTIRQ0,
@@ -527,9 +594,9 @@ diff -urNp linux-2.6.33.1/arch/avr32/include/asm/kmap_types.h linux-2.6.33.1/arc
  };
  
  #undef D
-diff -urNp linux-2.6.33.1/arch/avr32/mach-at32ap/pm.c linux-2.6.33.1/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.33.1/arch/avr32/mach-at32ap/pm.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/avr32/mach-at32ap/pm.c 2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/avr32/mach-at32ap/pm.c linux-2.6.34/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.34/arch/avr32/mach-at32ap/pm.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/mach-at32ap/pm.c   2010-07-01 20:45:13.000000000 -0400
 @@ -176,7 +176,7 @@ out:
        return 0;
  }
@@ -539,9 +606,9 @@ diff -urNp linux-2.6.33.1/arch/avr32/mach-at32ap/pm.c linux-2.6.33.1/arch/avr32/
        .valid  = avr32_pm_valid_state,
        .enter  = avr32_pm_enter,
  };
-diff -urNp linux-2.6.33.1/arch/avr32/mm/fault.c linux-2.6.33.1/arch/avr32/mm/fault.c
---- linux-2.6.33.1/arch/avr32/mm/fault.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/avr32/mm/fault.c       2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/avr32/mm/fault.c linux-2.6.34/arch/avr32/mm/fault.c
+--- linux-2.6.34/arch/avr32/mm/fault.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/avr32/mm/fault.c 2010-07-01 20:45:13.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -583,9 +650,9 @@ diff -urNp linux-2.6.33.1/arch/avr32/mm/fault.c linux-2.6.33.1/arch/avr32/mm/fau
                if (exception_trace && printk_ratelimit())
                        printk("%s%s[%d]: segfault at %08lx pc %08lx "
                               "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.33.1/arch/blackfin/kernel/kgdb.c linux-2.6.33.1/arch/blackfin/kernel/kgdb.c
---- linux-2.6.33.1/arch/blackfin/kernel/kgdb.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/blackfin/kernel/kgdb.c 2010-03-20 16:58:38.533259132 -0400
+diff -urNp linux-2.6.34/arch/blackfin/kernel/kgdb.c linux-2.6.34/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.34/arch/blackfin/kernel/kgdb.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/kernel/kgdb.c   2010-07-01 20:45:13.000000000 -0400
 @@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
        return -1;              /* this means that we do not want to exit from the handler */
  }
@@ -595,10 +662,10 @@ diff -urNp linux-2.6.33.1/arch/blackfin/kernel/kgdb.c linux-2.6.33.1/arch/blackf
        .gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
        .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.33.1/arch/blackfin/mach-common/pm.c linux-2.6.33.1/arch/blackfin/mach-common/pm.c
---- linux-2.6.33.1/arch/blackfin/mach-common/pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/blackfin/mach-common/pm.c      2010-03-20 16:58:38.533259132 -0400
-@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
+diff -urNp linux-2.6.34/arch/blackfin/mach-common/pm.c linux-2.6.34/arch/blackfin/mach-common/pm.c
+--- linux-2.6.34/arch/blackfin/mach-common/pm.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/mach-common/pm.c        2010-07-01 20:45:13.000000000 -0400
+@@ -256,7 +256,7 @@ static int bfin_pm_enter(suspend_state_t
        return 0;
  }
  
@@ -607,9 +674,9 @@ diff -urNp linux-2.6.33.1/arch/blackfin/mach-common/pm.c linux-2.6.33.1/arch/bla
        .enter = bfin_pm_enter,
        .valid  = bfin_pm_valid,
  };
-diff -urNp linux-2.6.33.1/arch/blackfin/mm/maccess.c linux-2.6.33.1/arch/blackfin/mm/maccess.c
---- linux-2.6.33.1/arch/blackfin/mm/maccess.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/blackfin/mm/maccess.c  2010-03-20 16:58:38.536529376 -0400
+diff -urNp linux-2.6.34/arch/blackfin/mm/maccess.c linux-2.6.34/arch/blackfin/mm/maccess.c
+--- linux-2.6.34/arch/blackfin/mm/maccess.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/blackfin/mm/maccess.c    2010-07-01 20:45:13.000000000 -0400
 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
        return bfin_mem_access_type(addr, size);
  }
@@ -628,9 +695,9 @@ diff -urNp linux-2.6.33.1/arch/blackfin/mm/maccess.c linux-2.6.33.1/arch/blackfi
  {
        unsigned long ldst = (unsigned long)dst;
        int mem_type;
-diff -urNp linux-2.6.33.1/arch/frv/include/asm/kmap_types.h linux-2.6.33.1/arch/frv/include/asm/kmap_types.h
---- linux-2.6.33.1/arch/frv/include/asm/kmap_types.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/frv/include/asm/kmap_types.h   2010-03-20 16:58:38.536529376 -0400
+diff -urNp linux-2.6.34/arch/frv/include/asm/kmap_types.h linux-2.6.34/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.34/arch/frv/include/asm/kmap_types.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/frv/include/asm/kmap_types.h     2010-07-01 20:45:13.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -639,9 +706,9 @@ diff -urNp linux-2.6.33.1/arch/frv/include/asm/kmap_types.h linux-2.6.33.1/arch/
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.33.1/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.33.1/arch/ia64/hp/common/hwsw_iommu.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/hp/common/hwsw_iommu.c    2010-03-20 16:58:38.544753181 -0400
+diff -urNp linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/hp/common/hwsw_iommu.c      2010-07-01 20:45:13.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -660,9 +727,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.33.1/arch/i
  {
        if (use_swiotlb(dev))
                return &swiotlb_dma_ops;
-diff -urNp linux-2.6.33.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.33.1/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.33.1/arch/ia64/hp/common/sba_iommu.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/hp/common/sba_iommu.c     2010-03-20 16:58:38.552757823 -0400
+diff -urNp linux-2.6.34/arch/ia64/hp/common/sba_iommu.c linux-2.6.34/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.34/arch/ia64/hp/common/sba_iommu.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/hp/common/sba_iommu.c       2010-07-01 20:45:13.000000000 -0400
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
        },
  };
@@ -681,45 +748,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/hp/common/sba_iommu.c linux-2.6.33.1/arch/ia
        .alloc_coherent         = sba_alloc_coherent,
        .free_coherent          = sba_free_coherent,
        .map_page               = sba_map_page,
-diff -urNp linux-2.6.33.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.33.1/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.33.1/arch/ia64/ia32/binfmt_elf32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/ia32/binfmt_elf32.c       2010-03-20 16:58:38.556766787 -0400
-@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
- 
- #define elf_read_implies_exec(ex, have_pt_gnu_stack)  (!(have_pt_gnu_stack))
- 
-+#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE   (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
-+
-+#define PAX_DELTA_MMAP_LEN    (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#define PAX_DELTA_STACK_LEN   (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
-+#endif
-+
- /* Ugly but avoids duplication */
- #include "../../../fs/binfmt_elf.c"
- 
-diff -urNp linux-2.6.33.1/arch/ia64/ia32/ia32priv.h linux-2.6.33.1/arch/ia64/ia32/ia32priv.h
---- linux-2.6.33.1/arch/ia64/ia32/ia32priv.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/ia32/ia32priv.h   2010-03-20 16:58:38.556766787 -0400
-@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
- #define ELF_DATA      ELFDATA2LSB
- #define ELF_ARCH      EM_386
- 
--#define IA32_STACK_TOP                IA32_PAGE_OFFSET
-+#ifdef CONFIG_PAX_RANDUSTACK
-+#define __IA32_DELTA_STACK    (current->mm->delta_stack)
-+#else
-+#define __IA32_DELTA_STACK    0UL
-+#endif
-+
-+#define IA32_STACK_TOP                (IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
-+
- #define IA32_GATE_OFFSET      IA32_PAGE_OFFSET
- #define IA32_GATE_END         IA32_PAGE_OFFSET + PAGE_SIZE
- 
-diff -urNp linux-2.6.33.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.33.1/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.33.1/arch/ia64/include/asm/dma-mapping.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/include/asm/dma-mapping.h 2010-03-20 16:58:38.564763179 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/dma-mapping.h linux-2.6.34/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/ia64/include/asm/dma-mapping.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/dma-mapping.h   2010-07-01 20:45:13.000000000 -0400
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -763,9 +794,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/include/asm/dma-mapping.h linux-2.6.33.1/arc
        return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.33.1/arch/ia64/include/asm/elf.h linux-2.6.33.1/arch/ia64/include/asm/elf.h
---- linux-2.6.33.1/arch/ia64/include/asm/elf.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/include/asm/elf.h 2010-03-20 16:58:38.564763179 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/elf.h linux-2.6.34/arch/ia64/include/asm/elf.h
+--- linux-2.6.34/arch/ia64/include/asm/elf.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/elf.h   2010-07-01 20:45:13.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -780,9 +811,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/include/asm/elf.h linux-2.6.33.1/arch/ia64/i
  #define PT_IA_64_UNWIND               0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.33.1/arch/ia64/include/asm/machvec.h linux-2.6.33.1/arch/ia64/include/asm/machvec.h
---- linux-2.6.33.1/arch/ia64/include/asm/machvec.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/include/asm/machvec.h     2010-03-20 16:58:38.568641931 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/machvec.h linux-2.6.34/arch/ia64/include/asm/machvec.h
+--- linux-2.6.34/arch/ia64/include/asm/machvec.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/machvec.h       2010-07-01 20:45:13.000000000 -0400
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -801,9 +832,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/include/asm/machvec.h linux-2.6.33.1/arch/ia
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.33.1/arch/ia64/include/asm/pgtable.h linux-2.6.33.1/arch/ia64/include/asm/pgtable.h
---- linux-2.6.33.1/arch/ia64/include/asm/pgtable.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/include/asm/pgtable.h     2010-03-20 16:58:38.568641931 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/pgtable.h linux-2.6.34/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.34/arch/ia64/include/asm/pgtable.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/pgtable.h       2010-07-01 20:45:13.000000000 -0400
 @@ -143,6 +143,17 @@
  #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY     __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -822,9 +853,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/include/asm/pgtable.h linux-2.6.33.1/arch/ia
  #define PAGE_GATE     __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL   __pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.33.1/arch/ia64/include/asm/uaccess.h linux-2.6.33.1/arch/ia64/include/asm/uaccess.h
---- linux-2.6.33.1/arch/ia64/include/asm/uaccess.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/include/asm/uaccess.h     2010-03-20 16:58:38.568641931 -0400
+diff -urNp linux-2.6.34/arch/ia64/include/asm/uaccess.h linux-2.6.34/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.34/arch/ia64/include/asm/uaccess.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/include/asm/uaccess.h       2010-07-01 20:45:13.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
        const void *__cu_from = (from);                                                 \
        long __cu_len = (n);                                                            \
@@ -843,9 +874,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/include/asm/uaccess.h linux-2.6.33.1/arch/ia
                __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);   \
        __cu_len;                                                                       \
  })
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/dma-mapping.c linux-2.6.33.1/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.33.1/arch/ia64/kernel/dma-mapping.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/dma-mapping.c      2010-03-20 16:58:38.568641931 -0400
+diff -urNp linux-2.6.34/arch/ia64/kernel/dma-mapping.c linux-2.6.34/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.34/arch/ia64/kernel/dma-mapping.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/dma-mapping.c        2010-07-01 20:45:13.000000000 -0400
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -864,9 +895,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/dma-mapping.c linux-2.6.33.1/arch/ia6
  {
        return dma_ops;
  }
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/module.c linux-2.6.33.1/arch/ia64/kernel/module.c
---- linux-2.6.33.1/arch/ia64/kernel/module.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/module.c   2010-03-20 16:58:38.576761283 -0400
+diff -urNp linux-2.6.34/arch/ia64/kernel/module.c linux-2.6.34/arch/ia64/kernel/module.c
+--- linux-2.6.34/arch/ia64/kernel/module.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/module.c     2010-07-01 20:45:13.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -955,9 +986,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/module.c linux-2.6.33.1/arch/ia64/ker
                mod->arch.gp = gp;
                DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
        }
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/pci-dma.c linux-2.6.33.1/arch/ia64/kernel/pci-dma.c
---- linux-2.6.33.1/arch/ia64/kernel/pci-dma.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/pci-dma.c  2010-03-20 16:58:38.576761283 -0400
+diff -urNp linux-2.6.34/arch/ia64/kernel/pci-dma.c linux-2.6.34/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.34/arch/ia64/kernel/pci-dma.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/pci-dma.c    2010-07-01 20:45:13.000000000 -0400
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
        .dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -967,10 +998,10 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/pci-dma.c linux-2.6.33.1/arch/ia64/ke
  
  static int __init pci_iommu_init(void)
  {
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.33.1/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.33.1/arch/ia64/kernel/pci-swiotlb.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/pci-swiotlb.c      2010-03-20 16:58:38.576761283 -0400
-@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
+diff -urNp linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/pci-swiotlb.c        2010-07-01 20:45:13.000000000 -0400
+@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
        return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
  
@@ -979,9 +1010,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/pci-swiotlb.c linux-2.6.33.1/arch/ia6
        .alloc_coherent = ia64_swiotlb_alloc_coherent,
        .free_coherent = swiotlb_free_coherent,
        .map_page = swiotlb_map_page,
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/sys_ia64.c linux-2.6.33.1/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.33.1/arch/ia64/kernel/sys_ia64.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/sys_ia64.c 2010-03-20 16:58:38.584549337 -0400
+diff -urNp linux-2.6.34/arch/ia64/kernel/sys_ia64.c linux-2.6.34/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.34/arch/ia64/kernel/sys_ia64.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/sys_ia64.c   2010-07-01 20:45:13.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
        if (REGION_NUMBER(addr) == RGN_HPAGE)
                addr = 0;
@@ -1008,21 +1039,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/sys_ia64.c linux-2.6.33.1/arch/ia64/k
                                goto full_search;
                        }
                        return -ENOMEM;
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/topology.c linux-2.6.33.1/arch/ia64/kernel/topology.c
---- linux-2.6.33.1/arch/ia64/kernel/topology.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/topology.c 2010-03-20 16:58:38.584549337 -0400
-@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
-       return ret;
- }
- 
--static struct sysfs_ops cache_sysfs_ops = {
-+static const struct sysfs_ops cache_sysfs_ops = {
-       .show   = cache_show
- };
- 
-diff -urNp linux-2.6.33.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.33.1/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.33.1/arch/ia64/kernel/vmlinux.lds.S      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/kernel/vmlinux.lds.S      2010-03-20 16:58:38.584549337 -0400
+diff -urNp linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/kernel/vmlinux.lds.S        2010-07-01 20:45:13.000000000 -0400
 @@ -196,7 +196,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1032,9 +1051,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/kernel/vmlinux.lds.S linux-2.6.33.1/arch/ia6
    . = __phys_per_cpu_start + PERCPU_PAGE_SIZE;        /* ensure percpu data fits
                                                 * into percpu page size
                                                 */
-diff -urNp linux-2.6.33.1/arch/ia64/mm/fault.c linux-2.6.33.1/arch/ia64/mm/fault.c
---- linux-2.6.33.1/arch/ia64/mm/fault.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/mm/fault.c        2010-03-20 16:58:38.584549337 -0400
+diff -urNp linux-2.6.34/arch/ia64/mm/fault.c linux-2.6.34/arch/ia64/mm/fault.c
+--- linux-2.6.34/arch/ia64/mm/fault.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/mm/fault.c  2010-07-01 20:45:13.000000000 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
        return pte_present(pte);
  }
@@ -1084,9 +1103,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/mm/fault.c linux-2.6.33.1/arch/ia64/mm/fault
    survive:
        /*
         * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.33.1/arch/ia64/mm/init.c linux-2.6.33.1/arch/ia64/mm/init.c
---- linux-2.6.33.1/arch/ia64/mm/init.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/mm/init.c 2010-03-20 16:58:38.584549337 -0400
+diff -urNp linux-2.6.34/arch/ia64/mm/init.c linux-2.6.34/arch/ia64/mm/init.c
+--- linux-2.6.34/arch/ia64/mm/init.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/mm/init.c   2010-07-01 20:45:13.000000000 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
                vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1107,10 +1126,10 @@ diff -urNp linux-2.6.33.1/arch/ia64/mm/init.c linux-2.6.33.1/arch/ia64/mm/init.c
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
                down_write(&current->mm->mmap_sem);
                if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.33.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.33.1/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.33.1/arch/ia64/sn/pci/pci_dma.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/ia64/sn/pci/pci_dma.c  2010-03-20 16:58:38.584549337 -0400
-@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
+diff -urNp linux-2.6.34/arch/ia64/sn/pci/pci_dma.c linux-2.6.34/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.34/arch/ia64/sn/pci/pci_dma.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/ia64/sn/pci/pci_dma.c    2010-07-01 20:45:13.000000000 -0400
+@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
        return ret;
  }
  
@@ -1119,9 +1138,9 @@ diff -urNp linux-2.6.33.1/arch/ia64/sn/pci/pci_dma.c linux-2.6.33.1/arch/ia64/sn
        .alloc_coherent         = sn_dma_alloc_coherent,
        .free_coherent          = sn_dma_free_coherent,
        .map_page               = sn_dma_map_page,
-diff -urNp linux-2.6.33.1/arch/m32r/lib/usercopy.c linux-2.6.33.1/arch/m32r/lib/usercopy.c
---- linux-2.6.33.1/arch/m32r/lib/usercopy.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/m32r/lib/usercopy.c    2010-03-20 16:58:38.584549337 -0400
+diff -urNp linux-2.6.34/arch/m32r/lib/usercopy.c linux-2.6.34/arch/m32r/lib/usercopy.c
+--- linux-2.6.34/arch/m32r/lib/usercopy.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/m32r/lib/usercopy.c      2010-07-01 20:45:13.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1142,10 +1161,143 @@ diff -urNp linux-2.6.33.1/arch/m32r/lib/usercopy.c linux-2.6.33.1/arch/m32r/lib/
        prefetchw(to);
        if (access_ok(VERIFY_READ, from, n))
                __copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.33.1/arch/mips/alchemy/devboards/pm.c linux-2.6.33.1/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.33.1/arch/mips/alchemy/devboards/pm.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/alchemy/devboards/pm.c    2010-03-20 16:58:38.588679980 -0400
-@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
+diff -urNp linux-2.6.34/arch/microblaze/include/asm/device.h linux-2.6.34/arch/microblaze/include/asm/device.h
+--- linux-2.6.34/arch/microblaze/include/asm/device.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/microblaze/include/asm/device.h  2010-07-01 20:45:14.000000000 -0400
+@@ -16,7 +16,7 @@ struct dev_archdata {
+       struct device_node      *of_node;
+ 
+       /* DMA operations on that device */
+-      struct dma_map_ops      *dma_ops;
++      const struct dma_map_ops        *dma_ops;
+       void                    *dma_data;
+ };
+ 
+diff -urNp linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/microblaze/include/asm/dma-mapping.h     2010-07-01 20:45:14.000000000 -0400
+@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
+       return 0xfffffffful;
+ }
+ 
+-extern struct dma_map_ops *dma_ops;
++extern const struct dma_map_ops *dma_ops;
+ 
+ /*
+  * Available generic sets of operations
+  */
+-extern struct dma_map_ops dma_direct_ops;
++extern const struct dma_map_ops dma_direct_ops;
+ 
+-static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
+ {
+       /* We don't handle the NULL dev case for ISA for now. We could
+        * do it via an out of line call but it is not needed for now. The
+@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dm
+       return dev->archdata.dma_ops;
+ }
+ 
+-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
++static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
+ {
+       dev->archdata.dma_ops = ops;
+ }
+ 
+ static inline int dma_supported(struct device *dev, u64 mask)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+       if (unlikely(!ops))
+               return 0;
+@@ -87,7 +87,7 @@ static inline int dma_supported(struct d
+ 
+ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+       if (unlikely(ops == NULL))
+               return -EIO;
+@@ -103,7 +103,7 @@ static inline int dma_set_mask(struct de
+ 
+ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+       if (ops->mapping_error)
+               return ops->mapping_error(dev, dma_addr);
+ 
+@@ -117,7 +117,7 @@ static inline int dma_mapping_error(stru
+ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t flag)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+       void *memory;
+ 
+       BUG_ON(!ops);
+@@ -131,7 +131,7 @@ static inline void *dma_alloc_coherent(s
+ static inline void dma_free_coherent(struct device *dev, size_t size,
+                                    void *cpu_addr, dma_addr_t dma_handle)
+ {
+-      struct dma_map_ops *ops = get_dma_ops(dev);
++      const struct dma_map_ops *ops = get_dma_ops(dev);
+ 
+       BUG_ON(!ops);
+       debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
+diff -urNp linux-2.6.34/arch/microblaze/include/asm/pci.h linux-2.6.34/arch/microblaze/include/asm/pci.h
+--- linux-2.6.34/arch/microblaze/include/asm/pci.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/microblaze/include/asm/pci.h     2010-07-01 20:45:14.000000000 -0400
+@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
+ }
+ 
+ #ifdef CONFIG_PCI
+-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
+-extern struct dma_map_ops *get_pci_dma_ops(void);
++extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
++extern const struct dma_map_ops *get_pci_dma_ops(void);
+ #else /* CONFIG_PCI */
+ #define set_pci_dma_ops(d)
+ #define get_pci_dma_ops()     NULL
+diff -urNp linux-2.6.34/arch/microblaze/kernel/dma.c linux-2.6.34/arch/microblaze/kernel/dma.c
+--- linux-2.6.34/arch/microblaze/kernel/dma.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/microblaze/kernel/dma.c  2010-07-01 20:45:14.000000000 -0400
+@@ -134,7 +134,7 @@ static inline void dma_direct_unmap_page
+       __dma_sync_page(dma_address, 0 , size, direction);
+ }
+ 
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+       .alloc_coherent = dma_direct_alloc_coherent,
+       .free_coherent  = dma_direct_free_coherent,
+       .map_sg         = dma_direct_map_sg,
+diff -urNp linux-2.6.34/arch/microblaze/pci/pci-common.c linux-2.6.34/arch/microblaze/pci/pci-common.c
+--- linux-2.6.34/arch/microblaze/pci/pci-common.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/microblaze/pci/pci-common.c      2010-07-01 20:45:14.000000000 -0400
+@@ -46,14 +46,14 @@ resource_size_t isa_mem_base;
+ /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
+ unsigned int pci_flags;
+ 
+-static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
++static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
+ 
+-void set_pci_dma_ops(struct dma_map_ops *dma_ops)
++void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
+ {
+       pci_dma_ops = dma_ops;
+ }
+ 
+-struct dma_map_ops *get_pci_dma_ops(void)
++const struct dma_map_ops *get_pci_dma_ops(void)
+ {
+       return pci_dma_ops;
+ }
+diff -urNp linux-2.6.34/arch/mips/alchemy/devboards/pm.c linux-2.6.34/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.34/arch/mips/alchemy/devboards/pm.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/alchemy/devboards/pm.c      2010-07-01 20:45:14.000000000 -0400
+@@ -110,7 +110,7 @@ static void db1x_pm_end(void)
  
  }
  
@@ -1154,10 +1306,10 @@ diff -urNp linux-2.6.33.1/arch/mips/alchemy/devboards/pm.c linux-2.6.33.1/arch/m
        .valid          = suspend_valid_only_mem,
        .begin          = db1x_pm_begin,
        .enter          = db1x_pm_enter,
-diff -urNp linux-2.6.33.1/arch/mips/include/asm/elf.h linux-2.6.33.1/arch/mips/include/asm/elf.h
---- linux-2.6.33.1/arch/mips/include/asm/elf.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/include/asm/elf.h 2010-03-20 16:58:38.588679980 -0400
-@@ -367,4 +367,11 @@ extern int dump_task_fpu(struct task_str
+diff -urNp linux-2.6.34/arch/mips/include/asm/elf.h linux-2.6.34/arch/mips/include/asm/elf.h
+--- linux-2.6.34/arch/mips/include/asm/elf.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/include/asm/elf.h   2010-07-01 20:45:14.000000000 -0400
+@@ -368,6 +368,13 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
  
@@ -1168,10 +1320,12 @@ diff -urNp linux-2.6.33.1/arch/mips/include/asm/elf.h linux-2.6.33.1/arch/mips/i
 +#define PAX_DELTA_STACK_LEN   (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
 +#endif
 +
- #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.33.1/arch/mips/include/asm/page.h linux-2.6.33.1/arch/mips/include/asm/page.h
---- linux-2.6.33.1/arch/mips/include/asm/page.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/include/asm/page.h        2010-03-20 16:58:38.592758361 -0400
+ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
+ struct linux_binprm;
+ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+diff -urNp linux-2.6.34/arch/mips/include/asm/page.h linux-2.6.34/arch/mips/include/asm/page.h
+--- linux-2.6.34/arch/mips/include/asm/page.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/include/asm/page.h  2010-07-01 20:45:14.000000000 -0400
 @@ -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;
@@ -1181,10 +1335,10 @@ diff -urNp linux-2.6.33.1/arch/mips/include/asm/page.h linux-2.6.33.1/arch/mips/
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)       ((x).pte)
-diff -urNp linux-2.6.33.1/arch/mips/include/asm/system.h linux-2.6.33.1/arch/mips/include/asm/system.h
---- linux-2.6.33.1/arch/mips/include/asm/system.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/include/asm/system.h      2010-03-20 16:58:38.592758361 -0400
-@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
+diff -urNp linux-2.6.34/arch/mips/include/asm/system.h linux-2.6.34/arch/mips/include/asm/system.h
+--- linux-2.6.34/arch/mips/include/asm/system.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/include/asm/system.h        2010-07-01 20:45:14.000000000 -0400
+@@ -234,6 +234,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
  
@@ -1192,9 +1346,9 @@ diff -urNp linux-2.6.33.1/arch/mips/include/asm/system.h linux-2.6.33.1/arch/mip
 +#define arch_align_stack(x) ((x) & ALMASK)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.33.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.33.1/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.33.1/arch/mips/kernel/binfmt_elfn32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/kernel/binfmt_elfn32.c    2010-03-20 16:58:38.592758361 -0400
+diff -urNp linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/kernel/binfmt_elfn32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -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)
@@ -1209,9 +1363,9 @@ diff -urNp linux-2.6.33.1/arch/mips/kernel/binfmt_elfn32.c linux-2.6.33.1/arch/m
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.33.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.33.1/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.33.1/arch/mips/kernel/binfmt_elfo32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/kernel/binfmt_elfo32.c    2010-03-20 16:58:38.592758361 -0400
+diff -urNp linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/kernel/binfmt_elfo32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -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)
@@ -1226,21 +1380,21 @@ diff -urNp linux-2.6.33.1/arch/mips/kernel/binfmt_elfo32.c linux-2.6.33.1/arch/m
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.33.1/arch/mips/kernel/kgdb.c linux-2.6.33.1/arch/mips/kernel/kgdb.c
---- linux-2.6.33.1/arch/mips/kernel/kgdb.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/kernel/kgdb.c     2010-03-20 16:58:38.592758361 -0400
+diff -urNp linux-2.6.34/arch/mips/kernel/kgdb.c linux-2.6.34/arch/mips/kernel/kgdb.c
+--- linux-2.6.34/arch/mips/kernel/kgdb.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/kernel/kgdb.c       2010-07-01 20:45:14.000000000 -0400
 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
        return -1;
  }
  
-+/* cannot be const */
++/* cannot be const, see kgdb_arch_init */
  struct kgdb_arch arch_kgdb_ops;
  
  /*
-diff -urNp linux-2.6.33.1/arch/mips/kernel/process.c linux-2.6.33.1/arch/mips/kernel/process.c
---- linux-2.6.33.1/arch/mips/kernel/process.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/kernel/process.c  2010-03-20 16:58:38.592758361 -0400
-@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
+diff -urNp linux-2.6.34/arch/mips/kernel/process.c linux-2.6.34/arch/mips/kernel/process.c
+--- linux-2.6.34/arch/mips/kernel/process.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/kernel/process.c    2010-07-01 20:45:14.000000000 -0400
+@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_stru
  out:
        return pc;
  }
@@ -1256,10 +1410,10 @@ diff -urNp linux-2.6.33.1/arch/mips/kernel/process.c linux-2.6.33.1/arch/mips/ke
 -
 -      return sp & ALMASK;
 -}
-diff -urNp linux-2.6.33.1/arch/mips/kernel/syscall.c linux-2.6.33.1/arch/mips/kernel/syscall.c
---- linux-2.6.33.1/arch/mips/kernel/syscall.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/kernel/syscall.c  2010-03-20 16:58:38.592758361 -0400
-@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
+diff -urNp linux-2.6.34/arch/mips/kernel/syscall.c linux-2.6.34/arch/mips/kernel/syscall.c
+--- linux-2.6.34/arch/mips/kernel/syscall.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/kernel/syscall.c    2010-07-01 20:45:14.000000000 -0400
+@@ -106,6 +106,11 @@ unsigned long arch_get_unmapped_area(str
        do_color_align = 0;
        if (filp || (flags & MAP_SHARED))
                do_color_align = 1;
@@ -1271,7 +1425,7 @@ diff -urNp linux-2.6.33.1/arch/mips/kernel/syscall.c linux-2.6.33.1/arch/mips/ke
        if (addr) {
                if (do_color_align)
                        addr = COLOUR_ALIGN(addr, pgoff);
-@@ -112,7 +117,7 @@ unsigned long arch_get_unmapped_area(str
+@@ -116,7 +121,7 @@ unsigned long arch_get_unmapped_area(str
                    (!vmm || addr + len <= vmm->vm_start))
                        return addr;
        }
@@ -1280,9 +1434,9 @@ diff -urNp linux-2.6.33.1/arch/mips/kernel/syscall.c linux-2.6.33.1/arch/mips/ke
        if (do_color_align)
                addr = COLOUR_ALIGN(addr, pgoff);
        else
-diff -urNp linux-2.6.33.1/arch/mips/loongson/common/pm.c linux-2.6.33.1/arch/mips/loongson/common/pm.c
---- linux-2.6.33.1/arch/mips/loongson/common/pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/loongson/common/pm.c      2010-03-20 16:58:38.608773091 -0400
+diff -urNp linux-2.6.34/arch/mips/loongson/common/pm.c linux-2.6.34/arch/mips/loongson/common/pm.c
+--- linux-2.6.34/arch/mips/loongson/common/pm.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/loongson/common/pm.c        2010-07-01 20:45:14.000000000 -0400
 @@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
        }
  }
@@ -1292,9 +1446,9 @@ diff -urNp linux-2.6.33.1/arch/mips/loongson/common/pm.c linux-2.6.33.1/arch/mip
        .valid  = loongson_pm_valid_state,
        .enter  = loongson_pm_enter,
  };
-diff -urNp linux-2.6.33.1/arch/mips/mm/fault.c linux-2.6.33.1/arch/mips/mm/fault.c
---- linux-2.6.33.1/arch/mips/mm/fault.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/mips/mm/fault.c        2010-03-20 16:58:38.612819864 -0400
+diff -urNp linux-2.6.34/arch/mips/mm/fault.c linux-2.6.34/arch/mips/mm/fault.c
+--- linux-2.6.34/arch/mips/mm/fault.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/mips/mm/fault.c  2010-07-01 20:45:14.000000000 -0400
 @@ -26,6 +26,23 @@
  #include <asm/ptrace.h>
  #include <asm/highmem.h>              /* For VMALLOC_END */
@@ -1319,9 +1473,9 @@ diff -urNp linux-2.6.33.1/arch/mips/mm/fault.c linux-2.6.33.1/arch/mips/mm/fault
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.33.1/arch/parisc/include/asm/elf.h linux-2.6.33.1/arch/parisc/include/asm/elf.h
---- linux-2.6.33.1/arch/parisc/include/asm/elf.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/include/asm/elf.h       2010-03-20 16:58:38.624763350 -0400
+diff -urNp linux-2.6.34/arch/parisc/include/asm/elf.h linux-2.6.34/arch/parisc/include/asm/elf.h
+--- linux-2.6.34/arch/parisc/include/asm/elf.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/include/asm/elf.h 2010-07-01 20:45:14.000000000 -0400
 @@ -342,6 +342,13 @@ struct pt_regs;   /* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1336,9 +1490,9 @@ diff -urNp linux-2.6.33.1/arch/parisc/include/asm/elf.h linux-2.6.33.1/arch/pari
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.33.1/arch/parisc/include/asm/pgtable.h linux-2.6.33.1/arch/parisc/include/asm/pgtable.h
---- linux-2.6.33.1/arch/parisc/include/asm/pgtable.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/include/asm/pgtable.h   2010-03-20 16:58:38.628643492 -0400
+diff -urNp linux-2.6.34/arch/parisc/include/asm/pgtable.h linux-2.6.34/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.34/arch/parisc/include/asm/pgtable.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/include/asm/pgtable.h     2010-07-01 20:45:14.000000000 -0400
 @@ -207,6 +207,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1357,10 +1511,10 @@ diff -urNp linux-2.6.33.1/arch/parisc/include/asm/pgtable.h linux-2.6.33.1/arch/
  #define PAGE_KERNEL   __pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO        __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC       __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc/kernel/module.c
---- linux-2.6.33.1/arch/parisc/kernel/module.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/kernel/module.c 2010-03-20 16:58:38.636778509 -0400
-@@ -95,16 +95,38 @@
+diff -urNp linux-2.6.34/arch/parisc/kernel/module.c linux-2.6.34/arch/parisc/kernel/module.c
+--- linux-2.6.34/arch/parisc/kernel/module.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/kernel/module.c   2010-07-01 20:45:14.000000000 -0400
+@@ -96,16 +96,38 @@
  
  /* three functions to determine where in the module core
   * or init pieces the location is */
@@ -1403,7 +1557,7 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
  }
  
  static inline int in_local(struct module *me, void *loc)
-@@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_
+@@ -365,13 +387,13 @@ int module_frob_arch_sections(CONST Elf_
        }
  
        /* align things a bit */
@@ -1424,7 +1578,7 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
  
        me->arch.got_max = gots;
        me->arch.fdesc_max = fdescs;
-@@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module 
+@@ -389,7 +411,7 @@ static Elf64_Word get_got(struct module 
  
        BUG_ON(value == 0);
  
@@ -1433,7 +1587,7 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
        for (i = 0; got[i].addr; i++)
                if (got[i].addr == value)
                        goto out;
-@@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module 
+@@ -407,7 +429,7 @@ static Elf64_Word get_got(struct module 
  #ifdef CONFIG_64BIT
  static Elf_Addr get_fdesc(struct module *me, unsigned long value)
  {
@@ -1442,7 +1596,7 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
  
        if (!value) {
                printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
-@@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module 
+@@ -425,7 +447,7 @@ static Elf_Addr get_fdesc(struct module 
  
        /* Create new one */
        fdesc->addr = value;
@@ -1451,7 +1605,7 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
        return (Elf_Addr)fdesc;
  }
  #endif /* CONFIG_64BIT */
-@@ -848,7 +870,7 @@ register_unwind_table(struct module *me,
+@@ -849,7 +871,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;
@@ -1460,9 +1614,9 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/module.c linux-2.6.33.1/arch/parisc
  
        DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
               me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.33.1/arch/parisc/kernel/sys_parisc.c linux-2.6.33.1/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.33.1/arch/parisc/kernel/sys_parisc.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/kernel/sys_parisc.c     2010-03-20 16:58:38.636778509 -0400
+diff -urNp linux-2.6.34/arch/parisc/kernel/sys_parisc.c linux-2.6.34/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.34/arch/parisc/kernel/sys_parisc.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/kernel/sys_parisc.c       2010-07-01 20:45:14.000000000 -0400
 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
        if (flags & MAP_FIXED)
                return addr;
@@ -1472,9 +1626,9 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/sys_parisc.c linux-2.6.33.1/arch/pa
  
        if (filp) {
                addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.33.1/arch/parisc/kernel/traps.c linux-2.6.33.1/arch/parisc/kernel/traps.c
---- linux-2.6.33.1/arch/parisc/kernel/traps.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/kernel/traps.c  2010-03-20 16:58:38.644755446 -0400
+diff -urNp linux-2.6.34/arch/parisc/kernel/traps.c linux-2.6.34/arch/parisc/kernel/traps.c
+--- linux-2.6.34/arch/parisc/kernel/traps.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/kernel/traps.c    2010-07-01 20:45:14.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
                        down_read(&current->mm->mmap_sem);
@@ -1486,9 +1640,9 @@ diff -urNp linux-2.6.33.1/arch/parisc/kernel/traps.c linux-2.6.33.1/arch/parisc/
                                fault_address = regs->iaoq[0];
                                fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.33.1/arch/parisc/mm/fault.c linux-2.6.33.1/arch/parisc/mm/fault.c
---- linux-2.6.33.1/arch/parisc/mm/fault.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/parisc/mm/fault.c      2010-03-20 16:58:38.644755446 -0400
+diff -urNp linux-2.6.34/arch/parisc/mm/fault.c linux-2.6.34/arch/parisc/mm/fault.c
+--- linux-2.6.34/arch/parisc/mm/fault.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/parisc/mm/fault.c        2010-07-01 20:45:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1658,9 +1812,9 @@ diff -urNp linux-2.6.33.1/arch/parisc/mm/fault.c linux-2.6.33.1/arch/parisc/mm/f
  
        /*
         * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/device.h linux-2.6.33.1/arch/powerpc/include/asm/device.h
---- linux-2.6.33.1/arch/powerpc/include/asm/device.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/device.h   2010-03-20 16:58:38.652757516 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/device.h linux-2.6.34/arch/powerpc/include/asm/device.h
+--- linux-2.6.34/arch/powerpc/include/asm/device.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/device.h     2010-07-01 20:45:14.000000000 -0400
 @@ -14,7 +14,7 @@ struct dev_archdata {
        struct device_node      *of_node;
  
@@ -1670,12 +1824,15 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/device.h linux-2.6.33.1/arch/
  
        /*
         * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h      2010-03-20 16:58:38.664764295 -0400
-@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/dma-mapping.h        2010-07-01 20:45:14.000000000 -0400
+@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma
+  * Available generic sets of operations
+  */
  #ifdef CONFIG_PPC64
- extern struct dma_map_ops dma_iommu_ops;
+-extern struct dma_map_ops dma_iommu_ops;
++extern const struct dma_map_ops dma_iommu_ops;
  #endif
 -extern struct dma_map_ops dma_direct_ops;
 +extern const struct dma_map_ops dma_direct_ops;
@@ -1703,7 +1860,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/
  
        if (unlikely(dma_ops == NULL))
                return 0;
-@@ -132,7 +132,7 @@ static inline int dma_supported(struct d
+@@ -129,7 +129,7 @@ static inline int dma_supported(struct d
  
  static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  {
@@ -1712,7 +1869,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/
  
        if (unlikely(dma_ops == NULL))
                return -EIO;
-@@ -147,7 +147,7 @@ static inline int dma_set_mask(struct de
+@@ -144,7 +144,7 @@ static inline int dma_set_mask(struct de
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag)
  {
@@ -1721,7 +1878,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/
        void *cpu_addr;
  
        BUG_ON(!dma_ops);
-@@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(s
+@@ -159,7 +159,7 @@ static inline void *dma_alloc_coherent(s
  static inline void dma_free_coherent(struct device *dev, size_t size,
                                     void *cpu_addr, dma_addr_t dma_handle)
  {
@@ -1730,7 +1887,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/
  
        BUG_ON(!dma_ops);
  
-@@ -173,7 +173,7 @@ static inline void dma_free_coherent(str
+@@ -170,7 +170,7 @@ static inline void dma_free_coherent(str
  
  static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
@@ -1739,9 +1896,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/dma-mapping.h linux-2.6.33.1/
  
        if (dma_ops->mapping_error)
                return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/elf.h linux-2.6.33.1/arch/powerpc/include/asm/elf.h
---- linux-2.6.33.1/arch/powerpc/include/asm/elf.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/elf.h      2010-03-20 16:58:38.664764295 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/elf.h linux-2.6.34/arch/powerpc/include/asm/elf.h
+--- linux-2.6.34/arch/powerpc/include/asm/elf.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/elf.h        2010-07-01 20:45:14.000000000 -0400
 @@ -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.  */
@@ -1774,9 +1931,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/elf.h linux-2.6.33.1/arch/pow
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/iommu.h linux-2.6.33.1/arch/powerpc/include/asm/iommu.h
---- linux-2.6.33.1/arch/powerpc/include/asm/iommu.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/iommu.h    2010-03-20 16:58:38.664764295 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/iommu.h linux-2.6.34/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.34/arch/powerpc/include/asm/iommu.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/iommu.h      2010-07-01 20:45:14.000000000 -0400
 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
@@ -1787,9 +1944,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/iommu.h linux-2.6.33.1/arch/p
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/kmap_types.h linux-2.6.33.1/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.33.1/arch/powerpc/include/asm/kmap_types.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/kmap_types.h       2010-03-20 16:58:38.664764295 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/kmap_types.h linux-2.6.34/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.34/arch/powerpc/include/asm/kmap_types.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/kmap_types.h 2010-07-01 20:45:14.000000000 -0400
 @@ -26,6 +26,7 @@ enum km_type {
        KM_SOFTIRQ1,
        KM_PPC_SYNC_PAGE,
@@ -1798,9 +1955,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/kmap_types.h linux-2.6.33.1/a
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/page_64.h linux-2.6.33.1/arch/powerpc/include/asm/page_64.h
---- linux-2.6.33.1/arch/powerpc/include/asm/page_64.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/page_64.h  2010-03-20 16:58:38.664764295 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/page_64.h linux-2.6.34/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.34/arch/powerpc/include/asm/page_64.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/page_64.h    2010-07-01 20:45:14.000000000 -0400
 @@ -180,15 +180,18 @@ do {                                             \
   * stack by default, so in the absense of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1822,10 +1979,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/page_64.h linux-2.6.33.1/arch
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/page.h linux-2.6.33.1/arch/powerpc/include/asm/page.h
---- linux-2.6.33.1/arch/powerpc/include/asm/page.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/page.h     2010-03-20 16:58:38.668753880 -0400
-@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/page.h linux-2.6.34/arch/powerpc/include/asm/page.h
+--- linux-2.6.34/arch/powerpc/include/asm/page.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/page.h       2010-07-01 20:45:14.000000000 -0400
+@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
   */
@@ -1837,7 +1994,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/page.h linux-2.6.33.1/arch/po
  
  #define VM_DATA_DEFAULT_FLAGS64       (VM_READ | VM_WRITE | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
+@@ -158,6 +159,9 @@ extern phys_addr_t kernstart_addr;
  #define is_kernel_addr(x)     ((x) >= PAGE_OFFSET)
  #endif
  
@@ -1847,9 +2004,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/page.h linux-2.6.33.1/arch/po
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/pci.h linux-2.6.33.1/arch/powerpc/include/asm/pci.h
---- linux-2.6.33.1/arch/powerpc/include/asm/pci.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/pci.h      2010-03-20 16:58:38.668753880 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/pci.h linux-2.6.34/arch/powerpc/include/asm/pci.h
+--- linux-2.6.34/arch/powerpc/include/asm/pci.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/pci.h        2010-07-01 20:45:14.000000000 -0400
 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
  }
  
@@ -1861,9 +2018,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/pci.h linux-2.6.33.1/arch/pow
  #else /* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()     NULL
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/pte-hash32.h linux-2.6.33.1/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.33.1/arch/powerpc/include/asm/pte-hash32.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/pte-hash32.h       2010-03-20 16:58:38.668753880 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/pte-hash32.h 2010-07-01 20:45:14.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE    0x004   /* when !present: nonlinear file mapping */
  #define _PAGE_USER    0x004   /* usermode access allowed */
@@ -1872,9 +2029,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/pte-hash32.h linux-2.6.33.1/a
  #define _PAGE_COHERENT        0x010   /* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE        0x020   /* I: cache inhibit */
  #define _PAGE_WRITETHRU       0x040   /* W: cache write-through */
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/reg.h linux-2.6.33.1/arch/powerpc/include/asm/reg.h
---- linux-2.6.33.1/arch/powerpc/include/asm/reg.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/reg.h      2010-03-20 16:58:38.672753614 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/reg.h linux-2.6.34/arch/powerpc/include/asm/reg.h
+--- linux-2.6.34/arch/powerpc/include/asm/reg.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/reg.h        2010-07-01 20:45:14.000000000 -0400
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR     0x136   /* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR    0x012   /* Data Storage Interrupt Status Register */
@@ -1883,9 +2040,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/reg.h linux-2.6.33.1/arch/pow
  #define   DSISR_PROTFAULT     0x08000000      /* protection fault */
  #define   DSISR_ISSTORE               0x02000000      /* access was a store */
  #define   DSISR_DABRMATCH     0x00400000      /* hit data breakpoint */
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.33.1/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.33.1/arch/powerpc/include/asm/swiotlb.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/swiotlb.h  2010-03-20 16:58:38.672753614 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/swiotlb.h linux-2.6.34/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.34/arch/powerpc/include/asm/swiotlb.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/swiotlb.h    2010-07-01 20:45:14.000000000 -0400
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -1895,9 +2052,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/swiotlb.h linux-2.6.33.1/arch
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/uaccess.h linux-2.6.33.1/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.33.1/arch/powerpc/include/asm/uaccess.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/include/asm/uaccess.h  2010-03-20 16:58:38.676578811 -0400
+diff -urNp linux-2.6.34/arch/powerpc/include/asm/uaccess.h linux-2.6.34/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.34/arch/powerpc/include/asm/uaccess.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/include/asm/uaccess.h    2010-07-01 20:45:14.000000000 -0400
 @@ -327,52 +327,6 @@ do {                                                              \
  extern unsigned long __copy_tofrom_user(void __user *to,
                const void __user *from, unsigned long size);
@@ -2066,22 +2223,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/include/asm/uaccess.h linux-2.6.33.1/arch
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/cacheinfo.c linux-2.6.33.1/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.33.1/arch/powerpc/kernel/cacheinfo.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/cacheinfo.c     2010-03-20 16:58:38.684761974 -0400
-@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
-       &cache_assoc_attr,
- };
- 
--static struct sysfs_ops cache_index_ops = {
-+static const struct sysfs_ops cache_index_ops = {
-       .show = cache_index_show,
- };
- 
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma.c linux-2.6.33.1/arch/powerpc/kernel/dma.c
---- linux-2.6.33.1/arch/powerpc/kernel/dma.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/dma.c   2010-03-20 16:58:38.700769723 -0400
-@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
+diff -urNp linux-2.6.34/arch/powerpc/kernel/dma.c linux-2.6.34/arch/powerpc/kernel/dma.c
+--- linux-2.6.34/arch/powerpc/kernel/dma.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/dma.c     2010-07-01 20:45:14.000000000 -0400
+@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
  }
  #endif
  
@@ -2090,9 +2235,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma.c linux-2.6.33.1/arch/powerpc/
        .alloc_coherent = dma_direct_alloc_coherent,
        .free_coherent  = dma_direct_free_coherent,
        .map_sg         = dma_direct_map_sg,
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.33.1/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.33.1/arch/powerpc/kernel/dma-iommu.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/dma-iommu.c     2010-03-20 16:58:38.708797745 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/dma-iommu.c linux-2.6.34/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.34/arch/powerpc/kernel/dma-iommu.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/dma-iommu.c       2010-07-01 20:45:14.000000000 -0400
 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
  }
  
@@ -2102,10 +2247,19 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma-iommu.c linux-2.6.33.1/arch/po
  {
        struct iommu_table *tbl = get_iommu_table_base(dev);
  
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.33.1/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.33.1/arch/powerpc/kernel/dma-swiotlb.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/dma-swiotlb.c   2010-03-20 16:58:38.720772371 -0400
-@@ -30,7 +30,7 @@ unsigned int ppc_swiotlb_enable;
+@@ -89,7 +89,7 @@ static int dma_iommu_dma_supported(struc
+               return 1;
+ }
+ 
+-struct dma_map_ops dma_iommu_ops = {
++const struct dma_map_ops dma_iommu_ops = {
+       .alloc_coherent = dma_iommu_alloc_coherent,
+       .free_coherent  = dma_iommu_free_coherent,
+       .map_sg         = dma_iommu_map_sg,
+diff -urNp linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/dma-swiotlb.c     2010-07-01 20:45:14.000000000 -0400
+@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
   */
@@ -2114,9 +2268,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.33.1/arch/
        .alloc_coherent = dma_direct_alloc_coherent,
        .free_coherent = dma_direct_free_coherent,
        .map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6.33.1/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.33.1/arch/powerpc/kernel/exceptions-64e.S        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/exceptions-64e.S        2010-03-20 16:58:38.720772371 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/exceptions-64e.S  2010-07-01 20:45:14.000000000 -0400
 @@ -455,6 +455,7 @@ storage_fault_common:
        std     r14,_DAR(r1)
        std     r15,_DSISR(r1)
@@ -2135,9 +2289,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/exceptions-64e.S linux-2.6.33.1/ar
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
        bl      .bad_page_fault
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6.33.1/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.33.1/arch/powerpc/kernel/exceptions-64s.S        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/exceptions-64s.S        2010-03-20 16:58:38.720772371 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/exceptions-64s.S  2010-07-01 20:45:14.000000000 -0400
 @@ -829,10 +829,10 @@ handle_page_fault:
  11:   ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
@@ -2150,10 +2304,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/exceptions-64s.S linux-2.6.33.1/ar
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/ibmebus.c linux-2.6.33.1/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.33.1/arch/powerpc/kernel/ibmebus.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/ibmebus.c       2010-03-20 16:58:38.720772371 -0400
-@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 
+diff -urNp linux-2.6.34/arch/powerpc/kernel/ibmebus.c linux-2.6.34/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.34/arch/powerpc/kernel/ibmebus.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/ibmebus.c 2010-07-01 20:45:14.000000000 -0400
+@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct 
        return 1;
  }
  
@@ -2162,9 +2316,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/ibmebus.c linux-2.6.33.1/arch/powe
        .alloc_coherent = ibmebus_alloc_coherent,
        .free_coherent  = ibmebus_free_coherent,
        .map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/kgdb.c linux-2.6.33.1/arch/powerpc/kernel/kgdb.c
---- linux-2.6.33.1/arch/powerpc/kernel/kgdb.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/kgdb.c  2010-03-20 16:58:38.720772371 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/kgdb.c linux-2.6.34/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.34/arch/powerpc/kernel/kgdb.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/kgdb.c    2010-07-01 20:45:14.000000000 -0400
 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
        if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
                return 0;
@@ -2183,9 +2337,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/kgdb.c linux-2.6.33.1/arch/powerpc
        .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/module_32.c linux-2.6.33.1/arch/powerpc/kernel/module_32.c
---- linux-2.6.33.1/arch/powerpc/kernel/module_32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/module_32.c     2010-03-20 16:58:38.724667855 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/module_32.c linux-2.6.34/arch/powerpc/kernel/module_32.c
+--- linux-2.6.34/arch/powerpc/kernel/module_32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/module_32.c       2010-07-01 20:45:14.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
                        me->arch.core_plt_section = i;
        }
@@ -2215,9 +2369,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/module_32.c linux-2.6.33.1/arch/po
  
        /* Find this entry, or if that fails, the next avail. entry */
        while (entry->jump[0]) {
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/module.c linux-2.6.33.1/arch/powerpc/kernel/module.c
---- linux-2.6.33.1/arch/powerpc/kernel/module.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/module.c        2010-03-20 16:58:38.724667855 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/module.c linux-2.6.34/arch/powerpc/kernel/module.c
+--- linux-2.6.34/arch/powerpc/kernel/module.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/module.c  2010-07-01 20:45:14.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2257,10 +2411,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/module.c linux-2.6.33.1/arch/power
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
                                    const Elf_Shdr *sechdrs,
                                    const char *name)
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/pci-common.c linux-2.6.33.1/arch/powerpc/kernel/pci-common.c
---- linux-2.6.33.1/arch/powerpc/kernel/pci-common.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/pci-common.c    2010-03-20 16:58:38.736620382 -0400
-@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
+diff -urNp linux-2.6.34/arch/powerpc/kernel/pci-common.c linux-2.6.34/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.34/arch/powerpc/kernel/pci-common.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/pci-common.c      2010-07-01 20:45:14.000000000 -0400
+@@ -51,14 +51,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
  
@@ -2278,10 +2432,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/pci-common.c linux-2.6.33.1/arch/p
  {
        return pci_dma_ops;
  }
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/process.c linux-2.6.33.1/arch/powerpc/kernel/process.c
---- linux-2.6.33.1/arch/powerpc/kernel/process.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/process.c       2010-03-20 16:58:38.740772809 -0400
-@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 
+diff -urNp linux-2.6.34/arch/powerpc/kernel/process.c linux-2.6.34/arch/powerpc/kernel/process.c
+--- linux-2.6.34/arch/powerpc/kernel/process.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/process.c 2010-07-01 20:45:14.000000000 -0400
+@@ -1217,51 +1217,3 @@ unsigned long arch_align_stack(unsigned 
                sp -= get_random_int() & ~PAGE_MASK;
        return sp & ~0xf;
  }
@@ -2333,9 +2487,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/process.c linux-2.6.33.1/arch/powe
 -
 -      return ret;
 -}
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/signal_32.c linux-2.6.33.1/arch/powerpc/kernel/signal_32.c
---- linux-2.6.33.1/arch/powerpc/kernel/signal_32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/signal_32.c     2010-03-20 16:58:38.740772809 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/signal_32.c linux-2.6.34/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.34/arch/powerpc/kernel/signal_32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/signal_32.c       2010-07-01 20:45:14.000000000 -0400
 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
        /* Save user registers on the stack */
        frame = &rt_sf->uc.uc_mcontext;
@@ -2345,9 +2499,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/signal_32.c linux-2.6.33.1/arch/po
                if (save_user_regs(regs, frame, 0, 1))
                        goto badframe;
                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/signal_64.c linux-2.6.33.1/arch/powerpc/kernel/signal_64.c
---- linux-2.6.33.1/arch/powerpc/kernel/signal_64.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/signal_64.c     2010-03-20 16:58:38.740772809 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/signal_64.c linux-2.6.34/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.34/arch/powerpc/kernel/signal_64.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/signal_64.c       2010-07-01 20:45:14.000000000 -0400
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
        current->thread.fpscr.val = 0;
  
@@ -2357,9 +2511,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/signal_64.c linux-2.6.33.1/arch/po
                regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
        } else {
                err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/vdso.c linux-2.6.33.1/arch/powerpc/kernel/vdso.c
---- linux-2.6.33.1/arch/powerpc/kernel/vdso.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/vdso.c  2010-03-20 16:58:38.740772809 -0400
+diff -urNp linux-2.6.34/arch/powerpc/kernel/vdso.c linux-2.6.34/arch/powerpc/kernel/vdso.c
+--- linux-2.6.34/arch/powerpc/kernel/vdso.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/vdso.c    2010-07-01 20:45:14.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2386,10 +2540,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/vdso.c linux-2.6.33.1/arch/powerpc
        if (IS_ERR_VALUE(vdso_base)) {
                rc = vdso_base;
                goto fail_mmapsem;
-diff -urNp linux-2.6.33.1/arch/powerpc/kernel/vio.c linux-2.6.33.1/arch/powerpc/kernel/vio.c
---- linux-2.6.33.1/arch/powerpc/kernel/vio.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/kernel/vio.c   2010-03-20 16:58:38.744562669 -0400
-@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
+diff -urNp linux-2.6.34/arch/powerpc/kernel/vio.c linux-2.6.34/arch/powerpc/kernel/vio.c
+--- linux-2.6.34/arch/powerpc/kernel/vio.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/kernel/vio.c     2010-07-01 20:45:14.000000000 -0400
+@@ -602,11 +602,12 @@ static void vio_dma_iommu_unmap_sg(struc
        vio_cmo_dealloc(viodev, alloc_size);
  }
  
@@ -2403,7 +2557,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/vio.c linux-2.6.33.1/arch/powerpc/
        .map_page       = vio_dma_iommu_map_page,
        .unmap_page     = vio_dma_iommu_unmap_page,
  
-@@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vi
+@@ -858,7 +859,6 @@ static void vio_cmo_bus_remove(struct vi
  
  static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
  {
@@ -2411,9 +2565,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/kernel/vio.c linux-2.6.33.1/arch/powerpc/
        viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
  }
  
-diff -urNp linux-2.6.33.1/arch/powerpc/lib/usercopy_64.c linux-2.6.33.1/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.33.1/arch/powerpc/lib/usercopy_64.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/lib/usercopy_64.c      2010-03-20 16:58:38.748775088 -0400
+diff -urNp linux-2.6.34/arch/powerpc/lib/usercopy_64.c linux-2.6.34/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.34/arch/powerpc/lib/usercopy_64.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/lib/usercopy_64.c        2010-07-01 20:45:14.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2445,9 +2599,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/lib/usercopy_64.c linux-2.6.33.1/arch/pow
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.33.1/arch/powerpc/mm/fault.c linux-2.6.33.1/arch/powerpc/mm/fault.c
---- linux-2.6.33.1/arch/powerpc/mm/fault.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/mm/fault.c     2010-03-20 16:58:38.748775088 -0400
+diff -urNp linux-2.6.34/arch/powerpc/mm/fault.c linux-2.6.34/arch/powerpc/mm/fault.c
+--- linux-2.6.34/arch/powerpc/mm/fault.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/mm/fault.c       2010-07-01 20:45:14.000000000 -0400
 @@ -30,6 +30,10 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -2552,9 +2706,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/mm/fault.c linux-2.6.33.1/arch/powerpc/mm
                _exception(SIGSEGV, regs, code, address);
                return 0;
        }
-diff -urNp linux-2.6.33.1/arch/powerpc/mm/mmap_64.c linux-2.6.33.1/arch/powerpc/mm/mmap_64.c
---- linux-2.6.33.1/arch/powerpc/mm/mmap_64.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/mm/mmap_64.c   2010-03-20 16:58:38.748775088 -0400
+diff -urNp linux-2.6.34/arch/powerpc/mm/mmap_64.c linux-2.6.34/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.34/arch/powerpc/mm/mmap_64.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/mm/mmap_64.c     2010-07-01 20:45:14.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2578,9 +2732,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/mm/mmap_64.c linux-2.6.33.1/arch/powerpc/
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.33.1/arch/powerpc/mm/slice.c linux-2.6.33.1/arch/powerpc/mm/slice.c
---- linux-2.6.33.1/arch/powerpc/mm/slice.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/mm/slice.c     2010-03-20 16:58:38.764771645 -0400
+diff -urNp linux-2.6.34/arch/powerpc/mm/slice.c linux-2.6.34/arch/powerpc/mm/slice.c
+--- linux-2.6.34/arch/powerpc/mm/slice.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/mm/slice.c       2010-07-01 20:45:14.000000000 -0400
 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
        if (fixed && addr > (mm->task_size - len))
                return -EINVAL;
@@ -2593,9 +2747,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/mm/slice.c linux-2.6.33.1/arch/powerpc/mm
        /* If hint, make sure it matches our alignment restrictions */
        if (!fixed && addr) {
                addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.33.1/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.33.1/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.33.1/arch/powerpc/platforms/52xx/lite5200_pm.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/platforms/52xx/lite5200_pm.c   2010-03-20 16:58:38.776769493 -0400
+diff -urNp linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/platforms/52xx/lite5200_pm.c     2010-07-01 20:45:14.000000000 -0400
 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
        lite5200_pm_target_state = PM_SUSPEND_ON;
  }
@@ -2605,9 +2759,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.33
        .valid          = lite5200_pm_valid,
        .begin          = lite5200_pm_begin,
        .prepare        = lite5200_pm_prepare,
-diff -urNp linux-2.6.33.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.33.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.33.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c    2010-03-20 16:58:38.776769493 -0400
+diff -urNp linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2010-07-01 20:45:14.000000000 -0400
 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
        iounmap(mbar);
  }
@@ -2617,9 +2771,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.33.
        .valid          = mpc52xx_pm_valid,
        .prepare        = mpc52xx_pm_prepare,
        .enter          = mpc52xx_pm_enter,
-diff -urNp linux-2.6.33.1/arch/powerpc/platforms/83xx/suspend.c linux-2.6.33.1/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.33.1/arch/powerpc/platforms/83xx/suspend.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/platforms/83xx/suspend.c       2010-03-20 16:58:38.776769493 -0400
+diff -urNp linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/platforms/83xx/suspend.c 2010-07-01 20:45:14.000000000 -0400
 @@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
        return ret;
  }
@@ -2629,10 +2783,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/83xx/suspend.c linux-2.6.33.1/a
        .valid = mpc83xx_suspend_valid,
        .begin = mpc83xx_suspend_begin,
        .enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.33.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.33.1/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.33.1/arch/powerpc/platforms/cell/iommu.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/platforms/cell/iommu.c 2010-03-20 16:58:38.776769493 -0400
-@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
+diff -urNp linux-2.6.34/arch/powerpc/platforms/cell/iommu.c linux-2.6.34/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.34/arch/powerpc/platforms/cell/iommu.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/platforms/cell/iommu.c   2010-07-01 20:45:14.000000000 -0400
+@@ -643,7 +643,7 @@ static int dma_fixed_dma_supported(struc
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
  
@@ -2641,10 +2795,10 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/cell/iommu.c linux-2.6.33.1/arc
        .alloc_coherent = dma_fixed_alloc_coherent,
        .free_coherent  = dma_fixed_free_coherent,
        .map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c     2010-03-20 16:58:38.776769493 -0400
-@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
+diff -urNp linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/platforms/ps3/system-bus.c       2010-07-01 20:45:14.000000000 -0400
+@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
        return mask >= DMA_BIT_MASK(32);
  }
  
@@ -2653,7 +2807,7 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.33.1
        .alloc_coherent = ps3_alloc_coherent,
        .free_coherent = ps3_free_coherent,
        .map_sg = ps3_sb_map_sg,
-@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops
+@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops
        .unmap_page = ps3_unmap_page,
  };
  
@@ -2662,9 +2816,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.33.1
        .alloc_coherent = ps3_alloc_coherent,
        .free_coherent = ps3_free_coherent,
        .map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.33.1/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.33.1/arch/powerpc/sysdev/fsl_pmc.c
---- linux-2.6.33.1/arch/powerpc/sysdev/fsl_pmc.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/powerpc/sysdev/fsl_pmc.c       2010-03-20 16:58:38.784767469 -0400
+diff -urNp linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c
+--- linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/powerpc/sysdev/fsl_pmc.c 2010-07-01 20:45:14.000000000 -0400
 @@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
        return 1;
  }
@@ -2674,9 +2828,9 @@ diff -urNp linux-2.6.33.1/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.33.1/arch/powe
        .valid = pmc_suspend_valid,
        .enter = pmc_suspend_enter,
  };
-diff -urNp linux-2.6.33.1/arch/s390/include/asm/elf.h linux-2.6.33.1/arch/s390/include/asm/elf.h
---- linux-2.6.33.1/arch/s390/include/asm/elf.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/include/asm/elf.h 2010-03-20 16:58:38.792763717 -0400
+diff -urNp linux-2.6.34/arch/s390/include/asm/elf.h linux-2.6.34/arch/s390/include/asm/elf.h
+--- linux-2.6.34/arch/s390/include/asm/elf.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/include/asm/elf.h   2010-07-01 20:45:14.000000000 -0400
 @@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
     that it will "exec", and that there is sufficient room for the brk.  */
  #define ELF_ET_DYN_BASE               (STACK_TOP / 3 * 2)
@@ -2691,9 +2845,9 @@ diff -urNp linux-2.6.33.1/arch/s390/include/asm/elf.h linux-2.6.33.1/arch/s390/i
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
  
-diff -urNp linux-2.6.33.1/arch/s390/include/asm/uaccess.h linux-2.6.33.1/arch/s390/include/asm/uaccess.h
---- linux-2.6.33.1/arch/s390/include/asm/uaccess.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/include/asm/uaccess.h     2010-03-20 16:58:38.800777709 -0400
+diff -urNp linux-2.6.34/arch/s390/include/asm/uaccess.h linux-2.6.34/arch/s390/include/asm/uaccess.h
+--- linux-2.6.34/arch/s390/include/asm/uaccess.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/include/asm/uaccess.h       2010-07-01 20:45:14.000000000 -0400
 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -2715,21 +2869,21 @@ diff -urNp linux-2.6.33.1/arch/s390/include/asm/uaccess.h linux-2.6.33.1/arch/s3
        if (__builtin_constant_p(n) && (n <= 256))
                return uaccess.copy_from_user_small(n, from, to);
        else
-@@ -285,6 +292,10 @@ static inline unsigned long __must_check
- copy_from_user(void *to, const void __user *from, unsigned long n)
- {
+@@ -293,6 +300,10 @@ copy_from_user(void *to, const void __us
+       unsigned int sz = __compiletime_object_size(to);
+ 
        might_fault();
 +
 +      if ((long)n < 0)
 +              return n;
 +
-       if (access_ok(VERIFY_READ, from, n))
-               n = __copy_from_user(to, from, n);
-       else
-diff -urNp linux-2.6.33.1/arch/s390/Kconfig linux-2.6.33.1/arch/s390/Kconfig
---- linux-2.6.33.1/arch/s390/Kconfig   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/Kconfig   2010-03-20 16:58:38.812766228 -0400
-@@ -222,13 +222,12 @@ config AUDIT_ARCH
+       if (unlikely(sz != -1 && sz < n)) {
+               copy_from_user_overflow();
+               return n;
+diff -urNp linux-2.6.34/arch/s390/Kconfig linux-2.6.34/arch/s390/Kconfig
+--- linux-2.6.34/arch/s390/Kconfig     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/Kconfig     2010-07-01 20:45:14.000000000 -0400
+@@ -229,13 +229,12 @@ config AUDIT_ARCH
  
  config S390_EXEC_PROTECT
        bool "Data execute protection"
@@ -2747,9 +2901,9 @@ diff -urNp linux-2.6.33.1/arch/s390/Kconfig linux-2.6.33.1/arch/s390/Kconfig
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.33.1/arch/s390/kernel/module.c linux-2.6.33.1/arch/s390/kernel/module.c
---- linux-2.6.33.1/arch/s390/kernel/module.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/kernel/module.c   2010-03-20 16:58:38.824764313 -0400
+diff -urNp linux-2.6.34/arch/s390/kernel/module.c linux-2.6.34/arch/s390/kernel/module.c
+--- linux-2.6.34/arch/s390/kernel/module.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/kernel/module.c     2010-07-01 20:45:14.000000000 -0400
 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
        /* Increase core size by size of got & plt and set start
@@ -2821,10 +2975,10 @@ diff -urNp linux-2.6.33.1/arch/s390/kernel/module.c linux-2.6.33.1/arch/s390/ker
                        rela->r_addend - loc;
                if (r_type == R_390_GOTPC)
                        *(unsigned int *) loc = val;
-diff -urNp linux-2.6.33.1/arch/s390/kernel/setup.c linux-2.6.33.1/arch/s390/kernel/setup.c
---- linux-2.6.33.1/arch/s390/kernel/setup.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/kernel/setup.c    2010-03-20 16:58:38.824764313 -0400
-@@ -298,7 +298,7 @@ static int __init early_parse_mem(char *
+diff -urNp linux-2.6.34/arch/s390/kernel/setup.c linux-2.6.34/arch/s390/kernel/setup.c
+--- linux-2.6.34/arch/s390/kernel/setup.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/kernel/setup.c      2010-07-01 20:45:14.000000000 -0400
+@@ -297,7 +297,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
  
@@ -2833,7 +2987,7 @@ diff -urNp linux-2.6.33.1/arch/s390/kernel/setup.c linux-2.6.33.1/arch/s390/kern
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-@@ -327,17 +327,6 @@ static int set_amode_and_uaccess(unsigne
+@@ -326,17 +326,6 @@ static int set_amode_and_uaccess(unsigne
        }
  }
  
@@ -2851,7 +3005,7 @@ diff -urNp linux-2.6.33.1/arch/s390/kernel/setup.c linux-2.6.33.1/arch/s390/kern
  static int __init early_parse_user_mode(char *p)
  {
        if (p && strcmp(p, "primary") == 0)
-@@ -354,20 +343,6 @@ static int __init early_parse_user_mode(
+@@ -353,20 +342,6 @@ static int __init early_parse_user_mode(
  }
  early_param("user_mode", early_parse_user_mode);
  
@@ -2872,9 +3026,9 @@ diff -urNp linux-2.6.33.1/arch/s390/kernel/setup.c linux-2.6.33.1/arch/s390/kern
  static void setup_addressing_mode(void)
  {
        if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.33.1/arch/s390/mm/maccess.c linux-2.6.33.1/arch/s390/mm/maccess.c
---- linux-2.6.33.1/arch/s390/mm/maccess.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/mm/maccess.c      2010-03-20 16:58:38.828581240 -0400
+diff -urNp linux-2.6.34/arch/s390/mm/maccess.c linux-2.6.34/arch/s390/mm/maccess.c
+--- linux-2.6.34/arch/s390/mm/maccess.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/mm/maccess.c        2010-07-01 20:45:14.000000000 -0400
 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void 
        return rc ? rc : count;
  }
@@ -2884,9 +3038,9 @@ diff -urNp linux-2.6.33.1/arch/s390/mm/maccess.c linux-2.6.33.1/arch/s390/mm/mac
  {
        long copied = 0;
  
-diff -urNp linux-2.6.33.1/arch/s390/mm/mmap.c linux-2.6.33.1/arch/s390/mm/mmap.c
---- linux-2.6.33.1/arch/s390/mm/mmap.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/s390/mm/mmap.c 2010-03-20 16:58:38.828581240 -0400
+diff -urNp linux-2.6.34/arch/s390/mm/mmap.c linux-2.6.34/arch/s390/mm/mmap.c
+--- linux-2.6.34/arch/s390/mm/mmap.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/s390/mm/mmap.c   2010-07-01 20:45:14.000000000 -0400
 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2933,9 +3087,9 @@ diff -urNp linux-2.6.33.1/arch/s390/mm/mmap.c linux-2.6.33.1/arch/s390/mm/mmap.c
                mm->get_unmapped_area = s390_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.33.1/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.33.1/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.33.1/arch/sh/boards/mach-hp6xx/pm.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/boards/mach-hp6xx/pm.c      2010-03-20 16:58:38.840778404 -0400
+diff -urNp linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/boards/mach-hp6xx/pm.c        2010-07-01 20:45:14.000000000 -0400
 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
        return 0;
  }
@@ -2945,9 +3099,9 @@ diff -urNp linux-2.6.33.1/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.33.1/arch/sh/
        .enter          = hp6x0_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.33.1/arch/sh/include/asm/dma-mapping.h linux-2.6.33.1/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.33.1/arch/sh/include/asm/dma-mapping.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/include/asm/dma-mapping.h   2010-03-20 16:58:38.844777279 -0400
+diff -urNp linux-2.6.34/arch/sh/include/asm/dma-mapping.h linux-2.6.34/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/sh/include/asm/dma-mapping.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/include/asm/dma-mapping.h     2010-07-01 20:45:14.000000000 -0400
 @@ -1,10 +1,10 @@
  #ifndef __ASM_SH_DMA_MAPPING_H
  #define __ASM_SH_DMA_MAPPING_H
@@ -3004,24 +3158,12 @@ diff -urNp linux-2.6.33.1/arch/sh/include/asm/dma-mapping.h linux-2.6.33.1/arch/
 -      struct dma_map_ops *ops = get_dma_ops(dev);
 +      const struct dma_map_ops *ops = get_dma_ops(dev);
  
-       WARN_ON(irqs_disabled());       /* for portability */
- 
-diff -urNp linux-2.6.33.1/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.33.1/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.33.1/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/kernel/cpu/sh4/sq.c 2010-03-20 16:58:38.848768890 -0400
-@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
-       NULL,
- };
- 
--static struct sysfs_ops sq_sysfs_ops = {
-+static const struct sysfs_ops sq_sysfs_ops = {
-       .show   = sq_sysfs_show,
-       .store  = sq_sysfs_store,
- };
-diff -urNp linux-2.6.33.1/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.33.1/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.33.1/arch/sh/kernel/cpu/shmobile/pm.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/kernel/cpu/shmobile/pm.c    2010-03-20 16:58:38.852765354 -0400
-@@ -140,7 +140,7 @@ static int sh_pm_enter(suspend_state_t s
+       if (dma_release_from_coherent(dev, get_order(size), vaddr))
+               return;
+diff -urNp linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/kernel/cpu/shmobile/pm.c      2010-07-01 20:45:14.000000000 -0400
+@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
        return 0;
  }
  
@@ -3030,9 +3172,9 @@ diff -urNp linux-2.6.33.1/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.33.1/arch/s
        .enter          = sh_pm_enter,
        .valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.33.1/arch/sh/kernel/dma-nommu.c linux-2.6.33.1/arch/sh/kernel/dma-nommu.c
---- linux-2.6.33.1/arch/sh/kernel/dma-nommu.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/kernel/dma-nommu.c  2010-03-20 16:58:38.852765354 -0400
+diff -urNp linux-2.6.34/arch/sh/kernel/dma-nommu.c linux-2.6.34/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.34/arch/sh/kernel/dma-nommu.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/kernel/dma-nommu.c    2010-07-01 20:45:14.000000000 -0400
 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device 
  }
  #endif
@@ -3042,11 +3184,11 @@ diff -urNp linux-2.6.33.1/arch/sh/kernel/dma-nommu.c linux-2.6.33.1/arch/sh/kern
        .alloc_coherent         = dma_generic_alloc_coherent,
        .free_coherent          = dma_generic_free_coherent,
        .map_page               = nommu_map_page,
-diff -urNp linux-2.6.33.1/arch/sh/kernel/kgdb.c linux-2.6.33.1/arch/sh/kernel/kgdb.c
---- linux-2.6.33.1/arch/sh/kernel/kgdb.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/kernel/kgdb.c       2010-03-20 16:58:38.856769610 -0400
-@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
- {
+diff -urNp linux-2.6.34/arch/sh/kernel/kgdb.c linux-2.6.34/arch/sh/kernel/kgdb.c
+--- linux-2.6.34/arch/sh/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/kernel/kgdb.c 2010-07-01 20:45:14.000000000 -0400
+@@ -307,7 +307,7 @@ void kgdb_arch_exit(void)
+       unregister_die_notifier(&kgdb_notifier);
  }
  
 -struct kgdb_arch arch_kgdb_ops = {
@@ -3054,10 +3196,10 @@ diff -urNp linux-2.6.33.1/arch/sh/kernel/kgdb.c linux-2.6.33.1/arch/sh/kernel/kg
        /* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
        .gdb_bpt_instr          = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.33.1/arch/sh/mm/consistent.c linux-2.6.33.1/arch/sh/mm/consistent.c
---- linux-2.6.33.1/arch/sh/mm/consistent.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sh/mm/consistent.c     2010-03-20 16:58:38.860748595 -0400
-@@ -21,7 +21,7 @@
+diff -urNp linux-2.6.34/arch/sh/mm/consistent.c linux-2.6.34/arch/sh/mm/consistent.c
+--- linux-2.6.34/arch/sh/mm/consistent.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sh/mm/consistent.c       2010-07-01 20:45:14.000000000 -0400
+@@ -22,7 +22,7 @@
  
  #define PREALLOC_DMA_DEBUG_ENTRIES    4096
  
@@ -3066,10 +3208,10 @@ diff -urNp linux-2.6.33.1/arch/sh/mm/consistent.c linux-2.6.33.1/arch/sh/mm/cons
  EXPORT_SYMBOL(dma_ops);
  
  static int __init dma_init(void)
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h  2010-03-20 16:58:38.860748595 -0400
-@@ -14,18 +14,38 @@
+diff -urNp linux-2.6.34/arch/sparc/include/asm/atomic_64.h linux-2.6.34/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.34/arch/sparc/include/asm/atomic_64.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/atomic_64.h    2010-07-03 19:27:09.000000000 -0400
+@@ -14,18 +14,39 @@
  #define ATOMIC64_INIT(i)      { (i) }
  
  #define atomic_read(v)                ((v)->counter)
@@ -3101,6 +3243,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
  extern void atomic_sub(int, atomic_t *);
 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
  extern void atomic64_sub(int, atomic64_t *);
++extern void atomic64_sub_unchecked(int, atomic64_unchecked_t *);
  
  extern int atomic_add_ret(int, atomic_t *);
  extern int atomic64_add_ret(int, atomic64_t *);
@@ -3108,7 +3251,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
  extern int atomic_sub_ret(int, atomic_t *);
  extern int atomic64_sub_ret(int, atomic64_t *);
  
-@@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6
+@@ -34,6 +55,7 @@ extern int atomic64_sub_ret(int, atomic6
  
  #define atomic_inc_return(v) atomic_add_ret(1, v)
  #define atomic64_inc_return(v) atomic64_add_ret(1, v)
@@ -3116,7 +3259,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
  
  #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
  #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
-@@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6
+@@ -59,10 +81,26 @@ extern int atomic64_sub_ret(int, atomic6
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -3131,8 +3274,19 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
 +}
  
  #define atomic_dec(v) atomic_sub(1, v)
++static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++      atomic_sub_unchecked(1, v);
++}
  #define atomic64_dec(v) atomic64_sub(1, v)
-@@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6
++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
++{
++      atomic64_sub_unchecked(1, v);
++}
+ 
+ #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
+ #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
+@@ -72,17 +110,28 @@ extern int atomic64_sub_ret(int, atomic6
  
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -3165,7 +3319,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom
+@@ -93,17 +142,28 @@ static inline int atomic_add_unless(atom
  
  static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -3198,15 +3352,15 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/atomic_64.h linux-2.6.33.1/arch
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h        2010-03-20 16:58:38.881211488 -0400
-@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
+diff -urNp linux-2.6.34/arch/sparc/include/asm/dma-mapping.h linux-2.6.34/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/sparc/include/asm/dma-mapping.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/dma-mapping.h  2010-07-03 09:57:51.000000000 -0400
+@@ -13,10 +13,10 @@ extern int dma_supported(struct device *
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
  #define dma_is_consistent(d, h)       (1)
  
 -extern struct dma_map_ops *dma_ops, pci32_dma_ops;
-+extern struct const dma_map_ops *dma_ops, pci32_dma_ops;
++extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
  extern struct bus_type pci_bus_type;
  
 -static inline struct dma_map_ops *get_dma_ops(struct device *dev)
@@ -3214,7 +3368,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.33.1/ar
  {
  #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
        if (dev->bus == &pci_bus_type)
-@@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dm
+@@ -30,7 +30,7 @@ static inline struct dma_map_ops *get_dm
  static inline void *dma_alloc_coherent(struct device *dev, size_t size,
                                       dma_addr_t *dma_handle, gfp_t flag)
  {
@@ -3223,7 +3377,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.33.1/ar
        void *cpu_addr;
  
        cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
-@@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(s
+@@ -41,7 +41,7 @@ static inline void *dma_alloc_coherent(s
  static inline void dma_free_coherent(struct device *dev, size_t size,
                                     void *cpu_addr, dma_addr_t dma_handle)
  {
@@ -3232,9 +3386,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/dma-mapping.h linux-2.6.33.1/ar
  
        debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
        ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/elf_32.h linux-2.6.33.1/arch/sparc/include/asm/elf_32.h
---- linux-2.6.33.1/arch/sparc/include/asm/elf_32.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/elf_32.h     2010-03-20 16:58:38.884769570 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/elf_32.h linux-2.6.34/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.34/arch/sparc/include/asm/elf_32.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/elf_32.h       2010-07-01 20:45:14.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3249,9 +3403,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/elf_32.h linux-2.6.33.1/arch/sp
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/elf_64.h linux-2.6.33.1/arch/sparc/include/asm/elf_64.h
---- linux-2.6.33.1/arch/sparc/include/asm/elf_64.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/elf_64.h     2010-03-20 16:58:38.892779813 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/elf_64.h linux-2.6.34/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.34/arch/sparc/include/asm/elf_64.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/elf_64.h       2010-07-01 20:45:14.000000000 -0400
 @@ -162,6 +162,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE               0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE        0x0000000070000000UL
@@ -3265,9 +3419,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/elf_64.h linux-2.6.33.1/arch/sp
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.33.1/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.33.1/arch/sparc/include/asm/pgtable_32.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/pgtable_32.h 2010-03-20 16:58:38.892779813 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/pgtable_32.h linux-2.6.34/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.34/arch/sparc/include/asm/pgtable_32.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/pgtable_32.h   2010-07-01 20:45:14.000000000 -0400
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3299,9 +3453,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/pgtable_32.h linux-2.6.33.1/arc
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.33.1/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.33.1/arch/sparc/include/asm/pgtsrmmu.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/pgtsrmmu.h   2010-03-20 16:58:38.917006269 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/pgtsrmmu.h     2010-07-01 20:45:14.000000000 -0400
 @@ -115,6 +115,13 @@
                                    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3316,9 +3470,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.33.1/arch/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
                                    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/spinlock_64.h linux-2.6.33.1/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.33.1/arch/sparc/include/asm/spinlock_64.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/spinlock_64.h        2010-03-20 16:58:38.917006269 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/spinlock_64.h linux-2.6.34/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.34/arch/sparc/include/asm/spinlock_64.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/spinlock_64.h  2010-07-01 20:45:14.000000000 -0400
 @@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
        __asm__ __volatile__ (
  "1:   ldsw            [%2], %0\n"
@@ -3370,9 +3524,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/spinlock_64.h linux-2.6.33.1/ar
  "     cas     [%2], %0, %1\n"
  "     cmp     %0, %1\n"
  "     bne,pn  %%xcc, 1b\n"
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.33.1/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.33.1/arch/sparc/include/asm/uaccess_32.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/uaccess_32.h 2010-03-20 16:58:38.917006269 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/uaccess_32.h linux-2.6.34/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.34/arch/sparc/include/asm/uaccess_32.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/uaccess_32.h   2010-07-01 20:45:14.000000000 -0400
 @@ -249,14 +249,25 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3431,9 +3585,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/uaccess_32.h linux-2.6.33.1/arc
        return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.33.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.33.1/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.33.1/arch/sparc/include/asm/uaccess_64.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/include/asm/uaccess_64.h 2010-03-20 16:58:38.924784570 -0400
+diff -urNp linux-2.6.34/arch/sparc/include/asm/uaccess_64.h linux-2.6.34/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.34/arch/sparc/include/asm/uaccess_64.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/include/asm/uaccess_64.h   2010-07-01 20:45:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3480,10 +3634,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/include/asm/uaccess_64.h linux-2.6.33.1/arc
        if (unlikely(ret))
                ret = copy_to_user_fixup(to, from, size);
        return ret;
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/iommu.c linux-2.6.33.1/arch/sparc/kernel/iommu.c
---- linux-2.6.33.1/arch/sparc/kernel/iommu.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/iommu.c   2010-03-20 16:58:38.928788728 -0400
-@@ -827,7 +827,7 @@ static void dma_4u_sync_sg_for_cpu(struc
+diff -urNp linux-2.6.34/arch/sparc/kernel/iommu.c linux-2.6.34/arch/sparc/kernel/iommu.c
+--- linux-2.6.34/arch/sparc/kernel/iommu.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/iommu.c     2010-07-01 20:45:14.000000000 -0400
+@@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struc
        spin_unlock_irqrestore(&iommu->lock, flags);
  }
  
@@ -3492,7 +3646,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/iommu.c linux-2.6.33.1/arch/sparc/ke
        .alloc_coherent         = dma_4u_alloc_coherent,
        .free_coherent          = dma_4u_free_coherent,
        .map_page               = dma_4u_map_page,
-@@ -838,7 +838,7 @@ static struct dma_map_ops sun4u_dma_ops 
+@@ -839,7 +839,7 @@ static struct dma_map_ops sun4u_dma_ops 
        .sync_sg_for_cpu        = dma_4u_sync_sg_for_cpu,
  };
  
@@ -3501,9 +3655,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/iommu.c linux-2.6.33.1/arch/sparc/ke
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/ioport.c linux-2.6.33.1/arch/sparc/kernel/ioport.c
---- linux-2.6.33.1/arch/sparc/kernel/ioport.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/ioport.c  2010-03-20 16:58:38.940791948 -0400
+diff -urNp linux-2.6.34/arch/sparc/kernel/ioport.c linux-2.6.34/arch/sparc/kernel/ioport.c
+--- linux-2.6.34/arch/sparc/kernel/ioport.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/ioport.c    2010-07-01 20:45:14.000000000 -0400
 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
        BUG();
  }
@@ -3531,9 +3685,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/ioport.c linux-2.6.33.1/arch/sparc/k
        .alloc_coherent         = pci32_alloc_coherent,
        .free_coherent          = pci32_free_coherent,
        .map_page               = pci32_map_page,
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/kgdb_32.c linux-2.6.33.1/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.33.1/arch/sparc/kernel/kgdb_32.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/kgdb_32.c 2010-03-20 16:58:38.940791948 -0400
+diff -urNp linux-2.6.34/arch/sparc/kernel/kgdb_32.c linux-2.6.34/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.34/arch/sparc/kernel/kgdb_32.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/kgdb_32.c   2010-07-01 20:45:14.000000000 -0400
 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -3543,10 +3697,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/kgdb_32.c linux-2.6.33.1/arch/sparc/
        /* Breakpoint instruction: ta 0x7d */
        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/kgdb_64.c linux-2.6.33.1/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.33.1/arch/sparc/kernel/kgdb_64.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/kgdb_64.c 2010-03-20 16:58:38.940791948 -0400
-@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
+diff -urNp linux-2.6.34/arch/sparc/kernel/kgdb_64.c linux-2.6.34/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.34/arch/sparc/kernel/kgdb_64.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/kgdb_64.c   2010-07-01 20:45:14.000000000 -0400
+@@ -181,7 +181,7 @@ void kgdb_arch_exit(void)
  {
  }
  
@@ -3555,9 +3709,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/kgdb_64.c linux-2.6.33.1/arch/sparc/
        /* Breakpoint instruction: ta 0x72 */
        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/Makefile linux-2.6.33.1/arch/sparc/kernel/Makefile
---- linux-2.6.33.1/arch/sparc/kernel/Makefile  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/Makefile  2010-03-20 16:58:38.944776638 -0400
+diff -urNp linux-2.6.34/arch/sparc/kernel/Makefile linux-2.6.34/arch/sparc/kernel/Makefile
+--- linux-2.6.34/arch/sparc/kernel/Makefile    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/Makefile    2010-07-01 20:45:14.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -3567,9 +3721,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/Makefile linux-2.6.33.1/arch/sparc/k
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.33.1/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.33.1/arch/sparc/kernel/pci_sun4v.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/pci_sun4v.c       2010-03-20 16:58:38.944776638 -0400
+diff -urNp linux-2.6.34/arch/sparc/kernel/pci_sun4v.c linux-2.6.34/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.34/arch/sparc/kernel/pci_sun4v.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/pci_sun4v.c 2010-07-01 20:45:14.000000000 -0400
 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
        spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -3579,9 +3733,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/pci_sun4v.c linux-2.6.33.1/arch/spar
        .alloc_coherent                 = dma_4v_alloc_coherent,
        .free_coherent                  = dma_4v_free_coherent,
        .map_page                       = dma_4v_map_page,
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.33.1/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.33.1/arch/sparc/kernel/sys_sparc_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/sys_sparc_32.c    2010-03-20 16:58:38.944776638 -0400
+diff -urNp linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/sys_sparc_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
        if (ARCH_SUN4C && len > 0x20000000)
                return -ENOMEM;
@@ -3591,10 +3745,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_32.c linux-2.6.33.1/arch/s
  
        if (flags & MAP_SHARED)
                addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c    2010-03-20 16:58:38.948763345 -0400
-@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
+diff -urNp linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/sys_sparc_64.c      2010-07-01 20:45:14.000000000 -0400
+@@ -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.
                 */
@@ -3603,7 +3757,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
                        return -EINVAL;
                return addr;
-@@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(str
+@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(str
        if (filp || (flags & MAP_SHARED))
                do_color_align = 1;
  
@@ -3614,7 +3768,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
        if (addr) {
                if (do_color_align)
                        addr = COLOUR_ALIGN(addr, pgoff);
-@@ -153,9 +157,9 @@ unsigned long arch_get_unmapped_area(str
+@@ -152,9 +156,9 @@ unsigned long arch_get_unmapped_area(str
        }
  
        if (len > mm->cached_hole_size) {
@@ -3626,7 +3780,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                mm->cached_hole_size = 0;
        }
  
-@@ -175,8 +179,8 @@ full_search:
+@@ -174,8 +178,8 @@ full_search:
                        vma = find_vma(mm, VA_EXCLUDE_END);
                }
                if (unlikely(task_size < addr)) {
@@ -3637,7 +3791,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                                mm->cached_hole_size = 0;
                                goto full_search;
                        }
-@@ -216,7 +220,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -215,7 +219,7 @@ arch_get_unmapped_area_topdown(struct fi
                /* We do not accept a shared mapping if it would violate
                 * cache aliasing constraints.
                 */
@@ -3646,7 +3800,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
                        return -EINVAL;
                return addr;
-@@ -386,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -385,6 +389,12 @@ void arch_pick_mmap_layout(struct mm_str
            gap == RLIM_INFINITY ||
            sysctl_legacy_va_layout) {
                mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -3659,7 +3813,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                mm->get_unmapped_area = arch_get_unmapped_area;
                mm->unmap_area = arch_unmap_area;
        } else {
-@@ -398,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str
+@@ -397,6 +407,12 @@ void arch_pick_mmap_layout(struct mm_str
                        gap = (task_size / 6 * 5);
  
                mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
@@ -3672,10 +3826,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/sys_sparc_64.c linux-2.6.33.1/arch/s
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.33.1/arch/sparc/kernel/traps_64.c linux-2.6.33.1/arch/sparc/kernel/traps_64.c
---- linux-2.6.33.1/arch/sparc/kernel/traps_64.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/kernel/traps_64.c        2010-03-20 16:58:38.948763345 -0400
-@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
+diff -urNp linux-2.6.34/arch/sparc/kernel/traps_64.c linux-2.6.34/arch/sparc/kernel/traps_64.c
+--- linux-2.6.34/arch/sparc/kernel/traps_64.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/kernel/traps_64.c  2010-07-01 20:45:14.000000000 -0400
+@@ -94,6 +94,12 @@ void bad_trap(struct pt_regs *regs, long
  
        lvl -= 0x100;
        if (regs->tstate & TSTATE_PRIV) {
@@ -3688,7 +3842,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/traps_64.c linux-2.6.33.1/arch/sparc
                sprintf(buffer, "Kernel bad sw trap %lx", lvl);
                die_if_kernel(buffer, regs);
        }
-@@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long
+@@ -112,11 +118,16 @@ void bad_trap(struct pt_regs *regs, long
  void bad_trap_tl1(struct pt_regs *regs, long lvl)
  {
        char buffer[32];
@@ -3706,9 +3860,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/kernel/traps_64.c linux-2.6.33.1/arch/sparc
        dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
  
        sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.33.1/arch/sparc/lib/atomic_64.S linux-2.6.33.1/arch/sparc/lib/atomic_64.S
---- linux-2.6.33.1/arch/sparc/lib/atomic_64.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/lib/atomic_64.S  2010-03-20 16:58:38.952780321 -0400
+diff -urNp linux-2.6.34/arch/sparc/lib/atomic_64.S linux-2.6.34/arch/sparc/lib/atomic_64.S
+--- linux-2.6.34/arch/sparc/lib/atomic_64.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/lib/atomic_64.S    2010-07-01 20:45:14.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
        BACKOFF_SETUP(%o2)
@@ -3853,7 +4007,27 @@ diff -urNp linux-2.6.33.1/arch/sparc/lib/atomic_64.S linux-2.6.33.1/arch/sparc/l
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, 2f
-@@ -110,7 +185,12 @@ atomic64_sub: /* %o0 = decrement, %o1 = 
+@@ -105,12 +180,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = 
+ 2:    BACKOFF_SPIN(%o2, %o3, 1b)
+       .size   atomic64_sub, .-atomic64_sub
+ 
++      .globl  atomic64_sub_unchecked
++      .type   atomic64_sub_unchecked,#function
++atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
++      BACKOFF_SETUP(%o2)
++1:    ldx     [%o1], %g1
++      subcc   %g1, %o0, %g7
++      casx    [%o1], %g1, %g7
++      cmp     %g1, %g7
++      bne,pn  %xcc, 2f
++       nop
++      retl
++       nop
++2:    BACKOFF_SPIN(%o2, %o3, 1b)
++      .size   atomic64_sub_unchecked, .-atomic64_sub_unchecked
++
+       .globl  atomic64_add_ret
+       .type   atomic64_add_ret,#function
  atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
        BACKOFF_SETUP(%o2)
  1:    ldx     [%o1], %g1
@@ -3867,7 +4041,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/lib/atomic_64.S linux-2.6.33.1/arch/sparc/l
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, 2f
-@@ -121,12 +201,33 @@ atomic64_add_ret: /* %o0 = increment, %o
+@@ -121,12 +216,33 @@ atomic64_add_ret: /* %o0 = increment, %o
  2:    BACKOFF_SPIN(%o2, %o3, 1b)
        .size   atomic64_add_ret, .-atomic64_add_ret
  
@@ -3902,10 +4076,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/lib/atomic_64.S linux-2.6.33.1/arch/sparc/l
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, 2f
-diff -urNp linux-2.6.33.1/arch/sparc/lib/ksyms.c linux-2.6.33.1/arch/sparc/lib/ksyms.c
---- linux-2.6.33.1/arch/sparc/lib/ksyms.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/lib/ksyms.c      2010-03-20 16:58:38.956579787 -0400
-@@ -142,8 +142,10 @@ EXPORT_SYMBOL(__downgrade_write);
+diff -urNp linux-2.6.34/arch/sparc/lib/ksyms.c linux-2.6.34/arch/sparc/lib/ksyms.c
+--- linux-2.6.34/arch/sparc/lib/ksyms.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/lib/ksyms.c        2010-07-01 20:45:14.000000000 -0400
+@@ -142,12 +142,15 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
  EXPORT_SYMBOL(atomic_add);
@@ -3916,9 +4090,14 @@ diff -urNp linux-2.6.33.1/arch/sparc/lib/ksyms.c linux-2.6.33.1/arch/sparc/lib/k
  EXPORT_SYMBOL(atomic_sub_ret);
  EXPORT_SYMBOL(atomic64_add);
  EXPORT_SYMBOL(atomic64_add_ret);
-diff -urNp linux-2.6.33.1/arch/sparc/lib/rwsem_64.S linux-2.6.33.1/arch/sparc/lib/rwsem_64.S
---- linux-2.6.33.1/arch/sparc/lib/rwsem_64.S   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/lib/rwsem_64.S   2010-03-20 16:58:38.956579787 -0400
+ EXPORT_SYMBOL(atomic64_sub);
++EXPORT_SYMBOL(atomic64_sub_unchecked);
+ EXPORT_SYMBOL(atomic64_sub_ret);
+ 
+ /* Atomic bit operations. */
+diff -urNp linux-2.6.34/arch/sparc/lib/rwsem_64.S linux-2.6.34/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.34/arch/sparc/lib/rwsem_64.S     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/lib/rwsem_64.S     2010-07-01 20:45:14.000000000 -0400
 @@ -11,7 +11,12 @@
        .globl          __down_read
  __down_read:
@@ -4017,9 +4196,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/lib/rwsem_64.S linux-2.6.33.1/arch/sparc/li
        cas             [%o0], %g3, %g7
        cmp             %g3, %g7
        bne,pn          %icc, 1b
-diff -urNp linux-2.6.33.1/arch/sparc/Makefile linux-2.6.33.1/arch/sparc/Makefile
---- linux-2.6.33.1/arch/sparc/Makefile 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/Makefile 2010-03-20 16:58:38.956579787 -0400
+diff -urNp linux-2.6.34/arch/sparc/Makefile linux-2.6.34/arch/sparc/Makefile
+--- linux-2.6.34/arch/sparc/Makefile   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/Makefile   2010-07-01 20:45:16.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)   += arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4029,9 +4208,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/Makefile linux-2.6.33.1/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_32.c linux-2.6.33.1/arch/sparc/mm/fault_32.c
---- linux-2.6.33.1/arch/sparc/mm/fault_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/mm/fault_32.c    2010-03-20 16:58:38.956579787 -0400
+diff -urNp linux-2.6.34/arch/sparc/mm/fault_32.c linux-2.6.34/arch/sparc/mm/fault_32.c
+--- linux-2.6.34/arch/sparc/mm/fault_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/mm/fault_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4042,7 +4221,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_32.c linux-2.6.33.1/arch/sparc/mm/
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -168,6 +171,267 @@ static unsigned long compute_si_addr(str
+@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(str
        return safe_compute_effective_address(regs, insn);
  }
  
@@ -4078,6 +4257,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_32.c linux-2.6.33.1/arch/sparc/mm/
 +{
 +      int ret;
 +
++      INIT_LIST_HEAD(&vma->anon_vma_chain);
 +      vma->vm_mm = current->mm;
 +      vma->vm_start = addr;
 +      vma->vm_end = addr + PAGE_SIZE;
@@ -4307,10 +4487,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_32.c linux-2.6.33.1/arch/sparc/mm/
 +}
 +#endif
 +
- asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
-                              unsigned long address)
+ static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
+                                     int text_fault)
  {
-@@ -234,6 +498,24 @@ good_area:
+@@ -282,6 +547,24 @@ good_area:
                if(!(vma->vm_flags & VM_WRITE))
                        goto bad_area;
        } else {
@@ -4335,9 +4515,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_32.c linux-2.6.33.1/arch/sparc/mm/
                /* Allow reads even for write-only mappings */
                if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
                        goto bad_area;
-diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_64.c linux-2.6.33.1/arch/sparc/mm/fault_64.c
---- linux-2.6.33.1/arch/sparc/mm/fault_64.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/mm/fault_64.c    2010-03-20 16:58:38.956579787 -0400
+diff -urNp linux-2.6.34/arch/sparc/mm/fault_64.c linux-2.6.34/arch/sparc/mm/fault_64.c
+--- linux-2.6.34/arch/sparc/mm/fault_64.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/mm/fault_64.c      2010-07-01 20:45:14.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4348,7 +4528,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_64.c linux-2.6.33.1/arch/sparc/mm/
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
-@@ -244,6 +247,456 @@ static void noinline __kprobes bogus_32b
+@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32b
        show_regs(regs);
  }
  
@@ -4384,6 +4564,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_64.c linux-2.6.33.1/arch/sparc/mm/
 +{
 +      int ret;
 +
++      INIT_LIST_HEAD(&vma->anon_vma_chain);
 +      vma->vm_mm = current->mm;
 +      vma->vm_start = addr;
 +      vma->vm_end = addr + PAGE_SIZE;
@@ -4805,7 +4986,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_64.c linux-2.6.33.1/arch/sparc/mm/
  asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  {
        struct mm_struct *mm = current->mm;
-@@ -312,6 +765,29 @@ asmlinkage void __kprobes do_sparc64_fau
+@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fau
        if (!vma)
                goto bad_area;
  
@@ -4835,10 +5016,10 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/fault_64.c linux-2.6.33.1/arch/sparc/mm/
        /* Pure DTLB misses do not tell us whether the fault causing
         * load/store/atomic was a write or not, it only says that there
         * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.33.1/arch/sparc/mm/init_32.c linux-2.6.33.1/arch/sparc/mm/init_32.c
---- linux-2.6.33.1/arch/sparc/mm/init_32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/mm/init_32.c     2010-03-20 16:58:38.956579787 -0400
-@@ -317,6 +317,9 @@ extern void device_scan(void);
+diff -urNp linux-2.6.34/arch/sparc/mm/init_32.c linux-2.6.34/arch/sparc/mm/init_32.c
+--- linux-2.6.34/arch/sparc/mm/init_32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/mm/init_32.c       2010-07-01 20:45:14.000000000 -0400
+@@ -318,6 +318,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
  
@@ -4848,7 +5029,7 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/init_32.c linux-2.6.33.1/arch/sparc/mm/i
  void __init paging_init(void)
  {
        switch(sparc_cpu_model) {
-@@ -345,17 +348,17 @@ void __init paging_init(void)
+@@ -346,17 +349,17 @@ void __init paging_init(void)
  
        /* Initialize the protection map with non-constant, MMU dependent values. */
        protection_map[0] = PAGE_NONE;
@@ -4872,9 +5053,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/init_32.c linux-2.6.33.1/arch/sparc/mm/i
        protection_map[12] = PAGE_READONLY;
        protection_map[13] = PAGE_READONLY;
        protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.33.1/arch/sparc/mm/Makefile linux-2.6.33.1/arch/sparc/mm/Makefile
---- linux-2.6.33.1/arch/sparc/mm/Makefile      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/mm/Makefile      2010-03-20 16:58:38.968781407 -0400
+diff -urNp linux-2.6.34/arch/sparc/mm/Makefile linux-2.6.34/arch/sparc/mm/Makefile
+--- linux-2.6.34/arch/sparc/mm/Makefile        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/mm/Makefile        2010-07-01 20:45:14.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -4884,9 +5065,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/Makefile linux-2.6.33.1/arch/sparc/mm/Ma
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.33.1/arch/sparc/mm/srmmu.c linux-2.6.33.1/arch/sparc/mm/srmmu.c
---- linux-2.6.33.1/arch/sparc/mm/srmmu.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/sparc/mm/srmmu.c       2010-03-20 16:58:38.968781407 -0400
+diff -urNp linux-2.6.34/arch/sparc/mm/srmmu.c linux-2.6.34/arch/sparc/mm/srmmu.c
+--- linux-2.6.34/arch/sparc/mm/srmmu.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/sparc/mm/srmmu.c 2010-07-01 20:45:14.000000000 -0400
 @@ -2198,6 +2198,13 @@ void __init ld_mmu_srmmu(void)
        PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
        BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4901,9 +5082,9 @@ diff -urNp linux-2.6.33.1/arch/sparc/mm/srmmu.c linux-2.6.33.1/arch/sparc/mm/srm
        BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
        page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.33.1/arch/um/include/asm/kmap_types.h linux-2.6.33.1/arch/um/include/asm/kmap_types.h
---- linux-2.6.33.1/arch/um/include/asm/kmap_types.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/um/include/asm/kmap_types.h    2010-03-20 16:58:38.968781407 -0400
+diff -urNp linux-2.6.34/arch/um/include/asm/kmap_types.h linux-2.6.34/arch/um/include/asm/kmap_types.h
+--- linux-2.6.34/arch/um/include/asm/kmap_types.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/um/include/asm/kmap_types.h      2010-07-01 20:45:14.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -4912,9 +5093,9 @@ diff -urNp linux-2.6.33.1/arch/um/include/asm/kmap_types.h linux-2.6.33.1/arch/u
        KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.33.1/arch/um/include/asm/page.h linux-2.6.33.1/arch/um/include/asm/page.h
---- linux-2.6.33.1/arch/um/include/asm/page.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/um/include/asm/page.h  2010-03-20 16:58:38.968781407 -0400
+diff -urNp linux-2.6.34/arch/um/include/asm/page.h linux-2.6.34/arch/um/include/asm/page.h
+--- linux-2.6.34/arch/um/include/asm/page.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/um/include/asm/page.h    2010-07-01 20:45:14.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE     (_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK     (~(PAGE_SIZE-1))
@@ -4925,9 +5106,9 @@ diff -urNp linux-2.6.33.1/arch/um/include/asm/page.h linux-2.6.33.1/arch/um/incl
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.33.1/arch/um/sys-i386/syscalls.c linux-2.6.33.1/arch/um/sys-i386/syscalls.c
---- linux-2.6.33.1/arch/um/sys-i386/syscalls.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/um/sys-i386/syscalls.c 2010-03-20 16:58:38.968781407 -0400
+diff -urNp linux-2.6.34/arch/um/sys-i386/syscalls.c linux-2.6.34/arch/um/sys-i386/syscalls.c
+--- linux-2.6.34/arch/um/sys-i386/syscalls.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/um/sys-i386/syscalls.c   2010-07-01 20:45:14.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -4948,11 +5129,11 @@ diff -urNp linux-2.6.33.1/arch/um/sys-i386/syscalls.c linux-2.6.33.1/arch/um/sys
 +}
 +
  /*
-  * Perform the select(nd, in, out, ex, tv) and mmap() system
-  * calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.33.1/arch/x86/boot/bitops.h linux-2.6.33.1/arch/x86/boot/bitops.h
---- linux-2.6.33.1/arch/x86/boot/bitops.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/bitops.h      2010-03-20 16:58:38.968781407 -0400
+  * The prototype on i386 is:
+  *
+diff -urNp linux-2.6.34/arch/x86/boot/bitops.h linux-2.6.34/arch/x86/boot/bitops.h
+--- linux-2.6.34/arch/x86/boot/bitops.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/bitops.h        2010-07-01 20:45:14.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
        u8 v;
        const u32 *p = (const u32 *)addr;
@@ -4971,9 +5152,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/bitops.h linux-2.6.33.1/arch/x86/boot/bi
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.33.1/arch/x86/boot/boot.h linux-2.6.33.1/arch/x86/boot/boot.h
---- linux-2.6.33.1/arch/x86/boot/boot.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/boot.h        2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/boot.h linux-2.6.34/arch/x86/boot/boot.h
+--- linux-2.6.34/arch/x86/boot/boot.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/boot.h  2010-07-01 20:45:14.000000000 -0400
 @@ -82,7 +82,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -4992,9 +5173,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/boot.h linux-2.6.33.1/arch/x86/boot/boot
            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
        return diff;
  }
-diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/head_32.S linux-2.6.33.1/arch/x86/boot/compressed/head_32.S
---- linux-2.6.33.1/arch/x86/boot/compressed/head_32.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/compressed/head_32.S  2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/compressed/head_32.S linux-2.6.34/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.34/arch/x86/boot/compressed/head_32.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/compressed/head_32.S    2010-07-01 20:45:14.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5023,9 +5204,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/head_32.S linux-2.6.33.1/arch
        addl    %ebx, -__PAGE_OFFSET(%ebx, %ecx)
        jmp     1b
  2:
-diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/head_64.S linux-2.6.33.1/arch/x86/boot/compressed/head_64.S
---- linux-2.6.33.1/arch/x86/boot/compressed/head_64.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/compressed/head_64.S  2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/compressed/head_64.S linux-2.6.34/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.34/arch/x86/boot/compressed/head_64.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/compressed/head_64.S    2010-07-01 20:45:14.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5044,10 +5225,10 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/head_64.S linux-2.6.33.1/arch
  #endif
  
        /* Target address to relocate to for decompression */
-diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/misc.c linux-2.6.33.1/arch/x86/boot/compressed/misc.c
---- linux-2.6.33.1/arch/x86/boot/compressed/misc.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/compressed/misc.c     2010-03-20 16:58:38.972657826 -0400
-@@ -292,7 +292,7 @@ static void parse_elf(void *output)
+diff -urNp linux-2.6.34/arch/x86/boot/compressed/misc.c linux-2.6.34/arch/x86/boot/compressed/misc.c
+--- linux-2.6.34/arch/x86/boot/compressed/misc.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/compressed/misc.c       2010-07-01 20:45:14.000000000 -0400
+@@ -285,7 +285,7 @@ static void parse_elf(void *output)
                case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
                        dest = output;
@@ -5056,7 +5237,7 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/misc.c linux-2.6.33.1/arch/x8
  #else
                        dest = (void *)(phdr->p_paddr);
  #endif
-@@ -339,7 +339,7 @@ asmlinkage void decompress_kernel(void *
+@@ -332,7 +332,7 @@ asmlinkage void decompress_kernel(void *
                error("Destination address too large");
  #endif
  #ifndef CONFIG_RELOCATABLE
@@ -5065,9 +5246,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/misc.c linux-2.6.33.1/arch/x8
                error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/mkpiggy.c linux-2.6.33.1/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.33.1/arch/x86/boot/compressed/mkpiggy.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/compressed/mkpiggy.c  2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/compressed/mkpiggy.c    2010-07-01 20:45:14.000000000 -0400
 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
  
        offs = (olen > ilen) ? olen - ilen : 0;
@@ -5077,9 +5258,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/mkpiggy.c linux-2.6.33.1/arch
        offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
  
        printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/relocs.c linux-2.6.33.1/arch/x86/boot/compressed/relocs.c
---- linux-2.6.33.1/arch/x86/boot/compressed/relocs.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/compressed/relocs.c   2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/compressed/relocs.c linux-2.6.34/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.34/arch/x86/boot/compressed/relocs.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/compressed/relocs.c     2010-07-01 20:45:14.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5272,9 +5453,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/compressed/relocs.c linux-2.6.33.1/arch/
        read_shdrs(fp);
        read_strtabs(fp);
        read_symtabs(fp);
-diff -urNp linux-2.6.33.1/arch/x86/boot/cpucheck.c linux-2.6.33.1/arch/x86/boot/cpucheck.c
---- linux-2.6.33.1/arch/x86/boot/cpucheck.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/cpucheck.c    2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/cpucheck.c linux-2.6.34/arch/x86/boot/cpucheck.c
+--- linux-2.6.34/arch/x86/boot/cpucheck.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/cpucheck.c      2010-07-01 20:45:14.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
        u16 fcw = -1, fsw = -1;
        u32 cr0;
@@ -5370,9 +5551,9 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/cpucheck.c linux-2.6.33.1/arch/x86/boot/
  
                err = check_flags();
        }
-diff -urNp linux-2.6.33.1/arch/x86/boot/header.S linux-2.6.33.1/arch/x86/boot/header.S
---- linux-2.6.33.1/arch/x86/boot/header.S      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/header.S      2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/header.S linux-2.6.34/arch/x86/boot/header.S
+--- linux-2.6.34/arch/x86/boot/header.S        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/header.S        2010-07-01 20:45:14.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:                .quad 0                 # 64-bit physical
                                                # single linked list of
                                                # struct setup_data
@@ -5382,9 +5563,33 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/header.S linux-2.6.33.1/arch/x86/boot/he
  
  #define ZO_INIT_SIZE  (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE  (VO__end - VO__text)
-diff -urNp linux-2.6.33.1/arch/x86/boot/video-vesa.c linux-2.6.33.1/arch/x86/boot/video-vesa.c
---- linux-2.6.33.1/arch/x86/boot/video-vesa.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/boot/video-vesa.c  2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/boot/memory.c linux-2.6.34/arch/x86/boot/memory.c
+--- linux-2.6.34/arch/x86/boot/memory.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/memory.c        2010-07-01 20:45:14.000000000 -0400
+@@ -19,7 +19,7 @@
+ 
+ static int detect_memory_e820(void)
+ {
+-      int count = 0;
++      unsigned int count = 0;
+       struct biosregs ireg, oreg;
+       struct e820entry *desc = boot_params.e820_map;
+       static struct e820entry buf; /* static so it is zeroed */
+diff -urNp linux-2.6.34/arch/x86/boot/video.c linux-2.6.34/arch/x86/boot/video.c
+--- linux-2.6.34/arch/x86/boot/video.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/video.c 2010-07-01 20:45:14.000000000 -0400
+@@ -96,7 +96,7 @@ static void store_mode_params(void)
+ static unsigned int get_entry(void)
+ {
+       char entry_buf[4];
+-      int i, len = 0;
++      unsigned int i, len = 0;
+       int key;
+       unsigned int v;
+ 
+diff -urNp linux-2.6.34/arch/x86/boot/video-vesa.c linux-2.6.34/arch/x86/boot/video-vesa.c
+--- linux-2.6.34/arch/x86/boot/video-vesa.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/boot/video-vesa.c    2010-07-01 20:45:14.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
        boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5393,9 +5598,106 @@ diff -urNp linux-2.6.33.1/arch/x86/boot/video-vesa.c linux-2.6.33.1/arch/x86/boo
  }
  
  /*
-diff -urNp linux-2.6.33.1/arch/x86/ia32/ia32_signal.c linux-2.6.33.1/arch/x86/ia32/ia32_signal.c
---- linux-2.6.33.1/arch/x86/ia32/ia32_signal.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/ia32/ia32_signal.c 2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/ia32/ia32entry.S linux-2.6.34/arch/x86/ia32/ia32entry.S
+--- linux-2.6.34/arch/x86/ia32/ia32entry.S     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/ia32/ia32entry.S     2010-07-01 20:45:14.000000000 -0400
+@@ -13,6 +13,7 @@
+ #include <asm/thread_info.h>  
+ #include <asm/segment.h>
+ #include <asm/irqflags.h>
++#include <asm/pgtable.h>
+ #include <linux/linkage.h>
+ 
+ /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
+@@ -114,6 +115,11 @@ ENTRY(ia32_sysenter_target)
+       SWAPGS_UNSAFE_STACK
+       movq    PER_CPU_VAR(kernel_stack), %rsp
+       addq    $(KERNEL_STACK_OFFSET),%rsp
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_enter_kernel_user
++#endif
++
+       /*
+        * No need to follow this irqs on/off section: the syscall
+        * disabled irqs, here we enable it straight after entry:
+@@ -144,6 +150,12 @@ ENTRY(ia32_sysenter_target)
+       SAVE_ARGS 0,0,1
+       /* no need to do an access_ok check here because rbp has been
+          32bit zero extended */ 
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      mov $PAX_USER_SHADOW_BASE,%r10
++      add %r10,%rbp
++#endif
++
+ 1:    movl    (%rbp),%ebp
+       .section __ex_table,"a"
+       .quad 1b,ia32_badarg
+@@ -166,6 +178,11 @@ sysenter_dispatch:
+       testl   $_TIF_ALLWORK_MASK,TI_flags(%r10)
+       jnz     sysexit_audit
+ sysexit_from_sys_call:
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel_user
++#endif
++
+       andl    $~TS_COMPAT,TI_status(%r10)
+       /* clear IF, that popfq doesn't enable interrupts early */
+       andl  $~0x200,EFLAGS-R11(%rsp) 
+@@ -284,6 +301,11 @@ ENTRY(ia32_cstar_target)
+       movl    %esp,%r8d
+       CFI_REGISTER    rsp,r8
+       movq    PER_CPU_VAR(kernel_stack),%rsp
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_enter_kernel_user
++#endif
++
+       /*
+        * No need to follow this irqs on/off section: the syscall
+        * disabled irqs and here we enable it straight after entry:
+@@ -305,6 +327,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 */      
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      mov $PAX_USER_SHADOW_BASE,%r10
++      add %r10,%r8
++#endif
++
+ 1:    movl    (%r8),%r9d
+       .section __ex_table,"a"
+       .quad 1b,ia32_badarg
+@@ -327,6 +355,11 @@ cstar_dispatch:
+       testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
+       jnz sysretl_audit
+ sysretl_from_sys_call:
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel_user
++#endif
++
+       andl $~TS_COMPAT,TI_status(%r10)
+       RESTORE_ARGS 1,-ARG_SKIP,1,1,1
+       movl RIP-ARGOFFSET(%rsp),%ecx
+@@ -409,6 +442,11 @@ ENTRY(ia32_syscall)
+       CFI_REL_OFFSET  rip,RIP-RIP
+       PARAVIRT_ADJUST_EXCEPTION_FRAME
+       SWAPGS
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_enter_kernel_user
++#endif
++
+       /*
+        * No need to follow this irqs on/off section: the syscall
+        * disabled irqs and here we enable it straight after entry:
+diff -urNp linux-2.6.34/arch/x86/ia32/ia32_signal.c linux-2.6.34/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.34/arch/x86/ia32/ia32_signal.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/ia32/ia32_signal.c   2010-07-01 20:45:14.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
        sp -= frame_size;
        /* Align the stack pointer according to the i386 ABI,
@@ -5414,10 +5716,10 @@ diff -urNp linux-2.6.33.1/arch/x86/ia32/ia32_signal.c linux-2.6.33.1/arch/x86/ia
        };
  
        frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/alternative.h linux-2.6.33.1/arch/x86/include/asm/alternative.h
---- linux-2.6.33.1/arch/x86/include/asm/alternative.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/alternative.h  2010-03-20 16:58:38.972657826 -0400
-@@ -86,7 +86,7 @@ static inline void alternatives_smp_swit
+diff -urNp linux-2.6.34/arch/x86/include/asm/alternative.h linux-2.6.34/arch/x86/include/asm/alternative.h
+--- linux-2.6.34/arch/x86/include/asm/alternative.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/alternative.h    2010-07-01 20:45:14.000000000 -0400
+@@ -91,7 +91,7 @@ static inline int alternatives_text_rese
        "        .byte 664f-663f\n"                     /* replacementlen  */   \
        "        .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */   \
        ".previous\n"                                                   \
@@ -5426,9 +5728,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/alternative.h linux-2.6.33.1/arch
        "663:\n\t" newinstr "\n664:\n"          /* replacement     */   \
        ".previous"
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/apm.h linux-2.6.33.1/arch/x86/include/asm/apm.h
---- linux-2.6.33.1/arch/x86/include/asm/apm.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/apm.h  2010-03-20 16:58:38.972657826 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/apm.h linux-2.6.34/arch/x86/include/asm/apm.h
+--- linux-2.6.34/arch/x86/include/asm/apm.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/apm.h    2010-07-01 20:45:14.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
        __asm__ __volatile__(APM_DO_ZERO_SEGS
                "pushl %%edi\n\t"
@@ -5447,325 +5749,26 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/apm.h linux-2.6.33.1/arch/x86/inc
                "setc %%bl\n\t"
                "popl %%ebp\n\t"
                "popl %%edi\n\t"
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_32.h linux-2.6.33.1/arch/x86/include/asm/atomic_32.h
---- linux-2.6.33.1/arch/x86/include/asm/atomic_32.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/atomic_32.h    2010-03-20 16:58:38.972657826 -0400
-@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
- }
- 
- /**
-+ * atomic_read_unchecked - read atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically reads the value of @v.
-+ */
-+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
-+{
-+      return v->counter;
-+}
-+
-+/**
-  * atomic_set - set atomic variable
-  * @v: pointer of type atomic_t
-  * @i: required value
-@@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t *
- }
- 
- /**
-+ * atomic_set_unchecked - set atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: required value
-+ *
-+ * Atomically sets the value of @v to @i.
-+ */
-+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
-+{
-+      v->counter = i;
-+}
-+
-+/**
-  * atomic_add - add integer to atomic variable
-  * @i: integer value to add
-  * @v: pointer of type atomic_t
-@@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t *
-  */
- static inline void atomic_add(int i, atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "addl %1,%0"
-+      asm volatile(LOCK_PREFIX "addl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "subl %1,%0\n"
-+                   "into\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   : "+m" (v->counter)
-+                   : "ir" (i));
-+}
-+
-+/**
-+ * atomic_add_unchecked - add integer to atomic variable
-+ * @i: integer value to add
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically adds @i to @v.
-+ */
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "addl %1,%0\n"
-                    : "+m" (v->counter)
-                    : "ir" (i));
- }
-@@ -59,7 +104,29 @@ static inline void atomic_add(int i, ato
-  */
- static inline void atomic_sub(int i, atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "subl %1,%0"
-+      asm volatile(LOCK_PREFIX "subl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "addl %1,%0\n"
-+                   "into\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   : "+m" (v->counter)
-+                   : "ir" (i));
-+}
-+
-+/**
-+ * atomic_sub_unchecked - subtract integer from atomic variable
-+ * @i: integer value to subtract
-+ * @v: pointer of type atomic_t
-+ *
-+ * Atomically subtracts @i from @v.
-+ */
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "subl %1,%0\n"
-                    : "+m" (v->counter)
-                    : "ir" (i));
- }
-@@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(in
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
-+      asm volatile(LOCK_PREFIX "subl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "addl %2,%0\n"
-+                   "into\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "+m" (v->counter), "=qm" (c)
-                    : "ir" (i) : "memory");
-       return c;
-@@ -91,7 +167,30 @@ static inline int atomic_sub_and_test(in
-  */
- static inline void atomic_inc(atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "incl %0"
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "into\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
-+                   LOCK_PREFIX "decl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   : "+m" (v->counter));
-+}
-+
-+/**
-+ * atomic_inc_unchecked - increment atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically increments @v by 1.
-+ */
-+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-                    : "+m" (v->counter));
- }
+diff -urNp linux-2.6.34/arch/x86/include/asm/asm.h linux-2.6.34/arch/x86/include/asm/asm.h
+--- linux-2.6.34/arch/x86/include/asm/asm.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/asm.h    2010-07-01 20:45:14.000000000 -0400
+@@ -37,6 +37,12 @@
+ #define _ASM_SI               __ASM_REG(si)
+ #define _ASM_DI               __ASM_REG(di)
  
-@@ -103,7 +202,18 @@ static inline void atomic_inc(atomic_t *
-  */
- static inline void atomic_dec(atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "decl %0"
-+      asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "into\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "incl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-                    : "+m" (v->counter));
- }
- 
-@@ -119,7 +229,19 @@ static inline int atomic_dec_and_test(at
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "decl %0; sete %1"
-+      asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "into\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "incl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "+m" (v->counter), "=qm" (c)
-                    : : "memory");
-       return c != 0;
-@@ -137,7 +259,19 @@ static inline int atomic_inc_and_test(at
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "incl %0; sete %1"
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "into\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "decl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "+m" (v->counter), "=qm" (c)
-                    : : "memory");
-       return c != 0;
-@@ -156,7 +290,16 @@ static inline int atomic_add_negative(in
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
-+      asm volatile(LOCK_PREFIX "addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "subl %2,%0\n"
-+                   "into\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   "sets %1\n"
-                    : "+m" (v->counter), "=qm" (c)
-                    : "ir" (i) : "memory");
-       return c;
-@@ -179,6 +322,46 @@ static inline int atomic_add_return(int 
- #endif
-       /* Modern 486+ processor */
-       __i = i;
-+      asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "movl %0, %1\n"
-+                   "into\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   : "+r" (i), "+m" (v->counter)
-+                   : : "memory");
-+      return i + __i;
-+
-+#ifdef CONFIG_M386
-+no_xadd: /* Legacy 386 processor */
-+      local_irq_save(flags);
-+      __i = atomic_read(v);
-+      atomic_set(v, i + __i);
-+      local_irq_restore(flags);
-+      return i + __i;
-+#endif
-+}
-+
-+/**
-+ * atomic_add_return_unchecked - add integer and return
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: integer value to add
-+ *
-+ * Atomically adds @i to @v and returns @i + @v
-+ */
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+      int __i;
-+#ifdef CONFIG_M386
-+      unsigned long flags;
-+      if (unlikely(boot_cpu_data.x86 <= 3))
-+              goto no_xadd;
-+#endif
-+      /* Modern 486+ processor */
-+      __i = i;
-       asm volatile(LOCK_PREFIX "xaddl %0, %1"
-                    : "+r" (i), "+m" (v->counter)
-                    : : "memory");
-@@ -227,22 +410,34 @@ static inline int atomic_xchg(atomic_t *
-  */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
- {
--      int c, old;
-+      int c, old, new;
-       c = atomic_read(v);
-       for (;;) {
--              if (unlikely(c == (u)))
-+              if (unlikely(c == u))
-                       break;
--              old = atomic_cmpxchg((v), c, c + (a));
-+
-+              asm volatile("addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                           "into\n0:\n"
-+                           _ASM_EXTABLE(0b, 0b)
++#ifdef CONFIG_X86_32
++#define _ASM_INTO     "into"
++#else
++#define _ASM_INTO     "int $4"
 +#endif
 +
-+                           : "=r" (new)
-+                           : "0" (c), "ir" (a));
-+
-+              old = atomic_cmpxchg(v, c, new);
-               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)
- 
- #define atomic_inc_return(v)  (atomic_add_return(1, v))
-+#define atomic_inc_return_unchecked(v)  (atomic_add_return_unchecked(1, v))
- #define atomic_dec_return(v)  (atomic_sub_return(1, v))
- 
- /* These are x86-specific, used by some header files */
-@@ -266,6 +461,14 @@ typedef struct {
+ /* Exception table entry */
+ #ifdef __ASSEMBLY__
+ # define _ASM_EXTABLE(from,to)            \
+diff -urNp linux-2.6.34/arch/x86/include/asm/atomic64_32.h linux-2.6.34/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.34/arch/x86/include/asm/atomic64_32.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/atomic64_32.h    2010-07-01 20:45:14.000000000 -0400
+@@ -12,6 +12,14 @@ typedef struct {
        u64 __aligned(8) counter;
  } atomic64_t;
  
@@ -5780,261 +5783,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_32.h linux-2.6.33.1/arch/x
  #define ATOMIC64_INIT(val)    { (val) }
  
  extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x86/include/asm/atomic_64.h
---- linux-2.6.33.1/arch/x86/include/asm/atomic_64.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/atomic_64.h    2010-03-20 16:58:38.972657826 -0400
-@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
- }
- 
- /**
-+ * atomic_read_unchecked - read atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically reads the value of @v.
-+ */
-+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
-+{
-+      return v->counter;
-+}
-+
-+/**
-  * atomic_set - set atomic variable
-  * @v: pointer of type atomic_t
-  * @i: required value
-@@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t *
- }
- 
- /**
-+ * atomic_set_unchecked - set atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ * @i: required value
-+ *
-+ * Atomically sets the value of @v to @i.
-+ */
-+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
-+{
-+      v->counter = i;
-+}
-+
-+/**
-  * atomic_add - add integer to atomic variable
-  * @i: integer value to add
-  * @v: pointer of type atomic_t
-@@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t *
-  */
- static inline void atomic_add(int i, atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "addl %1,%0"
-+      asm volatile(LOCK_PREFIX "addl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "subl %1,%0\n"
-+                   "int $4\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   : "=m" (v->counter)
-+                   : "ir" (i), "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_add_unchecked - add integer to atomic variable
-+ * @i: integer value to add
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically adds @i to @v.
-+ */
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "addl %1,%0\n"
-                    : "=m" (v->counter)
-                    : "ir" (i), "m" (v->counter));
- }
-@@ -58,7 +103,29 @@ static inline void atomic_add(int i, ato
-  */
- static inline void atomic_sub(int i, atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "subl %1,%0"
-+      asm volatile(LOCK_PREFIX "subl %1,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "addl %1,%0\n"
-+                   "int $4\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   : "=m" (v->counter)
-+                   : "ir" (i), "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_sub_unchecked - subtract the atomic variable
-+ * @i: integer value to subtract
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically subtracts @i from @v.
-+ */
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "subl %1,%0\n"
-                    : "=m" (v->counter)
-                    : "ir" (i), "m" (v->counter));
- }
-@@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(in
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
-+      asm volatile(LOCK_PREFIX "subl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "addl %2,%0\n"
-+                   "int $4\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "=m" (v->counter), "=qm" (c)
-                    : "ir" (i), "m" (v->counter) : "memory");
-       return c;
-@@ -90,7 +166,32 @@ static inline int atomic_sub_and_test(in
-  */
- static inline void atomic_inc(atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "incl %0"
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1:\n"
-+                   LOCK_PREFIX "decl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   : "=m" (v->counter)
-+                   : "m" (v->counter));
-+}
-+
-+/**
-+ * atomic_inc_unchecked - increment atomic variable
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically increments @v by 1.
-+ */
-+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
-+{
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-                    : "=m" (v->counter)
-                    : "m" (v->counter));
- }
-@@ -103,7 +204,19 @@ static inline void atomic_inc(atomic_t *
-  */
- static inline void atomic_dec(atomic_t *v)
- {
--      asm volatile(LOCK_PREFIX "decl %0"
-+      asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "incl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-                    : "=m" (v->counter)
-                    : "m" (v->counter));
- }
-@@ -120,7 +233,20 @@ static inline int atomic_dec_and_test(at
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "decl %0; sete %1"
-+      asm volatile(LOCK_PREFIX "decl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "incl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "=m" (v->counter), "=qm" (c)
-                    : "m" (v->counter) : "memory");
-       return c != 0;
-@@ -138,7 +264,20 @@ static inline int atomic_inc_and_test(at
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "incl %0; sete %1"
-+      asm volatile(LOCK_PREFIX "incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "int $4\n0:\n"
-+                   ".pushsection .fixup,\"ax\"\n"
-+                   "1: \n"
-+                   LOCK_PREFIX "decl %0\n"
-+                   "jmp 0b\n"
-+                   ".popsection\n"
-+                   _ASM_EXTABLE(0b, 1b)
-+#endif
-+
-+                   "sete %1\n"
-                    : "=m" (v->counter), "=qm" (c)
-                    : "m" (v->counter) : "memory");
-       return c != 0;
-@@ -157,7 +296,16 @@ static inline int atomic_add_negative(in
- {
-       unsigned char c;
- 
--      asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
-+      asm volatile(LOCK_PREFIX "addl %2,%0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   LOCK_PREFIX "subl %2,%0\n"
-+                   "int $4\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+                   "sets %1\n"
-                    : "=m" (v->counter), "=qm" (c)
-                    : "ir" (i), "m" (v->counter) : "memory");
-       return c;
-@@ -173,7 +321,15 @@ static inline int atomic_add_negative(in
- static inline int atomic_add_return(int i, atomic_t *v)
- {
-       int __i = i;
--      asm volatile(LOCK_PREFIX "xaddl %0, %1"
-+      asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+                   "jno 0f\n"
-+                   "movl %0, %1\n"
-+                   "int $4\n0:\n"
-+                   _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-                    : "+r" (i), "+m" (v->counter)
-                    : : "memory");
-       return i + __i;
-@@ -204,6 +360,18 @@ static inline long atomic64_read(const a
+diff -urNp linux-2.6.34/arch/x86/include/asm/atomic64_64.h linux-2.6.34/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.34/arch/x86/include/asm/atomic64_64.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/atomic64_64.h    2010-07-01 20:45:14.000000000 -0400
+@@ -22,6 +22,18 @@ static inline long atomic64_read(const a
  }
  
  /**
@@ -6053,7 +5805,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
   * atomic64_set - set atomic64 variable
   * @v: pointer to type atomic64_t
   * @i: required value
-@@ -216,6 +384,18 @@ static inline void atomic64_set(atomic64
+@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64
  }
  
  /**
@@ -6072,7 +5824,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
   * atomic64_add - add integer to atomic64 variable
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -224,6 +404,28 @@ static inline void atomic64_set(atomic64
+@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64
   */
  static inline void atomic64_add(long i, atomic64_t *v)
  {
@@ -6101,7 +5853,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
        asm volatile(LOCK_PREFIX "addq %1,%0"
                     : "=m" (v->counter)
                     : "er" (i), "m" (v->counter));
-@@ -238,7 +440,15 @@ static inline void atomic64_add(long i, 
+@@ -56,7 +102,15 @@ static inline void atomic64_add(long i, 
   */
  static inline void atomic64_sub(long i, atomic64_t *v)
  {
@@ -6118,7 +5870,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "=m" (v->counter)
                     : "er" (i), "m" (v->counter));
  }
-@@ -256,7 +466,16 @@ static inline int atomic64_sub_and_test(
+@@ -74,7 +128,16 @@ static inline int atomic64_sub_and_test(
  {
        unsigned char c;
  
@@ -6136,7 +5888,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "=m" (v->counter), "=qm" (c)
                     : "er" (i), "m" (v->counter) : "memory");
        return c;
-@@ -270,6 +489,31 @@ static inline int atomic64_sub_and_test(
+@@ -88,6 +151,31 @@ static inline int atomic64_sub_and_test(
   */
  static inline void atomic64_inc(atomic64_t *v)
  {
@@ -6168,7 +5920,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
        asm volatile(LOCK_PREFIX "incq %0"
                     : "=m" (v->counter)
                     : "m" (v->counter));
-@@ -283,7 +527,19 @@ static inline void atomic64_inc(atomic64
+@@ -101,7 +189,32 @@ static inline void atomic64_inc(atomic64
   */
  static inline void atomic64_dec(atomic64_t *v)
  {
@@ -6186,10 +5938,23 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
 +                   _ASM_EXTABLE(0b, 1b)
 +#endif
 +
++                   : "=m" (v->counter)
++                   : "m" (v->counter));
++}
++
++/**
++ * atomic64_dec_unchecked - decrement atomic64 variable
++ * @v: pointer to type atomic64_t
++ *
++ * Atomically decrements @v by 1.
++ */
++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
++{
++      asm volatile(LOCK_PREFIX "decq %0\n"
                     : "=m" (v->counter)
                     : "m" (v->counter));
  }
-@@ -300,7 +556,20 @@ static inline int atomic64_dec_and_test(
+@@ -118,7 +231,20 @@ static inline int atomic64_dec_and_test(
  {
        unsigned char c;
  
@@ -6211,7 +5976,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "=m" (v->counter), "=qm" (c)
                     : "m" (v->counter) : "memory");
        return c != 0;
-@@ -318,7 +587,20 @@ static inline int atomic64_inc_and_test(
+@@ -136,7 +262,20 @@ static inline int atomic64_inc_and_test(
  {
        unsigned char c;
  
@@ -6233,7 +5998,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "=m" (v->counter), "=qm" (c)
                     : "m" (v->counter) : "memory");
        return c != 0;
-@@ -337,7 +619,16 @@ static inline int atomic64_add_negative(
+@@ -155,7 +294,16 @@ static inline int atomic64_add_negative(
  {
        unsigned char c;
  
@@ -6251,7 +6016,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "=m" (v->counter), "=qm" (c)
                     : "er" (i), "m" (v->counter) : "memory");
        return c;
-@@ -353,7 +644,31 @@ static inline int atomic64_add_negative(
+@@ -171,7 +319,31 @@ static inline int atomic64_add_negative(
  static inline long atomic64_add_return(long i, atomic64_t *v)
  {
        long __i = i;
@@ -6284,7 +6049,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
                     : "+r" (i), "+m" (v->counter)
                     : : "memory");
        return i + __i;
-@@ -365,6 +680,7 @@ static inline long atomic64_sub_return(l
+@@ -183,6 +355,7 @@ static inline long atomic64_sub_return(l
  }
  
  #define atomic64_inc_return(v)  (atomic64_add_return(1, (v)))
@@ -6292,20 +6057,20 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
  #define atomic64_dec_return(v)  (atomic64_sub_return(1, (v)))
  
  static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-@@ -398,17 +714,29 @@ static inline long atomic_xchg(atomic_t 
+@@ -206,17 +379,29 @@ static inline long atomic64_xchg(atomic6
   */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
--      int c, old;
-+      int c, old, new;
-       c = atomic_read(v);
+-      long c, old;
++      long c, old, new;
+       c = atomic64_read(v);
        for (;;) {
 -              if (unlikely(c == (u)))
 +              if (unlikely(c == u))
                        break;
--              old = atomic_cmpxchg((v), c, c + (a));
+-              old = atomic64_cmpxchg((v), c, c + (a));
 +
-+              asm volatile("addl %2,%0\n"
++              asm volatile("add %2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                           "jno 0f\n"
@@ -6316,7 +6081,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
 +                           : "=r" (new)
 +                           : "0" (c), "ir" (a));
 +
-+              old = atomic_cmpxchg(v, c, new);
++              old = atomic64_cmpxchg(v, c, new);
                if (likely(old == c))
                        break;
                c = old;
@@ -6325,32 +6090,319 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
 +      return c != u;
  }
  
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -424,17 +752,29 @@ static inline int atomic_add_unless(atom
+ #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
+diff -urNp linux-2.6.34/arch/x86/include/asm/atomic.h linux-2.6.34/arch/x86/include/asm/atomic.h
+--- linux-2.6.34/arch/x86/include/asm/atomic.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/atomic.h 2010-07-01 20:45:14.000000000 -0400
+@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
+ }
+ 
+ /**
++ * atomic_read_unchecked - read atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically reads the value of @v.
++ */
++static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
++{
++      return v->counter;
++}
++
++/**
+  * atomic_set - set atomic variable
+  * @v: pointer of type atomic_t
+  * @i: required value
+@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *
+ }
+ 
+ /**
++ * atomic_set_unchecked - set atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ * @i: required value
++ *
++ * Atomically sets the value of @v to @i.
++ */
++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
++{
++      v->counter = i;
++}
++
++/**
+  * atomic_add - add integer to atomic variable
+  * @i: integer value to add
+  * @v: pointer of type atomic_t
+@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *
   */
- static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
+ static inline void atomic_add(int i, atomic_t *v)
  {
--      long c, old;
-+      long c, old, new;
-       c = atomic64_read(v);
+-      asm volatile(LOCK_PREFIX "addl %1,%0"
++      asm volatile(LOCK_PREFIX "addl %1,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "subl %1,%0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   : "+m" (v->counter)
++                   : "ir" (i));
++}
++
++/**
++ * atomic_add_unchecked - add integer to atomic variable
++ * @i: integer value to add
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically adds @i to @v.
++ */
++static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
++{
++      asm volatile(LOCK_PREFIX "addl %1,%0\n"
+                    : "+m" (v->counter)
+                    : "ir" (i));
+ }
+@@ -60,7 +105,29 @@ static inline void atomic_add(int i, ato
+  */
+ static inline void atomic_sub(int i, atomic_t *v)
+ {
+-      asm volatile(LOCK_PREFIX "subl %1,%0"
++      asm volatile(LOCK_PREFIX "subl %1,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "addl %1,%0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   : "+m" (v->counter)
++                   : "ir" (i));
++}
++
++/**
++ * atomic_sub_unchecked - subtract integer from atomic variable
++ * @i: integer value to subtract
++ * @v: pointer of type atomic_t
++ *
++ * Atomically subtracts @i from @v.
++ */
++static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
++{
++      asm volatile(LOCK_PREFIX "subl %1,%0\n"
+                    : "+m" (v->counter)
+                    : "ir" (i));
+ }
+@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in
+ {
+       unsigned char c;
+ 
+-      asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
++      asm volatile(LOCK_PREFIX "subl %2,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "addl %2,%0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   "sete %1\n"
+                    : "+m" (v->counter), "=qm" (c)
+                    : "ir" (i) : "memory");
+       return c;
+@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(in
+  */
+ static inline void atomic_inc(atomic_t *v)
+ {
+-      asm volatile(LOCK_PREFIX "incl %0"
++      asm volatile(LOCK_PREFIX "incl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "decl %0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   : "+m" (v->counter));
++}
++
++/**
++ * atomic_inc_unchecked - increment atomic variable
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically increments @v by 1.
++ */
++static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
++{
++      asm volatile(LOCK_PREFIX "incl %0\n"
+                    : "+m" (v->counter));
+ }
+ 
+@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *
+  */
+ static inline void atomic_dec(atomic_t *v)
+ {
+-      asm volatile(LOCK_PREFIX "decl %0"
++      asm volatile(LOCK_PREFIX "decl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "incl %0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   : "+m" (v->counter));
++}
++
++/**
++ * atomic_dec_unchecked - decrement atomic variable
++ * @v: pointer of type atomic_t
++ *
++ * Atomically decrements @v by 1.
++ */
++static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
++{
++      asm volatile(LOCK_PREFIX "decl %0\n"
+                    : "+m" (v->counter));
+ }
+ 
+@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at
+ {
+       unsigned char c;
+ 
+-      asm volatile(LOCK_PREFIX "decl %0; sete %1"
++      asm volatile(LOCK_PREFIX "decl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "incl %0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   "sete %1\n"
+                    : "+m" (v->counter), "=qm" (c)
+                    : : "memory");
+       return c != 0;
+@@ -138,7 +263,16 @@ static inline int atomic_inc_and_test(at
+ {
+       unsigned char c;
+ 
+-      asm volatile(LOCK_PREFIX "incl %0; sete %1"
++      asm volatile(LOCK_PREFIX "incl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "decl %0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   "sete %1\n"
+                    : "+m" (v->counter), "=qm" (c)
+                    : : "memory");
+       return c != 0;
+@@ -157,7 +291,16 @@ static inline int atomic_add_negative(in
+ {
+       unsigned char c;
+ 
+-      asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
++      asm volatile(LOCK_PREFIX "addl %2,%0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   LOCK_PREFIX "subl %2,%0\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   "sets %1\n"
+                    : "+m" (v->counter), "=qm" (c)
+                    : "ir" (i) : "memory");
+       return c;
+@@ -180,6 +323,46 @@ static inline int atomic_add_return(int 
+ #endif
+       /* Modern 486+ processor */
+       __i = i;
++      asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++                   "jno 0f\n"
++                   "movl %0, %1\n"
++                   _ASM_INTO "\n0:\n"
++                   _ASM_EXTABLE(0b, 0b)
++#endif
++
++                   : "+r" (i), "+m" (v->counter)
++                   : : "memory");
++      return i + __i;
++
++#ifdef CONFIG_M386
++no_xadd: /* Legacy 386 processor */
++      local_irq_save(flags);
++      __i = atomic_read(v);
++      atomic_set(v, i + __i);
++      local_irq_restore(flags);
++      return i + __i;
++#endif
++}
++
++/**
++ * atomic_add_return_unchecked - add integer and return
++ * @v: pointer of type atomic_unchecked_t
++ * @i: integer value to add
++ *
++ * Atomically adds @i to @v and returns @i + @v
++ */
++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
++{
++      int __i;
++#ifdef CONFIG_M386
++      unsigned long flags;
++      if (unlikely(boot_cpu_data.x86 <= 3))
++              goto no_xadd;
++#endif
++      /* Modern 486+ processor */
++      __i = i;
+       asm volatile(LOCK_PREFIX "xaddl %0, %1"
+                    : "+r" (i), "+m" (v->counter)
+                    : : "memory");
+@@ -208,6 +391,7 @@ static inline int atomic_sub_return(int 
+ }
+ 
+ #define atomic_inc_return(v)  (atomic_add_return(1, v))
++#define atomic_inc_return_unchecked(v)  (atomic_add_return_unchecked(1, v))
+ #define atomic_dec_return(v)  (atomic_sub_return(1, v))
+ 
+ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -231,17 +415,29 @@ static inline int atomic_xchg(atomic_t *
+  */
+ static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ {
+-      int c, old;
++      int c, old, new;
+       c = atomic_read(v);
        for (;;) {
 -              if (unlikely(c == (u)))
 +              if (unlikely(c == u))
                        break;
--              old = atomic64_cmpxchg((v), c, c + (a));
+-              old = atomic_cmpxchg((v), c, c + (a));
 +
-+              asm volatile("addq %2,%0\n"
++              asm volatile("addl %2,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +                           "jno 0f\n"
-+                           "int $4\n0:\n"
++                           _ASM_INTO "\n0:\n"
 +                           _ASM_EXTABLE(0b, 0b)
 +#endif
 +
 +                           : "=r" (new)
-+                           : "0" (c), "er" (a));
++                           : "0" (c), "ir" (a));
 +
-+              old = atomic64_cmpxchg((v), c, new);
++              old = atomic_cmpxchg(v, c, new);
                if (likely(old == c))
                        break;
                c = old;
@@ -6359,10 +6411,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/atomic_64.h linux-2.6.33.1/arch/x
 +      return c != u;
  }
  
- /**
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/boot.h linux-2.6.33.1/arch/x86/include/asm/boot.h
---- linux-2.6.33.1/arch/x86/include/asm/boot.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/boot.h 2010-03-20 16:58:38.972657826 -0400
+ #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+diff -urNp linux-2.6.34/arch/x86/include/asm/boot.h linux-2.6.34/arch/x86/include/asm/boot.h
+--- linux-2.6.34/arch/x86/include/asm/boot.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/boot.h   2010-07-01 20:45:14.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6380,9 +6432,30 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/boot.h linux-2.6.33.1/arch/x86/in
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2  PMD_SHIFT
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/cache.h linux-2.6.33.1/arch/x86/include/asm/cache.h
---- linux-2.6.33.1/arch/x86/include/asm/cache.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/cache.h        2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/cacheflush.h linux-2.6.34/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.34/arch/x86/include/asm/cacheflush.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/cacheflush.h     2010-07-01 20:45:14.000000000 -0400
+@@ -61,7 +61,7 @@ PAGEFLAG(WC, WC)
+ static inline unsigned long get_page_memtype(struct page *pg)
+ {
+       if (!PageUncached(pg) && !PageWC(pg))
+-              return -1;
++              return ~0UL;
+       else if (!PageUncached(pg) && PageWC(pg))
+               return _PAGE_CACHE_WC;
+       else if (PageUncached(pg) && !PageWC(pg))
+@@ -86,7 +86,7 @@ static inline void set_page_memtype(stru
+               SetPageWC(pg);
+               break;
+       default:
+-      case -1:
++      case ~0UL:
+               ClearPageUncached(pg);
+               ClearPageWC(pg);
+               break;
+diff -urNp linux-2.6.34/arch/x86/include/asm/cache.h linux-2.6.34/arch/x86/include/asm/cache.h
+--- linux-2.6.34/arch/x86/include/asm/cache.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/cache.h  2010-07-01 20:45:14.000000000 -0400
 @@ -8,6 +8,7 @@
  #define L1_CACHE_BYTES        (1 << L1_CACHE_SHIFT)
  
@@ -6391,9 +6464,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/cache.h linux-2.6.33.1/arch/x86/i
  
  #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
  #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/checksum_32.h linux-2.6.33.1/arch/x86/include/asm/checksum_32.h
---- linux-2.6.33.1/arch/x86/include/asm/checksum_32.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/checksum_32.h  2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/checksum_32.h linux-2.6.34/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.34/arch/x86/include/asm/checksum_32.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/checksum_32.h    2010-07-01 20:45:14.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
                                            int len, __wsum sum,
                                            int *src_err_ptr, int *dst_err_ptr);
@@ -6427,9 +6500,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/checksum_32.h linux-2.6.33.1/arch
                                                 len, sum, NULL, err_ptr);
  
        if (len)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/desc.h linux-2.6.33.1/arch/x86/include/asm/desc.h
---- linux-2.6.33.1/arch/x86/include/asm/desc.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/desc.h 2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/desc.h linux-2.6.34/arch/x86/include/asm/desc.h
+--- linux-2.6.34/arch/x86/include/asm/desc.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/desc.h   2010-07-01 20:45:14.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -6523,7 +6596,66 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/desc.h linux-2.6.33.1/arch/x86/in
  }
  
  #define _LDT_empty(info)                              \
-@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_
+@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct
+       desc->limit = (limit >> 16) & 0xf;
+ }
+ 
+-static inline void _set_gate(int gate, unsigned type, void *addr,
++static inline void _set_gate(int gate, unsigned type, const void *addr,
+                            unsigned dpl, unsigned ist, unsigned seg)
+ {
+       gate_desc s;
+@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u
+  * Pentium F0 0F bugfix can have resulted in the mapped
+  * IDT being write-protected.
+  */
+-static inline void set_intr_gate(unsigned int n, void *addr)
++static inline void set_intr_gate(unsigned int n, const void *addr)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+       _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
+@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig
+ /*
+  * This routine sets up an interrupt gate at directory privilege level 3.
+  */
+-static inline void set_system_intr_gate(unsigned int n, void *addr)
++static inline void set_system_intr_gate(unsigned int n, const void *addr)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+       _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
+ }
+ 
+-static inline void set_system_trap_gate(unsigned int n, void *addr)
++static inline void set_system_trap_gate(unsigned int n, const void *addr)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+       _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
+ }
+ 
+-static inline void set_trap_gate(unsigned int n, void *addr)
++static inline void set_trap_gate(unsigned int n, const void *addr)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+       _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
+@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne
+ static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+-      _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
++      _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
+ }
+ 
+-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+       BUG_ON((unsigned)n > 0xFF);
+       _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
+ }
+ 
+-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+       BUG_ON((unsigned)n > 0xFF);
        _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -6540,9 +6672,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/desc.h linux-2.6.33.1/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/device.h linux-2.6.33.1/arch/x86/include/asm/device.h
---- linux-2.6.33.1/arch/x86/include/asm/device.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/device.h       2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/device.h linux-2.6.34/arch/x86/include/asm/device.h
+--- linux-2.6.34/arch/x86/include/asm/device.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/device.h 2010-07-01 20:45:14.000000000 -0400
 @@ -6,7 +6,7 @@ struct dev_archdata {
        void    *acpi_handle;
  #endif
@@ -6552,9 +6684,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/device.h linux-2.6.33.1/arch/x86/
  #endif
  #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
        void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/dma-mapping.h linux-2.6.33.1/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.33.1/arch/x86/include/asm/dma-mapping.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/dma-mapping.h  2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/dma-mapping.h linux-2.6.34/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.34/arch/x86/include/asm/dma-mapping.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/dma-mapping.h    2010-07-01 20:45:14.000000000 -0400
 @@ -26,9 +26,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
@@ -6594,9 +6726,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/dma-mapping.h linux-2.6.33.1/arch
  
        WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/e820.h linux-2.6.33.1/arch/x86/include/asm/e820.h
---- linux-2.6.33.1/arch/x86/include/asm/e820.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/e820.h 2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/e820.h linux-2.6.34/arch/x86/include/asm/e820.h
+--- linux-2.6.34/arch/x86/include/asm/e820.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/e820.h   2010-07-01 20:45:14.000000000 -0400
 @@ -64,7 +64,7 @@ struct e820map {
  #define ISA_START_ADDRESS     0xa0000
  #define ISA_END_ADDRESS               0x100000
@@ -6606,9 +6738,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/e820.h linux-2.6.33.1/arch/x86/in
  #define BIOS_END              0x00100000
  
  #ifdef __KERNEL__
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/elf.h linux-2.6.33.1/arch/x86/include/asm/elf.h
---- linux-2.6.33.1/arch/x86/include/asm/elf.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/elf.h  2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/elf.h linux-2.6.34/arch/x86/include/asm/elf.h
+--- linux-2.6.34/arch/x86/include/asm/elf.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/elf.h    2010-07-01 20:45:14.000000000 -0400
 @@ -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.  */
@@ -6628,8 +6760,8 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/elf.h linux-2.6.33.1/arch/x86/inc
 +#else
 +#define PAX_ELF_ET_DYN_BASE   0x400000UL
 +
-+#define PAX_DELTA_MMAP_LEN    ((test_thread_flag(TIF_IA32)) ? 16 : 32)
-+#define PAX_DELTA_STACK_LEN   ((test_thread_flag(TIF_IA32)) ? 16 : 32)
++#define PAX_DELTA_MMAP_LEN    ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
++#define PAX_DELTA_STACK_LEN   ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
 +#endif
 +#endif
  
@@ -6662,15 +6794,15 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/elf.h linux-2.6.33.1/arch/x86/inc
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/futex.h linux-2.6.33.1/arch/x86/include/asm/futex.h
---- linux-2.6.33.1/arch/x86/include/asm/futex.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/futex.h        2010-03-20 16:58:38.976510592 -0400
-@@ -11,6 +11,40 @@
+diff -urNp linux-2.6.34/arch/x86/include/asm/futex.h linux-2.6.34/arch/x86/include/asm/futex.h
+--- linux-2.6.34/arch/x86/include/asm/futex.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/futex.h  2010-07-01 20:45:14.000000000 -0400
+@@ -11,17 +11,54 @@
  #include <asm/processor.h>
  #include <asm/system.h>
  
 +#ifdef CONFIG_X86_32
-+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
+ #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
 +      asm volatile(                                           \
 +                   "movw\t%w6, %%ds\n"                        \
 +                   "1:\t" insn "\n"                           \
@@ -6703,12 +6835,31 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/futex.h linux-2.6.33.1/arch/x86/i
 +                     "+m" (*uaddr), "=&r" (tem)               \
 +                   : "r" (oparg), "i" (-EFAULT), "1" (0), "r" (__USER_DS))
 +#else
- #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
++#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg)   \
++      typecheck(u32 *, uaddr);                                \
        asm volatile("1:\t" insn "\n"                           \
                     "2:\t.section .fixup,\"ax\"\n"             \
-@@ -36,8 +70,9 @@
+                    "3:\tmov\t%3, %1\n"                        \
+                    "\tjmp\t2b\n"                              \
+                    "\t.previous\n"                            \
+                    _ASM_EXTABLE(1b, 3b)                       \
+-                   : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
++                   : "=r" (oldval), "=r" (ret),               \
++                     "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))\
+                    : "i" (-EFAULT), "0" (oparg), "1" (0))
+ 
+ #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg)   \
++      typecheck(u32 *, uaddr);                                \
+       asm volatile("1:\tmovl  %2, %0\n"                       \
+                    "\tmovl\t%0, %3\n"                         \
+                    "\t" insn "\n"                             \
+@@ -34,10 +71,12 @@
+                    _ASM_EXTABLE(1b, 4b)                       \
+                    _ASM_EXTABLE(2b, 4b)                       \
                     : "=&a" (oldval), "=&r" (ret),             \
-                      "+m" (*uaddr), "=&r" (tem)               \
+-                     "+m" (*uaddr), "=&r" (tem)               \
++                     "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4)),\
++                     "=&r" (tem)                              \
                     : "r" (oparg), "i" (-EFAULT), "1" (0))
 +#endif
  
@@ -6717,7 +6868,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/futex.h linux-2.6.33.1/arch/x86/i
  {
        int op = (encoded_op >> 28) & 7;
        int cmp = (encoded_op >> 24) & 15;
-@@ -61,11 +96,20 @@ static inline int futex_atomic_op_inuser
+@@ -61,11 +100,20 @@ static inline int futex_atomic_op_inuser
  
        switch (op) {
        case FUTEX_OP_SET:
@@ -6738,7 +6889,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/futex.h linux-2.6.33.1/arch/x86/i
                break;
        case FUTEX_OP_OR:
                __futex_atomic_op2("orl %4, %3", ret, oldval, uaddr, oparg);
-@@ -109,7 +153,7 @@ static inline int futex_atomic_op_inuser
+@@ -109,7 +157,7 @@ static inline int futex_atomic_op_inuser
        return ret;
  }
  
@@ -6747,39 +6898,69 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/futex.h linux-2.6.33.1/arch/x86/i
                                                int newval)
  {
  
-@@ -122,14 +166,27 @@ static inline int futex_atomic_cmpxchg_i
-       if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+@@ -119,17 +167,31 @@ static inline int futex_atomic_cmpxchg_i
+               return -ENOSYS;
+ #endif
+ 
+-      if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
++      if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
                return -EFAULT;
  
 -      asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
+-                   "2:\t.section .fixup, \"ax\"\n"
 +      asm volatile(
 +#ifdef CONFIG_X86_32
 +                   "\tmovw %w5, %%ds\n"
-+                   "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
++                   "1:\t" LOCK_PREFIX "cmpxchgl %3, %%ds:%1\n"
 +                   "2:\tpushl   %%ss\n"
 +                   "\tpopl    %%ds\n"
-+                   "\t.section .fixup, \"ax\"\n"
 +#else
 +                   "1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-                    "2:\t.section .fixup, \"ax\"\n"
++                   "2:\n"
 +#endif
++                   "\t.section .fixup, \"ax\"\n"
                     "3:\tmov     %2, %0\n"
                     "\tjmp     2b\n"
                     "\t.previous\n"
                     _ASM_EXTABLE(1b, 3b)
-                    : "=a" (oldval), "+m" (*uaddr)
 +#ifdef CONFIG_X86_32
+                    : "=a" (oldval), "+m" (*uaddr)
 +                   : "i" (-EFAULT), "r" (newval), "0" (oldval), "r" (__USER_DS)
 +#else
++                   : "=a" (oldval), "+m" (*(uaddr + PAX_USER_SHADOW_BASE / 4))
                     : "i" (-EFAULT), "r" (newval), "0" (oldval)
 +#endif
                     : "memory"
        );
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/i387.h linux-2.6.33.1/arch/x86/include/asm/i387.h
---- linux-2.6.33.1/arch/x86/include/asm/i387.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/i387.h 2010-03-20 16:58:38.976510592 -0400
-@@ -197,13 +197,8 @@ static inline int fxrstor_checking(struc
+diff -urNp linux-2.6.34/arch/x86/include/asm/i387.h linux-2.6.34/arch/x86/include/asm/i387.h
+--- linux-2.6.34/arch/x86/include/asm/i387.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/i387.h   2010-07-01 20:45:14.000000000 -0400
+@@ -70,6 +70,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);
++#endif
++
+       asm volatile("1:  rex64/fxrstor (%[fx])\n\t"
+                    "2:\n"
+                    ".section .fixup,\"ax\"\n"
+@@ -115,6 +120,11 @@ static inline int fxsave_user(struct i38
+ {
+       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 __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
++#endif
++
+       asm volatile("1:  rex64/fxsave (%[fx])\n\t"
+                    "2:\n"
+                    ".section .fixup,\"ax\"\n"
+@@ -205,13 +215,8 @@ static inline int fxrstor_checking(struc
  }
  
  /* We need a safe address that is cheap to find and that is already
@@ -6795,10 +6976,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/i387.h linux-2.6.33.1/arch/x86/in
  
  /*
   * These must be called with preempt disabled
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/io_64.h linux-2.6.33.1/arch/x86/include/asm/io_64.h
---- linux-2.6.33.1/arch/x86/include/asm/io_64.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/io_64.h        2010-03-20 16:58:38.976510592 -0400
-@@ -140,6 +140,17 @@ __OUTS(l)
+diff -urNp linux-2.6.34/arch/x86/include/asm/io.h linux-2.6.34/arch/x86/include/asm/io.h
+--- linux-2.6.34/arch/x86/include/asm/io.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/io.h     2010-07-01 20:45:14.000000000 -0400
+@@ -213,6 +213,17 @@ extern void iounmap(volatile void __iome
  
  #include <linux/vmalloc.h>
  
@@ -6813,12 +6994,12 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/io_64.h linux-2.6.33.1/arch/x86/i
 +      return (pfn + (count >> PAGE_SHIFT)) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
 +}
 +
- #include <asm-generic/iomap.h>
- 
- void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/iommu.h linux-2.6.33.1/arch/x86/include/asm/iommu.h
---- linux-2.6.33.1/arch/x86/include/asm/iommu.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/iommu.h        2010-03-20 16:58:38.976510592 -0400
+ /*
+  * Convert a virtual cached pointer to an uncached pointer
+  */
+diff -urNp linux-2.6.34/arch/x86/include/asm/iommu.h linux-2.6.34/arch/x86/include/asm/iommu.h
+--- linux-2.6.34/arch/x86/include/asm/iommu.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/iommu.h  2010-07-01 20:45:14.000000000 -0400
 @@ -1,7 +1,7 @@
  #ifndef _ASM_X86_IOMMU_H
  #define _ASM_X86_IOMMU_H
@@ -6828,91 +7009,25 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/iommu.h linux-2.6.33.1/arch/x86/i
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/irqflags.h linux-2.6.33.1/arch/x86/include/asm/irqflags.h
---- linux-2.6.33.1/arch/x86/include/asm/irqflags.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/irqflags.h     2010-03-20 17:06:47.204705877 -0400
-@@ -142,10 +142,77 @@ static inline unsigned long __raw_local_
+diff -urNp linux-2.6.34/arch/x86/include/asm/irqflags.h linux-2.6.34/arch/x86/include/asm/irqflags.h
+--- linux-2.6.34/arch/x86/include/asm/irqflags.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/irqflags.h       2010-07-03 09:57:21.000000000 -0400
+@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
        sti;                                    \
        sysexit
  
-+/* PaX: special register usage in entry_64.S, beware */
-+#ifdef CONFIG_PAX_KERNEXEC
-+      .macro ljmpq sel, off
-+      .byte 0x48; ljmp *1234f(%rip)
-+      .pushsection .rodata
-+      .align 16
-+      1234: .quad \off; .word \sel
-+      .popsection
-+      .endm
-+
-+#define PAX_EXIT_KERNEL                       \
-+      push %rsi;                      \
-+      mov %cs, %rsi;                  \
-+      cmp $__KERNEXEC_KERNEL_CS, %esi;\
-+      jnz 2f;                         \
-+      mov %cr0, %rsi;                 \
-+      btc $16, %rsi;                  \
-+      ljmpq __KERNEL_CS, 1f;          \
-+1:    mov %rsi, %cr0;                 \
-+2:    pop %rsi
-+
-+#define PAX_ENTER_KERNEL              \
-+      push %rsi;                      \
-+      mov %cr0, %rsi;                 \
-+      bts $16, %rsi;                  \
-+      jnc 1f;                         \
-+      mov %cs, %esi;                  \
-+      cmp $__KERNEL_CS, %esi;         \
-+      jz 3f;                          \
-+      ljmpq __KERNEL_CS, 3f;          \
-+1:    ljmpq __KERNEXEC_KERNEL_CS, 2f; \
-+2:    mov %rsi, %cr0;                 \
-+3:    pop %rsi
-+#else
-+#define PAX_EXIT_KERNEL
-+#define PAX_ENTER_KERNEL
-+#endif
++#define GET_CR0_INTO_RDI              mov %cr0, %rdi
++#define SET_RDI_INTO_CR0              mov %rdi, %cr0
++#define GET_CR3_INTO_RDI              mov %cr3, %rdi
++#define SET_RDI_INTO_CR3              mov %rdi, %cr3
 +
  #else
  #define INTERRUPT_RETURN              iret
  #define ENABLE_INTERRUPTS_SYSEXIT     sti; sysexit
- #define GET_CR0_INTO_EAX              movl %cr0, %eax
-+
-+/* PaX: special register usage in entry_32.S, beware */
-+#ifdef CONFIG_PAX_KERNEXEC
-+#define PAX_EXIT_KERNEL                       \
-+      mov %cs, %esi;                  \
-+      cmp $__KERNEXEC_KERNEL_CS, %esi;\
-+      jnz 2f;                         \
-+      mov %cr0, %esi;                 \
-+      btc $16, %esi;                  \
-+      ljmp $__KERNEL_CS, $1f;         \
-+1:    mov %esi, %cr0;                 \
-+2:
-+
-+#define PAX_ENTER_KERNEL              \
-+      mov %cr0, %esi;                 \
-+      bts $16, %esi;                  \
-+      jnc 1f;                         \
-+      mov %cs, %esi;                  \
-+      cmp $__KERNEL_CS, %esi;         \
-+      jz 3f;                          \
-+      ljmp $__KERNEL_CS, $3f;         \
-+1:    ljmp $__KERNEXEC_KERNEL_CS, $2f;\
-+2:    mov %esi, %cr0;                 \
-+3:
-+#else
-+#define PAX_EXIT_KERNEL
-+#define PAX_ENTER_KERNEL
-+#endif
-+
- #endif
- 
- 
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/kvm_host.h linux-2.6.33.1/arch/x86/include/asm/kvm_host.h
---- linux-2.6.33.1/arch/x86/include/asm/kvm_host.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/kvm_host.h     2010-03-20 16:58:38.976510592 -0400
-@@ -536,7 +536,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.34/arch/x86/include/asm/kvm_host.h linux-2.6.34/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.34/arch/x86/include/asm/kvm_host.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/kvm_host.h       2010-07-01 20:45:14.000000000 -0400
+@@ -544,7 +544,7 @@ struct kvm_x86_ops {
        const struct trace_print_flags *exit_reasons_str;
  };
  
@@ -6921,9 +7036,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/kvm_host.h linux-2.6.33.1/arch/x8
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/local.h linux-2.6.33.1/arch/x86/include/asm/local.h
---- linux-2.6.33.1/arch/x86/include/asm/local.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/local.h        2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/local.h linux-2.6.34/arch/x86/include/asm/local.h
+--- linux-2.6.34/arch/x86/include/asm/local.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/local.h  2010-07-01 20:45:14.000000000 -0400
 @@ -18,26 +18,90 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7148,9 +7263,23 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/local.h linux-2.6.33.1/arch/x86/i
                     : "+r" (i), "+m" (l->a.counter)
                     : : "memory");
        return i + __i;
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/microcode.h linux-2.6.33.1/arch/x86/include/asm/microcode.h
---- linux-2.6.33.1/arch/x86/include/asm/microcode.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/microcode.h    2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/mc146818rtc.h linux-2.6.34/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.34/arch/x86/include/asm/mc146818rtc.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/mc146818rtc.h    2010-07-01 20:45:14.000000000 -0400
+@@ -81,8 +81,8 @@ static inline unsigned char current_lock
+ #else
+ #define lock_cmos_prefix(reg) do {} while (0)
+ #define lock_cmos_suffix(reg) do {} while (0)
+-#define lock_cmos(reg)
+-#define unlock_cmos()
++#define lock_cmos(reg) do {} while (0)
++#define unlock_cmos() do {} while (0)
+ #define do_i_have_lock_cmos() 0
+ #define current_lock_cmos_reg() 0
+ #endif
+diff -urNp linux-2.6.34/arch/x86/include/asm/microcode.h linux-2.6.34/arch/x86/include/asm/microcode.h
+--- linux-2.6.34/arch/x86/include/asm/microcode.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/microcode.h      2010-07-01 20:45:14.000000000 -0400
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -7191,9 +7320,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/microcode.h linux-2.6.33.1/arch/x
  {
        return NULL;
  }
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/mman.h linux-2.6.33.1/arch/x86/include/asm/mman.h
---- linux-2.6.33.1/arch/x86/include/asm/mman.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/mman.h 2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/mman.h linux-2.6.34/arch/x86/include/asm/mman.h
+--- linux-2.6.34/arch/x86/include/asm/mman.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/mman.h   2010-07-01 20:45:14.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7209,10 +7338,32 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/mman.h linux-2.6.33.1/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu_context.h linux-2.6.33.1/arch/x86/include/asm/mmu_context.h
---- linux-2.6.33.1/arch/x86/include/asm/mmu_context.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/mmu_context.h  2010-03-20 16:58:38.976510592 -0400
-@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s
+diff -urNp linux-2.6.34/arch/x86/include/asm/mmu_context.h linux-2.6.34/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.34/arch/x86/include/asm/mmu_context.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/mmu_context.h    2010-07-01 20:45:14.000000000 -0400
+@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
+ 
+ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
+ {
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      unsigned int i;
++      pgd_t *pgd;
++
++      pax_open_kernel();
++      pgd = get_cpu_pgd(smp_processor_id());
++      for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
++              if (paravirt_enabled())
++                      set_pgd(pgd+i, native_make_pgd(0));
++              else
++                      pgd[i] = native_make_pgd(0);
++      pax_close_kernel();
++#endif
++
+ #ifdef CONFIG_SMP
+       if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
+               percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
+@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
                             struct task_struct *tsk)
  {
        unsigned cpu = smp_processor_id();
@@ -7230,10 +7381,25 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu_context.h linux-2.6.33.1/arch
                percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
                percpu_write(cpu_tlbstate.active_mm, next);
  #endif
-@@ -52,6 +58,26 @@ static inline void switch_mm(struct mm_s
+               cpumask_set_cpu(cpu, mm_cpumask(next));
+ 
+               /* Re-load page tables */
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              pax_open_kernel();
++              __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
++              __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
++              pax_close_kernel();
++              load_cr3(get_cpu_pgd(cpu));
++#else
+               load_cr3(next->pgd);
++#endif
+ 
+               /*
+                * load the LDT, if the LDT is different:
                 */
                if (unlikely(prev->context.ldt != next->context.ldt))
                        load_LDT_nolock(&next->context);
+-      }
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
 +              if (!(__supported_pte_mask & _PAGE_NX)) {
@@ -7248,18 +7414,36 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu_context.h linux-2.6.33.1/arch
 +              if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
 +                           prev->context.user_cs_limit != next->context.user_cs_limit))
 +                      set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
-+#ifdef CONFIG_SMP
+ #ifdef CONFIG_SMP
 +              else if (unlikely(tlbstate != TLBSTATE_OK))
 +                      set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
 +#endif
 +#endif
 +
-       }
- #ifdef CONFIG_SMP
++      }
        else {
-@@ -65,6 +91,19 @@ static inline void switch_mm(struct mm_s
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              pax_open_kernel();
++              __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
++              __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
++              pax_close_kernel();
++              load_cr3(get_cpu_pgd(cpu));
++#endif
++
++#ifdef CONFIG_SMP
+               percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
+               BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
+ 
+@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
+                        * tlb flush IPI delivery. We must reload CR3
+                        * to make sure to use no freed page tables.
                         */
++
++#ifndef CONFIG_PAX_PER_CPU_PGD
                        load_cr3(next->pgd);
++#endif
++
                        load_LDT_nolock(&next->context);
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
@@ -7275,11 +7459,15 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu_context.h linux-2.6.33.1/arch
 +#endif
 +
                }
-       }
+-      }
  #endif
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu.h linux-2.6.33.1/arch/x86/include/asm/mmu.h
---- linux-2.6.33.1/arch/x86/include/asm/mmu.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/mmu.h  2010-03-20 16:58:38.976510592 -0400
++      }
+ }
+ 
+ #define activate_mm(prev, next)                       \
+diff -urNp linux-2.6.34/arch/x86/include/asm/mmu.h linux-2.6.34/arch/x86/include/asm/mmu.h
+--- linux-2.6.34/arch/x86/include/asm/mmu.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/mmu.h    2010-07-01 20:45:14.000000000 -0400
 @@ -9,10 +9,23 @@
   * we put the segment information here.
   */
@@ -7306,26 +7494,45 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/mmu.h linux-2.6.33.1/arch/x86/inc
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/module.h linux-2.6.33.1/arch/x86/include/asm/module.h
---- linux-2.6.33.1/arch/x86/include/asm/module.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/module.h       2010-03-20 16:58:38.976510592 -0400
-@@ -65,7 +65,12 @@
+diff -urNp linux-2.6.34/arch/x86/include/asm/module.h linux-2.6.34/arch/x86/include/asm/module.h
+--- linux-2.6.34/arch/x86/include/asm/module.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/module.h 2010-07-01 20:45:16.000000000 -0400
+@@ -59,13 +59,31 @@
+ #error unknown processor family
+ #endif
+ 
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++#define MODULE_PAX_UDEREF "UDEREF "
++#else
++#define MODULE_PAX_UDEREF ""
++#endif
++
+ #ifdef CONFIG_X86_32
+ # ifdef CONFIG_4KSTACKS
+ #  define MODULE_STACKSIZE "4KSTACKS "
  # else
  #  define MODULE_STACKSIZE ""
  # endif
 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
++# ifdef CONFIG_PAX_KERNEXEC
++#  define MODULE_PAX_KERNEXEC "KERNEXEC "
++# else
++#  define MODULE_PAX_KERNEXEC ""
++# endif
 +# ifdef CONFIG_GRKERNSEC
 +#  define MODULE_GRSEC "GRSECURITY "
 +# else
 +#  define MODULE_GRSEC ""
 +# endif
-+# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC
++# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
++#else
++# define MODULE_ARCH_VERMAGIC MODULE_PAX_UDEREF
  #endif
  
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/page_32_types.h linux-2.6.33.1/arch/x86/include/asm/page_32_types.h
---- linux-2.6.33.1/arch/x86/include/asm/page_32_types.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/page_32_types.h        2010-03-20 16:58:38.976510592 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/page_32_types.h linux-2.6.34/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.34/arch/x86/include/asm/page_32_types.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/page_32_types.h  2010-07-01 20:45:14.000000000 -0400
 @@ -15,6 +15,10 @@
   */
  #define __PAGE_OFFSET         _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7337,9 +7544,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/page_32_types.h linux-2.6.33.1/ar
  #ifdef CONFIG_4KSTACKS
  #define THREAD_ORDER  0
  #else
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/page_64_types.h linux-2.6.33.1/arch/x86/include/asm/page_64_types.h
---- linux-2.6.33.1/arch/x86/include/asm/page_64_types.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/page_64_types.h        2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/page_64_types.h linux-2.6.34/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.34/arch/x86/include/asm/page_64_types.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/page_64_types.h  2010-07-01 20:45:14.000000000 -0400
 @@ -39,6 +39,9 @@
  #define __START_KERNEL                (__START_KERNEL_map + __PHYSICAL_START)
  #define __START_KERNEL_map    _AC(0xffffffff80000000, UL)
@@ -7350,10 +7557,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/page_64_types.h linux-2.6.33.1/ar
  /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
  #define __PHYSICAL_MASK_SHIFT 46
  #define __VIRTUAL_MASK_SHIFT  47
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/paravirt.h linux-2.6.33.1/arch/x86/include/asm/paravirt.h
---- linux-2.6.33.1/arch/x86/include/asm/paravirt.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/paravirt.h     2010-03-20 16:58:38.980670389 -0400
-@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
+diff -urNp linux-2.6.34/arch/x86/include/asm/paravirt.h linux-2.6.34/arch/x86/include/asm/paravirt.h
+--- linux-2.6.34/arch/x86/include/asm/paravirt.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/paravirt.h       2010-07-01 20:45:14.000000000 -0400
+@@ -720,6 +720,21 @@ static inline void __set_fixmap(unsigned
        pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
@@ -7375,7 +7582,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/paravirt.h linux-2.6.33.1/arch/x8
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
  static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -945,7 +960,7 @@ extern void default_banner(void);
+@@ -936,7 +951,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)
@@ -7384,92 +7591,32 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/paravirt.h linux-2.6.33.1/arch/x8
  #endif
  
  #define INTERRUPT_RETURN                                              \
-@@ -980,6 +995,34 @@ extern void default_banner(void);
+@@ -1013,6 +1028,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))
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+#define PAX_EXIT_KERNEL                                       \
-+      push %eax; push %ecx;                           \
-+      mov %cs, %eax;                                  \
-+      cmp $__KERNEXEC_KERNEL_CS, %eax;                \
-+      jnz 2f;                                         \
-+      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
-+      btc $16, %eax;                                  \
-+      ljmp $__KERNEL_CS, $1f;                         \
-+1:    call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
-+2:    pop %ecx; pop %eax;                             \
 +
-+#define PAX_ENTER_KERNEL                              \
-+      push %eax; push %ecx;                           \
++#define GET_CR0_INTO_RDI                              \
 +      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
-+      bts $16, %eax;                                  \
-+      jnc 1f;                                         \
-+      mov %cs, %ecx;                                  \
-+      cmp $__KERNEL_CS, %ecx;                         \
-+      jz 3f;                                          \
-+      ljmp $__KERNEL_CS, $3f;                         \
-+1:    ljmp $__KERNEXEC_KERNEL_CS, $2f;                \
-+2:    call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
-+3:    pop %ecx; pop %eax;
-+#else
-+#define PAX_EXIT_KERNEL
-+#define PAX_ENTER_KERNEL
-+#endif
- 
- #else /* !CONFIG_X86_32 */
- 
-@@ -1022,6 +1065,46 @@ 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))
++      mov %rax,%rdi
 +
-+#ifdef CONFIG_PAX_KERNEXEC
-+      .macro ljmpq sel, off
-+      .byte 0x48; ljmp *1234f(%rip)
-+      .pushsection .rodata
-+      .align 16
-+      1234: .quad \off; .word \sel
-+      .popsection
-+      .endm
++#define SET_RDI_INTO_CR0                              \
++      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
 +
-+#define PAX_EXIT_KERNEL                                       \
-+      PV_SAVE_REGS(CLBR_NONE);                        \
-+      mov %cs, %rax;                                  \
-+      cmp $__KERNEXEC_KERNEL_CS, %eax;                \
-+      jnz 2f;                                         \
-+      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
-+      btc $16, %rax;                                  \
-+      mov %rax, %rdi;                                 \
-+      ljmpq __KERNEL_CS, 1f;                          \
-+1:    call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
-+2:    PV_RESTORE_REGS(CLBR_NONE);
-+
-+#define PAX_ENTER_KERNEL                              \
-+      PV_SAVE_REGS(CLBR_NONE);                        \
-+      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
-+      bts $16, %rax;                                  \
-+      jnc 1f;                                         \
-+      mov %cs, %rax;                                  \
-+      cmp $__KERNEL_CS, %eax;                         \
-+      jz 3f;                                          \
-+      ljmpq __KERNEL_CS, 3f;                          \
-+1:    mov %rax, %rdi;                                 \
-+      ljmpq __KERNEXEC_KERNEL_CS, 2f;                 \
-+2:    call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\
-+3:    PV_RESTORE_REGS(CLBR_NONE);
-+#else
-+#define PAX_EXIT_KERNEL
-+#define PAX_ENTER_KERNEL
-+#endif
++#define GET_CR3_INTO_RDI                              \
++      call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
++      mov %rax,%rdi
++
++#define SET_RDI_INTO_CR3                              \
++      call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
 +
  #endif        /* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/paravirt_types.h linux-2.6.33.1/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.33.1/arch/x86/include/asm/paravirt_types.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/paravirt_types.h       2010-03-20 16:58:38.980670389 -0400
-@@ -316,6 +316,12 @@ struct pv_mmu_ops {
+diff -urNp linux-2.6.34/arch/x86/include/asm/paravirt_types.h linux-2.6.34/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.34/arch/x86/include/asm/paravirt_types.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/paravirt_types.h 2010-07-01 20:45:14.000000000 -0400
+@@ -312,6 +312,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);
@@ -7482,9 +7629,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/paravirt_types.h linux-2.6.33.1/a
  };
  
  struct arch_spinlock;
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pci_x86.h linux-2.6.33.1/arch/x86/include/asm/pci_x86.h
---- linux-2.6.33.1/arch/x86/include/asm/pci_x86.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pci_x86.h      2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pci_x86.h linux-2.6.34/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.34/arch/x86/include/asm/pci_x86.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pci_x86.h        2010-07-01 20:45:14.000000000 -0400
 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
@@ -7507,9 +7654,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pci_x86.h linux-2.6.33.1/arch/x86
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgalloc.h linux-2.6.33.1/arch/x86/include/asm/pgalloc.h
---- linux-2.6.33.1/arch/x86/include/asm/pgalloc.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgalloc.h      2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgalloc.h linux-2.6.34/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.34/arch/x86/include/asm/pgalloc.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgalloc.h        2010-07-01 20:45:14.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
                                       pmd_t *pmd, pte_t *pte)
  {
@@ -7524,9 +7671,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgalloc.h linux-2.6.33.1/arch/x86
        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable-2level.h linux-2.6.33.1/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable-2level.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable-2level.h       2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable-2level.h linux-2.6.34/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable-2level.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable-2level.h 2010-07-01 20:45:14.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7537,10 +7684,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable-2level.h linux-2.6.33.1/a
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h   2010-03-20 16:58:38.980670389 -0400
-@@ -26,8 +26,6 @@
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_32.h linux-2.6.34/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable_32.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable_32.h     2010-07-01 20:45:14.000000000 -0400
+@@ -25,8 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
  
@@ -7549,7 +7696,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h linux-2.6.33.1/arch/
  static inline void pgtable_cache_init(void) { }
  static inline void check_pgt_cache(void) { }
  void paging_init(void);
-@@ -48,6 +46,11 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -47,6 +45,11 @@ extern void set_pmd_pfn(unsigned long, u
  # include <asm/pgtable-2level.h>
  #endif
  
@@ -7561,7 +7708,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h linux-2.6.33.1/arch/
  #if defined(CONFIG_HIGHPTE)
  #define __KM_PTE                      \
        (in_nmi() ? KM_NMI_PTE :        \
-@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -71,7 +74,9 @@ extern void set_pmd_pfn(unsigned long, u
  /* Clear a kernel PTE and flush it from the TLB */
  #define kpte_clear_flush(ptep, vaddr)         \
  do {                                          \
@@ -7571,7 +7718,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h linux-2.6.33.1/arch/
        __flush_tlb_one((vaddr));               \
  } while (0)
  
-@@ -84,6 +89,9 @@ do {                                         \
+@@ -83,6 +88,9 @@ do {                                         \
  
  #endif /* !__ASSEMBLY__ */
  
@@ -7581,9 +7728,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32.h linux-2.6.33.1/arch/
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32_types.h linux-2.6.33.1/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable_32_types.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable_32_types.h     2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable_32_types.h       2010-07-01 20:45:14.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -7613,9 +7760,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_32_types.h linux-2.6.33.1
  #define MODULES_VADDR VMALLOC_START
  #define MODULES_END   VMALLOC_END
  #define MODULES_LEN   (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable-3level.h linux-2.6.33.1/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable-3level.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable-3level.h       2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable-3level.h linux-2.6.34/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable-3level.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable-3level.h 2010-07-01 20:45:14.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7633,10 +7780,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable-3level.h linux-2.6.33.1/a
  }
  
  /*
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h   2010-03-20 16:58:38.980670389 -0400
-@@ -16,9 +16,12 @@
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_64.h linux-2.6.34/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable_64.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable_64.h     2010-07-01 20:45:14.000000000 -0400
+@@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
  extern pud_t level3_ident_pgt[512];
@@ -7646,10 +7793,12 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h linux-2.6.33.1/arch/
  extern pmd_t level2_kernel_pgt[512];
  extern pmd_t level2_fixmap_pgt[512];
 -extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
 +extern pmd_t level2_ident_pgt[512*2];
- extern pgd_t init_level4_pgt[];
++extern pgd_t init_level4_pgt[512];
  
  #define swapper_pg_dir init_level4_pgt
+ 
 @@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7670,9 +7819,20 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_64.h linux-2.6.33.1/arch/
  }
  
  static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable.h linux-2.6.33.1/arch/x86/include/asm/pgtable.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable.h      2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable_64_types.h       2010-07-01 20:45:14.000000000 -0400
+@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
+ #define MODULES_END      _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
+ 
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable.h linux-2.6.34/arch/x86/include/asm/pgtable.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable.h        2010-07-01 20:45:14.000000000 -0400
 @@ -76,12 +76,51 @@ extern struct list_head pgd_list;
  
  #define arch_end_context_switch(prev) do {} while(0)
@@ -7756,7 +7916,23 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable.h linux-2.6.33.1/arch/x86
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -474,7 +533,7 @@ static inline pud_t *pud_offset(pgd_t *p
+@@ -304,6 +363,15 @@ pte_t *populate_extra_pte(unsigned long 
+ #endif
+ 
+ #ifndef __ASSEMBLY__
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
++static inline pgd_t *get_cpu_pgd(unsigned int cpu)
++{
++      return cpu_pgd[cpu];
++}
++#endif
++
+ #include <linux/mm_types.h>
+ 
+ static inline int pte_none(pte_t pte)
+@@ -474,7 +542,7 @@ static inline pud_t *pud_offset(pgd_t *p
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -7765,7 +7941,42 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable.h linux-2.6.33.1/arch/x86
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -613,9 +672,12 @@ static inline void ptep_set_wrprotect(st
+@@ -497,7 +565,12 @@ static inline int pgd_none(pgd_t pgd)
+  * pgd_offset() returns a (pgd_t *)
+  * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
+  */
+-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
++#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
++#endif
++
+ /*
+  * a shortcut which implies the use of the kernel's pgd, instead
+  * of a process's
+@@ -508,6 +581,20 @@ static inline int pgd_none(pgd_t pgd)
+ #define KERNEL_PGD_BOUNDARY   pgd_index(PAGE_OFFSET)
+ #define KERNEL_PGD_PTRS               (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
+ 
++#ifdef CONFIG_X86_32
++#define USER_PGD_PTRS         KERNEL_PGD_BOUNDARY
++#else
++#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
++#define USER_PGD_PTRS         (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++#define PAX_USER_SHADOW_BASE  (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
++#else
++#define PAX_USER_SHADOW_BASE  (_AC(0,UL))
++#endif
++
++#endif
++
+ #ifndef __ASSEMBLY__
+ 
+ extern int direct_gbpages;
+@@ -613,11 +700,23 @@ static inline void ptep_set_wrprotect(st
   * dst and src can be on the same page, but the range must not overlap,
   * and must not cross a page boundary.
   */
@@ -7779,10 +7990,21 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable.h linux-2.6.33.1/arch/x86
 +      pax_close_kernel();
  }
  
++#ifdef CONFIG_PAX_PER_CPU_PGD
++extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
++#endif
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
++#else
++static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
++#endif
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_types.h linux-2.6.33.1/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.33.1/arch/x86/include/asm/pgtable_types.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/pgtable_types.h        2010-03-20 16:58:38.980670389 -0400
+ #include <asm-generic/pgtable.h>
+ #endif        /* __ASSEMBLY__ */
+diff -urNp linux-2.6.34/arch/x86/include/asm/pgtable_types.h linux-2.6.34/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.34/arch/x86/include/asm/pgtable_types.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/pgtable_types.h  2010-07-01 20:45:14.000000000 -0400
 @@ -16,12 +16,11 @@
  #define _PAGE_BIT_PSE         7       /* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT         7       /* on 4KB pages */
@@ -7858,9 +8080,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/pgtable_types.h linux-2.6.33.1/ar
  
  #define pgprot_writecombine   pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/processor.h linux-2.6.33.1/arch/x86/include/asm/processor.h
---- linux-2.6.33.1/arch/x86/include/asm/processor.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/processor.h    2010-03-20 16:58:38.980670389 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/processor.h linux-2.6.34/arch/x86/include/asm/processor.h
+--- linux-2.6.34/arch/x86/include/asm/processor.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/processor.h      2010-07-01 20:45:14.000000000 -0400
 @@ -273,7 +273,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -7918,7 +8140,14 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/processor.h linux-2.6.33.1/arch/x
         __regs__ - 1;                                                   \
  })
  
-@@ -977,7 +980,7 @@ extern unsigned long thread_saved_pc(str
+@@ -971,13 +974,13 @@ extern unsigned long thread_saved_pc(str
+ /*
+  * User space process size. 47bits minus one guard page.
+  */
+-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
++#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
+ 
+ /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
  #define IA32_PAGE_OFFSET      ((current->personality & ADDR_LIMIT_3GB) ? \
@@ -7938,9 +8167,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/processor.h linux-2.6.33.1/arch/x
  #define KSTK_EIP(task)                (task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/ptrace.h linux-2.6.33.1/arch/x86/include/asm/ptrace.h
---- linux-2.6.33.1/arch/x86/include/asm/ptrace.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/ptrace.h       2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/ptrace.h linux-2.6.34/arch/x86/include/asm/ptrace.h
+--- linux-2.6.34/arch/x86/include/asm/ptrace.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/ptrace.h 2010-07-01 20:45:14.000000000 -0400
 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
  }
  
@@ -7977,9 +8206,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/ptrace.h linux-2.6.33.1/arch/x86/
  #endif
  }
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/reboot.h linux-2.6.33.1/arch/x86/include/asm/reboot.h
---- linux-2.6.33.1/arch/x86/include/asm/reboot.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/reboot.h       2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/reboot.h linux-2.6.34/arch/x86/include/asm/reboot.h
+--- linux-2.6.34/arch/x86/include/asm/reboot.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/reboot.h 2010-07-01 20:45:14.000000000 -0400
 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
  
  void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -7989,13 +8218,13 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/reboot.h linux-2.6.33.1/arch/x86/
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/include/asm/rwsem.h
---- linux-2.6.33.1/arch/x86/include/asm/rwsem.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/rwsem.h        2010-03-20 16:58:38.984539447 -0400
-@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
+diff -urNp linux-2.6.34/arch/x86/include/asm/rwsem.h linux-2.6.34/arch/x86/include/asm/rwsem.h
+--- linux-2.6.34/arch/x86/include/asm/rwsem.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/rwsem.h  2010-07-01 20:45:14.000000000 -0400
+@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
  {
        asm volatile("# beginning down_read\n\t"
-                    LOCK_PREFIX "  incl      (%%eax)\n\t"
+                    LOCK_PREFIX _ASM_INC "(%1)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8006,7 +8235,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   LOCK_PREFIX "decl (%%eax)\n"
++                   LOCK_PREFIX _ASM_DEC "(%1)\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
@@ -8021,14 +8250,14 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
                     "# ending down_read\n\t"
                     : "+m" (sem->count)
                     : "a" (sem)
-@@ -124,13 +140,29 @@ static inline int __down_read_trylock(st
-       __s32 result, tmp;
+@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
+       rwsem_count_t result, tmp;
        asm volatile("# beginning __down_read_trylock\n\t"
-                    "  movl      %0,%1\n\t"
+                    "  mov          %0,%1\n\t"
 -                   "1:\n\t"
 +                   "2:\n\t"
-                    "  movl         %1,%2\n\t"
-                    "  addl      %3,%2\n\t"
+                    "  mov          %1,%2\n\t"
+                    "  add          %3,%2\n\t"
 -                   "  jle          2f\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
@@ -8040,14 +8269,14 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   "subl %3,%2\n"
++                   "sub %3,%2\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
 +#endif
 +
 +                   "  jle          3f\n\t"
-                    LOCK_PREFIX "  cmpxchgl  %2,%0\n\t"
+                    LOCK_PREFIX "  cmpxchg  %2,%0\n\t"
 -                   "  jnz          1b\n\t"
 -                   "2:\n\t"
 +                   "  jnz          2b\n\t"
@@ -8055,10 +8284,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
                     "# ending __down_read_trylock\n\t"
                     : "+m" (sem->count), "=&a" (result), "=&r" (tmp)
                     : "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -148,12 +180,28 @@ static inline void __down_write_nested(s
+@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
        tmp = RWSEM_ACTIVE_WRITE_BIAS;
        asm volatile("# beginning down_write\n\t"
-                    LOCK_PREFIX "  xadd      %%edx,(%%eax)\n\t"
+                    LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8069,14 +8298,14 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   "movl %%edx,(%%eax)\n"
++                   "mov %1,(%2)\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
 +#endif
 +
                     /* subtract 0x0000ffff, returns the old value */
-                    "  testl     %%edx,%%edx\n\t"
+                    "  test      %1,%1\n\t"
                     /* was the count 0 before? */
 -                   "  jz        1f\n"
 +                   "  jz        2f\n"
@@ -8086,10 +8315,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
                     "# ending down_write"
                     : "+m" (sem->count), "=d" (tmp)
                     : "a" (sem), "1" (tmp)
-@@ -186,10 +234,26 @@ static inline void __up_read(struct rw_s
-       __s32 tmp = -RWSEM_ACTIVE_READ_BIAS;
+@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
+       rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
        asm volatile("# beginning __up_read\n\t"
-                    LOCK_PREFIX "  xadd      %%edx,(%%eax)\n\t"
+                    LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8100,7 +8329,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   "movl %%edx,(%%eax)\n"
++                   "mov %1,(%2)\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
@@ -8115,10 +8344,10 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
                     "# ending __up_read\n"
                     : "+m" (sem->count), "=d" (tmp)
                     : "a" (sem), "1" (tmp)
-@@ -204,11 +268,27 @@ static inline void __up_write(struct rw_
+@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
+       rwsem_count_t tmp;
        asm volatile("# beginning __up_write\n\t"
-                    "  movl      %2,%%edx\n\t"
-                    LOCK_PREFIX "  xaddl     %%edx,(%%eax)\n\t"
+                    LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8129,7 +8358,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   "movl %%edx,(%%eax)\n"
++                   "mov %1,(%2)\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
@@ -8143,12 +8372,12 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 -                   "1:\n\t"
 +                   "2:\n\t"
                     "# ending __up_write\n"
-                    : "+m" (sem->count)
-                    : "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -222,10 +302,26 @@ static inline void __downgrade_write(str
+                    : "+m" (sem->count), "=d" (tmp)
+                    : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
+@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
  {
        asm volatile("# beginning __downgrade_write\n\t"
-                    LOCK_PREFIX "  addl      %2,(%%eax)\n\t"
+                    LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8159,13 +8388,16 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   LOCK_PREFIX "subl %2,(%%eax)\n"
++                   LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
 +#endif
 +
-                    /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
+                    /*
+                     * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
+                     *     0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
+                     */
 -                   "  jns       1f\n\t"
 +                   "  jns       2f\n\t"
                     "  call call_rwsem_downgrade_wake\n"
@@ -8173,13 +8405,13 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +                   "2:\n\t"
                     "# ending __downgrade_write\n"
                     : "+m" (sem->count)
-                    : "a" (sem), "i" (-RWSEM_WAITING_BIAS)
-@@ -237,7 +333,23 @@ static inline void __downgrade_write(str
-  */
- static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem)
+                    : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
+@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
+ static inline void rwsem_atomic_add(rwsem_count_t delta,
+                                   struct rw_semaphore *sem)
  {
--      asm volatile(LOCK_PREFIX "addl %1,%0"
-+      asm volatile(LOCK_PREFIX "addl %1,%0\n"
+-      asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
++      asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +#ifdef CONFIG_X86_32
@@ -8190,18 +8422,18 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   LOCK_PREFIX "subl %1,%0\n"
++                   LOCK_PREFIX _ASM_SUB "%1,%0\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
 +#endif
 +
                     : "+m" (sem->count)
-                    : "ir" (delta));
+                    : "er" (delta));
  }
-@@ -249,7 +361,23 @@ static inline int rwsem_atomic_update(in
+@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
  {
-       int tmp = delta;
+       rwsem_count_t tmp = delta;
  
 -      asm volatile(LOCK_PREFIX "xadd %0,%1"
 +      asm volatile(LOCK_PREFIX "xadd %0,%1\n"
@@ -8215,7 +8447,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
 +#endif
 +                   ".pushsection .fixup,\"ax\"\n"
 +                   "1:\n"
-+                   "movl %0,%1\n"
++                   "mov %0,%1\n"
 +                   "jmp 0b\n"
 +                   ".popsection\n"
 +                   _ASM_EXTABLE(0b, 1b)
@@ -8224,9 +8456,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/rwsem.h linux-2.6.33.1/arch/x86/i
                     : "+r" (tmp), "+m" (sem->count)
                     : : "memory");
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/segment.h linux-2.6.33.1/arch/x86/include/asm/segment.h
---- linux-2.6.33.1/arch/x86/include/asm/segment.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/segment.h      2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/segment.h linux-2.6.34/arch/x86/include/asm/segment.h
+--- linux-2.6.34/arch/x86/include/asm/segment.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/segment.h        2010-07-01 20:45:14.000000000 -0400
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu                      [ offset to per-cpu data area ]
@@ -8295,9 +8527,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/segment.h linux-2.6.33.1/arch/x86
  #define __KERNEL_DS   (GDT_ENTRY_KERNEL_DS * 8)
  #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/spinlock.h linux-2.6.33.1/arch/x86/include/asm/spinlock.h
---- linux-2.6.33.1/arch/x86/include/asm/spinlock.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/spinlock.h     2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/spinlock.h linux-2.6.34/arch/x86/include/asm/spinlock.h
+--- linux-2.6.34/arch/x86/include/asm/spinlock.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/spinlock.h       2010-07-01 20:45:14.000000000 -0400
 @@ -249,18 +249,50 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
@@ -8401,9 +8633,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/spinlock.h linux-2.6.33.1/arch/x8
                     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/system.h linux-2.6.33.1/arch/x86/include/asm/system.h
---- linux-2.6.33.1/arch/x86/include/asm/system.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/system.h       2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/system.h linux-2.6.34/arch/x86/include/asm/system.h
+--- linux-2.6.34/arch/x86/include/asm/system.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/system.h 2010-07-01 20:45:14.000000000 -0400
 @@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
  {
        unsigned long __limit;
@@ -8422,10 +8654,19 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/system.h linux-2.6.33.1/arch/x86/
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h   2010-03-20 16:58:38.984539447 -0400
-@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
+diff -urNp linux-2.6.34/arch/x86/include/asm/uaccess_32.h linux-2.6.34/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.34/arch/x86/include/asm/uaccess_32.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/uaccess_32.h     2010-07-01 20:45:14.000000000 -0400
+@@ -22,6 +22,8 @@ unsigned long __must_check __copy_from_u
+ unsigned long __must_check __copy_from_user_ll_nocache_nozero
+               (void *to, const void __user *from, unsigned long n);
+ 
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /**
+  * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
+  * @to:   Destination address, in user space.
+@@ -44,6 +46,9 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
  {
@@ -8435,7 +8676,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        if (__builtin_constant_p(n)) {
                unsigned long ret;
  
-@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to,
+@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to,
                        return ret;
                }
        }
@@ -8444,7 +8685,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        return __copy_to_user_ll(to, from, n);
  }
  
-@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const vo
+@@ -89,6 +96,9 @@ __copy_to_user(void __user *to, const vo
  static __always_inline unsigned long
  __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
  {
@@ -8454,7 +8695,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        /* Avoid zeroing the tail if the copy fails..
         * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
         * but as the zeroing behaviour is only significant when n is not
-@@ -138,6 +146,10 @@ static __always_inline unsigned long
+@@ -138,6 +148,10 @@ static __always_inline unsigned long
  __copy_from_user(void *to, const void __user *from, unsigned long n)
  {
        might_fault();
@@ -8465,7 +8706,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        if (__builtin_constant_p(n)) {
                unsigned long ret;
  
-@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __
+@@ -153,6 +167,8 @@ __copy_from_user(void *to, const void __
                        return ret;
                }
        }
@@ -8474,7 +8715,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        return __copy_from_user_ll(to, from, n);
  }
  
-@@ -160,6 +174,10 @@ static __always_inline unsigned long __c
+@@ -160,6 +176,10 @@ static __always_inline unsigned long __c
                                const void __user *from, unsigned long n)
  {
        might_fault();
@@ -8485,7 +8726,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        if (__builtin_constant_p(n)) {
                unsigned long ret;
  
-@@ -182,15 +200,19 @@ static __always_inline unsigned long
+@@ -182,15 +202,19 @@ static __always_inline unsigned long
  __copy_from_user_inatomic_nocache(void *to, const void __user *from,
                                  unsigned long n)
  {
@@ -8512,7 +8753,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
  
  extern void copy_from_user_overflow(void)
  #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -200,17 +222,61 @@ extern void copy_from_user_overflow(void
+@@ -200,17 +224,61 @@ extern void copy_from_user_overflow(void
  #endif
  ;
  
@@ -8581,23 +8822,25 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_32.h linux-2.6.33.1/arch/
        return n;
  }
  
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h   2010-03-20 16:58:38.984539447 -0400
-@@ -10,6 +10,8 @@
- #include <linux/lockdep.h>
+diff -urNp linux-2.6.34/arch/x86/include/asm/uaccess_64.h linux-2.6.34/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.34/arch/x86/include/asm/uaccess_64.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/uaccess_64.h     2010-07-03 09:56:50.000000000 -0400
+@@ -11,6 +11,11 @@
+ #include <asm/alternative.h>
+ #include <asm/cpufeature.h>
  #include <asm/page.h>
- 
++#include <asm/pgtable.h>
++
 +#define set_fs(x)     (current_thread_info()->addr_limit = (x))
 +
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
+ 
  /*
   * Copy To/From Userspace
-  */
-@@ -17,27 +19,26 @@
- /* Handles exceptions in both to and from, but doesn't do access_ok */
- __must_check unsigned long
- copy_user_generic(void *to, const void *from, unsigned len);
--
+@@ -37,26 +42,26 @@ copy_user_generic(void *to, const void *
+       return ret;
+ }
+ 
 -__must_check unsigned long
 -_copy_to_user(void __user *to, const void *from, unsigned len);
 -__must_check unsigned long
@@ -8634,7 +8877,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
        return n;
  }
  
-@@ -46,17 +47,33 @@ int copy_to_user(void __user *dst, const
+@@ -65,17 +70,35 @@ int copy_to_user(void __user *dst, const
  {
        might_fault();
  
@@ -8667,12 +8910,21 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
 +
 +      if (!__builtin_constant_p(size)) {
 +              check_object_size(dst, size, false);
++              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++                      src += PAX_USER_SHADOW_BASE;
                return copy_user_generic(dst, (__force void *)src, size);
 +      }
        switch (size) {
        case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
                              ret, "b", "b", "=q", 1);
-@@ -94,13 +111,27 @@ int __copy_from_user(void *dst, const vo
+@@ -108,18 +131,36 @@ int __copy_from_user(void *dst, const vo
+                              ret, "q", "", "=r", 8);
+               return ret;
+       default:
++              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++                      src += PAX_USER_SHADOW_BASE;
+               return copy_user_generic(dst, (__force void *)src, size);
+       }
  }
  
  static __always_inline __must_check
@@ -8698,12 +8950,21 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
 +
 +      if (!__builtin_constant_p(size)) {
 +              check_object_size(src, size, true);
++              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++                      dst += PAX_USER_SHADOW_BASE;
                return copy_user_generic((__force void *)dst, src, size);
 +      }
        switch (size) {
        case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
                              ret, "b", "b", "iq", 1);
-@@ -138,11 +169,15 @@ int __copy_to_user(void __user *dst, con
+@@ -152,19 +193,30 @@ int __copy_to_user(void __user *dst, con
+                              ret, "q", "", "er", 8);
+               return ret;
+       default:
++              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++                      dst += PAX_USER_SHADOW_BASE;
+               return copy_user_generic((__force void *)dst, src, size);
+       }
  }
  
  static __always_inline __must_check
@@ -8714,14 +8975,39 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
 +      unsigned ret = 0;
  
        might_fault();
+-      if (!__builtin_constant_p(size))
 +
 +      if ((int)size < 0)
 +              return size;
 +
-       if (!__builtin_constant_p(size))
++      if (!__builtin_constant_p(size)) {
++              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++                      src += PAX_USER_SHADOW_BASE;
++              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++                      dst += PAX_USER_SHADOW_BASE;
                return copy_user_generic((__force void *)dst,
                                         (__force void *)src, size);
-@@ -206,30 +241,38 @@ __copy_from_user_inatomic(void *dst, con
++      }
+       switch (size) {
+       case 1: {
+               u8 tmp;
+@@ -204,6 +256,10 @@ int __copy_in_user(void __user *dst, con
+               return ret;
+       }
+       default:
++              if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++                      src += PAX_USER_SHADOW_BASE;
++              if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++                      dst += PAX_USER_SHADOW_BASE;
+               return copy_user_generic((__force void *)dst,
+                                        (__force void *)src, size);
+       }
+@@ -222,33 +278,45 @@ __must_check unsigned long __clear_user(
+ static __must_check __always_inline int
+ __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
+ {
++      if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++              src += PAX_USER_SHADOW_BASE;
        return copy_user_generic(dst, (__force const void *)src, size);
  }
  
@@ -8732,6 +9018,8 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
 +      if ((int)size < 0)
 +              return size;
 +
++      if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++              dst += PAX_USER_SHADOW_BASE;
        return copy_user_generic((__force void *)dst, src, size);
  }
  
@@ -8767,22 +9055,18 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess_64.h linux-2.6.33.1/arch/
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86/include/asm/uaccess.h
---- linux-2.6.33.1/arch/x86/include/asm/uaccess.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/uaccess.h      2010-03-20 16:58:38.984539447 -0400
-@@ -8,8 +8,11 @@
+diff -urNp linux-2.6.34/arch/x86/include/asm/uaccess.h linux-2.6.34/arch/x86/include/asm/uaccess.h
+--- linux-2.6.34/arch/x86/include/asm/uaccess.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/uaccess.h        2010-07-01 20:45:14.000000000 -0400
+@@ -8,6 +8,7 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
  #include <linux/string.h>
 +#include <linux/sched.h>
-+#include <linux/slab.h>
  #include <asm/asm.h>
  #include <asm/page.h>
-+#include <asm/segment.h>
  
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-@@ -29,7 +32,12 @@
+@@ -29,7 +30,12 @@
  
  #define get_ds()      (KERNEL_DS)
  #define get_fs()      (current_thread_info()->addr_limit)
@@ -8795,7 +9079,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  #define segment_eq(a, b)      ((a).seg == (b).seg)
  
-@@ -77,7 +85,33 @@
+@@ -77,7 +83,33 @@
   * checks that the pointer is in the user space range - after calling
   * this function, memory access functions may still return -EFAULT.
   */
@@ -8830,7 +9114,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  /*
   * The exception table consists of pairs of addresses: the first is the
-@@ -183,13 +217,21 @@ extern int __get_user_bad(void);
+@@ -183,13 +215,21 @@ extern int __get_user_bad(void);
        asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
                     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
  
@@ -8855,7 +9139,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
                     ".section .fixup,\"ax\"\n"                         \
                     "4:        movl %3,%0\n"                           \
                     "  jmp 3b\n"                                       \
-@@ -197,15 +239,18 @@ extern int __get_user_bad(void);
+@@ -197,15 +237,18 @@ extern int __get_user_bad(void);
                     _ASM_EXTABLE(1b, 4b)                               \
                     _ASM_EXTABLE(2b, 4b)                               \
                     : "=r" (err)                                       \
@@ -8878,7 +9162,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  #define __put_user_x8(x, ptr, __ret_pu)                               \
        asm volatile("call __put_user_8" : "=a" (__ret_pu)      \
-@@ -374,16 +419,18 @@ do {                                                                     \
+@@ -374,16 +417,18 @@ do {                                                                     \
  } while (0)
  
  #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)     \
@@ -8900,7 +9184,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  #define __get_user_size_ex(x, ptr, size)                              \
  do {                                                                  \
-@@ -407,10 +454,12 @@ do {                                                                     \
+@@ -407,10 +452,12 @@ do {                                                                     \
  } while (0)
  
  #define __get_user_asm_ex(x, addr, itype, rtype, ltype)                       \
@@ -8915,7 +9199,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  #define __put_user_nocheck(x, ptr, size)                      \
  ({                                                            \
-@@ -424,7 +473,7 @@ do {                                                                       \
+@@ -424,13 +471,24 @@ do {                                                                     \
        int __gu_err;                                                   \
        unsigned long __gu_val;                                         \
        __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);    \
@@ -8924,7 +9208,25 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
        __gu_err;                                                       \
  })
  
-@@ -438,21 +487,26 @@ struct __large_struct { unsigned long bu
+ /* FIXME: this hack is definitely wrong -AK */
+ struct __large_struct { unsigned long buf[100]; };
+-#define __m(x) (*(struct __large_struct __user *)(x))
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define ____m(x)                                      \
++({                                                    \
++      unsigned long ____x = (unsigned long)(x);       \
++      if (____x < PAX_USER_SHADOW_BASE)               \
++              ____x += PAX_USER_SHADOW_BASE;          \
++      (void __user *)____x;                           \
++})
++#else
++#define ____m(x) (x)
++#endif
++#define __m(x) (*(struct __large_struct __user *)____m(x))
+ 
+ /*
+  * Tell gcc we read from memory instead of writing: this is because
+@@ -438,21 +496,26 @@ struct __large_struct { unsigned long bu
   * aliasing issues.
   */
  #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)     \
@@ -8955,7 +9257,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  
  /*
   * uaccess_try and catch
-@@ -530,7 +584,7 @@ struct __large_struct { unsigned long bu
+@@ -530,7 +593,7 @@ struct __large_struct { unsigned long bu
  #define get_user_ex(x, ptr)   do {                                    \
        unsigned long __gue_val;                                        \
        __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));       \
@@ -8964,7 +9266,7 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +621,7 @@ extern struct movsl_mask {
+@@ -567,6 +630,7 @@ extern struct movsl_mask {
  
  #define ARCH_HAS_NOCACHE_UACCESS 1
  
@@ -8972,9 +9274,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/uaccess.h linux-2.6.33.1/arch/x86
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/vgtod.h linux-2.6.33.1/arch/x86/include/asm/vgtod.h
---- linux-2.6.33.1/arch/x86/include/asm/vgtod.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/vgtod.h        2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/vgtod.h linux-2.6.34/arch/x86/include/asm/vgtod.h
+--- linux-2.6.34/arch/x86/include/asm/vgtod.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/vgtod.h  2010-07-01 20:45:14.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
        int             sysctl_enabled;
        struct timezone sys_tz;
@@ -8983,9 +9285,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/vgtod.h linux-2.6.33.1/arch/x86/i
                cycle_t (*vread)(void);
                cycle_t cycle_last;
                cycle_t mask;
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/vmi.h linux-2.6.33.1/arch/x86/include/asm/vmi.h
---- linux-2.6.33.1/arch/x86/include/asm/vmi.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/vmi.h  2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/vmi.h linux-2.6.34/arch/x86/include/asm/vmi.h
+--- linux-2.6.34/arch/x86/include/asm/vmi.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/vmi.h    2010-07-01 20:45:14.000000000 -0400
 @@ -191,6 +191,7 @@ struct vrom_header {
        u8      reserved[96];   /* Reserved for headers */
        char    vmi_init[8];    /* VMI_Init jump point */
@@ -8994,9 +9296,9 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/vmi.h linux-2.6.33.1/arch/x86/inc
  } __attribute__((packed));
  
  struct pnp_header {
-diff -urNp linux-2.6.33.1/arch/x86/include/asm/vsyscall.h linux-2.6.33.1/arch/x86/include/asm/vsyscall.h
---- linux-2.6.33.1/arch/x86/include/asm/vsyscall.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/include/asm/vsyscall.h     2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/include/asm/vsyscall.h linux-2.6.34/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.34/arch/x86/include/asm/vsyscall.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/vsyscall.h       2010-07-01 20:45:14.000000000 -0400
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -9027,10 +9329,38 @@ diff -urNp linux-2.6.33.1/arch/x86/include/asm/vsyscall.h linux-2.6.33.1/arch/x8
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
---- linux-2.6.33.1/arch/x86/Kconfig    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/Kconfig    2010-03-20 16:58:38.984539447 -0400
-@@ -1088,7 +1088,7 @@ config PAGE_OFFSET
+diff -urNp linux-2.6.34/arch/x86/include/asm/xsave.h linux-2.6.34/arch/x86/include/asm/xsave.h
+--- linux-2.6.34/arch/x86/include/asm/xsave.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/include/asm/xsave.h  2010-07-01 20:45:14.000000000 -0400
+@@ -58,6 +58,12 @@ static inline int xrstor_checking(struct
+ static inline int xsave_user(struct xsave_struct __user *buf)
+ {
+       int err;
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
++              buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
++#endif
++
+       __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
+                            "2:\n"
+                            ".section .fixup,\"ax\"\n"
+@@ -84,6 +90,11 @@ static inline int xrestore_user(struct x
+       u32 lmask = mask;
+       u32 hmask = mask >> 32;
+ 
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
++              xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
++#endif
++
+       __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
+                            "2:\n"
+                            ".section .fixup,\"ax\"\n"
+diff -urNp linux-2.6.34/arch/x86/Kconfig linux-2.6.34/arch/x86/Kconfig
+--- linux-2.6.34/arch/x86/Kconfig      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/Kconfig      2010-07-01 20:45:16.000000000 -0400
+@@ -1123,7 +1123,7 @@ config PAGE_OFFSET
        hex
        default 0xB0000000 if VMSPLIT_3G_OPT
        default 0x80000000 if VMSPLIT_2G
@@ -9039,7 +9369,7 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
        default 0x40000000 if VMSPLIT_1G
        default 0xC0000000
        depends on X86_32
-@@ -1422,7 +1422,7 @@ config ARCH_USES_PG_UNCACHED
+@@ -1457,7 +1457,7 @@ config ARCH_USES_PG_UNCACHED
  
  config EFI
        bool "EFI runtime service support"
@@ -9048,7 +9378,7 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
        ---help---
          This enables the kernel to use EFI runtime services that are
          available (such as the EFI variable services).
-@@ -1509,6 +1509,7 @@ config KEXEC_JUMP
+@@ -1544,6 +1544,7 @@ config KEXEC_JUMP
  config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000"
@@ -9056,7 +9386,7 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
        ---help---
          This gives the physical address where the kernel is loaded.
  
-@@ -1573,6 +1574,7 @@ config PHYSICAL_ALIGN
+@@ -1608,6 +1609,7 @@ config PHYSICAL_ALIGN
        hex
        prompt "Alignment value to which kernel should be aligned" if X86_32
        default "0x1000000"
@@ -9064,7 +9394,7 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
        range 0x2000 0x1000000
        ---help---
          This value puts the alignment restrictions on physical address
-@@ -1604,9 +1606,10 @@ config HOTPLUG_CPU
+@@ -1639,9 +1641,10 @@ config HOTPLUG_CPU
          Say N if you want to disable CPU hotplug.
  
  config COMPAT_VDSO
@@ -9076,9 +9406,9 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig linux-2.6.33.1/arch/x86/Kconfig
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-2.6.33.1/arch/x86/Kconfig.cpu linux-2.6.33.1/arch/x86/Kconfig.cpu
---- linux-2.6.33.1/arch/x86/Kconfig.cpu        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/Kconfig.cpu        2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/Kconfig.cpu linux-2.6.34/arch/x86/Kconfig.cpu
+--- linux-2.6.34/arch/x86/Kconfig.cpu  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/Kconfig.cpu  2010-07-01 20:45:14.000000000 -0400
 @@ -336,7 +336,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -9106,9 +9436,9 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig.cpu linux-2.6.33.1/arch/x86/Kconfig.c
  
  config X86_MINIMUM_CPU_FAMILY
        int
-diff -urNp linux-2.6.33.1/arch/x86/Kconfig.debug linux-2.6.33.1/arch/x86/Kconfig.debug
---- linux-2.6.33.1/arch/x86/Kconfig.debug      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/Kconfig.debug      2010-03-20 16:58:38.984539447 -0400
+diff -urNp linux-2.6.34/arch/x86/Kconfig.debug linux-2.6.34/arch/x86/Kconfig.debug
+--- linux-2.6.34/arch/x86/Kconfig.debug        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/Kconfig.debug        2010-07-01 20:45:14.000000000 -0400
 @@ -99,7 +99,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
        bool "Write protect kernel read-only data structures"
@@ -9118,10 +9448,10 @@ diff -urNp linux-2.6.33.1/arch/x86/Kconfig.debug linux-2.6.33.1/arch/x86/Kconfig
        ---help---
          Mark the kernel read-only data as write-protected in the pagetables,
          in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/boot.c linux-2.6.33.1/arch/x86/kernel/acpi/boot.c
---- linux-2.6.33.1/arch/x86/kernel/acpi/boot.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/acpi/boot.c 2010-03-20 16:58:38.988525305 -0400
-@@ -1503,7 +1503,7 @@ static struct dmi_system_id __initdata a
+diff -urNp linux-2.6.34/arch/x86/kernel/acpi/boot.c linux-2.6.34/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.34/arch/x86/kernel/acpi/boot.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/acpi/boot.c   2010-07-01 20:45:14.000000000 -0400
+@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata a
                     DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
                     },
         },
@@ -9130,9 +9460,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/boot.c linux-2.6.33.1/arch/x86/ke
  };
  
  /*
-diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.33.1/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.33.1/arch/x86/kernel/acpi/realmode/wakeup.S      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/acpi/realmode/wakeup.S      2010-03-20 16:58:38.988525305 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/acpi/realmode/wakeup.S        2010-07-01 20:45:14.000000000 -0400
 @@ -104,7 +104,7 @@ _start:
        movl    %eax, %ecx
        orl     %edx, %ecx
@@ -9142,9 +9472,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.33.1/
        wrmsr
  1:
  
-diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/sleep.c linux-2.6.33.1/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.33.1/arch/x86/kernel/acpi/sleep.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/acpi/sleep.c        2010-03-20 16:58:38.988525305 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/acpi/sleep.c linux-2.6.34/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.34/arch/x86/kernel/acpi/sleep.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/acpi/sleep.c  2010-07-01 20:45:14.000000000 -0400
 @@ -11,11 +11,12 @@
  #include <linux/cpumask.h>
  #include <asm/segment.h>
@@ -9172,9 +9502,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/sleep.c linux-2.6.33.1/arch/x86/k
        initial_gs = per_cpu_offset(smp_processor_id());
  #endif
        initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.33.1/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.33.1/arch/x86/kernel/acpi/wakeup_32.S    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/acpi/wakeup_32.S    2010-03-20 16:58:38.988525305 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/acpi/wakeup_32.S      2010-07-01 20:45:14.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
        # and restore the stack ... but you need gdt for this to work
        movl    saved_context_esp, %esp
@@ -9191,10 +9521,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.33.1/arch/x
  
  bogus_magic:
        jmp     bogus_magic
-diff -urNp linux-2.6.33.1/arch/x86/kernel/alternative.c linux-2.6.33.1/arch/x86/kernel/alternative.c
---- linux-2.6.33.1/arch/x86/kernel/alternative.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/alternative.c       2010-03-20 16:58:38.988525305 -0400
-@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
+diff -urNp linux-2.6.34/arch/x86/kernel/alternative.c linux-2.6.34/arch/x86/kernel/alternative.c
+--- linux-2.6.34/arch/x86/kernel/alternative.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/alternative.c 2010-07-03 09:56:01.000000000 -0400
+@@ -429,7 +429,7 @@ void __init_or_module apply_paravirt(str
  
                BUG_ON(p->len > MAX_PATCH_LEN);
                /* prep the buffer with the original instructions */
@@ -9203,7 +9533,16 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/alternative.c linux-2.6.33.1/arch/x86/
                used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
                                         (unsigned long)p->instr, p->len);
  
-@@ -492,12 +492,16 @@ void __init alternative_instructions(voi
+@@ -497,7 +497,7 @@ void __init alternative_instructions(voi
+       if (smp_alt_once)
+               free_init_pages("SMP alternatives",
+                               (unsigned long)__smp_locks,
+-                              (unsigned long)__smp_locks_end);
++                              PAGE_ALIGN((unsigned long)__smp_locks_end));
+ 
+       restart_nmi();
+ }
+@@ -514,12 +514,16 @@ 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.
   */
@@ -9222,7 +9561,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/alternative.c linux-2.6.33.1/arch/x86/
        sync_core();
        local_irq_restore(flags);
        /* Could also do a CLFLUSH here to speed up CPU recovery; but
-@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_
+@@ -542,36 +546,22 @@ static void *__init_or_module text_poke_
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -9266,10 +9605,11 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/alternative.c linux-2.6.33.1/arch/x86/
 +              BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
        return addr;
  }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/amd_iommu.c linux-2.6.33.1/arch/x86/kernel/amd_iommu.c
---- linux-2.6.33.1/arch/x86/kernel/amd_iommu.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/amd_iommu.c 2010-03-20 16:58:38.988525305 -0400
-@@ -2210,7 +2210,7 @@ static void prealloc_protection_domains(
+ 
+diff -urNp linux-2.6.34/arch/x86/kernel/amd_iommu.c linux-2.6.34/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.34/arch/x86/kernel/amd_iommu.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/amd_iommu.c   2010-07-01 20:45:14.000000000 -0400
+@@ -2211,7 +2211,7 @@ static void prealloc_protection_domains(
        }
  }
  
@@ -9278,10 +9618,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/amd_iommu.c linux-2.6.33.1/arch/x86/ke
        .alloc_coherent = alloc_coherent,
        .free_coherent = free_coherent,
        .map_page = map_page,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c      2010-03-20 16:58:38.988525305 -0400
-@@ -701,7 +701,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+diff -urNp linux-2.6.34/arch/x86/kernel/apic/io_apic.c linux-2.6.34/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.34/arch/x86/kernel/apic/io_apic.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/apic/io_apic.c        2010-07-01 20:45:14.000000000 -0400
+@@ -688,7 +688,7 @@ struct IO_APIC_route_entry **alloc_ioapi
        ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
                                GFP_ATOMIC);
        if (!ioapic_entries)
@@ -9290,7 +9630,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c linux-2.6.33.1/arch/x86
  
        for (apic = 0; apic < nr_ioapics; apic++) {
                ioapic_entries[apic] =
-@@ -718,7 +718,7 @@ nomem:
+@@ -705,7 +705,7 @@ nomem:
                kfree(ioapic_entries[apic]);
        kfree(ioapic_entries);
  
@@ -9299,7 +9639,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c linux-2.6.33.1/arch/x86
  }
  
  /*
-@@ -1135,7 +1135,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
+@@ -1122,7 +1122,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
  
@@ -9308,18 +9648,18 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/apic/io_apic.c linux-2.6.33.1/arch/x86
  {
        /* Used to the online set of cpus does not change
         * during assign_irq_vector.
-@@ -1143,7 +1143,7 @@ void lock_vector_lock(void)
-       spin_lock(&vector_lock);
+@@ -1130,7 +1130,7 @@ void lock_vector_lock(void)
+       raw_spin_lock(&vector_lock);
  }
  
 -void unlock_vector_lock(void)
 +void unlock_vector_lock(void) __releases(vector_lock)
  {
-       spin_unlock(&vector_lock);
+       raw_spin_unlock(&vector_lock);
  }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/apm_32.c linux-2.6.33.1/arch/x86/kernel/apm_32.c
---- linux-2.6.33.1/arch/x86/kernel/apm_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/apm_32.c    2010-03-20 16:58:38.988525305 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/apm_32.c linux-2.6.34/arch/x86/kernel/apm_32.c
+--- linux-2.6.34/arch/x86/kernel/apm_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/apm_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -9421,9 +9761,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/apm_32.c linux-2.6.33.1/arch/x86/kerne
  
        proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.33.1/arch/x86/kernel/asm-offsets_32.c linux-2.6.33.1/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.33.1/arch/x86/kernel/asm-offsets_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/asm-offsets_32.c    2010-03-20 16:58:38.988525305 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/asm-offsets_32.c linux-2.6.34/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.34/arch/x86/kernel/asm-offsets_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/asm-offsets_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -115,6 +115,11 @@ void foo(void)
        OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
        OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9436,10 +9776,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/asm-offsets_32.c linux-2.6.33.1/arch/x
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c    2010-03-20 16:58:38.988525305 -0400
-@@ -63,6 +63,12 @@ int main(void)
+diff -urNp linux-2.6.34/arch/x86/kernel/asm-offsets_64.c linux-2.6.34/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.34/arch/x86/kernel/asm-offsets_64.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/asm-offsets_64.c      2010-07-01 20:45:14.000000000 -0400
+@@ -63,6 +63,18 @@ int main(void)
        OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
        OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
        OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
@@ -9448,11 +9788,17 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.33.1/arch/x
 +      OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
 +      OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
 +#endif
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
++      OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
++      OFFSET(PV_MMU_set_pgd, pv_mmu_ops, set_pgd);
++#endif
 +
  #endif
  
  
-@@ -115,6 +121,7 @@ int main(void)
+@@ -115,6 +127,7 @@ int main(void)
        ENTRY(cr8);
        BLANK();
  #undef ENTRY
@@ -9460,9 +9806,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/asm-offsets_64.c linux-2.6.33.1/arch/x
        DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
        BLANK();
        DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/common.c linux-2.6.33.1/arch/x86/kernel/cpu/common.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/common.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/common.c        2010-03-20 16:58:38.992510812 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/common.c linux-2.6.34/arch/x86/kernel/cpu/common.c
+--- linux-2.6.34/arch/x86/kernel/cpu/common.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/common.c  2010-07-01 20:45:14.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9553,6 +9899,15 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/common.c linux-2.6.33.1/arch/x86/k
        oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
+@@ -1129,7 +1079,7 @@ void __cpuinit cpu_init(void)
+       switch_to_new_gdt(cpu);
+       loadsegment(fs, 0);
+ 
+-      load_idt((const struct desc_ptr *)&idt_descr);
++      load_idt(&idt_descr);
+ 
+       memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
+       syscall_init();
 @@ -1201,7 +1151,7 @@ void __cpuinit cpu_init(void)
  {
        int cpu = smp_processor_id();
@@ -9562,10 +9917,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/common.c linux-2.6.33.1/arch/x86/k
        struct thread_struct *thread = &curr->thread;
  
        if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c  2010-03-20 16:58:38.992510812 -0400
-@@ -523,7 +523,7 @@ static const struct dmi_system_id sw_any
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c    2010-07-01 20:45:14.000000000 -0400
+@@ -524,7 +524,7 @@ static const struct dmi_system_id sw_any
                        DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
                },
        },
@@ -9574,10 +9929,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
  };
  
  static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c    2010-03-20 16:58:38.992510812 -0400
-@@ -225,7 +225,7 @@ static struct cpu_model models[] =
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c      2010-07-01 20:45:14.000000000 -0400
+@@ -226,7 +226,7 @@ static struct cpu_model models[] =
        { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
        { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
  
@@ -9586,10 +9941,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
  };
  #undef _BANIAS
  #undef BANIAS
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/intel.c linux-2.6.33.1/arch/x86/kernel/cpu/intel.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/intel.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/intel.c 2010-03-20 16:58:38.992510812 -0400
-@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/intel.c linux-2.6.34/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.34/arch/x86/kernel/cpu/intel.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/intel.c   2010-07-01 20:45:14.000000000 -0400
+@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
         * Update the IDT descriptor and reload the IDT so that
         * it uses the read-only mapped virtual address.
         */
@@ -9598,21 +9953,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/intel.c linux-2.6.33.1/arch/x86/ke
        load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.33.1/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/intel_cacheinfo.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/intel_cacheinfo.c       2010-03-20 16:58:38.992510812 -0400
-@@ -848,7 +848,7 @@ static ssize_t store(struct kobject *kob
-       return ret;
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
-       .show   = show,
-       .store  = store,
- };
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/Makefile linux-2.6.33.1/arch/x86/kernel/cpu/Makefile
---- linux-2.6.33.1/arch/x86/kernel/cpu/Makefile        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/Makefile        2010-03-20 16:58:38.992510812 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/Makefile linux-2.6.34/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.34/arch/x86/kernel/cpu/Makefile  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/Makefile  2010-07-01 20:45:14.000000000 -0400
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -9624,22 +9967,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/Makefile linux-2.6.33.1/arch/x86/k
  obj-y                 := intel_cacheinfo.o addon_cpuid_features.o
  obj-y                 += proc.o capflags.o powerflags.o common.o
  obj-y                 += vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce_amd.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce_amd.c        2010-03-20 16:58:38.992510812 -0400
-@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
-       return ret;
- }
- 
--static struct sysfs_ops threshold_ops = {
-+static const struct sysfs_ops threshold_ops = {
-       .show                   = show,
-       .store                  = store,
- };
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c    2010-03-20 16:58:38.992510812 -0400
-@@ -201,7 +201,7 @@ static void print_mce(struct mce *m)
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/mcheck/mce.c      2010-07-01 20:45:14.000000000 -0400
+@@ -209,7 +209,7 @@ static void print_mce(struct mce *m)
                        !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
                                m->cs, m->ip);
  
@@ -9648,7 +9979,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x
                        print_symbol("{%s}", m->ip);
                pr_cont("\n");
        }
-@@ -1444,14 +1444,14 @@ void __cpuinit mcheck_cpu_init(struct cp
+@@ -1452,14 +1452,14 @@ void __cpuinit mcheck_cpu_init(struct cp
   */
  
  static DEFINE_SPINLOCK(mce_state_lock);
@@ -9665,7 +9996,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x
                spin_unlock(&mce_state_lock);
  
                return -EBUSY;
-@@ -1459,7 +1459,7 @@ static int mce_open(struct inode *inode,
+@@ -1467,7 +1467,7 @@ static int mce_open(struct inode *inode,
  
        if (file->f_flags & O_EXCL)
                open_exclu = 1;
@@ -9674,7 +10005,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x
  
        spin_unlock(&mce_state_lock);
  
-@@ -1470,7 +1470,7 @@ static int mce_release(struct inode *ino
+@@ -1478,7 +1478,7 @@ static int mce_release(struct inode *ino
  {
        spin_lock(&mce_state_lock);
  
@@ -9683,7 +10014,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x
        open_exclu = 0;
  
        spin_unlock(&mce_state_lock);
-@@ -1610,6 +1610,7 @@ static struct miscdevice mce_log_device 
+@@ -1616,6 +1616,7 @@ static struct miscdevice mce_log_device 
        MISC_MCELOG_MINOR,
        "mcelog",
        &mce_chrdev_ops,
@@ -9691,46 +10022,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.33.1/arch/x
  };
  
  /*
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/amd.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/amd.c      2010-03-20 16:58:38.992510812 -0400
-@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
-       return 0;
- }
- 
--static struct mtrr_ops amd_mtrr_ops = {
-+static const struct mtrr_ops amd_mtrr_ops = {
-       .vendor            = X86_VENDOR_AMD,
-       .set               = amd_set_mtrr,
-       .get               = amd_get_mtrr,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/centaur.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/centaur.c  2010-03-20 16:58:38.992510812 -0400
-@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 
-       return 0;
- }
- 
--static struct mtrr_ops centaur_mtrr_ops = {
-+static const struct mtrr_ops centaur_mtrr_ops = {
-       .vendor            = X86_VENDOR_CENTAUR,
-       .set               = centaur_set_mcr,
-       .get               = centaur_get_mcr,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/cyrix.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/cyrix.c    2010-03-20 16:58:38.992510812 -0400
-@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
-       post_set();
- }
- 
--static struct mtrr_ops cyrix_mtrr_ops = {
-+static const struct mtrr_ops cyrix_mtrr_ops = {
-       .vendor            = X86_VENDOR_CYRIX,
-       .set_all           = cyrix_set_all,
-       .set               = cyrix_set_arr,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/generic.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/generic.c  2010-03-20 16:58:38.992510812 -0400
-@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/generic.c    2010-07-01 20:45:14.000000000 -0400
+@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
        { MSR_MTRRfix64K_00000, 1 }, /* one   64k MTRR  */
        { MSR_MTRRfix16K_80000, 2 }, /* two   16k MTRRs */
        { MSR_MTRRfix4K_C0000,  8 }, /* eight  4k MTRRs */
@@ -9739,39 +10034,21 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.33.1/arch
  };
  
  static unsigned long smp_changes_mask;
-@@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
- /*
-  * Generic structure...
-  */
--struct mtrr_ops generic_mtrr_ops = {
-+const struct mtrr_ops generic_mtrr_ops = {
-       .use_intel_if           = 1,
-       .set_all                = generic_set_all,
-       .get                    = generic_get_mtrr,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/main.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/main.c     2010-03-20 16:58:38.996547732 -0400
-@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/main.c       2010-07-01 20:45:14.000000000 -0400
+@@ -60,7 +60,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
  
--static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
+-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
  
--struct mtrr_ops *mtrr_if;
-+const struct mtrr_ops *mtrr_if;
+ const struct mtrr_ops *mtrr_if;
  
- static void set_mtrr(unsigned int reg, unsigned long base,
-                    unsigned long size, mtrr_type type);
- 
--void set_mtrr_ops(struct mtrr_ops *ops)
-+void set_mtrr_ops(const struct mtrr_ops *ops)
- {
-       if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
-               mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/mtrr.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/mtrr.h     2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/mtrr/mtrr.h       2010-07-01 20:45:14.000000000 -0400
 @@ -12,19 +12,19 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
@@ -9800,31 +10077,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.33.1/arch/x8
  };
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
-@@ -32,7 +32,7 @@ extern int generic_get_free_region(unsig
- extern int generic_validate_add_page(unsigned long base, unsigned long size,
-                                    unsigned int type);
- 
--extern struct mtrr_ops generic_mtrr_ops;
-+extern const struct mtrr_ops generic_mtrr_ops;
- 
- extern int positive_have_wrcomb(void);
- 
-@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int in
-               u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
- void get_mtrr_state(void);
- 
--extern void set_mtrr_ops(struct mtrr_ops *ops);
-+extern void set_mtrr_ops(const struct mtrr_ops *ops);
- 
- extern u64 size_or_mask, size_and_mask;
--extern struct mtrr_ops *mtrr_if;
-+extern const struct mtrr_ops *mtrr_if;
- 
- #define is_cpu(vnd)   (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
- #define use_intel()   (mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c      2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/perfctr-watchdog.c        2010-07-01 20:45:14.000000000 -0400
 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
  
  /* Interface defining a CPU specific perfctr watchdog */
@@ -9842,15 +10097,15 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.33.1/
        unsigned perfctr;
        unsigned evntsel;
        u64 checkbit;
-@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
+@@ -634,6 +634,7 @@ static const struct wd_ops p4_wd_ops = {
  #define ARCH_PERFMON_NMI_EVENT_SEL    ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
  #define ARCH_PERFMON_NMI_EVENT_UMASK  ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
  
-+/* cannot be const */
++/* cannot be const, see probe_nmi_watchdog */
  static struct wd_ops intel_arch_wd_ops;
  
  static int setup_intel_arch_watchdog(unsigned nmi_hz)
-@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns
+@@ -686,6 +687,7 @@ static int setup_intel_arch_watchdog(uns
        return 1;
  }
  
@@ -9858,10 +10113,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.33.1/
  static struct wd_ops intel_arch_wd_ops __read_mostly = {
        .reserve        = single_msr_reserve,
        .unreserve      = single_msr_unreserve,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.33.1/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.33.1/arch/x86/kernel/cpu/perf_event.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/cpu/perf_event.c    2010-03-20 16:58:38.996547732 -0400
-@@ -2426,7 +2426,7 @@ perf_callchain_user(struct pt_regs *regs
+diff -urNp linux-2.6.34/arch/x86/kernel/cpu/perf_event.c linux-2.6.34/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.34/arch/x86/kernel/cpu/perf_event.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/cpu/perf_event.c      2010-07-01 20:45:14.000000000 -0400
+@@ -1699,7 +1699,7 @@ perf_callchain_user(struct pt_regs *regs
                        break;
  
                callchain_store(entry, frame.return_address);
@@ -9870,10 +10125,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/cpu/perf_event.c linux-2.6.33.1/arch/x
        }
  }
  
-diff -urNp linux-2.6.33.1/arch/x86/kernel/crash.c linux-2.6.33.1/arch/x86/kernel/crash.c
---- linux-2.6.33.1/arch/x86/kernel/crash.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/crash.c     2010-03-20 16:58:38.996547732 -0400
-@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 
+diff -urNp linux-2.6.34/arch/x86/kernel/crash.c linux-2.6.34/arch/x86/kernel/crash.c
+--- linux-2.6.34/arch/x86/kernel/crash.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/crash.c       2010-07-01 20:45:14.000000000 -0400
+@@ -40,7 +40,7 @@ static void kdump_nmi_callback(int cpu, 
        regs = args->regs;
  
  #ifdef CONFIG_X86_32
@@ -9882,9 +10137,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/crash.c linux-2.6.33.1/arch/x86/kernel
                crash_fixup_ss_esp(&fixed_regs, regs);
                regs = &fixed_regs;
        }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/doublefault_32.c linux-2.6.33.1/arch/x86/kernel/doublefault_32.c
---- linux-2.6.33.1/arch/x86/kernel/doublefault_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/doublefault_32.c    2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/doublefault_32.c linux-2.6.34/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.34/arch/x86/kernel/doublefault_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/doublefault_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -9916,10 +10171,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/doublefault_32.c linux-2.6.33.1/arch/x
                .fs             = __KERNEL_PERCPU,
  
                .__cr3          = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c      2010-03-20 16:58:38.996547732 -0400
-@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
+diff -urNp linux-2.6.34/arch/x86/kernel/dumpstack_32.c linux-2.6.34/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.34/arch/x86/kernel/dumpstack_32.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/dumpstack_32.c        2010-07-01 20:45:14.000000000 -0400
+@@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs
         * When in-kernel, we also print out the stack and code at the
         * time of the fault..
         */
@@ -9933,7 +10188,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c linux-2.6.33.1/arch/x86
  
                printk(KERN_EMERG "Stack:\n");
                show_stack_log_lvl(NULL, regs, &regs->sp,
-@@ -124,10 +125,10 @@ void show_registers(struct pt_regs *regs
+@@ -119,10 +120,10 @@ void show_registers(struct pt_regs *regs
  
                printk(KERN_EMERG "Code: ");
  
@@ -9946,7 +10201,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c linux-2.6.33.1/arch/x86
                        code_len = code_len - code_prologue + 1;
                }
                for (i = 0; i < code_len; i++, ip++) {
-@@ -136,7 +137,7 @@ void show_registers(struct pt_regs *regs
+@@ -131,7 +132,7 @@ void show_registers(struct pt_regs *regs
                                printk(" Bad EIP value.");
                                break;
                        }
@@ -9955,7 +10210,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c linux-2.6.33.1/arch/x86
                                printk("<%02x> ", c);
                        else
                                printk("%02x ", c);
-@@ -149,6 +150,7 @@ int is_valid_bugaddr(unsigned long ip)
+@@ -144,6 +145,7 @@ int is_valid_bugaddr(unsigned long ip)
  {
        unsigned short ud2;
  
@@ -9963,9 +10218,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack_32.c linux-2.6.33.1/arch/x86
        if (ip < PAGE_OFFSET)
                return 0;
        if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack.c linux-2.6.33.1/arch/x86/kernel/dumpstack.c
---- linux-2.6.33.1/arch/x86/kernel/dumpstack.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/dumpstack.c 2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/dumpstack.c linux-2.6.34/arch/x86/kernel/dumpstack.c
+--- linux-2.6.34/arch/x86/kernel/dumpstack.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/dumpstack.c   2010-07-01 20:45:14.000000000 -0400
 @@ -207,7 +207,7 @@ void dump_stack(void)
  #endif
  
@@ -10002,31 +10257,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/dumpstack.c linux-2.6.33.1/arch/x86/ke
                report_bug(regs->ip, regs);
  
        if (__die(str, regs, err))
-diff -urNp linux-2.6.33.1/arch/x86/kernel/e820.c linux-2.6.33.1/arch/x86/kernel/e820.c
---- linux-2.6.33.1/arch/x86/kernel/e820.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/e820.c      2010-03-20 16:58:38.996547732 -0400
-@@ -28,6 +28,8 @@
- #include <asm/setup.h>
- #include <asm/trampoline.h>
- 
-+#include "acpi/realmode/wakeup.h"
-+
- /*
-  * The e820 map is the map that gets modified e.g. with command line parameters
-  * and that is also registered with modifications in the kernel resource tree
-@@ -741,8 +743,7 @@ static struct early_res early_res[MAX_EA
-        */
-       { PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE", 1 },
- #endif
--
--      {}
-+      { 0, 0, {0}, 0 }
- };
- 
- static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/efi_32.c linux-2.6.33.1/arch/x86/kernel/efi_32.c
---- linux-2.6.33.1/arch/x86/kernel/efi_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/efi_32.c    2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/efi_32.c linux-2.6.34/arch/x86/kernel/efi_32.c
+--- linux-2.6.34/arch/x86/kernel/efi_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/efi_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -38,70 +38,38 @@
   */
  
@@ -10107,9 +10340,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/efi_32.c linux-2.6.33.1/arch/x86/kerne
  
        /*
         * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.33.1/arch/x86/kernel/efi_stub_32.S linux-2.6.33.1/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.33.1/arch/x86/kernel/efi_stub_32.S       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/efi_stub_32.S       2010-03-20 16:58:38.996547732 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/efi_stub_32.S linux-2.6.34/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.34/arch/x86/kernel/efi_stub_32.S 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/efi_stub_32.S 2010-07-01 20:45:14.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -10208,19 +10441,79 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/efi_stub_32.S linux-2.6.33.1/arch/x86/
  saved_return_addr:
        .long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/kernel/entry_32.S
---- linux-2.6.33.1/arch/x86/kernel/entry_32.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/entry_32.S  2010-03-20 16:58:39.000574964 -0400
-@@ -191,7 +191,7 @@
+diff -urNp linux-2.6.34/arch/x86/kernel/entry_32.S linux-2.6.34/arch/x86/kernel/entry_32.S
+--- linux-2.6.34/arch/x86/kernel/entry_32.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/entry_32.S    2010-07-01 20:45:14.000000000 -0400
+@@ -191,7 +191,67 @@
  
  #endif        /* CONFIG_X86_32_LAZY_GS */
  
 -.macro SAVE_ALL
++.macro PAX_EXIT_KERNEL
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_PARAVIRT
++      push %eax; push %ecx;
++#endif
++      mov %cs, %esi
++      cmp $__KERNEXEC_KERNEL_CS, %esi
++      jnz 2f
++#ifdef CONFIG_PARAVIRT
++      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
++      mov %eax, %esi
++#else
++      mov %cr0, %esi
++#endif
++      btr $16, %esi
++      ljmp $__KERNEL_CS, $1f
++1:
++#ifdef CONFIG_PARAVIRT
++      mov %esi, %eax
++      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
++#else
++      mov %esi, %cr0
++#endif
++2:
++#ifdef CONFIG_PARAVIRT
++      pop %ecx; pop %eax
++#endif
++#endif
++.endm
++
++.macro PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_PARAVIRT
++      push %eax; push %ecx;
++      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
++      mov %eax, %esi
++#else
++      mov %cr0, %esi
++#endif
++      bts $16, %esi
++      jnc 1f
++      mov %cs, %esi
++      cmp $__KERNEL_CS, %esi
++      jz 3f
++      ljmp $__KERNEL_CS, $3f
++1:    ljmp $__KERNEXEC_KERNEL_CS, $2f
++2:
++#ifdef CONFIG_PARAVIRT
++      mov %esi, %eax
++      call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
++#else
++      mov %esi, %cr0
++#endif
++3:
++#ifdef CONFIG_PARAVIRT
++      pop %ecx; pop %eax
++#endif
++#endif
++.endm
++
 +.macro __SAVE_ALL _DS
        cld
        PUSH_GS
        pushl %fs
-@@ -224,7 +224,7 @@
+@@ -224,7 +284,7 @@
        pushl %ebx
        CFI_ADJUST_CFA_OFFSET 4
        CFI_REL_OFFSET ebx, 0
@@ -10229,7 +10522,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        movl %edx, %ds
        movl %edx, %es
        movl $(__KERNEL_PERCPU), %edx
-@@ -232,6 +232,15 @@
+@@ -232,6 +292,15 @@
        SET_KERNEL_GS %edx
  .endm
  
@@ -10245,7 +10538,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  .macro RESTORE_INT_REGS
        popl %ebx
        CFI_ADJUST_CFA_OFFSET -4
-@@ -356,7 +365,15 @@ check_userspace:
+@@ -356,7 +425,15 @@ check_userspace:
        movb PT_CS(%esp), %al
        andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
        cmpl $USER_RPL, %eax
@@ -10261,7 +10554,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  
  ENTRY(resume_userspace)
        LOCKDEP_SYS_EXIT
-@@ -422,10 +439,9 @@ sysenter_past_esp:
+@@ -422,10 +499,9 @@ sysenter_past_esp:
        /*CFI_REL_OFFSET cs, 0*/
        /*
         * Push current_thread_info()->sysenter_return to the stack.
@@ -10274,7 +10567,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        CFI_ADJUST_CFA_OFFSET 4
        CFI_REL_OFFSET eip, 0
  
-@@ -438,9 +454,19 @@ sysenter_past_esp:
+@@ -438,9 +514,19 @@ sysenter_past_esp:
   * Load the potential sixth argument from user stack.
   * Careful about security.
   */
@@ -10294,7 +10587,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
        .align 4
-@@ -463,12 +489,23 @@ sysenter_do_call:
+@@ -463,12 +549,23 @@ sysenter_do_call:
        testl $_TIF_ALLWORK_MASK, %ecx
        jne sysexit_audit
  sysenter_exit:
@@ -10318,7 +10611,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        PTGS_TO_GS
        ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -512,11 +549,17 @@ sysexit_audit:
+@@ -512,11 +609,17 @@ sysexit_audit:
  
        CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -10338,7 +10631,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  .popsection
        PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -550,6 +593,10 @@ syscall_exit:
+@@ -550,6 +653,10 @@ syscall_exit:
        testl $_TIF_ALLWORK_MASK, %ecx  # current->work
        jne syscall_exit_work
  
@@ -10349,7 +10642,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  restore_all:
        TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -614,7 +661,13 @@ ldt_ss:
+@@ -614,7 +721,13 @@ ldt_ss:
        mov PT_OLDESP(%esp), %eax       /* load userspace esp */
        mov %dx, %ax                    /* eax: new kernel esp */
        sub %eax, %edx                  /* offset (low word is 0) */
@@ -10364,7 +10657,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        shr $16, %edx
        mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
        mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
-@@ -654,25 +707,19 @@ work_resched:
+@@ -654,25 +767,19 @@ work_resched:
  
  work_notifysig:                               # deal with pending signals and
                                        # notify-resume requests
@@ -10393,7 +10686,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  #endif
        xorl %edx, %edx
        call do_notify_resume
-@@ -707,6 +754,10 @@ END(syscall_exit_work)
+@@ -707,6 +814,10 @@ END(syscall_exit_work)
  
        RING0_INT_FRAME                 # can't unwind into user space anyway
  syscall_fault:
@@ -10404,7 +10697,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        GET_THREAD_INFO(%ebp)
        movl $-EFAULT,PT_EAX(%esp)
        jmp resume_userspace
-@@ -790,7 +841,13 @@ ptregs_clone:
+@@ -790,7 +901,13 @@ ptregs_clone:
   * normal stack and adjusts ESP with the matching offset.
   */
        /* fixup the stack */
@@ -10419,7 +10712,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
        mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
        shl $16, %eax
-@@ -1254,7 +1311,6 @@ return_to_handler:
+@@ -1254,7 +1371,6 @@ return_to_handler:
        jmp *%ecx
  #endif
  
@@ -10427,15 +10720,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1306,12 +1362,15 @@ error_code:
-       movl %ecx, %fs
-       UNWIND_ESPFIX_STACK
-       GS_TO_REG %ecx
-+
-+      PAX_ENTER_KERNEL
-+
-       movl PT_GS(%esp), %edi          # get the function address
-       movl PT_ORIG_EAX(%esp), %edx    # get the error code
+@@ -1311,9 +1427,12 @@ error_code:
        movl $-1, PT_ORIG_EAX(%esp)     # no syscall to restart
        REG_TO_PTGS %ecx
        SET_KERNEL_GS %ecx
@@ -10443,8 +10728,13 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
 +      movl $(__KERNEL_DS), %ecx
        movl %ecx, %ds
        movl %ecx, %es
++
++      PAX_ENTER_KERNEL
++
        TRACE_IRQS_OFF
-@@ -1407,6 +1466,9 @@ nmi_stack_correct:
+       movl %esp,%eax                  # pt_regs pointer
+       call *%edi
+@@ -1407,6 +1526,9 @@ nmi_stack_correct:
        xorl %edx,%edx          # zero error code
        movl %esp,%eax          # pt_regs pointer
        call do_nmi
@@ -10454,7 +10744,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        jmp restore_all_notrace
        CFI_ENDPROC
  
-@@ -1447,6 +1509,9 @@ nmi_espfix_stack:
+@@ -1447,6 +1569,9 @@ nmi_espfix_stack:
        FIXUP_ESPFIX_STACK              # %eax == %esp
        xorl %edx,%edx                  # zero error code
        call do_nmi
@@ -10464,9 +10754,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_32.S linux-2.6.33.1/arch/x86/ker
        RESTORE_REGS
        lss 12+4(%esp), %esp            # back to espfix stack
        CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_64.S linux-2.6.33.1/arch/x86/kernel/entry_64.S
---- linux-2.6.33.1/arch/x86/kernel/entry_64.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/entry_64.S  2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/entry_64.S linux-2.6.34/arch/x86/kernel/entry_64.S
+--- linux-2.6.34/arch/x86/kernel/entry_64.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/entry_64.S    2010-07-01 20:45:14.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -10475,43 +10765,340 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_64.S linux-2.6.33.1/arch/x86/ker
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -800,6 +801,7 @@ END(interrupt)
+@@ -174,6 +175,189 @@ ENTRY(native_usergs_sysret64)
+ ENDPROC(native_usergs_sysret64)
+ #endif /* CONFIG_PARAVIRT */
+ 
++      .macro ljmpq sel, off
++#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
++      .byte 0x48; ljmp *1234f(%rip)
++      .pushsection .rodata
++      .align 16
++      1234: .quad \off; .word \sel
++      .popsection
++#else
++      push $\sel
++      push $\off
++      lretq
++#endif
++      .endm
++
++ENTRY(pax_enter_kernel)
++
++#ifdef CONFIG_PAX_KERNEXEC
++      push %rdi
++
++#ifdef CONFIG_PARAVIRT
++      PV_SAVE_REGS(CLBR_RDI)
++#endif
++
++      GET_CR0_INTO_RDI
++      bts $16,%rdi
++      jnc 1f
++      mov %cs,%edi
++      cmp $__KERNEL_CS,%edi
++      jz 3f
++      ljmpq __KERNEL_CS,3f
++1:    ljmpq __KERNEXEC_KERNEL_CS,2f
++2:    SET_RDI_INTO_CR0
++3:
++
++#ifdef CONFIG_PARAVIRT
++      PV_RESTORE_REGS(CLBR_RDI)
++#endif
++
++      pop %rdi
++#endif
++
++      retq
++ENDPROC(pax_enter_kernel)
++
++ENTRY(pax_exit_kernel)
++
++#ifdef CONFIG_PAX_KERNEXEC
++      push %rdi
++
++#ifdef CONFIG_PARAVIRT
++      PV_SAVE_REGS(CLBR_RDI)
++#endif
++
++      mov %cs,%rdi
++      cmp $__KERNEXEC_KERNEL_CS,%edi
++      jnz 2f
++      GET_CR0_INTO_RDI
++      btr $16,%rdi
++      ljmpq __KERNEL_CS,1f
++1:    SET_RDI_INTO_CR0
++2:
++
++#ifdef CONFIG_PARAVIRT
++      PV_RESTORE_REGS(CLBR_RDI);
++#endif
++
++      pop %rdi
++#endif
++
++      retq
++ENDPROC(pax_exit_kernel)
++
++ENTRY(pax_enter_kernel_user)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      push %rdi
++      push %rbx
++
++#ifdef CONFIG_PARAVIRT
++      PV_SAVE_REGS(CLBR_RDI)
++#endif
++
++      GET_CR3_INTO_RDI
++      mov %rdi,%rbx
++      add $__START_KERNEL_map,%rbx
++      sub phys_base(%rip),%rbx
++
++#ifdef CONFIG_PARAVIRT
++      push %rdi
++      cmpl $0, pv_info+PARAVIRT_enabled
++      jz 1f
++      i = 0
++      .rept USER_PGD_PTRS
++      mov i*8(%rbx),%rsi
++      mov $0,%sil
++      lea i*8(%rbx),%rdi
++      call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd)
++      i = i + 1
++      .endr
++      jmp 2f
++1:
++#endif
++
++      i = 0
++      .rept USER_PGD_PTRS
++      movb $0,i*8(%rbx)
++      i = i + 1
++      .endr
++
++#ifdef CONFIG_PARAVIRT
++2:    pop %rdi
++#endif
++      SET_RDI_INTO_CR3
++
++#ifdef CONFIG_PAX_KERNEXEC
++      GET_CR0_INTO_RDI
++      bts $16,%rdi
++      SET_RDI_INTO_CR0
++#endif
++
++#ifdef CONFIG_PARAVIRT
++      PV_RESTORE_REGS(CLBR_RDI)
++#endif
++
++      pop %rbx
++      pop %rdi
++#endif
++
++      retq
++ENDPROC(pax_enter_kernel_user)
++
++ENTRY(pax_exit_kernel_user)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      push %rdi
++
++#ifdef CONFIG_PARAVIRT
++      push %rbx
++      PV_SAVE_REGS(CLBR_RDI)
++#endif
++
++#ifdef CONFIG_PAX_KERNEXEC
++      GET_CR0_INTO_RDI
++      btr $16,%rdi
++      SET_RDI_INTO_CR0
++#endif
++
++      GET_CR3_INTO_RDI
++      add $__START_KERNEL_map,%rdi
++      sub phys_base(%rip),%rdi
++
++#ifdef CONFIG_PARAVIRT
++      cmpl $0, pv_info+PARAVIRT_enabled
++      jz 1f
++      mov %rdi,%rbx
++      i = 0
++      .rept USER_PGD_PTRS
++      mov i*8(%rbx),%rsi
++      mov $0x67,%sil
++      lea i*8(%rbx),%rdi
++      call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd)
++      i = i + 1
++      .endr
++      jmp 2f
++1:
++#endif
++
++      i = 0
++      .rept USER_PGD_PTRS
++      movb $0x67,i*8(%rdi)
++      i = i + 1
++      .endr
++
++#ifdef CONFIG_PARAVIRT
++2:    PV_RESTORE_REGS(CLBR_RDI)
++      pop %rbx
++#endif
++
++      pop %rdi
++#endif
++
++      retq
++ENDPROC(pax_exit_kernel_user)
+ 
+ .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
+ #ifdef CONFIG_TRACE_IRQFLAGS
+@@ -317,7 +501,7 @@ ENTRY(save_args)
+       leaq -ARGOFFSET+16(%rsp),%rdi   /* arg1 for handler */
+       movq_cfi rbp, 8         /* push %rbp */
+       leaq 8(%rsp), %rbp              /* mov %rsp, %ebp */
+-      testl $3, CS(%rdi)
++      testb $3, CS(%rdi)
+       je 1f
+       SWAPGS
+       /*
+@@ -409,7 +593,7 @@ ENTRY(ret_from_fork)
+ 
+       RESTORE_REST
+ 
+-      testl $3, CS-ARGOFFSET(%rsp)            # from kernel_thread?
++      testb $3, CS-ARGOFFSET(%rsp)            # from kernel_thread?
+       je   int_ret_from_sys_call
+ 
+       testl $_TIF_IA32, TI_flags(%rcx)        # 32-bit compat task needs IRET
+@@ -468,6 +652,11 @@ ENTRY(system_call_after_swapgs)
+ 
+       movq    %rsp,PER_CPU_VAR(old_rsp)
+       movq    PER_CPU_VAR(kernel_stack),%rsp
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_enter_kernel_user
++#endif
++
+       /*
+        * No need to follow this irqs off/on section - it's straight
+        * and short:
+@@ -502,6 +691,11 @@ sysret_check:
+       andl %edi,%edx
+       jnz  sysret_careful
+       CFI_REMEMBER_STATE
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel_user
++#endif
++
+       /*
+        * sysretq will re-enable interrupts:
+        */
+@@ -613,7 +807,7 @@ tracesys:
+ GLOBAL(int_ret_from_sys_call)
+       DISABLE_INTERRUPTS(CLBR_NONE)
+       TRACE_IRQS_OFF
+-      testl $3,CS-ARGOFFSET(%rsp)
++      testb $3,CS-ARGOFFSET(%rsp)
+       je retint_restore_args
+       movl $_TIF_ALLWORK_MASK,%edi
+       /* edi: mask to check */
+@@ -800,6 +994,16 @@ END(interrupt)
        CFI_ADJUST_CFA_OFFSET 10*8
        call save_args
        PARTIAL_FRAME 0
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rdi)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        call \func
        .endm
  
-@@ -825,6 +827,7 @@ ret_from_intr:
-       CFI_DEF_CFA_REGISTER    rsp
+@@ -826,7 +1030,7 @@ ret_from_intr:
        CFI_ADJUST_CFA_OFFSET   -8
  exit_intr:
-+      PAX_EXIT_KERNEL
        GET_THREAD_INFO(%rcx)
-       testl $3,CS-ARGOFFSET(%rsp)
+-      testl $3,CS-ARGOFFSET(%rsp)
++      testb $3,CS-ARGOFFSET(%rsp)
        je retint_kernel
-@@ -1040,6 +1043,7 @@ ENTRY(\sym)
+ 
+       /* Interrupt came from user space */
+@@ -848,12 +1052,18 @@ retint_swapgs:          /* return to user-space 
+        * The iretq could re-enable interrupts:
+        */
+       DISABLE_INTERRUPTS(CLBR_ANY)
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel_user
++#endif
++
+       TRACE_IRQS_IRETQ
+       SWAPGS
+       jmp restore_args
+ 
+ retint_restore_args:  /* return to kernel space */
+       DISABLE_INTERRUPTS(CLBR_ANY)
++      call pax_exit_kernel
+       /*
+        * The iretq could re-enable interrupts:
+        */
+@@ -1040,6 +1250,16 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET 15*8
        call error_entry
        DEFAULT_FRAME 0
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1057,6 +1061,7 @@ ENTRY(\sym)
+@@ -1057,6 +1277,16 @@ ENTRY(\sym)
        subq $15*8, %rsp
        call save_paranoid
        TRACE_IRQS_OFF
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1074,9 +1079,15 @@ ENTRY(\sym)
+@@ -1074,9 +1304,24 @@ ENTRY(\sym)
        subq $15*8, %rsp
        call save_paranoid
        TRACE_IRQS_OFF
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
 -      PER_CPU(init_tss, %r12)
@@ -10524,57 +11111,114 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/entry_64.S linux-2.6.33.1/arch/x86/ker
        subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
        call \do_sym
        addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
-@@ -1093,6 +1104,7 @@ ENTRY(\sym)
+@@ -1093,6 +1338,16 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET 15*8
        call error_entry
        DEFAULT_FRAME 0
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1112,6 +1124,7 @@ ENTRY(\sym)
+@@ -1112,6 +1367,16 @@ ENTRY(\sym)
        call save_paranoid
        DEFAULT_FRAME 0
        TRACE_IRQS_OFF
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1373,11 +1386,13 @@ ENTRY(paranoid_exit)
-       testl $3,CS(%rsp)
+@@ -1370,14 +1635,27 @@ ENTRY(paranoid_exit)
+       TRACE_IRQS_OFF
+       testl %ebx,%ebx                         /* swapgs needed? */
+       jnz paranoid_restore
+-      testl $3,CS(%rsp)
++      testb $3,CS(%rsp)
        jnz   paranoid_userspace
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel
++      TRACE_IRQS_IRETQ 0
++      SWAPGS_UNSAFE_STACK
++      RESTORE_ALL 8
++      jmp irq_return
++#endif
  paranoid_swapgs:
-+      PAX_EXIT_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      call pax_exit_kernel_user
++#else
++      call pax_exit_kernel
++#endif
        TRACE_IRQS_IRETQ 0
        SWAPGS_UNSAFE_STACK
        RESTORE_ALL 8
        jmp irq_return
  paranoid_restore:
-+      PAX_EXIT_KERNEL
++      call pax_exit_kernel
        TRACE_IRQS_IRETQ 0
        RESTORE_ALL 8
        jmp irq_return
-@@ -1499,6 +1514,7 @@ ENTRY(nmi)
+@@ -1435,7 +1713,7 @@ ENTRY(error_entry)
+       movq_cfi r14, R14+8
+       movq_cfi r15, R15+8
+       xorl %ebx,%ebx
+-      testl $3,CS+8(%rsp)
++      testb $3,CS+8(%rsp)
+       je error_kernelspace
+ error_swapgs:
+       SWAPGS
+@@ -1499,6 +1777,16 @@ ENTRY(nmi)
        CFI_ADJUST_CFA_OFFSET 15*8
        call save_paranoid
        DEFAULT_FRAME 0
-+      PAX_ENTER_KERNEL
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      testb $3, CS(%rsp)
++      jnz 1f
++      call pax_enter_kernel
++      jmp 2f
++1:    call pax_enter_kernel_user
++2:
++#else
++      call pax_enter_kernel
++#endif
        /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
        movq %rsp,%rdi
        movq $-1,%rsi
-@@ -1514,6 +1530,7 @@ ENTRY(nmi)
+@@ -1509,11 +1797,12 @@ ENTRY(nmi)
+       DISABLE_INTERRUPTS(CLBR_NONE)
+       testl %ebx,%ebx                         /* swapgs needed? */
+       jnz nmi_restore
+-      testl $3,CS(%rsp)
++      testb $3,CS(%rsp)
+       jnz nmi_userspace
  nmi_swapgs:
        SWAPGS_UNSAFE_STACK
  nmi_restore:
-+      PAX_EXIT_KERNEL
++      call pax_exit_kernel
        RESTORE_ALL 8
        jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kernel/ftrace.c
---- linux-2.6.33.1/arch/x86/kernel/ftrace.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/ftrace.c    2010-03-20 16:58:39.000574964 -0400
-@@ -151,7 +151,9 @@ void ftrace_nmi_enter(void)
- {
+diff -urNp linux-2.6.34/arch/x86/kernel/ftrace.c linux-2.6.34/arch/x86/kernel/ftrace.c
+--- linux-2.6.34/arch/x86/kernel/ftrace.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/ftrace.c      2010-07-01 20:45:14.000000000 -0400
+@@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
+ 
        if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
                smp_rmb();
 +              pax_open_kernel();
@@ -10583,7 +11227,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
                atomic_inc(&nmi_update_count);
        }
        /* Must have previous changes seen before executions */
-@@ -234,7 +236,7 @@ do_ftrace_mod_code(unsigned long ip, voi
+@@ -260,7 +262,7 @@ do_ftrace_mod_code(unsigned long ip, voi
  
  
  
@@ -10592,7 +11236,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
  
  static unsigned char *ftrace_nop_replace(void)
  {
-@@ -247,6 +249,8 @@ ftrace_modify_code(unsigned long ip, uns
+@@ -273,6 +275,8 @@ ftrace_modify_code(unsigned long ip, uns
  {
        unsigned char replaced[MCOUNT_INSN_SIZE];
  
@@ -10601,7 +11245,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
        /*
         * Note: Due to modules and __init, code can
         *  disappear and change, we need to protect against faulting
-@@ -303,7 +307,7 @@ int ftrace_update_ftrace_func(ftrace_fun
+@@ -329,7 +333,7 @@ int ftrace_update_ftrace_func(ftrace_fun
        unsigned char old[MCOUNT_INSN_SIZE], *new;
        int ret;
  
@@ -10610,7 +11254,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
        new = ftrace_call_replace(ip, (unsigned long)func);
        ret = ftrace_modify_code(ip, old, new);
  
-@@ -356,15 +360,15 @@ int __init ftrace_dyn_arch_init(void *da
+@@ -382,15 +386,15 @@ int __init ftrace_dyn_arch_init(void *da
        switch (faulted) {
        case 0:
                pr_info("converting mcount calls to 0f 1f 44 00 00\n");
@@ -10629,7 +11273,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
                break;
        }
  
-@@ -385,6 +389,8 @@ static int ftrace_mod_jmp(unsigned long 
+@@ -411,6 +415,8 @@ static int ftrace_mod_jmp(unsigned long 
  {
        unsigned char code[MCOUNT_INSN_SIZE];
  
@@ -10638,10 +11282,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ftrace.c linux-2.6.33.1/arch/x86/kerne
        if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
                return -EFAULT;
  
-diff -urNp linux-2.6.33.1/arch/x86/kernel/head32.c linux-2.6.33.1/arch/x86/kernel/head32.c
---- linux-2.6.33.1/arch/x86/kernel/head32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/head32.c    2010-03-20 16:58:39.000574964 -0400
-@@ -16,6 +16,7 @@
+diff -urNp linux-2.6.34/arch/x86/kernel/head32.c linux-2.6.34/arch/x86/kernel/head32.c
+--- linux-2.6.34/arch/x86/kernel/head32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/head32.c      2010-07-01 20:45:14.000000000 -0400
+@@ -17,6 +17,7 @@
  #include <asm/apic.h>
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -10649,24 +11293,19 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head32.c linux-2.6.33.1/arch/x86/kerne
  
  static void __init i386_default_early_setup(void)
  {
-@@ -29,7 +30,7 @@ static void __init i386_default_early_se
+@@ -40,7 +41,7 @@ void __init i386_start_kernel(void)
+                                        "EX TRAMPOLINE");
+ #endif
  
- void __init i386_start_kernel(void)
- {
 -      reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
 +      reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
  
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Reserve INITRD */
-diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kernel/head_32.S
---- linux-2.6.33.1/arch/x86/kernel/head_32.S   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/head_32.S   2010-03-20 16:58:39.000574964 -0400
-@@ -21,10 +21,17 @@
- #include <asm/msr-index.h>
- #include <asm/cpufeature.h>
- #include <asm/percpu.h>
-+#include <asm/msr-index.h>
- 
+diff -urNp linux-2.6.34/arch/x86/kernel/head_32.S linux-2.6.34/arch/x86/kernel/head_32.S
+--- linux-2.6.34/arch/x86/kernel/head_32.S     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/head_32.S     2010-07-03 09:51:21.000000000 -0400
+@@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
  
@@ -10679,7 +11318,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  /*
   * References to members of the new_cpu_data structure.
   */
-@@ -54,11 +61,7 @@
+@@ -54,11 +60,7 @@
   * and small than max_low_pfn, otherwise will waste some page table entries
   */
  
@@ -10692,7 +11331,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  
  /* Enough space to fit pagetables for the low memory linear map */
  MAPPING_BEYOND_END = \
-@@ -75,6 +78,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
+@@ -75,6 +77,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
  RESERVE_BRK(pagetables, INIT_MAP_SIZE)
  
  /*
@@ -10705,7 +11344,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
   * 32-bit kernel entrypoint; only used by the boot CPU.  On entry,
   * %esi points to the real-mode code as a 32-bit pointer.
   * CS and DS must be 4 GB flat segments, but we don't depend on
-@@ -82,6 +91,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
+@@ -82,6 +90,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
   * can.
   */
  __HEAD
@@ -10719,7 +11358,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  ENTRY(startup_32)
        /* test KEEP_SEGMENTS flag to see if the bootloader is asking
                us to not reload segments */
-@@ -99,6 +115,55 @@ ENTRY(startup_32)
+@@ -99,6 +114,55 @@ ENTRY(startup_32)
        movl %eax,%gs
  2:
  
@@ -10775,7 +11414,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  /*
   * Clear BSS first so that there are no surprises...
   */
-@@ -142,9 +207,7 @@ ENTRY(startup_32)
+@@ -142,9 +206,7 @@ ENTRY(startup_32)
        cmpl $num_subarch_entries, %eax
        jae bad_subarch
  
@@ -10786,7 +11425,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  
  bad_subarch:
  WEAK(lguest_entry)
-@@ -156,10 +219,10 @@ WEAK(xen_entry)
+@@ -156,10 +218,10 @@ WEAK(xen_entry)
        __INITDATA
  
  subarch_entries:
@@ -10801,7 +11440,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  num_subarch_entries = (. - subarch_entries) / 4
  .previous
  #endif /* CONFIG_PARAVIRT */
-@@ -220,8 +283,11 @@ default_entry:
+@@ -220,8 +282,11 @@ default_entry:
        movl %eax, pa(max_pfn_mapped)
  
        /* Do early initialization of the fixmap area */
@@ -10815,7 +11454,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  #else /* Not PAE */
  
  page_pde_offset = (__PAGE_OFFSET >> 20);
-@@ -251,8 +317,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
+@@ -251,8 +316,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
        movl %eax, pa(max_pfn_mapped)
  
        /* Do early initialization of the fixmap area */
@@ -10829,7 +11468,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  #endif
        jmp 3f
  /*
-@@ -299,6 +368,7 @@ ENTRY(startup_32_smp)
+@@ -299,6 +367,7 @@ ENTRY(startup_32_smp)
        orl %edx,%eax
        movl %eax,%cr4
  
@@ -10837,7 +11476,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
        testb $X86_CR4_PAE, %al         # check if PAE is enabled
        jz 6f
  
-@@ -323,6 +393,9 @@ ENTRY(startup_32_smp)
+@@ -323,6 +392,9 @@ ENTRY(startup_32_smp)
        /* Make changes effective */
        wrmsr
  
@@ -10847,7 +11486,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  6:
  
  /*
-@@ -348,9 +421,7 @@ ENTRY(startup_32_smp)
+@@ -348,9 +420,7 @@ ENTRY(startup_32_smp)
  
  #ifdef CONFIG_SMP
        cmpb $0, ready
@@ -10858,7 +11497,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  #endif /* CONFIG_SMP */
  
  /*
-@@ -428,7 +499,7 @@ is386:     movl $2,%ecx            # set MP
+@@ -428,7 +498,7 @@ is386:     movl $2,%ecx            # set MP
  1:    movl $(__KERNEL_DS),%eax        # reload all the segment registers
        movl %eax,%ss                   # after changing gdt.
  
@@ -10867,20 +11506,20 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
        movl %eax,%ds
        movl %eax,%es
  
-@@ -442,8 +513,11 @@ is386:    movl $2,%ecx            # set MP
+@@ -442,8 +512,11 @@ is386:    movl $2,%ecx            # set MP
         */
        cmpb $0,ready
        jne 1f
--      movl $per_cpu__gdt_page,%eax
+-      movl $gdt_page,%eax
 +      movl $cpu_gdt_table,%eax
-       movl $per_cpu__stack_canary,%ecx
+       movl $stack_canary,%ecx
 +#ifdef CONFIG_SMP
 +      addl $__per_cpu_load,%ecx
 +#endif
        movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
        shrl $16, %ecx
        movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -461,10 +535,6 @@ is386:    movl $2,%ecx            # set MP
+@@ -461,10 +534,6 @@ is386:    movl $2,%ecx            # set MP
  #ifdef CONFIG_SMP
        movb ready, %cl
        movb $1, ready
@@ -10891,7 +11530,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  #endif /* CONFIG_SMP */
        jmp *(initial_code)
  
-@@ -550,22 +620,22 @@ early_page_fault:
+@@ -550,22 +619,22 @@ early_page_fault:
        jmp early_fault
  
  early_fault:
@@ -10919,7 +11558,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  hlt_loop:
        hlt
        jmp hlt_loop
-@@ -573,8 +643,11 @@ hlt_loop:
+@@ -573,8 +642,11 @@ hlt_loop:
  /* This is the default interrupt "handler" :-) */
        ALIGN
  ignore_int:
@@ -10932,7 +11571,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
        pushl %eax
        pushl %ecx
        pushl %edx
-@@ -583,9 +656,6 @@ ignore_int:
+@@ -583,9 +655,6 @@ ignore_int:
        movl $(__KERNEL_DS),%eax
        movl %eax,%ds
        movl %eax,%es
@@ -10942,7 +11581,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
        pushl 16(%esp)
        pushl 24(%esp)
        pushl 32(%esp)
-@@ -612,27 +682,37 @@ ENTRY(initial_code)
+@@ -612,27 +681,38 @@ ENTRY(initial_code)
  /*
   * BSS section
   */
@@ -10982,10 +11621,23 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
 -      /* Page-aligned for the benefit of paravirt? */
 -      .align PAGE_SIZE_asm
 +.section .swapper_pg_dir,"a",@progbits
++
  ENTRY(swapper_pg_dir)
        .long   pa(swapper_pg_pmd+PGD_IDENT_ATTR),0     /* low identity map */
  # if KPMDS == 3
-@@ -655,11 +735,12 @@ ENTRY(swapper_pg_dir)
+@@ -651,15 +731,24 @@ ENTRY(swapper_pg_dir)
+ #  error "Kernel PMDs should be 1, 2 or 3"
+ # endif
+       .align PAGE_SIZE_asm            /* needs to be page-sized too */
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++ENTRY(cpu_pgd)
++      .rept NR_CPUS
++      .fill   4,8,0
++      .endr
++#endif
++
+ #endif
  
  .data
  ENTRY(stack_start)
@@ -10999,7 +11651,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  early_recursion_flag:
        .long 0
  
-@@ -695,7 +776,7 @@ fault_msg:
+@@ -695,7 +784,7 @@ fault_msg:
        .word 0                         # 32 bit align gdt_desc.address
  boot_gdt_descr:
        .word __BOOT_DS+7
@@ -11008,16 +11660,16 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
  
        .word 0                         # 32-bit align idt_desc.address
  idt_descr:
-@@ -706,7 +787,7 @@ idt_descr:
+@@ -706,7 +795,7 @@ idt_descr:
        .word 0                         # 32 bit align gdt_desc.address
  ENTRY(early_gdt_descr)
        .word GDT_ENTRIES*8-1
--      .long per_cpu__gdt_page         /* Overwritten for secondary CPUs */
+-      .long gdt_page                  /* Overwritten for secondary CPUs */
 +      .long cpu_gdt_table             /* Overwritten for secondary CPUs */
  
  /*
   * The boot_gdt must mirror the equivalent in setup.S and is
-@@ -715,5 +796,65 @@ ENTRY(early_gdt_descr)
+@@ -715,5 +804,65 @@ ENTRY(early_gdt_descr)
        .align L1_CACHE_BYTES
  ENTRY(boot_gdt)
        .fill GDT_ENTRY_BOOT_CS,8,0
@@ -11085,9 +11737,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_32.S linux-2.6.33.1/arch/x86/kern
 +      /* Be sure this is zeroed to avoid false validations in Xen */
 +      .fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +      .endr
-diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kernel/head_64.S
---- linux-2.6.33.1/arch/x86/kernel/head_64.S   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/head_64.S   2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/head_64.S linux-2.6.34/arch/x86/kernel/head_64.S
+--- linux-2.6.34/arch/x86/kernel/head_64.S     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/head_64.S     2010-07-01 20:45:14.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -11153,6 +11805,17 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
  
        /*
         * Fixup the kernel text+data virtual addresses. Note that
+@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64)
+        * after the boot processor executes this code.
+        */
+ 
+-      /* Enable PAE mode and PGE */
+-      movl    $(X86_CR4_PAE | X86_CR4_PGE), %eax
++      /* Enable PAE mode and PSE/PGE */
++      movl    $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
+       movq    %rax, %cr4
+ 
+       /* Setup early boot stage 4 level pagetables. */
 @@ -184,9 +176,14 @@ ENTRY(secondary_startup_64)
        movl    $MSR_EFER, %ecx
        rdmsr
@@ -11203,7 +11866,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
  #define NEXT_PAGE(name) \
        .balign PAGE_SIZE; \
  ENTRY(name)
-@@ -351,13 +353,29 @@ NEXT_PAGE(init_level4_pgt)
+@@ -351,13 +353,36 @@ NEXT_PAGE(init_level4_pgt)
        .quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
        .org    init_level4_pgt + L4_PAGE_OFFSET*8, 0
        .quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
@@ -11215,6 +11878,13 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
        /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
        .quad   level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
  
++#ifdef CONFIG_PAX_PER_CPU_PGD
++NEXT_PAGE(cpu_pgd)
++      .rept NR_CPUS
++      .fill   512,8,0
++      .endr
++#endif
++
  NEXT_PAGE(level3_ident_pgt)
        .quad   level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
 +#ifdef CONFIG_XEN
@@ -11233,7 +11903,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
  
  NEXT_PAGE(level3_kernel_pgt)
        .fill   L3_START_KERNEL,8,0
-@@ -365,20 +383,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -365,20 +390,23 @@ NEXT_PAGE(level3_kernel_pgt)
        .quad   level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
        .quad   level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -11265,7 +11935,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
  
  NEXT_PAGE(level2_kernel_pgt)
        /*
-@@ -391,33 +412,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -391,33 +419,55 @@ NEXT_PAGE(level2_kernel_pgt)
         *  If you want to increase this then increase MODULES_VADDR
         *  too.)
         */
@@ -11331,9 +12001,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/head_64.S linux-2.6.33.1/arch/x86/kern
  
        __PAGE_ALIGNED_BSS
        .align PAGE_SIZE
-diff -urNp linux-2.6.33.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.33.1/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.33.1/arch/x86/kernel/i386_ksyms_32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/i386_ksyms_32.c     2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/i386_ksyms_32.c       2010-07-01 20:45:14.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -11355,9 +12025,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/i386_ksyms_32.c linux-2.6.33.1/arch/x8
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.33.1/arch/x86/kernel/init_task.c linux-2.6.33.1/arch/x86/kernel/init_task.c
---- linux-2.6.33.1/arch/x86/kernel/init_task.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/init_task.c 2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/init_task.c linux-2.6.34/arch/x86/kernel/init_task.c
+--- linux-2.6.34/arch/x86/kernel/init_task.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/init_task.c   2010-07-01 20:45:14.000000000 -0400
 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
   * section. Since TSS's are completely CPU-local, we want them
   * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -11366,9 +12036,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/init_task.c linux-2.6.33.1/arch/x86/ke
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/ioport.c linux-2.6.33.1/arch/x86/kernel/ioport.c
---- linux-2.6.33.1/arch/x86/kernel/ioport.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/ioport.c    2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/ioport.c linux-2.6.34/arch/x86/kernel/ioport.c
+--- linux-2.6.34/arch/x86/kernel/ioport.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/ioport.c      2010-07-01 20:45:16.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -11382,7 +12052,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ioport.c linux-2.6.33.1/arch/x86/kerne
        if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
                return -EINVAL;
 +#ifdef CONFIG_GRKERNSEC_IO
-+      if (turn_on) {
++      if (turn_on && grsec_disable_privio) {
 +              gr_handle_ioperm();
 +              return -EPERM;
 +      }
@@ -11399,23 +12069,22 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ioport.c linux-2.6.33.1/arch/x86/kerne
  
        set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
  
-@@ -112,8 +119,13 @@ long sys_iopl(unsigned int level, struct
+@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct
                return -EINVAL;
        /* Trying to gain more privileges? */
        if (level > old) {
 +#ifdef CONFIG_GRKERNSEC_IO
-+              gr_handle_iopl();
-+              return -EPERM;
-+#else
++              if (grsec_disable_privio) {
++                      gr_handle_iopl();
++                      return -EPERM;
++              }
++#endif
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
-+#endif
        }
-       regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
-       t->iopl = level << 12;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/irq_32.c linux-2.6.33.1/arch/x86/kernel/irq_32.c
---- linux-2.6.33.1/arch/x86/kernel/irq_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/irq_32.c    2010-03-20 16:58:39.000574964 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/irq_32.c linux-2.6.34/arch/x86/kernel/irq_32.c
+--- linux-2.6.34/arch/x86/kernel/irq_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/irq_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
                return 0;
  
@@ -11434,9 +12103,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/irq_32.c linux-2.6.33.1/arch/x86/kerne
  
                call_on_stack(__do_softirq, isp);
                /*
-diff -urNp linux-2.6.33.1/arch/x86/kernel/kgdb.c linux-2.6.33.1/arch/x86/kernel/kgdb.c
---- linux-2.6.33.1/arch/x86/kernel/kgdb.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/kgdb.c      2010-03-20 16:58:39.004585163 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/kgdb.c linux-2.6.34/arch/x86/kernel/kgdb.c
+--- linux-2.6.34/arch/x86/kernel/kgdb.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/kgdb.c        2010-07-01 20:45:14.000000000 -0400
 @@ -89,7 +89,7 @@ void pt_regs_to_gdb_regs(unsigned long *
        gdb_regs[GDB_CS]        = regs->cs;
        gdb_regs[GDB_FS]        = 0xFFFF;
@@ -11455,34 +12124,46 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/kgdb.c linux-2.6.33.1/arch/x86/kernel/
        /* Breakpoint instruction: */
        .gdb_bpt_instr          = { 0xcc },
        .flags                  = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/kprobes.c linux-2.6.33.1/arch/x86/kernel/kprobes.c
---- linux-2.6.33.1/arch/x86/kernel/kprobes.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/kprobes.c   2010-03-20 16:58:39.004585163 -0400
-@@ -113,9 +113,13 @@ static void __kprobes set_jmp_op(void *f
-               char op;
+diff -urNp linux-2.6.34/arch/x86/kernel/kprobes.c linux-2.6.34/arch/x86/kernel/kprobes.c
+--- linux-2.6.34/arch/x86/kernel/kprobes.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/kprobes.c     2010-07-01 20:45:14.000000000 -0400
+@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relat
                s32 raddr;
-       } __attribute__((packed)) * jop;
--      jop = (struct __arch_jmp_op *)from;
-+
-+      jop = (struct __arch_jmp_op *)(ktla_ktva(from));
+       } __attribute__((packed)) *insn;
+ 
+-      insn = (struct __arch_relative_insn *)from;
++      insn = (struct __arch_relative_insn *)(ktla_ktva(from));
 +
 +      pax_open_kernel();
-       jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
-       jop->op = RELATIVEJUMP_INSTRUCTION;
+       insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
+       insn->op = op;
 +      pax_close_kernel();
  }
  
- /*
-@@ -323,16 +327,18 @@ static void __kprobes fix_riprel(struct 
- 
- static void __kprobes arch_copy_kprobe(struct kprobe *p)
- {
--      memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+ /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
+@@ -315,7 +318,9 @@ static int __kprobes __copy_instruction(
+               }
+       }
+       insn_get_length(&insn);
 +      pax_open_kernel();
-+      memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+       memcpy(dest, insn.kaddr, insn.length);
 +      pax_close_kernel();
  
-       fix_riprel(p);
+ #ifdef CONFIG_X86_64
+       if (insn_rip_relative(&insn)) {
+@@ -339,7 +344,9 @@ static int __kprobes __copy_instruction(
+                         (u8 *) dest;
+               BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
+               disp = (u8 *) dest + insn_offset_displacement(&insn);
++              pax_open_kernel();
+               *(s32 *) disp = (s32) newdisp;
++              pax_close_kernel();
+       }
+ #endif
+       return insn.length;
+@@ -353,12 +360,12 @@ static void __kprobes arch_copy_kprobe(s
+        */
+       __copy_instruction(p->ainsn.insn, p->addr, 0);
  
 -      if (can_boost(p->addr))
 +      if (can_boost(ktla_ktva(p->addr)))
@@ -11495,7 +12176,16 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/kprobes.c linux-2.6.33.1/arch/x86/kern
  }
  
  int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -412,7 +418,7 @@ static void __kprobes prepare_singlestep
+@@ -467,7 +474,7 @@ static void __kprobes setup_singlestep(s
+                * nor set current_kprobe, because it doesn't use single
+                * stepping.
+                */
+-              regs->ip = (unsigned long)p->ainsn.insn;
++              regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
+               preempt_enable_no_resched();
+               return;
+       }
+@@ -486,7 +493,7 @@ static void __kprobes setup_singlestep(s
        if (p->opcode == BREAKPOINT_INSTRUCTION)
                regs->ip = (unsigned long)p->addr;
        else
@@ -11503,26 +12193,17 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/kprobes.c linux-2.6.33.1/arch/x86/kern
 +              regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
  }
  
- void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
-@@ -433,7 +439,7 @@ static void __kprobes setup_singlestep(s
-       if (p->ainsn.boostable == 1 && !p->post_handler) {
-               /* Boost up -- we can execute copied instructions directly */
-               reset_current_kprobe();
--              regs->ip = (unsigned long)p->ainsn.insn;
-+              regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
-               preempt_enable_no_resched();
-               return;
-       }
-@@ -490,7 +496,7 @@ static int __kprobes kprobe_handler(stru
-       struct kprobe_ctlblk *kcb;
- 
-       addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
--      if (*addr != BREAKPOINT_INSTRUCTION) {
-+      if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
+ /*
+@@ -565,7 +572,7 @@ static int __kprobes kprobe_handler(stru
+                               setup_singlestep(p, regs, kcb, 0);
+                       return 1;
+               }
+-      } else if (*addr != BREAKPOINT_INSTRUCTION) {
++      } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
                /*
                 * The breakpoint instruction was removed right
                 * after we hit it.  Another cpu has removed
-@@ -742,7 +748,7 @@ static void __kprobes resume_execution(s
+@@ -791,7 +798,7 @@ static void __kprobes resume_execution(s
                struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
        unsigned long *tos = stack_addr(regs);
@@ -11531,7 +12212,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/kprobes.c linux-2.6.33.1/arch/x86/kern
        unsigned long orig_ip = (unsigned long)p->addr;
        kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -925,7 +931,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -974,7 +981,7 @@ int __kprobes kprobe_exceptions_notify(s
        struct die_args *args = data;
        int ret = NOTIFY_DONE;
  
@@ -11540,10 +12221,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/kprobes.c linux-2.6.33.1/arch/x86/kern
                return ret;
  
        switch (val) {
-diff -urNp linux-2.6.33.1/arch/x86/kernel/ldt.c linux-2.6.33.1/arch/x86/kernel/ldt.c
---- linux-2.6.33.1/arch/x86/kernel/ldt.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/ldt.c       2010-03-20 16:58:39.004585163 -0400
-@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
+diff -urNp linux-2.6.34/arch/x86/kernel/ldt.c linux-2.6.34/arch/x86/kernel/ldt.c
+--- linux-2.6.34/arch/x86/kernel/ldt.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/ldt.c 2010-07-01 20:45:14.000000000 -0400
+@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
        if (reload) {
  #ifdef CONFIG_SMP
                preempt_disable();
@@ -11559,7 +12240,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ldt.c linux-2.6.33.1/arch/x86/kernel/l
  #endif
        }
        if (oldsize) {
-@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t 
+@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t 
                return err;
  
        for (i = 0; i < old->size; i++)
@@ -11568,7 +12249,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ldt.c linux-2.6.33.1/arch/x86/kernel/l
        return 0;
  }
  
-@@ -115,6 +115,24 @@ int init_new_context(struct task_struct 
+@@ -116,6 +116,24 @@ int init_new_context(struct task_struct 
                retval = copy_ldt(&mm->context, &old_mm->context);
                mutex_unlock(&old_mm->context.lock);
        }
@@ -11593,7 +12274,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ldt.c linux-2.6.33.1/arch/x86/kernel/l
        return retval;
  }
  
-@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, u
+@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, u
                }
        }
  
@@ -11607,9 +12288,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ldt.c linux-2.6.33.1/arch/x86/kernel/l
        fill_ldt(&ldt, &ldt_info);
        if (oldmode)
                ldt.avl = 0;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.33.1/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.33.1/arch/x86/kernel/machine_kexec_32.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/machine_kexec_32.c  2010-03-20 16:58:39.004585163 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/machine_kexec_32.c linux-2.6.34/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.34/arch/x86/kernel/machine_kexec_32.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/machine_kexec_32.c    2010-07-01 20:45:14.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -11637,9 +12318,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/machine_kexec_32.c linux-2.6.33.1/arch
  
        relocate_kernel_ptr = control_page;
        page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_amd.c linux-2.6.33.1/arch/x86/kernel/microcode_amd.c
---- linux-2.6.33.1/arch/x86/kernel/microcode_amd.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/microcode_amd.c     2010-03-20 16:58:39.004585163 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/microcode_amd.c linux-2.6.34/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.34/arch/x86/kernel/microcode_amd.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/microcode_amd.c       2010-07-01 20:45:14.000000000 -0400
 @@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
        uci->mc = NULL;
  }
@@ -11658,9 +12339,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_amd.c linux-2.6.33.1/arch/x8
  {
        return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_core.c linux-2.6.33.1/arch/x86/kernel/microcode_core.c
---- linux-2.6.33.1/arch/x86/kernel/microcode_core.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/microcode_core.c    2010-03-20 16:58:39.004585163 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/microcode_core.c linux-2.6.34/arch/x86/kernel/microcode_core.c
+--- linux-2.6.34/arch/x86/kernel/microcode_core.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/microcode_core.c      2010-07-01 20:45:14.000000000 -0400
 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION     "2.00"
@@ -11670,9 +12351,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_core.c linux-2.6.33.1/arch/x
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_intel.c linux-2.6.33.1/arch/x86/kernel/microcode_intel.c
---- linux-2.6.33.1/arch/x86/kernel/microcode_intel.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/microcode_intel.c   2010-03-20 16:58:39.011824892 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/microcode_intel.c linux-2.6.34/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.34/arch/x86/kernel/microcode_intel.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/microcode_intel.c     2010-07-01 20:45:14.000000000 -0400
 @@ -436,13 +436,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -11707,10 +12388,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/microcode_intel.c linux-2.6.33.1/arch/
  {
        return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kernel/module.c
---- linux-2.6.33.1/arch/x86/kernel/module.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/module.c    2010-03-20 16:58:39.011824892 -0400
-@@ -34,7 +34,7 @@
+diff -urNp linux-2.6.34/arch/x86/kernel/module.c linux-2.6.34/arch/x86/kernel/module.c
+--- linux-2.6.34/arch/x86/kernel/module.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/module.c      2010-07-01 20:45:14.000000000 -0400
+@@ -35,7 +35,7 @@
  #define DEBUGP(fmt...)
  #endif
  
@@ -11719,7 +12400,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
  {
        struct vm_struct *area;
  
-@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
+@@ -49,8 +49,18 @@ void *module_alloc(unsigned long size)
        if (!area)
                return NULL;
  
@@ -11740,7 +12421,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
  }
  
  /* Free memory returned from module_alloc */
-@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi
+@@ -59,6 +69,40 @@ void module_free(struct module *mod, voi
        vfree(module_region);
  }
  
@@ -11781,7 +12462,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
  /* We don't need anything special. */
  int module_frob_arch_sections(Elf_Ehdr *hdr,
                              Elf_Shdr *sechdrs,
-@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -78,14 +122,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
        unsigned int i;
        Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
        Elf32_Sym *sym;
@@ -11801,7 +12482,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
                /* This is the symbol it is referring to.  Note that all
                   undefined symbols have been resolved.  */
                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -94,11 +140,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 */
@@ -11819,7 +12500,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
                        break;
                default:
                        printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
+@@ -154,21 +204,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
                case R_X86_64_NONE:
                        break;
                case R_X86_64_64:
@@ -11850,37 +12531,36 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/module.c linux-2.6.33.1/arch/x86/kerne
  #if 0
                        if ((s64)val != *(s32 *)loc)
                                goto overflow;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/paravirt.c linux-2.6.33.1/arch/x86/kernel/paravirt.c
---- linux-2.6.33.1/arch/x86/kernel/paravirt.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/paravirt.c  2010-03-20 16:58:39.012867487 -0400
-@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
- 
- /* Neat trick to map patch type back to the call within the
+diff -urNp linux-2.6.34/arch/x86/kernel/paravirt.c linux-2.6.34/arch/x86/kernel/paravirt.c
+--- linux-2.6.34/arch/x86/kernel/paravirt.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/paravirt.c    2010-07-01 20:45:14.000000000 -0400
+@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
   * corresponding structure. */
--static void *get_call_destination(u8 type)
-+static const void *get_call_destination(u8 type)
+ 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,13 +133,13 @@ static void *get_call_destination(u8 typ
-               .pv_lock_ops = pv_lock_ops,
- #endif
-       };
--      return *((void **)&tmpl + type);
-+      return *((const void **)&tmpl + type);
- }
- 
- unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
-                               unsigned long addr, unsigned len)
- {
--      void *opfunc = get_call_destination(type);
-+      const void *opfunc = get_call_destination(type);
-       unsigned ret;
- 
+@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type,
        if (opfunc == NULL)
+               /* If there's no function, patch it with a ud2a (BUG) */
+               ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
+-      else if (opfunc == _paravirt_nop)
++      else if (opfunc == (void *)_paravirt_nop)
+               /* If the operation is a nop, then nop the callsite */
+               ret = paravirt_patch_nop();
+ 
+       /* identity functions just return their single argument */
+-      else if (opfunc == _paravirt_ident_32)
++      else if (opfunc == (void *)_paravirt_ident_32)
+               ret = paravirt_patch_ident_32(insnbuf, len);
+-      else if (opfunc == _paravirt_ident_64)
++      else if (opfunc == (void *)_paravirt_ident_64)
+               ret = paravirt_patch_ident_64(insnbuf, len);
+ 
+       else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
 @@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn
        if (insn_len > len || start == NULL)
                insn_len = len;
@@ -11944,7 +12624,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/paravirt.c linux-2.6.33.1/arch/x86/ker
  
        .read_cr2 = native_read_cr2,
        .write_cr2 = native_write_cr2,
-@@ -467,6 +467,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -463,6 +463,12 @@ struct pv_mmu_ops pv_mmu_ops = {
        },
  
        .set_fixmap = native_set_fixmap,
@@ -11957,9 +12637,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/paravirt.c linux-2.6.33.1/arch/x86/ker
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.33.1/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.33.1/arch/x86/kernel/paravirt-spinlocks.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/paravirt-spinlocks.c        2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/paravirt-spinlocks.c  2010-07-01 20:45:14.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
        arch_spin_lock(lock);
  }
@@ -11969,9 +12649,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.33.1/ar
  #ifdef CONFIG_SMP
        .spin_is_locked = __ticket_spin_is_locked,
        .spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.33.1/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.33.1/arch/x86/kernel/pci-calgary_64.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/pci-calgary_64.c    2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/pci-calgary_64.c linux-2.6.34/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.34/arch/x86/kernel/pci-calgary_64.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/pci-calgary_64.c      2010-07-01 20:45:14.000000000 -0400
 @@ -470,7 +470,7 @@ static void calgary_free_coherent(struct
        free_pages((unsigned long)vaddr, get_order(size));
  }
@@ -11981,10 +12661,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-calgary_64.c linux-2.6.33.1/arch/x
        .alloc_coherent = calgary_alloc_coherent,
        .free_coherent = calgary_free_coherent,
        .map_sg = calgary_map_sg,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-dma.c linux-2.6.33.1/arch/x86/kernel/pci-dma.c
---- linux-2.6.33.1/arch/x86/kernel/pci-dma.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/pci-dma.c   2010-03-20 16:58:39.012867487 -0400
-@@ -15,7 +15,7 @@
+diff -urNp linux-2.6.34/arch/x86/kernel/pci-dma.c linux-2.6.34/arch/x86/kernel/pci-dma.c
+--- linux-2.6.34/arch/x86/kernel/pci-dma.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/pci-dma.c     2010-07-01 20:45:14.000000000 -0400
+@@ -16,7 +16,7 @@
  
  static int forbid_dac __read_mostly;
  
@@ -11993,7 +12673,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-dma.c linux-2.6.33.1/arch/x86/kern
  EXPORT_SYMBOL(dma_ops);
  
  static int iommu_sac_force __read_mostly;
-@@ -240,7 +240,7 @@ early_param("iommu", iommu_setup);
+@@ -248,7 +248,7 @@ early_param("iommu", iommu_setup);
  
  int dma_supported(struct device *dev, u64 mask)
  {
@@ -12002,10 +12682,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-dma.c linux-2.6.33.1/arch/x86/kern
  
  #ifdef CONFIG_PCI
        if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-gart_64.c linux-2.6.33.1/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.33.1/arch/x86/kernel/pci-gart_64.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/pci-gart_64.c       2010-03-20 16:58:39.012867487 -0400
-@@ -695,7 +695,7 @@ static __init int init_k8_gatt(struct ag
+diff -urNp linux-2.6.34/arch/x86/kernel/pci-gart_64.c linux-2.6.34/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.34/arch/x86/kernel/pci-gart_64.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/pci-gart_64.c 2010-07-01 20:45:14.000000000 -0400
+@@ -699,7 +699,7 @@ static __init int init_k8_gatt(struct ag
        return -1;
  }
  
@@ -12014,10 +12694,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-gart_64.c linux-2.6.33.1/arch/x86/
        .map_sg                         = gart_map_sg,
        .unmap_sg                       = gart_unmap_sg,
        .map_page                       = gart_map_page,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-nommu.c linux-2.6.33.1/arch/x86/kernel/pci-nommu.c
---- linux-2.6.33.1/arch/x86/kernel/pci-nommu.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/pci-nommu.c 2010-03-20 16:58:39.012867487 -0400
-@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
+diff -urNp linux-2.6.34/arch/x86/kernel/pci-nommu.c linux-2.6.34/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.34/arch/x86/kernel/pci-nommu.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/pci-nommu.c   2010-07-01 20:45:14.000000000 -0400
+@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
        flush_write_buffers();
  }
  
@@ -12026,9 +12706,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-nommu.c linux-2.6.33.1/arch/x86/ke
        .alloc_coherent         = dma_generic_alloc_coherent,
        .free_coherent          = nommu_free_coherent,
        .map_sg                 = nommu_map_sg,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.33.1/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.33.1/arch/x86/kernel/pci-swiotlb.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/pci-swiotlb.c       2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/pci-swiotlb.c linux-2.6.34/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.34/arch/x86/kernel/pci-swiotlb.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/pci-swiotlb.c 2010-07-01 20:45:14.000000000 -0400
 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
        return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
@@ -12038,9 +12718,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/pci-swiotlb.c linux-2.6.33.1/arch/x86/
        .mapping_error = swiotlb_dma_mapping_error,
        .alloc_coherent = x86_swiotlb_alloc_coherent,
        .free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/kernel/process_32.c
---- linux-2.6.33.1/arch/x86/kernel/process_32.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/process_32.c        2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/process_32.c linux-2.6.34/arch/x86/kernel/process_32.c
+--- linux-2.6.34/arch/x86/kernel/process_32.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/process_32.c  2010-07-01 20:45:14.000000000 -0400
 @@ -66,6 +66,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -12058,7 +12738,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
                sp = regs->sp;
                ss = regs->ss & 0xffff;
                gs = get_user_gs(regs);
-@@ -203,7 +204,7 @@ int copy_thread(unsigned long clone_flag
+@@ -197,7 +198,7 @@ int copy_thread(unsigned long clone_flag
        struct task_struct *tsk;
        int err;
  
@@ -12067,7 +12747,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
        *childregs = *regs;
        childregs->ax = 0;
        childregs->sp = sp;
-@@ -237,6 +238,7 @@ int copy_thread(unsigned long clone_flag
+@@ -231,6 +232,7 @@ int copy_thread(unsigned long clone_flag
         * Set a new TLS for the child thread?
         */
        if (clone_flags & CLONE_SETTLS)
@@ -12075,7 +12755,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
                err = do_set_thread_area(p, -1,
                        (struct user_desc __user *)childregs->si, 0);
  
-@@ -307,7 +309,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -301,7 +303,7 @@ __switch_to(struct task_struct *prev_p, 
        struct thread_struct *prev = &prev_p->thread,
                                 *next = &next_p->thread;
        int cpu = smp_processor_id();
@@ -12084,7 +12764,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
        bool preload_fpu;
  
        /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -342,6 +344,11 @@ __switch_to(struct task_struct *prev_p, 
+@@ -336,6 +338,11 @@ __switch_to(struct task_struct *prev_p, 
         */
        lazy_save_gs(prev->gs);
  
@@ -12096,7 +12776,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
        /*
         * Load the per-thread Thread-Local Storage descriptor.
         */
-@@ -418,3 +425,27 @@ unsigned long get_wchan(struct task_stru
+@@ -412,3 +419,27 @@ unsigned long get_wchan(struct task_stru
        return 0;
  }
  
@@ -12124,9 +12804,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_32.c linux-2.6.33.1/arch/x86/k
 +      load_sp0(init_tss + smp_processor_id(), thread);
 +}
 +#endif
-diff -urNp linux-2.6.33.1/arch/x86/kernel/process_64.c linux-2.6.33.1/arch/x86/kernel/process_64.c
---- linux-2.6.33.1/arch/x86/kernel/process_64.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/process_64.c        2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/process_64.c linux-2.6.34/arch/x86/kernel/process_64.c
+--- linux-2.6.34/arch/x86/kernel/process_64.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/process_64.c  2010-07-01 20:45:14.000000000 -0400
 @@ -88,7 +88,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -12136,7 +12816,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_64.c linux-2.6.33.1/arch/x86/k
                return;
        __exit_idle();
  }
-@@ -389,7 +389,7 @@ __switch_to(struct task_struct *prev_p, 
+@@ -383,7 +383,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();
@@ -12145,7 +12825,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_64.c linux-2.6.33.1/arch/x86/k
        unsigned fsindex, gsindex;
        bool preload_fpu;
  
-@@ -542,12 +542,11 @@ unsigned long get_wchan(struct task_stru
+@@ -536,12 +536,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);
@@ -12160,9 +12840,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process_64.c linux-2.6.33.1/arch/x86/k
                        return 0;
                ip = *(u64 *)(fp+8);
                if (!in_sched_functions(ip))
-diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kernel/process.c
---- linux-2.6.33.1/arch/x86/kernel/process.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/process.c   2010-03-20 16:58:39.012867487 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/process.c linux-2.6.34/arch/x86/kernel/process.c
+--- linux-2.6.34/arch/x86/kernel/process.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/process.c     2010-07-01 20:45:14.000000000 -0400
 @@ -78,7 +78,7 @@ void exit_thread(void)
        unsigned long *bp = t->io_bitmap_ptr;
  
@@ -12172,7 +12852,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kern
  
                t->io_bitmap_ptr = NULL;
                clear_thread_flag(TIF_IO_BITMAP);
-@@ -105,7 +105,7 @@ void show_regs_common(void)
+@@ -112,7 +112,7 @@ void show_regs_common(void)
  
        printk(KERN_CONT "\n");
        printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
@@ -12181,7 +12861,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kern
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version, board, product);
-@@ -115,6 +115,9 @@ void flush_thread(void)
+@@ -122,6 +122,9 @@ void flush_thread(void)
  {
        struct task_struct *tsk = current;
  
@@ -12191,7 +12871,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kern
        flush_ptrace_hw_breakpoint(tsk);
        memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
        /*
-@@ -272,8 +275,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -279,8 +282,8 @@ int kernel_thread(int (*fn)(void *), voi
        regs.di = (unsigned long) arg;
  
  #ifdef CONFIG_X86_32
@@ -12202,7 +12882,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kern
        regs.fs = __KERNEL_PERCPU;
        regs.gs = __KERNEL_STACK_CANARY;
  #else
-@@ -664,17 +667,3 @@ static int __init idle_setup(char *str)
+@@ -689,17 +692,3 @@ static int __init idle_setup(char *str)
        return 0;
  }
  early_param("idle", idle_setup);
@@ -12220,10 +12900,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/process.c linux-2.6.33.1/arch/x86/kern
 -      return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
 -}
 -
-diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kernel/ptrace.c
---- linux-2.6.33.1/arch/x86/kernel/ptrace.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/ptrace.c    2010-03-20 16:58:39.012867487 -0400
-@@ -1167,7 +1167,7 @@ static const struct user_regset_view use
+diff -urNp linux-2.6.34/arch/x86/kernel/ptrace.c linux-2.6.34/arch/x86/kernel/ptrace.c
+--- linux-2.6.34/arch/x86/kernel/ptrace.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/ptrace.c      2010-07-01 20:45:14.000000000 -0400
+@@ -1145,7 +1145,7 @@ static const struct user_regset_view use
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
        int ret;
@@ -12232,7 +12912,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
  
        switch (request) {
        /* read the word at location addr in the USER area. */
-@@ -1254,14 +1254,14 @@ long arch_ptrace(struct task_struct *chi
+@@ -1232,14 +1232,14 @@ long arch_ptrace(struct task_struct *chi
                if (addr < 0)
                        return -EIO;
                ret = do_get_thread_area(child, addr,
@@ -12249,7 +12929,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
                break;
  #endif
  
-@@ -1280,12 +1280,12 @@ long arch_ptrace(struct task_struct *chi
+@@ -1258,12 +1258,12 @@ long arch_ptrace(struct task_struct *chi
  #ifdef CONFIG_X86_PTRACE_BTS
        case PTRACE_BTS_CONFIG:
                ret = ptrace_bts_config
@@ -12264,7 +12944,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
                break;
  
        case PTRACE_BTS_SIZE:
-@@ -1294,7 +1294,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -1272,7 +1272,7 @@ long arch_ptrace(struct task_struct *chi
  
        case PTRACE_BTS_GET:
                ret = ptrace_bts_read_record
@@ -12273,7 +12953,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
                break;
  
        case PTRACE_BTS_CLEAR:
-@@ -1303,7 +1303,7 @@ long arch_ptrace(struct task_struct *chi
+@@ -1281,7 +1281,7 @@ long arch_ptrace(struct task_struct *chi
  
        case PTRACE_BTS_DRAIN:
                ret = ptrace_bts_drain
@@ -12282,7 +12962,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
                break;
  #endif /* CONFIG_X86_PTRACE_BTS */
  
-@@ -1690,7 +1690,7 @@ static void fill_sigtrap_info(struct tas
+@@ -1697,7 +1697,7 @@ static void fill_sigtrap_info(struct tas
        memset(info, 0, sizeof(*info));
        info->si_signo = SIGTRAP;
        info->si_code = si_code;
@@ -12291,9 +12971,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/ptrace.c linux-2.6.33.1/arch/x86/kerne
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-2.6.33.1/arch/x86/kernel/reboot.c linux-2.6.33.1/arch/x86/kernel/reboot.c
---- linux-2.6.33.1/arch/x86/kernel/reboot.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/reboot.c    2010-03-20 16:58:39.016512700 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/reboot.c linux-2.6.34/arch/x86/kernel/reboot.c
+--- linux-2.6.34/arch/x86/kernel/reboot.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/reboot.c      2010-07-01 20:45:14.000000000 -0400
 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -12370,10 +13050,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/reboot.c linux-2.6.33.1/arch/x86/kerne
  
        /* Set up the IDT for real mode. */
        load_idt(&real_mode_idt);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/setup.c linux-2.6.33.1/arch/x86/kernel/setup.c
---- linux-2.6.33.1/arch/x86/kernel/setup.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/setup.c     2010-03-20 16:58:39.016512700 -0400
-@@ -749,14 +749,14 @@ void __init setup_arch(char **cmdline_p)
+diff -urNp linux-2.6.34/arch/x86/kernel/setup.c linux-2.6.34/arch/x86/kernel/setup.c
+--- linux-2.6.34/arch/x86/kernel/setup.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/setup.c       2010-07-01 20:45:14.000000000 -0400
+@@ -779,14 +779,14 @@ void __init setup_arch(char **cmdline_p)
  
        if (!boot_params.hdr.root_flags)
                root_mountflags &= ~MS_RDONLY;
@@ -12393,9 +13073,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/setup.c linux-2.6.33.1/arch/x86/kernel
        data_resource.end = virt_to_phys(_edata)-1;
        bss_resource.start = virt_to_phys(&__bss_start);
        bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/setup_percpu.c linux-2.6.33.1/arch/x86/kernel/setup_percpu.c
---- linux-2.6.33.1/arch/x86/kernel/setup_percpu.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/setup_percpu.c      2010-03-20 16:58:39.016512700 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/setup_percpu.c linux-2.6.34/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.34/arch/x86/kernel/setup_percpu.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/setup_percpu.c        2010-07-01 20:45:14.000000000 -0400
 @@ -27,19 +27,17 @@
  # define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
  #endif
@@ -12419,7 +13099,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/setup_percpu.c linux-2.6.33.1/arch/x86
        [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
  };
  EXPORT_SYMBOL(__per_cpu_offset);
-@@ -161,10 +159,10 @@ static inline void setup_percpu_segment(
+@@ -167,10 +165,10 @@ static inline void setup_percpu_segment(
  {
  #ifdef CONFIG_X86_32
        struct desc_struct gdt;
@@ -12433,7 +13113,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/setup_percpu.c linux-2.6.33.1/arch/x86
        write_gdt_entry(get_cpu_gdt_table(cpu),
                        GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
  #endif
-@@ -213,6 +211,11 @@ void __init setup_per_cpu_areas(void)
+@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
        /* alrighty, percpu areas up and running */
        delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
        for_each_possible_cpu(cpu) {
@@ -12445,7 +13125,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/setup_percpu.c linux-2.6.33.1/arch/x86
                per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
                per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
                per_cpu(cpu_number, cpu) = cpu;
-@@ -240,6 +243,12 @@ void __init setup_per_cpu_areas(void)
+@@ -246,6 +249,12 @@ void __init setup_per_cpu_areas(void)
                        early_per_cpu_map(x86_cpu_to_node_map, cpu);
  #endif
  #endif
@@ -12458,9 +13138,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/setup_percpu.c linux-2.6.33.1/arch/x86
                /*
                 * Up to this point, the boot CPU has been using .data.init
                 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.33.1/arch/x86/kernel/signal.c linux-2.6.33.1/arch/x86/kernel/signal.c
---- linux-2.6.33.1/arch/x86/kernel/signal.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/signal.c    2010-03-20 16:58:39.016512700 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/signal.c linux-2.6.34/arch/x86/kernel/signal.c
+--- linux-2.6.34/arch/x86/kernel/signal.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/signal.c      2010-07-01 20:45:14.000000000 -0400
 @@ -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.
@@ -12532,10 +13212,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/signal.c linux-2.6.33.1/arch/x86/kerne
                return;
  
        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/smpboot.c linux-2.6.33.1/arch/x86/kernel/smpboot.c
---- linux-2.6.33.1/arch/x86/kernel/smpboot.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/smpboot.c   2010-03-20 16:58:39.016512700 -0400
-@@ -750,7 +750,11 @@ do_rest:
+diff -urNp linux-2.6.34/arch/x86/kernel/smpboot.c linux-2.6.34/arch/x86/kernel/smpboot.c
+--- linux-2.6.34/arch/x86/kernel/smpboot.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/smpboot.c     2010-07-01 20:45:14.000000000 -0400
+@@ -761,7 +761,11 @@ do_rest:
                (unsigned long)task_stack_page(c_idle.idle) -
                KERNEL_STACK_OFFSET + THREAD_SIZE;
  #endif
@@ -12547,9 +13227,22 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/smpboot.c linux-2.6.33.1/arch/x86/kern
        initial_code = (unsigned long)start_secondary;
        stack_start.sp = (void *) c_idle.idle->thread.sp;
  
-diff -urNp linux-2.6.33.1/arch/x86/kernel/step.c linux-2.6.33.1/arch/x86/kernel/step.c
---- linux-2.6.33.1/arch/x86/kernel/step.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/step.c      2010-03-20 16:58:39.016512700 -0400
+@@ -894,6 +898,12 @@ int __cpuinit native_cpu_up(unsigned int
+ 
+       per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
+ 
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
++                      swapper_pg_dir + KERNEL_PGD_BOUNDARY,
++                      KERNEL_PGD_PTRS);
++#endif
++
+ #ifdef CONFIG_X86_32
+       /* init low mem mapping */
+       clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
+diff -urNp linux-2.6.34/arch/x86/kernel/step.c linux-2.6.34/arch/x86/kernel/step.c
+--- linux-2.6.34/arch/x86/kernel/step.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/step.c        2010-07-01 20:45:14.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
                struct desc_struct *desc;
                unsigned long base;
@@ -12582,18 +13275,18 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/step.c linux-2.6.33.1/arch/x86/kernel/
                                /* 32-bit mode: register increment */
                                return 0;
                        /* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.33.1/arch/x86/kernel/syscall_table_32.S linux-2.6.33.1/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.33.1/arch/x86/kernel/syscall_table_32.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/syscall_table_32.S  2010-03-20 16:58:39.016512700 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/syscall_table_32.S linux-2.6.34/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.34/arch/x86/kernel/syscall_table_32.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/syscall_table_32.S    2010-07-01 20:45:14.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
        .long sys_exit
-diff -urNp linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c       2010-03-20 16:58:39.016512700 -0400
-@@ -24,6 +24,21 @@
+diff -urNp linux-2.6.34/arch/x86/kernel/sys_i386_32.c linux-2.6.34/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.34/arch/x86/kernel/sys_i386_32.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/sys_i386_32.c 2010-07-01 20:45:14.000000000 -0400
+@@ -24,6 +24,221 @@
  
  #include <asm/syscalls.h>
  
@@ -12612,13 +13305,6 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c linux-2.6.33.1/arch/x86/
 +      return 0;
 +}
 +
- /*
-  * Perform the select(nd, in, out, ex, tv) and mmap() system
-  * calls. Linux/i386 didn't use to be able to handle more than
-@@ -58,6 +73,205 @@ out:
-       return err;
- }
- 
 +unsigned long
 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
 +              unsigned long len, unsigned long pgoff, unsigned long flags)
@@ -12818,30 +13504,13 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/sys_i386_32.c linux-2.6.33.1/arch/x86/
 +
 +      return addr;
 +}
- 
- struct sel_arg_struct {
-       unsigned long n;
-@@ -93,7 +307,7 @@ asmlinkage int sys_ipc(uint call, int fi
-               return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
-       case SEMTIMEDOP:
-               return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
--                                      (const struct timespec __user *)fifth);
-+                                      (__force const struct timespec __user *)fifth);
- 
-       case SEMGET:
-               return sys_semget(first, second, third);
-@@ -140,7 +354,7 @@ asmlinkage int sys_ipc(uint call, int fi
-                       ret = do_shmat(first, (char __user *) ptr, second, &raddr);
-                       if (ret)
-                               return ret;
--                      return put_user(raddr, (ulong __user *) third);
-+                      return put_user(raddr, (__force ulong __user *) third);
-               }
-               case 1: /* iBCS2 emulator entry point */
-                       if (!segment_eq(get_fs(), get_ds()))
-diff -urNp linux-2.6.33.1/arch/x86/kernel/sys_x86_64.c linux-2.6.33.1/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.33.1/arch/x86/kernel/sys_x86_64.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/sys_x86_64.c        2010-03-20 16:58:39.016512700 -0400
++
+ /*
+  * Do a system call from kernel instead of calling sys_execve so we
+  * end up with proper pt_regs.
+diff -urNp linux-2.6.34/arch/x86/kernel/sys_x86_64.c linux-2.6.34/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.34/arch/x86/kernel/sys_x86_64.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/sys_x86_64.c  2010-07-01 20:45:14.000000000 -0400
 @@ -32,8 +32,8 @@ out:
        return error;
  }
@@ -12923,9 +13592,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/sys_x86_64.c linux-2.6.33.1/arch/x86/k
        mm->cached_hole_size = ~0UL;
  
        return addr;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/time.c linux-2.6.33.1/arch/x86/kernel/time.c
---- linux-2.6.33.1/arch/x86/kernel/time.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/time.c      2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/time.c linux-2.6.34/arch/x86/kernel/time.c
+--- linux-2.6.34/arch/x86/kernel/time.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/time.c        2010-07-01 20:45:14.000000000 -0400
 @@ -26,17 +26,13 @@
  int timer_ack;
  #endif
@@ -12964,9 +13633,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/time.c linux-2.6.33.1/arch/x86/kernel/
        }
        return pc;
  }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/tls.c linux-2.6.33.1/arch/x86/kernel/tls.c
---- linux-2.6.33.1/arch/x86/kernel/tls.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/tls.c       2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/tls.c linux-2.6.34/arch/x86/kernel/tls.c
+--- linux-2.6.34/arch/x86/kernel/tls.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/tls.c 2010-07-01 20:45:14.000000000 -0400
 @@ -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;
@@ -12979,9 +13648,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/tls.c linux-2.6.33.1/arch/x86/kernel/t
        set_tls_desc(p, idx, &info, 1);
  
        return 0;
-diff -urNp linux-2.6.33.1/arch/x86/kernel/trampoline_32.S linux-2.6.33.1/arch/x86/kernel/trampoline_32.S
---- linux-2.6.33.1/arch/x86/kernel/trampoline_32.S     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/trampoline_32.S     2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/trampoline_32.S linux-2.6.34/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.34/arch/x86/kernel/trampoline_32.S       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/trampoline_32.S       2010-07-01 20:45:14.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -13004,9 +13673,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/trampoline_32.S linux-2.6.33.1/arch/x8
  
        # These need to be in the same 64K segment as the above;
        # hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.33.1/arch/x86/kernel/traps.c linux-2.6.33.1/arch/x86/kernel/traps.c
---- linux-2.6.33.1/arch/x86/kernel/traps.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/traps.c     2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/traps.c linux-2.6.34/arch/x86/kernel/traps.c
+--- linux-2.6.34/arch/x86/kernel/traps.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/traps.c       2010-07-01 20:45:14.000000000 -0400
 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -13129,7 +13798,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/traps.c linux-2.6.33.1/arch/x86/kernel
        die("general protection fault", regs, error_code);
  }
  
-@@ -556,7 +585,7 @@ dotraplinkage void __kprobes do_debug(st
+@@ -559,7 +588,7 @@ dotraplinkage void __kprobes do_debug(st
        /* It's safe to allow irq's after DR6 has been saved */
        preempt_conditional_sti(regs);
  
@@ -13138,7 +13807,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/traps.c linux-2.6.33.1/arch/x86/kernel
                handle_vm86_trap((struct kernel_vm86_regs *) regs,
                                error_code, 1);
                return;
-@@ -569,7 +598,7 @@ dotraplinkage void __kprobes do_debug(st
+@@ -572,7 +601,7 @@ dotraplinkage void __kprobes do_debug(st
         * We already checked v86 mode above, so we can check for kernel mode
         * by just checking the CPL of CS.
         */
@@ -13147,7 +13816,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/traps.c linux-2.6.33.1/arch/x86/kernel
                tsk->thread.debugreg6 &= ~DR_STEP;
                set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
                regs->flags &= ~X86_EFLAGS_TF;
-@@ -736,7 +765,7 @@ do_simd_coprocessor_error(struct pt_regs
+@@ -739,7 +768,7 @@ do_simd_coprocessor_error(struct pt_regs
         * Handle strange cache flush from user space exception
         * in all other cases.  This is undocumented behaviour.
         */
@@ -13156,9 +13825,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/traps.c linux-2.6.33.1/arch/x86/kernel
                handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
                return;
        }
-diff -urNp linux-2.6.33.1/arch/x86/kernel/tsc.c linux-2.6.33.1/arch/x86/kernel/tsc.c
---- linux-2.6.33.1/arch/x86/kernel/tsc.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/tsc.c       2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/tsc.c linux-2.6.34/arch/x86/kernel/tsc.c
+--- linux-2.6.34/arch/x86/kernel/tsc.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/tsc.c 2010-07-01 20:45:14.000000000 -0400
 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
                        DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
                },
@@ -13168,9 +13837,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/tsc.c linux-2.6.33.1/arch/x86/kernel/t
  };
  
  static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/vm86_32.c linux-2.6.33.1/arch/x86/kernel/vm86_32.c
---- linux-2.6.33.1/arch/x86/kernel/vm86_32.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/vm86_32.c   2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/vm86_32.c linux-2.6.34/arch/x86/kernel/vm86_32.c
+--- linux-2.6.34/arch/x86/kernel/vm86_32.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/vm86_32.c     2010-07-01 20:45:16.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -13235,10 +13904,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vm86_32.c linux-2.6.33.1/arch/x86/kern
        if (get_user(segoffs, intr_ptr))
                goto cannot_handle;
        if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kernel/vmi_32.c
---- linux-2.6.33.1/arch/x86/kernel/vmi_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/vmi_32.c    2010-03-20 16:58:39.020693949 -0400
-@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 
+diff -urNp linux-2.6.34/arch/x86/kernel/vmi_32.c linux-2.6.34/arch/x86/kernel/vmi_32.c
+--- linux-2.6.34/arch/x86/kernel/vmi_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/vmi_32.c      2010-07-01 20:45:14.000000000 -0400
+@@ -46,12 +46,17 @@ typedef u32 __attribute__((regparm(1))) 
  typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
  
  #define call_vrom_func(rom,func) \
@@ -13259,7 +13928,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
  static int disable_pge;
  static int disable_pse;
  static int disable_sep;
-@@ -76,10 +81,10 @@ static struct {
+@@ -78,10 +83,10 @@ static struct {
        void (*set_initial_ap_state)(int, int);
        void (*halt)(void);
        void (*set_lazy_mode)(int mode);
@@ -13272,7 +13941,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
  
  /*
   * VMI patching routines.
-@@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops;
+@@ -96,7 +101,7 @@ struct vmi_timer_ops vmi_timer_ops;
  static inline void patch_offset(void *insnbuf,
                                unsigned long ip, unsigned long dest)
  {
@@ -13281,7 +13950,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
  }
  
  static unsigned patch_internal(int call, unsigned len, void *insnbuf,
-@@ -102,6 +107,7 @@ static unsigned patch_internal(int call,
+@@ -104,6 +109,7 @@ static unsigned patch_internal(int call,
  {
        u64 reloc;
        struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
@@ -13289,7 +13958,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
        reloc = call_vrom_long_func(vmi_rom, get_reloc, call);
        switch(rel->type) {
                case VMI_RELOCATION_CALL_REL:
-@@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud
+@@ -382,13 +388,13 @@ static void vmi_set_pud(pud_t *pudp, pud
  
  static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
  {
@@ -13305,7 +13974,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
        vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
  }
  #endif
-@@ -438,8 +444,8 @@ vmi_startup_ipi_hook(int phys_apicid, un
+@@ -416,8 +422,8 @@ vmi_startup_ipi_hook(int phys_apicid, un
        ap.ss = __KERNEL_DS;
        ap.esp = (unsigned long) start_esp;
  
@@ -13316,7 +13985,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
        ap.fs = __KERNEL_PERCPU;
        ap.gs = __KERNEL_STACK_CANARY;
  
-@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
+@@ -464,6 +470,18 @@ static void vmi_leave_lazy_mmu(void)
        paravirt_leave_lazy_mmu();
  }
  
@@ -13335,7 +14004,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
  static inline int __init check_vmi_rom(struct vrom_header *rom)
  {
        struct pci_header *pci;
-@@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(s
+@@ -476,6 +494,10 @@ static inline int __init check_vmi_rom(s
                return 0;
        if (rom->vrom_signature != VMI_SIGNATURE)
                return 0;
@@ -13346,7 +14015,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
        if (rom->api_version_maj != VMI_API_REV_MAJOR ||
            rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
                printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
-@@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(v
+@@ -540,7 +562,7 @@ static inline int __init probe_vmi_rom(v
                struct vrom_header *romstart;
                romstart = (struct vrom_header *)isa_bus_to_virt(base);
                if (check_vmi_rom(romstart)) {
@@ -13355,7 +14024,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
                        return 1;
                }
        }
-@@ -836,6 +858,11 @@ static inline int __init activate_vmi(vo
+@@ -816,6 +838,11 @@ static inline int __init activate_vmi(vo
  
        para_fill(pv_irq_ops.safe_halt, Halt);
  
@@ -13367,7 +14036,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
        /*
         * Alternative instruction rewriting doesn't happen soon enough
         * to convert VMI_IRET to a call instead of a jump; so we have
-@@ -853,16 +880,16 @@ static inline int __init activate_vmi(vo
+@@ -833,16 +860,16 @@ static inline int __init activate_vmi(vo
  
  void __init vmi_init(void)
  {
@@ -13388,7 +14057,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
  
  #ifdef CONFIG_X86_IO_APIC
        /* This is virtual hardware; timer routing is wired correctly */
-@@ -874,7 +901,7 @@ void __init vmi_activate(void)
+@@ -854,7 +881,7 @@ void __init vmi_activate(void)
  {
        unsigned long flags;
  
@@ -13397,9 +14066,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmi_32.c linux-2.6.33.1/arch/x86/kerne
                return;
  
        local_irq_save(flags);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S       2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/vmlinux.lds.S linux-2.6.34/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.34/arch/x86/kernel/vmlinux.lds.S 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/vmlinux.lds.S 2010-07-03 09:50:33.000000000 -0400
 @@ -26,6 +26,22 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -13504,11 +14173,11 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
  
 -      NOTES :text :note
 +      . += __KERNEL_TEXT_OFFSET;
-+
-+      . = ALIGN(PAGE_SIZE);
-+      NOTES :rodata :note
  
 -      EXCEPTION_TABLE(16) :text = 0x9090
++      . = ALIGN(PAGE_SIZE);
++      NOTES :rodata :note
++
 +      EXCEPTION_TABLE(16) :rodata
  
        X64_ALIGN_DEBUG_RODATA_BEGIN
@@ -13620,7 +14289,8 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
 +              VMLINUX_SYMBOL(_einittext) = .;
 +              . = ALIGN(PAGE_SIZE);
 +      } :text.init
-+
+ 
+-      INIT_DATA_SECTION(16)
 +      /*
 +       * .exit.text is discard at runtime, not link time, to deal with
 +       *  references from .altinstructions and .eh_frame
@@ -13630,8 +14300,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
 +              . = ALIGN(16);
 +      } :text.exit
 +      . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
- 
--      INIT_DATA_SECTION(16)
++
 +      . = ALIGN(PAGE_SIZE);
 +      INIT_DATA_SECTION(16) :init
  
@@ -13658,8 +14327,13 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
        PERCPU(PAGE_SIZE)
  #endif
  
-@@ -295,12 +370,6 @@ SECTIONS
-               . = ALIGN(PAGE_SIZE);
+@@ -291,16 +366,10 @@ SECTIONS
+       .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
+               __smp_locks = .;
+               *(.smp_locks)
+-              . = ALIGN(PAGE_SIZE);
+               __smp_locks_end = .;
++              . = ALIGN(PAGE_SIZE);
        }
  
 -#ifdef CONFIG_X86_64
@@ -13682,7 +14356,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
 @@ -342,13 +412,12 @@ SECTIONS
   * for the boot processor.
   */
- #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
+ #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
 -INIT_PER_CPU(gdt_page);
  INIT_PER_CPU(irq_stack_union);
  
@@ -13694,9 +14368,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vmlinux.lds.S linux-2.6.33.1/arch/x86/
           "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.33.1/arch/x86/kernel/vsyscall_64.c linux-2.6.33.1/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.33.1/arch/x86/kernel/vsyscall_64.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/vsyscall_64.c       2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/vsyscall_64.c linux-2.6.34/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.34/arch/x86/kernel/vsyscall_64.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/vsyscall_64.c 2010-07-01 20:45:14.000000000 -0400
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
        write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -13714,21 +14388,21 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/vsyscall_64.c linux-2.6.33.1/arch/x86/
                p = tcache->blob[1];
        } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
                /* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.33.1/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.33.1/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.33.1/arch/x86/kernel/x8664_ksyms_64.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/x8664_ksyms_64.c    2010-03-20 16:58:39.020693949 -0400
-@@ -28,8 +28,6 @@ EXPORT_SYMBOL(__put_user_8);
- 
- EXPORT_SYMBOL(copy_user_generic);
+diff -urNp linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/x8664_ksyms_64.c      2010-07-01 20:45:14.000000000 -0400
+@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
+ EXPORT_SYMBOL(copy_user_generic_string);
+ EXPORT_SYMBOL(copy_user_generic_unrolled);
  EXPORT_SYMBOL(__copy_user_nocache);
 -EXPORT_SYMBOL(_copy_from_user);
 -EXPORT_SYMBOL(_copy_to_user);
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.33.1/arch/x86/kernel/xsave.c linux-2.6.33.1/arch/x86/kernel/xsave.c
---- linux-2.6.33.1/arch/x86/kernel/xsave.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kernel/xsave.c     2010-03-20 16:58:39.020693949 -0400
+diff -urNp linux-2.6.34/arch/x86/kernel/xsave.c linux-2.6.34/arch/x86/kernel/xsave.c
+--- linux-2.6.34/arch/x86/kernel/xsave.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kernel/xsave.c       2010-07-01 20:45:14.000000000 -0400
 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
            fx_sw_user->xstate_size > fx_sw_user->extended_size)
                return -1;
@@ -13756,10 +14430,21 @@ diff -urNp linux-2.6.33.1/arch/x86/kernel/xsave.c linux-2.6.33.1/arch/x86/kernel
                                       buf);
        if (unlikely(err)) {
                /*
-diff -urNp linux-2.6.33.1/arch/x86/kvm/emulate.c linux-2.6.33.1/arch/x86/kvm/emulate.c
---- linux-2.6.33.1/arch/x86/kvm/emulate.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kvm/emulate.c      2010-03-20 16:58:39.024538149 -0400
-@@ -413,6 +413,7 @@ static u32 group2_table[] = {
+diff -urNp linux-2.6.34/arch/x86/kvm/emulate.c linux-2.6.34/arch/x86/kvm/emulate.c
+--- linux-2.6.34/arch/x86/kvm/emulate.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kvm/emulate.c        2010-07-01 20:45:14.000000000 -0400
+@@ -84,8 +84,8 @@
+ #define Src2CL      (1<<29)
+ #define Src2ImmByte (2<<29)
+ #define Src2One     (3<<29)
+-#define Src2Imm16   (4<<29)
+-#define Src2Mask    (7<<29)
++#define Src2Imm16   (4U<<29)
++#define Src2Mask    (7U<<29)
+ 
+ enum {
+       Group1_80, Group1_81, Group1_82, Group1_83,
+@@ -438,6 +438,7 @@ static u32 group2_table[] = {
  
  #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix)    \
        do {                                                            \
@@ -13767,7 +14452,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/emulate.c linux-2.6.33.1/arch/x86/kvm/emu
                __asm__ __volatile__ (                                  \
                        _PRE_EFLAGS("0", "4", "2")                      \
                        _op _suffix " %"_x"3,%1; "                      \
-@@ -426,8 +427,6 @@ static u32 group2_table[] = {
+@@ -451,8 +452,6 @@ static u32 group2_table[] = {
  /* Raw emulation: instruction has two explicit operands. */
  #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
        do {                                                            \
@@ -13776,7 +14461,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/emulate.c linux-2.6.33.1/arch/x86/kvm/emu
                switch ((_dst).bytes) {                                 \
                case 2:                                                 \
                        ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
-@@ -443,7 +442,6 @@ static u32 group2_table[] = {
+@@ -468,7 +467,6 @@ static u32 group2_table[] = {
  
  #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
        do {                                                                 \
@@ -13784,10 +14469,22 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/emulate.c linux-2.6.33.1/arch/x86/kvm/emu
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
                        ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
-diff -urNp linux-2.6.33.1/arch/x86/kvm/svm.c linux-2.6.33.1/arch/x86/kvm/svm.c
---- linux-2.6.33.1/arch/x86/kvm/svm.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kvm/svm.c  2010-03-20 16:58:39.024538149 -0400
-@@ -2428,7 +2428,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.34/arch/x86/kvm/lapic.c linux-2.6.34/arch/x86/kvm/lapic.c
+--- linux-2.6.34/arch/x86/kvm/lapic.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kvm/lapic.c  2010-07-01 20:45:14.000000000 -0400
+@@ -52,7 +52,7 @@
+ #define APIC_BUS_CYCLE_NS 1
+ 
+ /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
+-#define apic_debug(fmt, arg...)
++#define apic_debug(fmt, arg...) do {} while (0)
+ 
+ #define APIC_LVT_NUM                  6
+ /* 14 is the version for Xeon and Pentium 8.4.8*/
+diff -urNp linux-2.6.34/arch/x86/kvm/svm.c linux-2.6.34/arch/x86/kvm/svm.c
+--- linux-2.6.34/arch/x86/kvm/svm.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kvm/svm.c    2010-07-01 20:45:14.000000000 -0400
+@@ -2457,7 +2457,11 @@ static void reload_tss(struct kvm_vcpu *
        int cpu = raw_smp_processor_id();
  
        struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -13799,8 +14496,8 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/svm.c linux-2.6.33.1/arch/x86/kvm/svm.c
        load_TR_desc();
  }
  
-@@ -2910,7 +2914,7 @@ static bool svm_gb_page_enable(void)
-       return true;
+@@ -2950,7 +2954,7 @@ static void svm_fpu_deactivate(struct kv
+       svm->vmcb->control.intercept_exceptions |= 1 << NM_VECTOR;
  }
  
 -static struct kvm_x86_ops svm_x86_ops = {
@@ -13808,10 +14505,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/svm.c linux-2.6.33.1/arch/x86/kvm/svm.c
        .cpu_has_kvm_support = has_svm,
        .disabled_by_bios = is_disabled,
        .hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
---- linux-2.6.33.1/arch/x86/kvm/vmx.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kvm/vmx.c  2010-03-20 16:58:39.024538149 -0400
-@@ -580,7 +580,11 @@ static void reload_tss(void)
+diff -urNp linux-2.6.34/arch/x86/kvm/vmx.c linux-2.6.34/arch/x86/kvm/vmx.c
+--- linux-2.6.34/arch/x86/kvm/vmx.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kvm/vmx.c    2010-07-01 20:45:14.000000000 -0400
+@@ -605,7 +605,11 @@ static void reload_tss(void)
  
        kvm_get_gdt(&gdt);
        descs = (void *)gdt.base;
@@ -13823,7 +14520,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
        load_TR_desc();
  }
  
-@@ -1385,8 +1389,11 @@ static __init int hardware_setup(void)
+@@ -1444,8 +1448,11 @@ static __init int hardware_setup(void)
        if (!cpu_has_vmx_flexpriority())
                flexpriority_enabled = 0;
  
@@ -13837,7 +14534,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
  
        if (enable_ept && !cpu_has_vmx_ept_2m_page())
                kvm_disable_largepages();
-@@ -2357,7 +2364,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2419,7 +2426,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
        vmcs_writel(HOST_IDTR_BASE, dt.base);   /* 22.2.4 */
  
        asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
@@ -13846,7 +14543,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
        vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
        vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
        vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
-@@ -3742,6 +3749,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3835,6 +3842,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
                "jmp .Lkvm_vmx_return \n\t"
                ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
                ".Lkvm_vmx_return: "
@@ -13859,7 +14556,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
                /* Save guest registers, load host registers, keep flags */
                "xchg %0,     (%%"R"sp) \n\t"
                "mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -3788,6 +3801,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3881,8 +3894,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
                [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
  #endif
                [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
@@ -13869,9 +14566,12 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
 +#endif
 +
              : "cc", "memory"
-               , R"bx", R"di", R"si"
+-              , R"bx", R"di", R"si"
++              , R"ax", R"bx", R"di", R"si"
  #ifdef CONFIG_X86_64
-@@ -3806,7 +3824,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+               , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
+ #endif
+@@ -3896,7 +3914,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
        if (vmx->rmode.irq.pending)
                fixup_rmode_irq(vmx);
  
@@ -13880,8 +14580,8 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
        vmx->launched = 1;
  
        vmx_complete_interrupts(vmx);
-@@ -3974,7 +3992,7 @@ static bool vmx_gb_page_enable(void)
-       return false;
+@@ -4115,7 +4133,7 @@ static void vmx_cpuid_update(struct kvm_
+       }
  }
  
 -static struct kvm_x86_ops vmx_x86_ops = {
@@ -13889,10 +14589,10 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/vmx.c linux-2.6.33.1/arch/x86/kvm/vmx.c
        .cpu_has_kvm_support = cpu_has_kvm_support,
        .disabled_by_bios = vmx_disabled_by_bios,
        .hardware_setup = hardware_setup,
-diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
---- linux-2.6.33.1/arch/x86/kvm/x86.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/kvm/x86.c  2010-03-20 16:58:39.024538149 -0400
-@@ -83,7 +83,7 @@ static void update_cr8_intercept(struct 
+diff -urNp linux-2.6.34/arch/x86/kvm/x86.c linux-2.6.34/arch/x86/kvm/x86.c
+--- linux-2.6.34/arch/x86/kvm/x86.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/kvm/x86.c    2010-07-01 20:45:14.000000000 -0400
+@@ -85,7 +85,7 @@ static void update_cr8_intercept(struct 
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
                                    struct kvm_cpuid_entry2 __user *entries);
  
@@ -13901,7 +14601,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
  EXPORT_SYMBOL_GPL(kvm_x86_ops);
  
  int ignore_msrs = 0;
-@@ -109,38 +109,38 @@ static struct kvm_shared_msrs_global __r
+@@ -111,38 +111,38 @@ static struct kvm_shared_msrs_global __r
  static DEFINE_PER_CPU(struct kvm_shared_msrs, shared_msrs);
  
  struct kvm_stats_debugfs_item debugfs_entries[] = {
@@ -13972,7 +14672,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
        { NULL }
  };
  
-@@ -1405,6 +1405,8 @@ long kvm_arch_dev_ioctl(struct file *fil
+@@ -1603,6 +1603,8 @@ long kvm_arch_dev_ioctl(struct file *fil
                if (n < msr_list.nmsrs)
                        goto out;
                r = -EFAULT;
@@ -13981,7 +14681,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
                if (copy_to_user(user_msr_list->indices, &msrs_to_save,
                                 num_msrs_to_save * sizeof(u32)))
                        goto out;
-@@ -1787,7 +1789,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -1994,7 +1996,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
                                    struct kvm_interrupt *irq)
  {
@@ -13990,7 +14690,7 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
                return -EINVAL;
        if (irqchip_in_kernel(vcpu->kvm))
                return -ENXIO;
-@@ -3414,10 +3416,10 @@ static void kvm_timer_init(void)
+@@ -3747,10 +3749,10 @@ static void kvm_timer_init(void)
        }
  }
  
@@ -14003,9 +14703,9 @@ diff -urNp linux-2.6.33.1/arch/x86/kvm/x86.c linux-2.6.33.1/arch/x86/kvm/x86.c
  
        if (kvm_x86_ops) {
                printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.33.1/arch/x86/lib/checksum_32.S linux-2.6.33.1/arch/x86/lib/checksum_32.S
---- linux-2.6.33.1/arch/x86/lib/checksum_32.S  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/checksum_32.S  2010-03-20 16:58:39.024538149 -0400
+diff -urNp linux-2.6.34/arch/x86/lib/checksum_32.S linux-2.6.34/arch/x86/lib/checksum_32.S
+--- linux-2.6.34/arch/x86/lib/checksum_32.S    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/checksum_32.S    2010-07-01 20:45:14.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -14251,9 +14951,9 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/checksum_32.S linux-2.6.33.1/arch/x86/lib
                                
  #undef ROUND
  #undef ROUND1         
-diff -urNp linux-2.6.33.1/arch/x86/lib/clear_page_64.S linux-2.6.33.1/arch/x86/lib/clear_page_64.S
---- linux-2.6.33.1/arch/x86/lib/clear_page_64.S        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/clear_page_64.S        2010-03-20 16:58:39.028522513 -0400
+diff -urNp linux-2.6.34/arch/x86/lib/clear_page_64.S linux-2.6.34/arch/x86/lib/clear_page_64.S
+--- linux-2.6.34/arch/x86/lib/clear_page_64.S  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/clear_page_64.S  2010-07-01 20:45:14.000000000 -0400
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -14263,9 +14963,9 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/clear_page_64.S linux-2.6.33.1/arch/x86/l
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (clear_page_c - clear_page) - (2f - 1b)   /* offset */
  2:
-diff -urNp linux-2.6.33.1/arch/x86/lib/copy_page_64.S linux-2.6.33.1/arch/x86/lib/copy_page_64.S
---- linux-2.6.33.1/arch/x86/lib/copy_page_64.S 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/copy_page_64.S 2010-03-20 16:58:39.028522513 -0400
+diff -urNp linux-2.6.34/arch/x86/lib/copy_page_64.S linux-2.6.34/arch/x86/lib/copy_page_64.S
+--- linux-2.6.34/arch/x86/lib/copy_page_64.S   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/copy_page_64.S   2010-07-01 20:45:14.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -14275,10 +14975,17 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/copy_page_64.S linux-2.6.33.1/arch/x86/li
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (copy_page_c - copy_page) - (2f - 1b)     /* offset */
  2:
-diff -urNp linux-2.6.33.1/arch/x86/lib/copy_user_64.S linux-2.6.33.1/arch/x86/lib/copy_user_64.S
---- linux-2.6.33.1/arch/x86/lib/copy_user_64.S 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/copy_user_64.S 2010-03-20 16:58:39.028522513 -0400
-@@ -21,7 +21,7 @@
+diff -urNp linux-2.6.34/arch/x86/lib/copy_user_64.S linux-2.6.34/arch/x86/lib/copy_user_64.S
+--- linux-2.6.34/arch/x86/lib/copy_user_64.S   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/copy_user_64.S   2010-07-01 20:45:14.000000000 -0400
+@@ -15,13 +15,14 @@
+ #include <asm/asm-offsets.h>
+ #include <asm/thread_info.h>
+ #include <asm/cpufeature.h>
++#include <asm/pgtable.h>
+ 
+       .macro ALTERNATIVE_JUMP feature,orig,alt
+ 0:
        .byte 0xe9      /* 32bit jump */
        .long \orig-1f  /* by default jump to orig */
  1:
@@ -14287,7 +14994,7 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/copy_user_64.S linux-2.6.33.1/arch/x86/li
  2:    .byte 0xe9                      /* near jump with 32bit immediate */
        .long \alt-1b /* offset */   /* or alternatively to alt */
        .previous
-@@ -64,32 +64,6 @@
+@@ -64,37 +65,13 @@
  #endif
        .endm
  
@@ -14317,10 +15024,8 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/copy_user_64.S linux-2.6.33.1/arch/x86/li
 -      CFI_ENDPROC
 -ENDPROC(_copy_from_user)
 -
- ENTRY(copy_user_generic)
-       CFI_STARTPROC
-       ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
-@@ -101,6 +75,8 @@ ENDPROC(copy_user_generic)
+       .section .fixup,"ax"
+       /* must zero dest */
  ENTRY(bad_from_user)
  bad_from_user:
        CFI_STARTPROC
@@ -14329,14 +15034,63 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/copy_user_64.S linux-2.6.33.1/arch/x86/li
        movl %edx,%ecx
        xorl %eax,%eax
        rep
-diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/getuser.S
---- linux-2.6.33.1/arch/x86/lib/getuser.S      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/getuser.S      2010-03-20 16:58:39.028522513 -0400
-@@ -33,14 +33,28 @@
+diff -urNp linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/copy_user_nocache_64.S   2010-07-01 20:45:14.000000000 -0400
+@@ -14,6 +14,7 @@
+ #include <asm/current.h>
+ #include <asm/asm-offsets.h>
+ #include <asm/thread_info.h>
++#include <asm/pgtable.h>
+ 
+       .macro ALIGN_DESTINATION
+ #ifdef FIX_ALIGNMENT
+@@ -50,6 +51,15 @@
+  */
+ ENTRY(__copy_user_nocache)
+       CFI_STARTPROC
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      mov $PAX_USER_SHADOW_BASE,%rcx
++      cmp %rcx,%rsi
++      jae 1f
++      add %rcx,%rsi
++1:
++#endif
++
+       cmpl $8,%edx
+       jb 20f          /* less then 8 bytes, go to byte copy loop */
+       ALIGN_DESTINATION
+diff -urNp linux-2.6.34/arch/x86/lib/csum-wrappers_64.c linux-2.6.34/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.34/arch/x86/lib/csum-wrappers_64.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/csum-wrappers_64.c       2010-07-01 20:45:14.000000000 -0400
+@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
+                       len -= 2;
+               }
+       }
++      if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++              src += PAX_USER_SHADOW_BASE;
+       isum = csum_partial_copy_generic((__force const void *)src,
+                               dst, len, isum, errp, NULL);
+       if (unlikely(*errp))
+@@ -105,6 +107,8 @@ csum_partial_copy_to_user(const void *sr
+       }
+ 
+       *errp = 0;
++      if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
++              dst += PAX_USER_SHADOW_BASE;
+       return csum_partial_copy_generic(src, (void __force *)dst,
+                                        len, isum, NULL, errp);
+ }
+diff -urNp linux-2.6.34/arch/x86/lib/getuser.S linux-2.6.34/arch/x86/lib/getuser.S
+--- linux-2.6.34/arch/x86/lib/getuser.S        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/getuser.S        2010-07-01 20:45:14.000000000 -0400
+@@ -33,14 +33,38 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
  #include <asm/asm.h>
 +#include <asm/segment.h>
++#include <asm/pgtable.h>
  
        .text
  ENTRY(__get_user_1)
@@ -14349,6 +15103,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
++      cmp %_ASM_DX,%_ASM_AX
++      jae 1234f
++      add %_ASM_DX,%_ASM_AX
++1234:
++#endif
++
 +#endif
 +
  1:    movzb (%_ASM_AX),%edx
@@ -14361,7 +15124,7 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -49,11 +63,24 @@ ENDPROC(__get_user_1)
+@@ -49,11 +73,33 @@ ENDPROC(__get_user_1)
  ENTRY(__get_user_2)
        CFI_STARTPROC
        add $1,%_ASM_AX
@@ -14374,6 +15137,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
++      cmp %_ASM_DX,%_ASM_AX
++      jae 1234f
++      add %_ASM_DX,%_ASM_AX
++1234:
++#endif
++
 +#endif
 +
  2:    movzwl -1(%_ASM_AX),%edx
@@ -14386,7 +15158,7 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -62,11 +89,24 @@ ENDPROC(__get_user_2)
+@@ -62,11 +108,33 @@ ENDPROC(__get_user_2)
  ENTRY(__get_user_4)
        CFI_STARTPROC
        add $3,%_ASM_AX
@@ -14399,6 +15171,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
++      cmp %_ASM_DX,%_ASM_AX
++      jae 1234f
++      add %_ASM_DX,%_ASM_AX
++1234:
++#endif
++
 +#endif
 +
  3:    mov -3(%_ASM_AX),%edx
@@ -14411,7 +15192,23 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        xor %eax,%eax
        ret
        CFI_ENDPROC
-@@ -89,6 +129,12 @@ ENDPROC(__get_user_8)
+@@ -80,6 +148,15 @@ ENTRY(__get_user_8)
+       GET_THREAD_INFO(%_ASM_DX)
+       cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+       jae     bad_get_user
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++      mov $PAX_USER_SHADOW_BASE,%_ASM_DX
++      cmp %_ASM_DX,%_ASM_AX
++      jae 1234f
++      add %_ASM_DX,%_ASM_AX
++1234:
++#endif
++
+ 4:    movq -7(%_ASM_AX),%_ASM_DX
+       xor %eax,%eax
+       ret
+@@ -89,6 +166,12 @@ ENDPROC(__get_user_8)
  
  bad_get_user:
        CFI_STARTPROC
@@ -14424,33 +15221,9 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/getuser.S linux-2.6.33.1/arch/x86/lib/get
        xor %edx,%edx
        mov $(-EFAULT),%_ASM_AX
        ret
-diff -urNp linux-2.6.33.1/arch/x86/lib/memcpy_64.S linux-2.6.33.1/arch/x86/lib/memcpy_64.S
---- linux-2.6.33.1/arch/x86/lib/memcpy_64.S    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/memcpy_64.S    2010-03-20 16:58:39.028522513 -0400
-@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
-        * It is also a lot simpler. Use this when possible:
-        */
- 
--      .section .altinstr_replacement, "ax"
-+      .section .altinstr_replacement, "a"
- 1:    .byte 0xeb                              /* jmp <disp8> */
-       .byte (memcpy_c - memcpy) - (2f - 1b)   /* offset */
- 2:
-diff -urNp linux-2.6.33.1/arch/x86/lib/memset_64.S linux-2.6.33.1/arch/x86/lib/memset_64.S
---- linux-2.6.33.1/arch/x86/lib/memset_64.S    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/memset_64.S    2010-03-20 16:58:39.028522513 -0400
-@@ -118,7 +118,7 @@ ENDPROC(__memset)
- 
- #include <asm/cpufeature.h>
- 
--      .section .altinstr_replacement,"ax"
-+      .section .altinstr_replacement,"a"
- 1:    .byte 0xeb                              /* jmp <disp8> */
-       .byte (memset_c - memset) - (2f - 1b)   /* offset */
- 2:
-diff -urNp linux-2.6.33.1/arch/x86/lib/mmx_32.c linux-2.6.33.1/arch/x86/lib/mmx_32.c
---- linux-2.6.33.1/arch/x86/lib/mmx_32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/mmx_32.c       2010-03-20 16:58:39.028522513 -0400
+diff -urNp linux-2.6.34/arch/x86/lib/mmx_32.c linux-2.6.34/arch/x86/lib/mmx_32.c
+--- linux-2.6.34/arch/x86/lib/mmx_32.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/mmx_32.c 2010-07-01 20:45:14.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
        void *p;
@@ -14766,18 +15539,20 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/mmx_32.c linux-2.6.33.1/arch/x86/lib/mmx_
  
                from += 64;
                to += 64;
-diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/putuser.S
---- linux-2.6.33.1/arch/x86/lib/putuser.S      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/putuser.S      2010-03-20 16:58:39.028522513 -0400
-@@ -15,6 +15,7 @@
+diff -urNp linux-2.6.34/arch/x86/lib/putuser.S linux-2.6.34/arch/x86/lib/putuser.S
+--- linux-2.6.34/arch/x86/lib/putuser.S        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/putuser.S        2010-07-01 20:45:14.000000000 -0400
+@@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
  #include <asm/asm.h>
+-
 +#include <asm/segment.h>
- 
++#include <asm/pgtable.h>
  
  /*
-@@ -29,59 +30,120 @@
+  * __put_user_X
+@@ -29,59 +30,156 @@
   * as they get called from within inline assembly.
   */
  
@@ -14798,6 +15573,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/put
 +      GET_THREAD_INFO(%_ASM_BX)
        cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
        jae bad_put_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_BX
++      cmp %_ASM_BX,%_ASM_CX
++      jae 1234f
++      add %_ASM_BX,%_ASM_CX
++1234:
++#endif
++
 +#endif
 +
  1:    movb %al,(%_ASM_CX)
@@ -14823,6 +15607,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/put
        sub $1,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_BX
++      cmp %_ASM_BX,%_ASM_CX
++      jae 1234f
++      add %_ASM_BX,%_ASM_CX
++1234:
++#endif
++
 +#endif
 +
  2:    movw %ax,(%_ASM_CX)
@@ -14848,6 +15641,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/put
        sub $3,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_BX
++      cmp %_ASM_BX,%_ASM_CX
++      jae 1234f
++      add %_ASM_BX,%_ASM_CX
++1234:
++#endif
++
 +#endif
 +
  3:    movl %eax,(%_ASM_CX)
@@ -14873,6 +15675,15 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/put
        sub $7,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      mov $PAX_USER_SHADOW_BASE,%_ASM_BX
++      cmp %_ASM_BX,%_ASM_CX
++      jae 1234f
++      add %_ASM_BX,%_ASM_CX
++1234:
++#endif
++
 +#endif
 +
  4:    mov %_ASM_AX,(%_ASM_CX)
@@ -14900,9 +15711,9 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/putuser.S linux-2.6.33.1/arch/x86/lib/put
        movl $-EFAULT,%eax
        EXIT
  END(bad_put_user)
-diff -urNp linux-2.6.33.1/arch/x86/lib/usercopy_32.c linux-2.6.33.1/arch/x86/lib/usercopy_32.c
---- linux-2.6.33.1/arch/x86/lib/usercopy_32.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/lib/usercopy_32.c  2010-03-20 16:58:39.028522513 -0400
+diff -urNp linux-2.6.34/arch/x86/lib/usercopy_32.c linux-2.6.34/arch/x86/lib/usercopy_32.c
+--- linux-2.6.34/arch/x86/lib/usercopy_32.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/usercopy_32.c    2010-07-01 20:45:14.000000000 -0400
 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
   * Copy a null terminated string from userspace.
   */
@@ -15887,10 +16698,49 @@ diff -urNp linux-2.6.33.1/arch/x86/lib/usercopy_32.c linux-2.6.33.1/arch/x86/lib
 +#endif
 +
 +EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.33.1/arch/x86/Makefile linux-2.6.33.1/arch/x86/Makefile
---- linux-2.6.33.1/arch/x86/Makefile   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/Makefile   2010-03-20 16:58:39.028522513 -0400
-@@ -192,3 +192,12 @@ define archhelp
+diff -urNp linux-2.6.34/arch/x86/lib/usercopy_64.c linux-2.6.34/arch/x86/lib/usercopy_64.c
+--- linux-2.6.34/arch/x86/lib/usercopy_64.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/lib/usercopy_64.c    2010-07-01 20:45:14.000000000 -0400
+@@ -42,6 +42,8 @@ long
+ __strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+       long res;
++      if ((unsigned long)src < PAX_USER_SHADOW_BASE)
++              src += PAX_USER_SHADOW_BASE;
+       __do_strncpy_from_user(dst, src, count, res);
+       return res;
+ }
+@@ -65,6 +67,8 @@ unsigned long __clear_user(void __user *
+ {
+       long __d0;
+       might_fault();
++      if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
++              addr += PAX_USER_SHADOW_BASE;
+       /* no memory constraint because it doesn't change any memory gcc knows
+          about */
+       asm volatile(
+@@ -151,10 +155,14 @@ EXPORT_SYMBOL(strlen_user);
+ 
+ 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)) { 
++      if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
++              if ((unsigned long)to < PAX_USER_SHADOW_BASE)
++                      to += PAX_USER_SHADOW_BASE;
++              if ((unsigned long)from < PAX_USER_SHADOW_BASE)
++                      from += PAX_USER_SHADOW_BASE;
+               return copy_user_generic((__force void *)to, (__force void *)from, len);
+-      } 
+-      return len;             
++      }
++      return len;
+ }
+ EXPORT_SYMBOL(copy_in_user);
+ 
+diff -urNp linux-2.6.34/arch/x86/Makefile linux-2.6.34/arch/x86/Makefile
+--- linux-2.6.34/arch/x86/Makefile     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/Makefile     2010-07-01 20:45:14.000000000 -0400
+@@ -190,3 +190,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
  endef
@@ -15903,9 +16753,9 @@ diff -urNp linux-2.6.33.1/arch/x86/Makefile linux-2.6.33.1/arch/x86/Makefile
 +
 +archprepare:
 +      $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.33.1/arch/x86/mm/extable.c linux-2.6.33.1/arch/x86/mm/extable.c
---- linux-2.6.33.1/arch/x86/mm/extable.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/extable.c       2010-03-20 16:58:39.032549699 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/extable.c linux-2.6.34/arch/x86/mm/extable.c
+--- linux-2.6.34/arch/x86/mm/extable.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/extable.c 2010-07-01 20:45:14.000000000 -0400
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -15979,10 +16829,10 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/extable.c linux-2.6.33.1/arch/x86/mm/extab
                extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
                extern u32 pnp_bios_is_utter_crap;
                pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
---- linux-2.6.33.1/arch/x86/mm/fault.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/fault.c 2010-03-20 16:58:39.032549699 -0400
-@@ -11,10 +11,14 @@
+diff -urNp linux-2.6.34/arch/x86/mm/fault.c linux-2.6.34/arch/x86/mm/fault.c
+--- linux-2.6.34/arch/x86/mm/fault.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/fault.c   2010-07-01 20:45:16.000000000 -0400
+@@ -11,10 +11,19 @@
  #include <linux/kprobes.h>            /* __kprobes, ...               */
  #include <linux/mmiotrace.h>          /* kmmio_handler, ...           */
  #include <linux/perf_event.h>         /* perf_sw_event                */
@@ -15994,10 +16844,15 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
  #include <asm/kmemcheck.h>            /* kmemcheck_*(), ...           */
 +#include <asm/vsyscall.h>
 +#include <asm/tlbflush.h>
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#include <asm/stacktrace.h>
++#include "../kernel/dumpstack.h"
++#endif
  
  /*
   * Page fault error code bits:
-@@ -52,7 +56,7 @@ static inline int __kprobes notify_page_
+@@ -52,7 +61,7 @@ static inline int __kprobes notify_page_
        int ret = 0;
  
        /* kprobe_running() needs smp_processor_id() */
@@ -16006,7 +16861,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
                preempt_disable();
                if (kprobe_running() && kprobe_fault_handler(regs, 14))
                        ret = 1;
-@@ -173,6 +177,30 @@ force_sig_info_fault(int si_signo, int s
+@@ -173,6 +182,30 @@ force_sig_info_fault(int si_signo, int s
        force_sig_info(si_signo, &info, tsk);
  }
  
@@ -16037,7 +16892,88 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -536,7 +564,7 @@ static int is_errata93(struct pt_regs *r
+@@ -225,11 +258,24 @@ void vmalloc_sync_all(void)
+            address += PMD_SIZE) {
+ 
+               unsigned long flags;
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              unsigned long cpu;
++#else
+               struct page *page;
++#endif
+ 
+               spin_lock_irqsave(&pgd_lock, flags);
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++                      pgd_t *pgd = get_cpu_pgd(cpu);
++#else
+               list_for_each_entry(page, &pgd_list, lru) {
+-                      if (!vmalloc_sync_one(page_address(page), address))
++                      pgd_t *pgd = page_address(page);
++#endif
++
++                      if (!vmalloc_sync_one(pgd, address))
+                               break;
+               }
+               spin_unlock_irqrestore(&pgd_lock, flags);
+@@ -259,6 +305,11 @@ static noinline __kprobes int vmalloc_fa
+        * an interrupt in the middle of a task switch..
+        */
+       pgd_paddr = read_cr3();
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
++#endif
++
+       pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
+       if (!pmd_k)
+               return -1;
+@@ -333,15 +384,27 @@ void vmalloc_sync_all(void)
+ 
+               const pgd_t *pgd_ref = pgd_offset_k(address);
+               unsigned long flags;
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              unsigned long cpu;
++#else
+               struct page *page;
++#endif
+ 
+               if (pgd_none(*pgd_ref))
+                       continue;
+ 
+               spin_lock_irqsave(&pgd_lock, flags);
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++                      pgd_t *pgd = pgd_offset_cpu(cpu, address);
++#else
+               list_for_each_entry(page, &pgd_list, lru) {
+                       pgd_t *pgd;
+                       pgd = (pgd_t *)page_address(page) + pgd_index(address);
++#endif
++
+                       if (pgd_none(*pgd))
+                               set_pgd(pgd, *pgd_ref);
+                       else
+@@ -374,7 +437,14 @@ static noinline __kprobes int vmalloc_fa
+        * happen within a race in page table update. In the later
+        * case just flush:
+        */
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
++      pgd = pgd_offset_cpu(smp_processor_id(), address);
++#else
+       pgd = pgd_offset(current->active_mm, address);
++#endif
++
+       pgd_ref = pgd_offset_k(address);
+       if (pgd_none(*pgd_ref))
+               return -1;
+@@ -536,7 +606,7 @@ static int is_errata93(struct pt_regs *r
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -16046,7 +16982,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
                return 1;
  #endif
        return 0;
-@@ -563,7 +591,7 @@ static int is_f00f_bug(struct pt_regs *r
+@@ -563,7 +633,7 @@ static int is_f00f_bug(struct pt_regs *r
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -16055,7 +16991,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -572,15 +600,26 @@ show_fault_oops(struct pt_regs *regs, un
+@@ -572,15 +642,26 @@ show_fault_oops(struct pt_regs *regs, un
        if (!oops_may_print())
                return;
  
@@ -16084,7 +17020,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
        printk(KERN_ALERT "BUG: unable to handle kernel ");
        if (address < PAGE_SIZE)
                printk(KERN_CONT "NULL pointer dereference");
-@@ -705,6 +744,68 @@ __bad_area_nosemaphore(struct pt_regs *r
+@@ -705,6 +786,68 @@ __bad_area_nosemaphore(struct pt_regs *r
                       unsigned long address, int si_code)
  {
        struct task_struct *tsk = current;
@@ -16153,7 +17089,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
  
        /* User mode accesses just cause a SIGSEGV */
        if (error_code & PF_USER) {
-@@ -849,6 +950,106 @@ static int spurious_fault_check(unsigned
+@@ -849,6 +992,106 @@ static int spurious_fault_check(unsigned
        return 1;
  }
  
@@ -16260,7 +17196,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -915,6 +1116,9 @@ int show_unhandled_signals = 1;
+@@ -915,6 +1158,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
  {
@@ -16270,7 +17206,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
        if (write) {
                /* write, present and write, not present: */
                if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -948,17 +1152,16 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -948,17 +1194,31 @@ do_page_fault(struct pt_regs *regs, unsi
  {
        struct vm_area_struct *vma;
        struct task_struct *tsk;
@@ -16280,7 +17216,22 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
        int fault;
  
 +      /* Get the faulting address: */
-+      const unsigned long address = read_cr2();
++      unsigned long address = read_cr2();
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++      if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
++              if (!search_exception_tables(regs->ip)) {
++                      bad_area_nosemaphore(regs, error_code, address);
++                      return;
++              }
++              if (address < PAX_USER_SHADOW_BASE) {
++                      printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
++                      printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
++                      show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
++              } else
++                      address -= PAX_USER_SHADOW_BASE;
++      }
++#endif
 +
        tsk = current;
        mm = tsk->mm;
@@ -16291,7 +17242,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/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.
-@@ -1018,7 +1221,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1018,7 +1278,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:
         */
@@ -16300,7 +17251,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
                local_irq_enable();
                error_code |= PF_USER;
        } else {
-@@ -1072,6 +1275,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1072,6 +1332,11 @@ do_page_fault(struct pt_regs *regs, unsi
                might_sleep();
        }
  
@@ -16312,7 +17263,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
        vma = find_vma(mm, address);
        if (unlikely(!vma)) {
                bad_area(regs, error_code, address);
-@@ -1083,18 +1291,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1083,18 +1348,24 @@ do_page_fault(struct pt_regs *regs, unsi
                bad_area(regs, error_code, address);
                return;
        }
@@ -16336,19 +17287,19 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
 +      if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
 +              bad_area(regs, error_code, address);
 +              return;
-+      }
+       }
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
 +              bad_area(regs, error_code, address);
 +              return;
-       }
++      }
 +#endif
 +
        if (unlikely(expand_stack(vma, address))) {
                bad_area(regs, error_code, address);
                return;
-@@ -1138,3 +1352,199 @@ good_area:
+@@ -1138,3 +1409,199 @@ good_area:
  
        up_read(&mm->mmap_sem);
  }
@@ -16548,9 +17499,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/fault.c linux-2.6.33.1/arch/x86/mm/fault.c
 +
 +      return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.33.1/arch/x86/mm/gup.c linux-2.6.33.1/arch/x86/mm/gup.c
---- linux-2.6.33.1/arch/x86/mm/gup.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/gup.c   2010-03-20 16:58:39.032549699 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/gup.c linux-2.6.34/arch/x86/mm/gup.c
+--- linux-2.6.34/arch/x86/mm/gup.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/gup.c     2010-07-01 20:45:14.000000000 -0400
 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 
        addr = start;
        len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -16560,9 +17511,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/gup.c linux-2.6.33.1/arch/x86/mm/gup.c
                                        (void __user *)start, len)))
                return 0;
  
-diff -urNp linux-2.6.33.1/arch/x86/mm/highmem_32.c linux-2.6.33.1/arch/x86/mm/highmem_32.c
---- linux-2.6.33.1/arch/x86/mm/highmem_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/highmem_32.c    2010-03-20 16:58:39.032549699 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/highmem_32.c linux-2.6.34/arch/x86/mm/highmem_32.c
+--- linux-2.6.34/arch/x86/mm/highmem_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/highmem_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
        idx = type + KM_TYPE_NR*smp_processor_id();
        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -16574,10 +17525,10 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/highmem_32.c linux-2.6.33.1/arch/x86/mm/hi
  
        return (void *)vaddr;
  }
-diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/hugetlbpage.c
---- linux-2.6.33.1/arch/x86/mm/hugetlbpage.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/hugetlbpage.c   2010-03-20 16:58:39.032549699 -0400
-@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
+diff -urNp linux-2.6.34/arch/x86/mm/hugetlbpage.c linux-2.6.34/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.34/arch/x86/mm/hugetlbpage.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/hugetlbpage.c     2010-07-01 20:45:14.000000000 -0400
+@@ -266,13 +266,18 @@ static unsigned long hugetlb_get_unmappe
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
@@ -16600,7 +17551,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
        }
  
  full_search:
-@@ -281,13 +286,13 @@ full_search:
+@@ -280,13 +285,13 @@ full_search:
  
        for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
                /* At this point:  (!vma || addr < vma->vm_end). */
@@ -16617,7 +17568,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
                                mm->cached_hole_size = 0;
                                goto full_search;
                        }
-@@ -310,9 +315,8 @@ static unsigned long hugetlb_get_unmappe
+@@ -309,9 +314,8 @@ static unsigned long hugetlb_get_unmappe
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma, *prev_vma;
@@ -16628,7 +17579,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
  
        /* don't allow allocations above current base */
        if (mm->free_area_cache > base)
-@@ -322,7 +326,7 @@ static unsigned long hugetlb_get_unmappe
+@@ -321,7 +325,7 @@ static unsigned long hugetlb_get_unmappe
                largest_hole = 0;
                mm->free_area_cache  = base;
        }
@@ -16637,7 +17588,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
        /* make sure it can fit in the remaining address space */
        if (mm->free_area_cache < len)
                goto fail;
-@@ -364,22 +368,26 @@ try_again:
+@@ -363,22 +367,26 @@ try_again:
  
  fail:
        /*
@@ -16675,7 +17626,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
        mm->cached_hole_size = ~0UL;
        addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
                        len, pgoff, flags);
-@@ -387,6 +395,7 @@ fail:
+@@ -386,6 +394,7 @@ fail:
        /*
         * Restore the topdown base:
         */
@@ -16683,7 +17634,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
        mm->free_area_cache = base;
        mm->cached_hole_size = ~0UL;
  
-@@ -400,10 +409,17 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -399,10 +408,17 @@ hugetlb_get_unmapped_area(struct file *f
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
@@ -16702,7 +17653,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
                return -ENOMEM;
  
        if (flags & MAP_FIXED) {
-@@ -415,7 +431,7 @@ hugetlb_get_unmapped_area(struct file *f
+@@ -414,7 +430,7 @@ hugetlb_get_unmapped_area(struct file *f
        if (addr) {
                addr = ALIGN(addr, huge_page_size(h));
                vma = find_vma(mm, addr);
@@ -16711,9 +17662,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/hugetlbpage.c linux-2.6.33.1/arch/x86/mm/h
                    (!vma || addr + len <= vma->vm_start))
                        return addr;
        }
-diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_32.c
---- linux-2.6.33.1/arch/x86/mm/init_32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/init_32.c       2010-03-20 16:58:39.032549699 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/init_32.c linux-2.6.34/arch/x86/mm/init_32.c
+--- linux-2.6.34/arch/x86/mm/init_32.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/init_32.c 2010-07-01 20:45:14.000000000 -0400
 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -16829,8 +17780,8 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
  }
  
  /*
-@@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned lo
-       int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
+@@ -244,9 +244,10 @@ kernel_physical_mapping_init(unsigned lo
+       unsigned long last_map_addr = end;
        unsigned long start_pfn, end_pfn;
        pgd_t *pgd_base = swapper_pg_dir;
 -      int pgd_idx, pmd_idx, pte_ofs;
@@ -16841,7 +17792,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
        pmd_t *pmd;
        pte_t *pte;
        unsigned pages_2m, pages_4k;
-@@ -278,8 +279,13 @@ repeat:
+@@ -279,8 +280,13 @@ repeat:
        pfn = start_pfn;
        pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
        pgd = pgd_base + pgd_idx;
@@ -16857,7 +17808,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
  
                if (pfn >= end_pfn)
                        continue;
-@@ -291,14 +297,13 @@ repeat:
+@@ -292,14 +298,13 @@ repeat:
  #endif
                for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
                     pmd++, pmd_idx++) {
@@ -16873,7 +17824,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                                pgprot_t prot = PAGE_KERNEL_LARGE;
                                /*
                                 * first pass will use the same initial
-@@ -308,11 +313,7 @@ repeat:
+@@ -309,11 +314,7 @@ repeat:
                                        __pgprot(PTE_IDENT_ATTR |
                                                 _PAGE_PSE);
  
@@ -16886,7 +17837,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                                        prot = PAGE_KERNEL_LARGE_EXEC;
  
                                pages_2m++;
-@@ -329,7 +330,7 @@ repeat:
+@@ -330,7 +331,7 @@ repeat:
                        pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
                        pte += pte_ofs;
                        for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
@@ -16895,7 +17846,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                                pgprot_t prot = PAGE_KERNEL;
                                /*
                                 * first pass will use the same initial
-@@ -337,7 +338,7 @@ repeat:
+@@ -338,7 +339,7 @@ repeat:
                                 */
                                pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
  
@@ -16904,7 +17855,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                                        prot = PAGE_KERNEL_EXEC;
  
                                pages_4k++;
-@@ -489,7 +490,7 @@ void __init native_pagetable_setup_start
+@@ -491,7 +492,7 @@ void __init native_pagetable_setup_start
  
                pud = pud_offset(pgd, va);
                pmd = pmd_offset(pud, va);
@@ -16913,7 +17864,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                        break;
  
                pte = pte_offset_kernel(pmd, va);
-@@ -541,9 +542,7 @@ void __init early_ioremap_page_table_ran
+@@ -543,9 +544,7 @@ void __init early_ioremap_page_table_ran
  
  static void __init pagetable_init(void)
  {
@@ -16924,7 +17875,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
  }
  
  #ifdef CONFIG_ACPI_SLEEP
-@@ -551,12 +550,12 @@ static void __init pagetable_init(void)
+@@ -553,12 +552,12 @@ static void __init pagetable_init(void)
   * ACPI suspend needs this for resume, because things like the intel-agp
   * driver might have split up a kernel 4MB mapping.
   */
@@ -16939,7 +17890,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
  }
  #else /* !CONFIG_ACPI_SLEEP */
  static inline void save_pg_dir(void)
-@@ -588,7 +587,7 @@ void zap_low_mappings(bool early)
+@@ -590,7 +589,7 @@ void zap_low_mappings(bool early)
                flush_tlb_all();
  }
  
@@ -16948,7 +17899,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  /* user-defined highmem size */
-@@ -777,7 +776,7 @@ void __init setup_bootmem_allocator(void
+@@ -781,7 +780,7 @@ void __init setup_bootmem_allocator(void
         * Initialize the boot-time allocator (with low memory only):
         */
        bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
@@ -16957,7 +17908,20 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                                 PAGE_SIZE);
        if (bootmap == -1L)
                panic("Cannot find bootmem map of size %ld\n", bootmap_size);
-@@ -881,7 +880,7 @@ void __init mem_init(void)
+@@ -871,6 +870,12 @@ void __init mem_init(void)
+ 
+       pci_iommu_alloc();
+ 
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
++                      swapper_pg_dir + KERNEL_PGD_BOUNDARY,
++                      KERNEL_PGD_PTRS);
++#endif
++
+ #ifdef CONFIG_FLATMEM
+       BUG_ON(!mem_map);
+ #endif
+@@ -888,7 +893,7 @@ void __init mem_init(void)
        set_highmem_pages_init();
  
        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
@@ -16966,7 +17930,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
  
        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -922,10 +921,10 @@ void __init mem_init(void)
+@@ -929,10 +934,10 @@ void __init mem_init(void)
                ((unsigned long)&__init_end -
                 (unsigned long)&__init_begin) >> 10,
  
@@ -16980,7 +17944,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
                ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
  
        /*
-@@ -1006,6 +1005,7 @@ void set_kernel_text_rw(void)
+@@ -1013,6 +1018,7 @@ void set_kernel_text_rw(void)
        if (!kernel_set_to_readonly)
                return;
  
@@ -16988,7 +17952,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
        pr_debug("Set kernel text: %lx - %lx for read write\n",
                 start, start+size);
  
-@@ -1020,6 +1020,7 @@ void set_kernel_text_ro(void)
+@@ -1027,6 +1033,7 @@ void set_kernel_text_ro(void)
        if (!kernel_set_to_readonly)
                return;
  
@@ -16996,7 +17960,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
        pr_debug("Set kernel text: %lx - %lx for read only\n",
                 start, start+size);
  
-@@ -1031,6 +1032,7 @@ void mark_rodata_ro(void)
+@@ -1038,6 +1045,7 @@ void mark_rodata_ro(void)
        unsigned long start = PFN_ALIGN(_text);
        unsigned long size = PFN_ALIGN(_etext) - start;
  
@@ -17004,10 +17968,18 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_32.c linux-2.6.33.1/arch/x86/mm/init_
        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
        printk(KERN_INFO "Write protecting the kernel text: %luk\n",
                size >> 10);
-diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_64.c
---- linux-2.6.33.1/arch/x86/mm/init_64.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/init_64.c       2010-03-20 16:58:39.032549699 -0400
-@@ -73,7 +73,7 @@ early_param("gbpages", parse_direct_gbpa
+diff -urNp linux-2.6.34/arch/x86/mm/init_64.c linux-2.6.34/arch/x86/mm/init_64.c
+--- linux-2.6.34/arch/x86/mm/init_64.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/init_64.c 2010-07-01 20:45:14.000000000 -0400
+@@ -50,7 +50,6 @@
+ #include <asm/numa.h>
+ #include <asm/cacheflush.h>
+ #include <asm/init.h>
+-#include <linux/bootmem.h>
+ 
+ static unsigned long dma_reserve __initdata;
+ 
+@@ -74,7 +73,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
  
@@ -17016,7 +17988,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  int force_personality32;
-@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
+@@ -165,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
        pmd = fill_pmd(pud, vaddr);
        pte = fill_pte(pmd, vaddr);
  
@@ -17026,7 +17998,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_
  
        /*
         * It's enough to flush this one mapping.
-@@ -223,14 +225,12 @@ static void __init __init_extra_mapping(
+@@ -224,14 +225,12 @@ static void __init __init_extra_mapping(
                pgd = pgd_offset_k((unsigned long)__va(phys));
                if (pgd_none(*pgd)) {
                        pud = (pud_t *) spp_getpage();
@@ -17043,7 +18015,20 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_
                }
                pmd = pmd_offset(pud, phys);
                BUG_ON(!pmd_none(*pmd));
-@@ -882,8 +882,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -680,6 +679,12 @@ void __init mem_init(void)
+ 
+       pci_iommu_alloc();
+ 
++#ifdef CONFIG_PAX_PER_CPU_PGD
++      clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
++                      swapper_pg_dir + KERNEL_PGD_BOUNDARY,
++                      KERNEL_PGD_PTRS);
++#endif
++
+       /* clear_bss() already clear the empty_zero_page */
+ 
+       reservedpages = 0;
+@@ -886,8 +891,8 @@ int kern_addr_valid(unsigned long addr)
  static struct vm_area_struct gate_vma = {
        .vm_start       = VSYSCALL_START,
        .vm_end         = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -17054,7 +18039,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_
  };
  
  struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-@@ -917,7 +917,7 @@ int in_gate_area_no_task(unsigned long a
+@@ -921,7 +926,7 @@ int in_gate_area_no_task(unsigned long a
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -17063,10 +18048,10 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init_64.c linux-2.6.33.1/arch/x86/mm/init_
                return "[vdso]";
        if (vma == &gate_vma)
                return "[vsyscall]";
-diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
---- linux-2.6.33.1/arch/x86/mm/init.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/init.c  2010-03-20 16:58:39.036535097 -0400
-@@ -69,11 +69,7 @@ static void __init find_early_table_spac
+diff -urNp linux-2.6.34/arch/x86/mm/init.c linux-2.6.34/arch/x86/mm/init.c
+--- linux-2.6.34/arch/x86/mm/init.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/init.c    2010-07-01 20:45:14.000000000 -0400
+@@ -70,11 +70,7 @@ static void __init find_early_table_spac
         * cause a hotspot and fill up ZONE_DMA. The page tables
         * need roughly 0.5KB per GB.
         */
@@ -17079,7 +18064,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
        e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
                                        tables, PAGE_SIZE);
        if (e820_table_start == -1UL)
-@@ -327,7 +323,13 @@ unsigned long __init_refok init_memory_m
+@@ -321,7 +317,13 @@ unsigned long __init_refok init_memory_m
   */
  int devmem_is_allowed(unsigned long pagenr)
  {
@@ -17094,16 +18079,12 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
                return 1;
        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
                return 0;
-@@ -375,6 +377,87 @@ void free_init_pages(char *what, unsigne
+@@ -380,6 +382,88 @@ void free_init_pages(char *what, unsigne
  
  void free_initmem(void)
  {
 +
 +#ifdef CONFIG_PAX_KERNEXEC
-+      pgd_t *pgd;
-+      pud_t *pud;
-+      pmd_t *pmd;
-+
 +#ifdef CONFIG_X86_32
 +      /* PaX: limit KERNEL_CS to actual size */
 +      unsigned long addr, limit;
@@ -17133,12 +18114,14 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
 +*/
 +#ifdef CONFIG_X86_PAE
 +      set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
++/*
 +      for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
 +              pgd = pgd_offset_k(addr);
 +              pud = pud_offset(pgd, addr);
 +              pmd = pmd_offset(pud, addr);
 +              set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
 +      }
++*/
 +#endif
 +
 +#ifdef CONFIG_MODULES
@@ -17146,6 +18129,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
 +#endif
 +
 +#else
++      pgd_t *pgd;
++      pud_t *pud;
++      pmd_t *pmd;
 +      unsigned long addr, end;
 +
 +      /* PaX: make kernel code/rodata read-only, rest non-executable */
@@ -17182,9 +18168,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/init.c linux-2.6.33.1/arch/x86/mm/init.c
        free_init_pages("unused kernel memory",
                        (unsigned long)(&__init_begin),
                        (unsigned long)(&__init_end));
-diff -urNp linux-2.6.33.1/arch/x86/mm/iomap_32.c linux-2.6.33.1/arch/x86/mm/iomap_32.c
---- linux-2.6.33.1/arch/x86/mm/iomap_32.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/iomap_32.c      2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/iomap_32.c linux-2.6.34/arch/x86/mm/iomap_32.c
+--- linux-2.6.34/arch/x86/mm/iomap_32.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/iomap_32.c        2010-07-01 20:45:14.000000000 -0400
 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
        debug_kmap_atomic(type);
        idx = type + KM_TYPE_NR * smp_processor_id();
@@ -17197,21 +18183,10 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/iomap_32.c linux-2.6.33.1/arch/x86/mm/ioma
        arch_flush_lazy_mmu_mode();
  
        return (void *)vaddr;
-diff -urNp linux-2.6.33.1/arch/x86/mm/ioremap.c linux-2.6.33.1/arch/x86/mm/ioremap.c
---- linux-2.6.33.1/arch/x86/mm/ioremap.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/ioremap.c       2010-03-20 16:58:39.036535097 -0400
-@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
-        * Second special case: Some BIOSen report the PC BIOS
-        * area (640->1Mb) as ram even though it is not.
-        */
--      if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
--                  pagenr < (BIOS_END >> PAGE_SHIFT))
-+      if (pagenr >= (ISA_START_ADDRESS >> PAGE_SHIFT) &&
-+                  pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
-               return 0;
- 
-       for (i = 0; i < e820.nr_map; i++) {
-@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re
+diff -urNp linux-2.6.34/arch/x86/mm/ioremap.c linux-2.6.34/arch/x86/mm/ioremap.c
+--- linux-2.6.34/arch/x86/mm/ioremap.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/ioremap.c 2010-07-01 20:45:14.000000000 -0400
+@@ -100,13 +100,10 @@ static void __iomem *__ioremap_caller(re
        /*
         * Don't allow anybody to remap normal RAM that we're using..
         */
@@ -17227,7 +18202,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/ioremap.c linux-2.6.33.1/arch/x86/mm/iorem
                        return NULL;
                WARN_ON_ONCE(is_ram);
        }
-@@ -383,7 +380,7 @@ static int __init early_ioremap_debug_se
+@@ -346,7 +343,7 @@ static int __init early_ioremap_debug_se
  early_param("early_ioremap_debug", early_ioremap_debug_setup);
  
  static __initdata int after_paging_init;
@@ -17236,7 +18211,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/ioremap.c linux-2.6.33.1/arch/x86/mm/iorem
  
  static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
  {
-@@ -415,8 +412,7 @@ void __init early_ioremap_init(void)
+@@ -378,8 +375,7 @@ void __init early_ioremap_init(void)
                slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
  
        pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
@@ -17246,9 +18221,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/ioremap.c linux-2.6.33.1/arch/x86/mm/iorem
  
        /*
         * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.33.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.33.1/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.33.1/arch/x86/mm/kmemcheck/kmemcheck.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/kmemcheck/kmemcheck.c   2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/kmemcheck/kmemcheck.c     2010-07-01 20:45:14.000000000 -0400
 @@ -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.
@@ -17261,9 +18236,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.33.1/arch/
                return false;
  
        pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.33.1/arch/x86/mm/mmap.c linux-2.6.33.1/arch/x86/mm/mmap.c
---- linux-2.6.33.1/arch/x86/mm/mmap.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/mmap.c  2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/mmap.c linux-2.6.34/arch/x86/mm/mmap.c
+--- linux-2.6.34/arch/x86/mm/mmap.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/mmap.c    2010-07-01 20:45:14.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -17280,7 +18255,7 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/mmap.c linux-2.6.33.1/arch/x86/mm/mmap.c
 -static unsigned long mmap_base(void)
 +static unsigned long mmap_base(struct mm_struct *mm)
  {
-       unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
+       unsigned long gap = rlimit(RLIMIT_STACK);
 +      unsigned long pax_task_size = TASK_SIZE;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -17345,9 +18320,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/mmap.c linux-2.6.33.1/arch/x86/mm/mmap.c
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-2.6.33.1/arch/x86/mm/numa_32.c linux-2.6.33.1/arch/x86/mm/numa_32.c
---- linux-2.6.33.1/arch/x86/mm/numa_32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/numa_32.c       2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/numa_32.c linux-2.6.34/arch/x86/mm/numa_32.c
+--- linux-2.6.34/arch/x86/mm/numa_32.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/numa_32.c 2010-07-01 20:45:14.000000000 -0400
 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
@@ -17356,16 +18331,25 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/numa_32.c linux-2.6.33.1/arch/x86/mm/numa_
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.33.1/arch/x86/mm/pageattr.c linux-2.6.33.1/arch/x86/mm/pageattr.c
---- linux-2.6.33.1/arch/x86/mm/pageattr.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/pageattr.c      2010-03-20 16:58:39.036535097 -0400
-@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
+diff -urNp linux-2.6.34/arch/x86/mm/pageattr.c linux-2.6.34/arch/x86/mm/pageattr.c
+--- linux-2.6.34/arch/x86/mm/pageattr.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/pageattr.c        2010-07-01 20:45:14.000000000 -0400
+@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
+        * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
+        */
+       if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
+-              pgprot_val(forbidden) |= _PAGE_NX;
++              pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
+ 
+       /*
+        * The kernel text needs to be executable for obvious reasons
         * Does not cover __inittext since that is gone later on. On
         * 64bit we do not enforce !NX on the low mapping
         */
 -      if (within(address, (unsigned long)_text, (unsigned long)_etext))
+-              pgprot_val(forbidden) |= _PAGE_NX;
 +      if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
-               pgprot_val(forbidden) |= _PAGE_NX;
++              pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
  
 +#ifdef CONFIG_DEBUG_RODATA
        /*
@@ -17379,20 +18363,63 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/pageattr.c linux-2.6.33.1/arch/x86/mm/page
  
  #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
        /*
-@@ -347,7 +349,10 @@ EXPORT_SYMBOL_GPL(lookup_address);
+@@ -316,6 +318,13 @@ static inline pgprot_t static_protection
+       }
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC
++      if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
++              pgprot_val(forbidden) |= _PAGE_RW;
++              pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
++      }
++#endif
++
+       prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
+ 
+       return prot;
+@@ -368,23 +377,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
  static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
  {
        /* change init_mm */
 +      pax_open_kernel();
        set_pte_atomic(kpte, pte);
-+      pax_close_kernel();
 +
  #ifdef CONFIG_X86_32
        if (!SHARED_KERNEL_PMD) {
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              unsigned long cpu;
++#else
                struct page *page;
-diff -urNp linux-2.6.33.1/arch/x86/mm/pageattr-test.c linux-2.6.33.1/arch/x86/mm/pageattr-test.c
---- linux-2.6.33.1/arch/x86/mm/pageattr-test.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/pageattr-test.c 2010-03-20 16:58:39.036535097 -0400
++#endif
+ 
++#ifdef CONFIG_PAX_PER_CPU_PGD
++              for (cpu = 0; cpu < NR_CPUS; ++cpu) {
++                      pgd_t *pgd = get_cpu_pgd(cpu);
++#else
+               list_for_each_entry(page, &pgd_list, lru) {
+-                      pgd_t *pgd;
++                      pgd_t *pgd = (pgd_t *)page_address(page);
++#endif
++
+                       pud_t *pud;
+                       pmd_t *pmd;
+ 
+-                      pgd = (pgd_t *)page_address(page) + pgd_index(address);
++                      pgd += pgd_index(address);
+                       pud = pud_offset(pgd, address);
+                       pmd = pmd_offset(pud, address);
+                       set_pte_atomic((pte_t *)pmd, pte);
+               }
+       }
+ #endif
++      pax_close_kernel();
+ }
+ 
+ static int
+diff -urNp linux-2.6.34/arch/x86/mm/pageattr-test.c linux-2.6.34/arch/x86/mm/pageattr-test.c
+--- linux-2.6.34/arch/x86/mm/pageattr-test.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/pageattr-test.c   2010-07-01 20:45:14.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -17402,9 +18429,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/pageattr-test.c linux-2.6.33.1/arch/x86/mm
  }
  
  struct split_state {
-diff -urNp linux-2.6.33.1/arch/x86/mm/pat.c linux-2.6.33.1/arch/x86/mm/pat.c
---- linux-2.6.33.1/arch/x86/mm/pat.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/pat.c   2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/pat.c linux-2.6.34/arch/x86/mm/pat.c
+--- linux-2.6.34/arch/x86/mm/pat.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/pat.c     2010-07-01 20:45:14.000000000 -0400
 @@ -259,7 +259,7 @@ chk_conflict(struct memtype *new, struct
  
   conflict:
@@ -17441,9 +18468,9 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/pat.c linux-2.6.33.1/arch/x86/mm/pat.c
                                cattr_name(want_flags),
                                (unsigned long long)paddr,
                                (unsigned long long)(paddr + size),
-diff -urNp linux-2.6.33.1/arch/x86/mm/pgtable_32.c linux-2.6.33.1/arch/x86/mm/pgtable_32.c
---- linux-2.6.33.1/arch/x86/mm/pgtable_32.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/pgtable_32.c    2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/pgtable_32.c linux-2.6.34/arch/x86/mm/pgtable_32.c
+--- linux-2.6.34/arch/x86/mm/pgtable_32.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/pgtable_32.c      2010-07-01 20:45:14.000000000 -0400
 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
                return;
        }
@@ -17458,9 +18485,296 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/pgtable_32.c linux-2.6.33.1/arch/x86/mm/pg
  
        /*
         * It's enough to flush this one mapping.
-diff -urNp linux-2.6.33.1/arch/x86/mm/tlb.c linux-2.6.33.1/arch/x86/mm/tlb.c
---- linux-2.6.33.1/arch/x86/mm/tlb.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/mm/tlb.c   2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/mm/pgtable.c linux-2.6.34/arch/x86/mm/pgtable.c
+--- linux-2.6.34/arch/x86/mm/pgtable.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/pgtable.c 2010-07-01 20:45:14.000000000 -0400
+@@ -84,8 +84,59 @@ static inline void pgd_list_del(pgd_t *p
+       list_del(&page->lru);
+ }
+ 
+-#define UNSHARED_PTRS_PER_PGD                         \
+-      (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
++
++void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
++{
++      while (count--)
++              *dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER);
++
++}
++#endif
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
++{
++      while (count--)
++
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++              *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
++#else
++              *dst++ = *src++;
++#endif
++
++}
++#endif
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++static inline void pgd_ctor(pgd_t *pgd) {}
++static inline void pgd_dtor(pgd_t *pgd) {}
++#ifdef CONFIG_X86_64
++#define pxd_t                         pud_t
++#define pyd_t                         pgd_t
++#define paravirt_release_pxd(pfn)     paravirt_release_pud(pfn)
++#define pxd_free(mm, pud)             pud_free((mm), (pud))
++#define pyd_populate(mm, pgd, pud)    pgd_populate((mm), (pgd), (pud))
++#define pyd_offset(mm ,address)               pgd_offset((mm), (address))
++#define PYD_SIZE                      PGDIR_SIZE
++#else
++#define pxd_t                         pmd_t
++#define pyd_t                         pud_t
++#define paravirt_release_pxd(pfn)     paravirt_release_pmd(pfn)
++#define pxd_free(mm, pud)             pmd_free((mm), (pud))
++#define pyd_populate(mm, pgd, pud)    pud_populate((mm), (pgd), (pud))
++#define pyd_offset(mm ,address)               pud_offset((mm), (address))
++#define PYD_SIZE                      PUD_SIZE
++#endif
++#else
++#define pxd_t                         pmd_t
++#define pyd_t                         pud_t
++#define paravirt_release_pxd(pfn)     paravirt_release_pmd(pfn)
++#define pxd_free(mm, pmd)             pmd_free((mm), (pmd))
++#define pyd_populate(mm, pud, pmd)    pud_populate((mm), (pud), (pmd))
++#define pyd_offset(mm ,address)               pud_offset((mm), (address))
++#define PYD_SIZE                      PUD_SIZE
+ 
+ static void pgd_ctor(pgd_t *pgd)
+ {
+@@ -120,6 +171,7 @@ static void pgd_dtor(pgd_t *pgd)
+       pgd_list_del(pgd);
+       spin_unlock_irqrestore(&pgd_lock, flags);
+ }
++#endif
+ 
+ /*
+  * List of all pgd's needed for non-PAE so it can invalidate entries
+@@ -132,7 +184,7 @@ static void pgd_dtor(pgd_t *pgd)
+  * -- wli
+  */
+ 
+-#ifdef CONFIG_X86_PAE
++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
+ /*
+  * In PAE mode, we need to do a cr3 reload (=tlb flush) when
+  * updating the top-level pagetable entries to guarantee the
+@@ -144,7 +196,7 @@ static void pgd_dtor(pgd_t *pgd)
+  * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
+  * and initialize the kernel pmds here.
+  */
+-#define PREALLOCATED_PMDS     UNSHARED_PTRS_PER_PGD
++#define PREALLOCATED_PXDS     (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
+ 
+ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
+ {
+@@ -163,36 +215,38 @@ void pud_populate(struct mm_struct *mm, 
+       if (mm == current->active_mm)
+               write_cr3(read_cr3());
+ }
++#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
++#define PREALLOCATED_PXDS     USER_PGD_PTRS
+ #else  /* !CONFIG_X86_PAE */
+ 
+ /* No need to prepopulate any pagetable entries in non-PAE modes. */
+-#define PREALLOCATED_PMDS     0
++#define PREALLOCATED_PXDS     0
+ 
+ #endif        /* CONFIG_X86_PAE */
+ 
+-static void free_pmds(pmd_t *pmds[])
++static void free_pxds(pxd_t *pxds[])
+ {
+       int i;
+ 
+-      for(i = 0; i < PREALLOCATED_PMDS; i++)
+-              if (pmds[i])
+-                      free_page((unsigned long)pmds[i]);
++      for(i = 0; i < PREALLOCATED_PXDS; i++)
++              if (pxds[i])
++                      free_page((unsigned long)pxds[i]);
+ }
+ 
+-static int preallocate_pmds(pmd_t *pmds[])
++static int preallocate_pxds(pxd_t *pxds[])
+ {
+       int i;
+       bool failed = false;
+ 
+-      for(i = 0; i < PREALLOCATED_PMDS; i++) {
+-              pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
+-              if (pmd == NULL)
++      for(i = 0; i < PREALLOCATED_PXDS; i++) {
++              pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
++              if (pxd == NULL)
+                       failed = true;
+-              pmds[i] = pmd;
++              pxds[i] = pxd;
+       }
+ 
+       if (failed) {
+-              free_pmds(pmds);
++              free_pxds(pxds);
+               return -ENOMEM;
+       }
+ 
+@@ -205,51 +259,56 @@ static int preallocate_pmds(pmd_t *pmds[
+  * preallocate which never got a corresponding vma will need to be
+  * freed manually.
+  */
+-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
++static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
+ {
+       int i;
+ 
+-      for(i = 0; i < PREALLOCATED_PMDS; i++) {
++      for(i = 0; i < PREALLOCATED_PXDS; i++) {
+               pgd_t pgd = pgdp[i];
+ 
+               if (pgd_val(pgd) != 0) {
+-                      pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
++                      pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
+ 
+-                      pgdp[i] = native_make_pgd(0);
++                      set_pgd(pgdp + i, native_make_pgd(0));
+ 
+-                      paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
+-                      pmd_free(mm, pmd);
++                      paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
++                      pxd_free(mm, pxd);
+               }
+       }
+ }
+ 
+-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
++static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
+ {
+-      pud_t *pud;
++      pyd_t *pyd;
+       unsigned long addr;
+       int i;
+ 
+-      if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
++      if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
+               return;
+ 
+-      pud = pud_offset(pgd, 0);
++#ifdef CONFIG_X86_64
++      pyd = pyd_offset(mm, 0L);
++#else
++      pyd = pyd_offset(pgd, 0L);
++#endif
+ 
+-      for (addr = i = 0; i < PREALLOCATED_PMDS;
+-           i++, pud++, addr += PUD_SIZE) {
+-              pmd_t *pmd = pmds[i];
++      for (addr = i = 0; i < PREALLOCATED_PXDS;
++           i++, pyd++, addr += PYD_SIZE) {
++              pxd_t *pxd = pxds[i];
+ 
+               if (i >= KERNEL_PGD_BOUNDARY)
+-                      memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
+-                             sizeof(pmd_t) * PTRS_PER_PMD);
++                      memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
++                             sizeof(pxd_t) * PTRS_PER_PMD);
+ 
+-              pud_populate(mm, pud, pmd);
++              pyd_populate(mm, pyd, pxd);
+       }
+ }
+ 
+ pgd_t *pgd_alloc(struct mm_struct *mm)
+ {
+       pgd_t *pgd;
+-      pmd_t *pmds[PREALLOCATED_PMDS];
++      pxd_t *pxds[PREALLOCATED_PXDS];
++
+       unsigned long flags;
+ 
+       pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
+@@ -259,11 +318,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ 
+       mm->pgd = pgd;
+ 
+-      if (preallocate_pmds(pmds) != 0)
++      if (preallocate_pxds(pxds) != 0)
+               goto out_free_pgd;
+ 
+       if (paravirt_pgd_alloc(mm) != 0)
+-              goto out_free_pmds;
++              goto out_free_pxds;
+ 
+       /*
+        * Make sure that pre-populating the pmds is atomic with
+@@ -273,14 +332,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+       spin_lock_irqsave(&pgd_lock, flags);
+ 
+       pgd_ctor(pgd);
+-      pgd_prepopulate_pmd(mm, pgd, pmds);
++      pgd_prepopulate_pxd(mm, pgd, pxds);
+ 
+       spin_unlock_irqrestore(&pgd_lock, flags);
+ 
+       return pgd;
+ 
+-out_free_pmds:
+-      free_pmds(pmds);
++out_free_pxds:
++      free_pxds(pxds);
+ out_free_pgd:
+       free_page((unsigned long)pgd);
+ out:
+@@ -289,7 +348,7 @@ out:
+ 
+ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
+ {
+-      pgd_mop_up_pmds(mm, pgd);
++      pgd_mop_up_pxds(mm, pgd);
+       pgd_dtor(pgd);
+       paravirt_pgd_free(mm, pgd);
+       free_page((unsigned long)pgd);
+diff -urNp linux-2.6.34/arch/x86/mm/setup_nx.c linux-2.6.34/arch/x86/mm/setup_nx.c
+--- linux-2.6.34/arch/x86/mm/setup_nx.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/setup_nx.c        2010-07-02 21:45:04.000000000 -0400
+@@ -5,8 +5,11 @@
+ #include <asm/pgtable.h>
+ #include <asm/proto.h>
+ 
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+ static int disable_nx __cpuinitdata;
++#endif
+ 
++#if (defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)) && !defined(CONFIG_PAX_PAGEEXEC)
+ /*
+  * noexec = on|off
+  *
+@@ -28,12 +31,15 @@ static int __init noexec_setup(char *str
+       return 0;
+ }
+ early_param("noexec", noexec_setup);
++#endif
+ 
+ void __cpuinit x86_configure_nx(void)
+ {
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+       if (cpu_has_nx && !disable_nx)
+               __supported_pte_mask |= _PAGE_NX;
+       else
++#endif
+               __supported_pte_mask &= ~_PAGE_NX;
+ }
+ 
+diff -urNp linux-2.6.34/arch/x86/mm/tlb.c linux-2.6.34/arch/x86/mm/tlb.c
+--- linux-2.6.34/arch/x86/mm/tlb.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/mm/tlb.c     2010-07-01 20:45:14.000000000 -0400
 @@ -13,7 +13,7 @@
  #include <asm/uv/uv.h>
  
@@ -17470,9 +18784,21 @@ diff -urNp linux-2.6.33.1/arch/x86/mm/tlb.c linux-2.6.33.1/arch/x86/mm/tlb.c
  
  /*
   *    Smarter SMP flushing macros.
-diff -urNp linux-2.6.33.1/arch/x86/oprofile/backtrace.c linux-2.6.33.1/arch/x86/oprofile/backtrace.c
---- linux-2.6.33.1/arch/x86/oprofile/backtrace.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/oprofile/backtrace.c       2010-03-20 17:06:47.204705877 -0400
+@@ -62,7 +62,11 @@ void leave_mm(int cpu)
+               BUG();
+       cpumask_clear_cpu(cpu,
+                         mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
++
++#ifndef CONFIG_PAX_PER_CPU_PGD
+       load_cr3(swapper_pg_dir);
++#endif
++
+ }
+ EXPORT_SYMBOL_GPL(leave_mm);
+ 
+diff -urNp linux-2.6.34/arch/x86/oprofile/backtrace.c linux-2.6.34/arch/x86/oprofile/backtrace.c
+--- linux-2.6.34/arch/x86/oprofile/backtrace.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/oprofile/backtrace.c 2010-07-01 20:45:14.000000000 -0400
 @@ -58,7 +58,7 @@ static struct frame_head *dump_user_back
        struct frame_head bufhead[2];
  
@@ -17491,9 +18817,9 @@ diff -urNp linux-2.6.33.1/arch/x86/oprofile/backtrace.c linux-2.6.33.1/arch/x86/
                unsigned long stack = kernel_stack_pointer(regs);
                if (depth)
                        dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.33.1/arch/x86/oprofile/op_model_p4.c linux-2.6.33.1/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.33.1/arch/x86/oprofile/op_model_p4.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/oprofile/op_model_p4.c     2010-03-20 16:58:39.036535097 -0400
+diff -urNp linux-2.6.34/arch/x86/oprofile/op_model_p4.c linux-2.6.34/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.34/arch/x86/oprofile/op_model_p4.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/oprofile/op_model_p4.c       2010-07-01 20:45:14.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
  #endif
  }
@@ -17503,10 +18829,10 @@ diff -urNp linux-2.6.33.1/arch/x86/oprofile/op_model_p4.c linux-2.6.33.1/arch/x8
  {
  #ifdef CONFIG_SMP
        return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.33.1/arch/x86/pci/common.c linux-2.6.33.1/arch/x86/pci/common.c
---- linux-2.6.33.1/arch/x86/pci/common.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/common.c       2010-03-20 16:58:39.036535097 -0400
-@@ -31,8 +31,8 @@ int noioapicreroute = 1;
+diff -urNp linux-2.6.34/arch/x86/pci/common.c linux-2.6.34/arch/x86/pci/common.c
+--- linux-2.6.34/arch/x86/pci/common.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/common.c 2010-07-01 20:45:14.000000000 -0400
+@@ -32,8 +32,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
  struct pci_bus *pci_root_bus;
@@ -17517,7 +18843,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/common.c linux-2.6.33.1/arch/x86/pci/comm
  
  int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
                                                int reg, int len, u32 *val)
-@@ -370,7 +370,7 @@ static const struct dmi_system_id __devi
+@@ -365,7 +365,7 @@ static const struct dmi_system_id __devi
                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
                },
        },
@@ -17526,9 +18852,9 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/common.c linux-2.6.33.1/arch/x86/pci/comm
  };
  
  void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.33.1/arch/x86/pci/direct.c linux-2.6.33.1/arch/x86/pci/direct.c
---- linux-2.6.33.1/arch/x86/pci/direct.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/direct.c       2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/pci/direct.c linux-2.6.34/arch/x86/pci/direct.c
+--- linux-2.6.34/arch/x86/pci/direct.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/direct.c 2010-07-01 20:45:14.000000000 -0400
 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
  
  #undef PCI_CONF1_ADDRESS
@@ -17556,9 +18882,9 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/direct.c linux-2.6.33.1/arch/x86/pci/dire
  {
        u32 x = 0;
        int year, devfn;
-diff -urNp linux-2.6.33.1/arch/x86/pci/fixup.c linux-2.6.33.1/arch/x86/pci/fixup.c
---- linux-2.6.33.1/arch/x86/pci/fixup.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/fixup.c        2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/pci/fixup.c linux-2.6.34/arch/x86/pci/fixup.c
+--- linux-2.6.34/arch/x86/pci/fixup.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/fixup.c  2010-07-01 20:45:14.000000000 -0400
 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
                        DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
                },
@@ -17577,10 +18903,10 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/fixup.c linux-2.6.33.1/arch/x86/pci/fixup
  };
  
  static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.33.1/arch/x86/pci/irq.c linux-2.6.33.1/arch/x86/pci/irq.c
---- linux-2.6.33.1/arch/x86/pci/irq.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/irq.c  2010-03-20 16:58:39.040721575 -0400
-@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
+diff -urNp linux-2.6.34/arch/x86/pci/irq.c linux-2.6.34/arch/x86/pci/irq.c
+--- linux-2.6.34/arch/x86/pci/irq.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/irq.c    2010-07-01 20:45:14.000000000 -0400
+@@ -542,7 +542,7 @@ static __init int intel_router_probe(str
        static struct pci_device_id __initdata pirq_440gx[] = {
                { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
                { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) },
@@ -17589,7 +18915,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/irq.c linux-2.6.33.1/arch/x86/pci/irq.c
        };
  
        /* 440GX has a proprietary PIRQ router -- don't use it */
-@@ -1107,7 +1107,7 @@ static struct dmi_system_id __initdata p
+@@ -1108,7 +1108,7 @@ static struct dmi_system_id __initdata p
                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
                },
        },
@@ -17597,10 +18923,10 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/irq.c linux-2.6.33.1/arch/x86/pci/irq.c
 +      { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL }
  };
  
- int __init pcibios_irq_init(void)
-diff -urNp linux-2.6.33.1/arch/x86/pci/mmconfig_32.c linux-2.6.33.1/arch/x86/pci/mmconfig_32.c
---- linux-2.6.33.1/arch/x86/pci/mmconfig_32.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/mmconfig_32.c  2010-03-20 16:58:39.040721575 -0400
+ void __init pcibios_irq_init(void)
+diff -urNp linux-2.6.34/arch/x86/pci/mmconfig_32.c linux-2.6.34/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.34/arch/x86/pci/mmconfig_32.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/mmconfig_32.c    2010-07-01 20:45:14.000000000 -0400
 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int 
        return 0;
  }
@@ -17610,9 +18936,9 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/mmconfig_32.c linux-2.6.33.1/arch/x86/pci
        .read =         pci_mmcfg_read,
        .write =        pci_mmcfg_write,
  };
-diff -urNp linux-2.6.33.1/arch/x86/pci/mmconfig_64.c linux-2.6.33.1/arch/x86/pci/mmconfig_64.c
---- linux-2.6.33.1/arch/x86/pci/mmconfig_64.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/mmconfig_64.c  2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/pci/mmconfig_64.c linux-2.6.34/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.34/arch/x86/pci/mmconfig_64.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/mmconfig_64.c    2010-07-01 20:45:14.000000000 -0400
 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int 
        return 0;
  }
@@ -17622,10 +18948,10 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/mmconfig_64.c linux-2.6.33.1/arch/x86/pci
        .read =         pci_mmcfg_read,
        .write =        pci_mmcfg_write,
  };
-diff -urNp linux-2.6.33.1/arch/x86/pci/numaq_32.c linux-2.6.33.1/arch/x86/pci/numaq_32.c
---- linux-2.6.33.1/arch/x86/pci/numaq_32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/numaq_32.c     2010-03-20 16:58:39.040721575 -0400
-@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
+diff -urNp linux-2.6.34/arch/x86/pci/numaq_32.c linux-2.6.34/arch/x86/pci/numaq_32.c
+--- linux-2.6.34/arch/x86/pci/numaq_32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/numaq_32.c       2010-07-01 20:45:14.000000000 -0400
+@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
  
  #undef PCI_CONF1_MQ_ADDRESS
  
@@ -17634,9 +18960,9 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/numaq_32.c linux-2.6.33.1/arch/x86/pci/nu
        .read   = pci_conf1_mq_read,
        .write  = pci_conf1_mq_write
  };
-diff -urNp linux-2.6.33.1/arch/x86/pci/olpc.c linux-2.6.33.1/arch/x86/pci/olpc.c
---- linux-2.6.33.1/arch/x86/pci/olpc.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/olpc.c 2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/pci/olpc.c linux-2.6.34/arch/x86/pci/olpc.c
+--- linux-2.6.34/arch/x86/pci/olpc.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/olpc.c   2010-07-01 20:45:14.000000000 -0400
 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
        return 0;
  }
@@ -17646,10 +18972,10 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/olpc.c linux-2.6.33.1/arch/x86/pci/olpc.c
        .read = pci_olpc_read,
        .write = pci_olpc_write,
  };
-diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbios.c
---- linux-2.6.33.1/arch/x86/pci/pcbios.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/pci/pcbios.c       2010-03-20 16:58:39.040721575 -0400
-@@ -56,50 +56,93 @@ union bios32 {
+diff -urNp linux-2.6.34/arch/x86/pci/pcbios.c linux-2.6.34/arch/x86/pci/pcbios.c
+--- linux-2.6.34/arch/x86/pci/pcbios.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/pci/pcbios.c 2010-07-01 20:45:14.000000000 -0400
+@@ -57,50 +57,93 @@ union bios32 {
  static struct {
        unsigned long address;
        unsigned short segment;
@@ -17757,7 +19083,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
  
  static int __devinit check_pcibios(void)
  {
-@@ -108,11 +151,13 @@ static int __devinit check_pcibios(void)
+@@ -109,11 +152,13 @@ static int __devinit check_pcibios(void)
        unsigned long flags, pcibios_entry;
  
        if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
@@ -17774,7 +19100,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -121,7 +166,8 @@ static int __devinit check_pcibios(void)
+@@ -122,7 +167,8 @@ static int __devinit check_pcibios(void)
                          "=b" (ebx),
                          "=c" (ecx)
                        : "1" (PCIBIOS_PCI_BIOS_PRESENT),
@@ -17784,7 +19110,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        : "memory");
                local_irq_restore(flags);
  
-@@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int se
+@@ -166,7 +212,10 @@ static int pci_bios_read(unsigned int se
  
        switch (len) {
        case 1:
@@ -17796,7 +19122,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int se
+@@ -175,7 +224,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_BYTE),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17806,7 +19132,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                /*
                 * Zero-extend the result beyond 8 bits, do not trust the
                 * BIOS having done it:
-@@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int se
+@@ -183,7 +233,10 @@ static int pci_bios_read(unsigned int se
                *value &= 0xff;
                break;
        case 2:
@@ -17818,7 +19144,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int se
+@@ -192,7 +245,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_WORD),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17828,7 +19154,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                /*
                 * Zero-extend the result beyond 16 bits, do not trust the
                 * BIOS having done it:
-@@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int se
+@@ -200,7 +254,10 @@ static int pci_bios_read(unsigned int se
                *value &= 0xffff;
                break;
        case 4:
@@ -17840,7 +19166,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int se
+@@ -209,7 +266,8 @@ static int pci_bios_read(unsigned int se
                        : "1" (PCIBIOS_READ_CONFIG_DWORD),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17850,7 +19176,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                break;
        }
  
-@@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int s
+@@ -232,7 +290,10 @@ static int pci_bios_write(unsigned int s
  
        switch (len) {
        case 1:
@@ -17862,7 +19188,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int s
+@@ -241,10 +302,14 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17879,7 +19205,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int s
+@@ -253,10 +318,14 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17896,7 +19222,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                        "jc 1f\n\t"
                        "xor %%ah, %%ah\n"
                        "1:"
-@@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int s
+@@ -265,7 +334,8 @@ static int pci_bios_write(unsigned int s
                          "c" (value),
                          "b" (bx),
                          "D" ((long)reg),
@@ -17906,7 +19232,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                break;
        }
  
-@@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int s
+@@ -279,7 +349,7 @@ static int pci_bios_write(unsigned int s
   * Function table for BIOS32 access
   */
  
@@ -17915,7 +19241,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
        .read =         pci_bios_read,
        .write =        pci_bios_write
  };
-@@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_acces
+@@ -288,7 +358,7 @@ static struct pci_raw_ops pci_bios_acces
   * Try to find PCI BIOS.
   */
  
@@ -17924,7 +19250,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
  {
        union bios32 *check;
        unsigned char sum;
-@@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_i
+@@ -369,10 +439,13 @@ struct irq_routing_table * pcibios_get_i
  
        DBG("PCI: Fetching IRQ routing table... ");
        __asm__("push %%es\n\t"
@@ -17939,7 +19265,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                "jc 1f\n\t"
                "xor %%ah, %%ah\n"
                "1:"
-@@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_i
+@@ -383,7 +456,8 @@ struct irq_routing_table * pcibios_get_i
                  "1" (0),
                  "D" ((long) &opt),
                  "S" (&pci_indirect),
@@ -17949,7 +19275,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                : "memory");
        DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
        if (ret & 0xff00)
-@@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -407,7 +481,10 @@ int pcibios_set_irq_routing(struct pci_d
  {
        int ret;
  
@@ -17961,7 +19287,7 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
                "jc 1f\n\t"
                "xor %%ah, %%ah\n"
                "1:"
-@@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_d
+@@ -415,7 +492,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)),
@@ -17971,9 +19297,9 @@ diff -urNp linux-2.6.33.1/arch/x86/pci/pcbios.c linux-2.6.33.1/arch/x86/pci/pcbi
        return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.33.1/arch/x86/power/cpu.c linux-2.6.33.1/arch/x86/power/cpu.c
---- linux-2.6.33.1/arch/x86/power/cpu.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/power/cpu.c        2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/power/cpu.c linux-2.6.34/arch/x86/power/cpu.c
+--- linux-2.6.34/arch/x86/power/cpu.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/power/cpu.c  2010-07-01 20:45:14.000000000 -0400
 @@ -127,7 +127,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -17993,9 +19319,9 @@ diff -urNp linux-2.6.33.1/arch/x86/power/cpu.c linux-2.6.33.1/arch/x86/power/cpu
  
        syscall_init();                         /* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.33.1/arch/x86/vdso/Makefile linux-2.6.33.1/arch/x86/vdso/Makefile
---- linux-2.6.33.1/arch/x86/vdso/Makefile      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/Makefile      2010-03-20 16:58:39.040721575 -0400
+diff -urNp linux-2.6.34/arch/x86/vdso/Makefile linux-2.6.34/arch/x86/vdso/Makefile
+--- linux-2.6.34/arch/x86/vdso/Makefile        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/Makefile        2010-07-01 20:45:14.000000000 -0400
 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO    $@
                       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
                       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -18005,9 +19331,9 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/Makefile linux-2.6.33.1/arch/x86/vdso/Ma
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.33.1/arch/x86/vdso/vclock_gettime.c linux-2.6.33.1/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.33.1/arch/x86/vdso/vclock_gettime.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/vclock_gettime.c      2010-03-20 16:58:39.044545939 -0400
+diff -urNp linux-2.6.34/arch/x86/vdso/vclock_gettime.c linux-2.6.34/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.34/arch/x86/vdso/vclock_gettime.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/vclock_gettime.c        2010-07-01 20:45:14.000000000 -0400
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -18106,9 +19432,9 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vclock_gettime.c linux-2.6.33.1/arch/x86
  }
  int gettimeofday(struct timeval *, struct timezone *)
        __attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.33.1/arch/x86/vdso/vdso32-setup.c linux-2.6.33.1/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.33.1/arch/x86/vdso/vdso32-setup.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/vdso32-setup.c        2010-03-20 16:58:39.044545939 -0400
+diff -urNp linux-2.6.34/arch/x86/vdso/vdso32-setup.c linux-2.6.34/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.34/arch/x86/vdso/vdso32-setup.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/vdso32-setup.c  2010-07-01 20:45:14.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -18191,9 +19517,9 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vdso32-setup.c linux-2.6.33.1/arch/x86/v
                return &gate_vma;
        return NULL;
  }
-diff -urNp linux-2.6.33.1/arch/x86/vdso/vdso.lds.S linux-2.6.33.1/arch/x86/vdso/vdso.lds.S
---- linux-2.6.33.1/arch/x86/vdso/vdso.lds.S    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/vdso.lds.S    2010-03-20 16:58:39.044545939 -0400
+diff -urNp linux-2.6.34/arch/x86/vdso/vdso.lds.S linux-2.6.34/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.34/arch/x86/vdso/vdso.lds.S      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/vdso.lds.S      2010-07-01 20:45:14.000000000 -0400
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)    VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -18204,9 +19530,9 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vdso.lds.S linux-2.6.33.1/arch/x86/vdso/
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef        VEXTERN
-diff -urNp linux-2.6.33.1/arch/x86/vdso/vextern.h linux-2.6.33.1/arch/x86/vdso/vextern.h
---- linux-2.6.33.1/arch/x86/vdso/vextern.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/vextern.h     2010-03-20 16:58:39.044545939 -0400
+diff -urNp linux-2.6.34/arch/x86/vdso/vextern.h linux-2.6.34/arch/x86/vdso/vextern.h
+--- linux-2.6.34/arch/x86/vdso/vextern.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/vextern.h       2010-07-01 20:45:14.000000000 -0400
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -18214,10 +19540,10 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vextern.h linux-2.6.33.1/arch/x86/vdso/v
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
---- linux-2.6.33.1/arch/x86/vdso/vma.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/vdso/vma.c 2010-03-20 16:58:39.044545939 -0400
-@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
+diff -urNp linux-2.6.34/arch/x86/vdso/vma.c linux-2.6.34/arch/x86/vdso/vma.c
+--- linux-2.6.34/arch/x86/vdso/vma.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/vdso/vma.c   2010-07-01 20:45:14.000000000 -0400
+@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
        if (!vbase)
                goto oom;
  
@@ -18226,7 +19552,7 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
                printk("VDSO: I'm broken; not ELF\n");
                vdso_enabled = 0;
        }
-@@ -66,6 +66,7 @@ static int __init init_vdso_vars(void)
+@@ -67,6 +67,7 @@ static int __init init_vdso_vars(void)
        *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
  #include "vextern.h"
  #undef VEXTERN
@@ -18234,7 +19560,7 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
        return 0;
  
   oom:
-@@ -116,7 +117,7 @@ int arch_setup_additional_pages(struct l
+@@ -117,7 +118,7 @@ int arch_setup_additional_pages(struct l
                goto up_fail;
        }
  
@@ -18243,7 +19569,7 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
  
        ret = install_special_mapping(mm, addr, vdso_size,
                                      VM_READ|VM_EXEC|
-@@ -124,7 +125,7 @@ int arch_setup_additional_pages(struct l
+@@ -125,7 +126,7 @@ int arch_setup_additional_pages(struct l
                                      VM_ALWAYSDUMP,
                                      vdso_pages);
        if (ret) {
@@ -18252,7 +19578,7 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
                goto up_fail;
        }
  
-@@ -132,10 +133,3 @@ up_fail:
+@@ -133,10 +134,3 @@ up_fail:
        up_write(&mm->mmap_sem);
        return ret;
  }
@@ -18263,10 +19589,10 @@ diff -urNp linux-2.6.33.1/arch/x86/vdso/vma.c linux-2.6.33.1/arch/x86/vdso/vma.c
 -      return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.33.1/arch/x86/xen/enlighten.c linux-2.6.33.1/arch/x86/xen/enlighten.c
---- linux-2.6.33.1/arch/x86/xen/enlighten.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/xen/enlighten.c    2010-03-20 16:58:39.044545939 -0400
-@@ -73,8 +73,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
+diff -urNp linux-2.6.34/arch/x86/xen/enlighten.c linux-2.6.34/arch/x86/xen/enlighten.c
+--- linux-2.6.34/arch/x86/xen/enlighten.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/xen/enlighten.c      2010-07-01 20:45:16.000000000 -0400
+@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
  
@@ -18275,7 +19601,7 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/enlighten.c linux-2.6.33.1/arch/x86/xen/e
  /*
   * Point at some empty memory to start with. We map the real shared_info
   * page as soon as fixmap is up and running.
-@@ -550,7 +548,7 @@ static void xen_write_idt_entry(gate_des
+@@ -551,7 +549,7 @@ static void xen_write_idt_entry(gate_des
  
        preempt_disable();
  
@@ -18284,7 +19610,26 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/enlighten.c linux-2.6.33.1/arch/x86/xen/e
        end = start + __get_cpu_var(idt_desc).size + 1;
  
        xen_mc_flush();
-@@ -1133,13 +1131,6 @@ asmlinkage void __init xen_start_kernel(
+@@ -1103,7 +1101,17 @@ asmlinkage void __init xen_start_kernel(
+       __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
+ 
+       /* Work out if we support NX */
+-      x86_configure_nx();
++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
++      if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
++          (cpuid_edx(0x80000001) & (1 << (X86_FEATURE_NX & 31)))) {
++              unsigned l, h;
++
++              __supported_pte_mask |= _PAGE_NX;
++              rdmsr(MSR_EFER, l, h);
++              l |= EFER_NX;
++              wrmsr(MSR_EFER, l, h);
++      }
++#endif
+ 
+       xen_setup_features();
+ 
+@@ -1134,13 +1142,6 @@ asmlinkage void __init xen_start_kernel(
  
        machine_ops = xen_machine_ops;
  
@@ -18298,10 +19643,10 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/enlighten.c linux-2.6.33.1/arch/x86/xen/e
        xen_smp_init();
  
        pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.33.1/arch/x86/xen/mmu.c linux-2.6.33.1/arch/x86/xen/mmu.c
---- linux-2.6.33.1/arch/x86/xen/mmu.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/xen/mmu.c  2010-03-20 16:58:39.044545939 -0400
-@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
+diff -urNp linux-2.6.34/arch/x86/xen/mmu.c linux-2.6.34/arch/x86/xen/mmu.c
+--- linux-2.6.34/arch/x86/xen/mmu.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/xen/mmu.c    2010-07-01 20:45:14.000000000 -0400
+@@ -1694,6 +1694,8 @@ __init pgd_t *xen_setup_kernel_pagetable
        convert_pfn_mfn(init_level4_pgt);
        convert_pfn_mfn(level3_ident_pgt);
        convert_pfn_mfn(level3_kernel_pgt);
@@ -18310,7 +19655,7 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/mmu.c linux-2.6.33.1/arch/x86/xen/mmu.c
  
        l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
        l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1729,7 +1731,10 @@ __init pgd_t *xen_setup_kernel_pagetable
+@@ -1712,7 +1714,10 @@ __init pgd_t *xen_setup_kernel_pagetable
        set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
        set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
        set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -18321,10 +19666,10 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/mmu.c linux-2.6.33.1/arch/x86/xen/mmu.c
        set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
        set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.33.1/arch/x86/xen/smp.c linux-2.6.33.1/arch/x86/xen/smp.c
---- linux-2.6.33.1/arch/x86/xen/smp.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/xen/smp.c  2010-03-20 16:58:39.044545939 -0400
-@@ -168,11 +168,6 @@ static void __init xen_smp_prepare_boot_
+diff -urNp linux-2.6.34/arch/x86/xen/smp.c linux-2.6.34/arch/x86/xen/smp.c
+--- linux-2.6.34/arch/x86/xen/smp.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/xen/smp.c    2010-07-01 20:45:14.000000000 -0400
+@@ -169,11 +169,6 @@ static void __init xen_smp_prepare_boot_
  {
        BUG_ON(smp_processor_id() != 0);
        native_smp_prepare_boot_cpu();
@@ -18336,7 +19681,7 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/smp.c linux-2.6.33.1/arch/x86/xen/smp.c
        xen_setup_vcpu_info_placement();
  }
  
-@@ -232,8 +227,8 @@ cpu_initialize_context(unsigned int cpu,
+@@ -233,8 +228,8 @@ cpu_initialize_context(unsigned int cpu,
        gdt = get_cpu_gdt_table(cpu);
  
        ctxt->flags = VGCF_IN_KERNEL;
@@ -18347,9 +19692,30 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/smp.c linux-2.6.33.1/arch/x86/xen/smp.c
        ctxt->user_regs.ss = __KERNEL_DS;
  #ifdef CONFIG_X86_32
        ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.33.1/arch/x86/xen/xen-ops.h linux-2.6.33.1/arch/x86/xen/xen-ops.h
---- linux-2.6.33.1/arch/x86/xen/xen-ops.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/arch/x86/xen/xen-ops.h      2010-03-20 16:58:39.044545939 -0400
+diff -urNp linux-2.6.34/arch/x86/xen/xen-head.S linux-2.6.34/arch/x86/xen/xen-head.S
+--- linux-2.6.34/arch/x86/xen/xen-head.S       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/xen/xen-head.S       2010-07-01 20:45:14.000000000 -0400
+@@ -19,6 +19,17 @@ ENTRY(startup_xen)
+ #ifdef CONFIG_X86_32
+       mov %esi,xen_start_info
+       mov $init_thread_union+THREAD_SIZE,%esp
++#ifdef CONFIG_SMP
++      movl $cpu_gdt_table,%edi
++      movl $__per_cpu_load,%eax
++      movw %ax,__KERNEL_PERCPU + 2(%edi)
++      rorl $16,%eax
++      movb %al,__KERNEL_PERCPU + 4(%edi)
++      movb %ah,__KERNEL_PERCPU + 7(%edi)
++      movl $__per_cpu_end - 1,%eax
++      subl $__per_cpu_start,%eax
++      movw %ax,__KERNEL_PERCPU + 0(%edi)
++#endif
+ #else
+       mov %rsi,xen_start_info
+       mov $init_thread_union+THREAD_SIZE,%rsp
+diff -urNp linux-2.6.34/arch/x86/xen/xen-ops.h linux-2.6.34/arch/x86/xen/xen-ops.h
+--- linux-2.6.34/arch/x86/xen/xen-ops.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/arch/x86/xen/xen-ops.h        2010-07-01 20:45:14.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -18359,21 +19725,9 @@ diff -urNp linux-2.6.33.1/arch/x86/xen/xen-ops.h linux-2.6.33.1/arch/x86/xen/xen
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.33.1/block/blk-integrity.c linux-2.6.33.1/block/blk-integrity.c
---- linux-2.6.33.1/block/blk-integrity.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/blk-integrity.c       2010-03-20 16:58:39.052902082 -0400
-@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
-       NULL,
- };
- 
--static struct sysfs_ops integrity_ops = {
-+static const struct sysfs_ops integrity_ops = {
-       .show   = &integrity_attr_show,
-       .store  = &integrity_attr_store,
- };
-diff -urNp linux-2.6.33.1/block/blk-iopoll.c linux-2.6.33.1/block/blk-iopoll.c
---- linux-2.6.33.1/block/blk-iopoll.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/blk-iopoll.c  2010-03-20 16:58:39.068779508 -0400
+diff -urNp linux-2.6.34/block/blk-iopoll.c linux-2.6.34/block/blk-iopoll.c
+--- linux-2.6.34/block/blk-iopoll.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/block/blk-iopoll.c    2010-07-01 20:45:14.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -18383,9 +19737,9 @@ diff -urNp linux-2.6.33.1/block/blk-iopoll.c linux-2.6.33.1/block/blk-iopoll.c
  {
        struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
        int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.33.1/block/blk-map.c linux-2.6.33.1/block/blk-map.c
---- linux-2.6.33.1/block/blk-map.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/blk-map.c     2010-03-20 16:58:39.068779508 -0400
+diff -urNp linux-2.6.34/block/blk-map.c linux-2.6.34/block/blk-map.c
+--- linux-2.6.34/block/blk-map.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/block/blk-map.c       2010-07-01 20:45:14.000000000 -0400
 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
         * direct dma. else, set up kernel bounce buffers
         */
@@ -18404,9 +19758,9 @@ diff -urNp linux-2.6.33.1/block/blk-map.c linux-2.6.33.1/block/blk-map.c
        if (do_copy)
                bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
        else
-diff -urNp linux-2.6.33.1/block/blk-softirq.c linux-2.6.33.1/block/blk-softirq.c
---- linux-2.6.33.1/block/blk-softirq.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/blk-softirq.c 2010-03-20 16:58:39.068779508 -0400
+diff -urNp linux-2.6.34/block/blk-softirq.c linux-2.6.34/block/blk-softirq.c
+--- linux-2.6.34/block/blk-softirq.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/block/blk-softirq.c   2010-07-01 20:45:14.000000000 -0400
 @@ -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.
@@ -18416,33 +19770,9 @@ diff -urNp linux-2.6.33.1/block/blk-softirq.c linux-2.6.33.1/block/blk-softirq.c
  {
        struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.33.1/block/blk-sysfs.c linux-2.6.33.1/block/blk-sysfs.c
---- linux-2.6.33.1/block/blk-sysfs.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/blk-sysfs.c   2010-03-20 16:58:39.068779508 -0400
-@@ -447,7 +447,7 @@ static void blk_release_queue(struct kob
-       kmem_cache_free(blk_requestq_cachep, q);
- }
- 
--static struct sysfs_ops queue_sysfs_ops = {
-+static const struct sysfs_ops queue_sysfs_ops = {
-       .show   = queue_attr_show,
-       .store  = queue_attr_store,
- };
-diff -urNp linux-2.6.33.1/block/elevator.c linux-2.6.33.1/block/elevator.c
---- linux-2.6.33.1/block/elevator.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/block/elevator.c    2010-03-20 16:58:39.073372227 -0400
-@@ -883,7 +883,7 @@ elv_attr_store(struct kobject *kobj, str
-       return error;
- }
- 
--static struct sysfs_ops elv_sysfs_ops = {
-+static const struct sysfs_ops elv_sysfs_ops = {
-       .show   = elv_attr_show,
-       .store  = elv_attr_store,
- };
-diff -urNp linux-2.6.33.1/crypto/lrw.c linux-2.6.33.1/crypto/lrw.c
---- linux-2.6.33.1/crypto/lrw.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/crypto/lrw.c        2010-03-20 16:58:39.077284706 -0400
+diff -urNp linux-2.6.34/crypto/lrw.c linux-2.6.34/crypto/lrw.c
+--- linux-2.6.34/crypto/lrw.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/crypto/lrw.c  2010-07-01 20:45:14.000000000 -0400
 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
        struct priv *ctx = crypto_tfm_ctx(parent);
        struct crypto_cipher *child = ctx->child;
@@ -18452,9 +19782,9 @@ diff -urNp linux-2.6.33.1/crypto/lrw.c linux-2.6.33.1/crypto/lrw.c
        int bsize = crypto_cipher_blocksize(child);
  
        crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/dontdiff
---- linux-2.6.33.1/Documentation/dontdiff      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/Documentation/dontdiff      2010-03-20 16:58:39.077284706 -0400
+diff -urNp linux-2.6.34/Documentation/dontdiff linux-2.6.34/Documentation/dontdiff
+--- linux-2.6.34/Documentation/dontdiff        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/Documentation/dontdiff        2010-07-01 20:45:13.000000000 -0400
 @@ -3,6 +3,7 @@
  *.bin
  *.cpio
@@ -18488,17 +19818,18 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  SCCS
  System.map*
  TAGS
-@@ -77,7 +84,9 @@ btfixupprep
+@@ -76,7 +83,10 @@ btfixupprep
  build
  bvmlinux
  bzImage*
 +capflags.c
  classlist.h*
++clut_vga16.c
 +common-cmds.h
  comp*.log
  compile.h*
  conf
-@@ -107,13 +116,15 @@ generated
+@@ -106,13 +116,15 @@ generated
  genheaders
  genksyms
  *_gray256.c
@@ -18515,7 +19846,7 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  keywords.c
  ksym.c*
  ksym.h*
-@@ -137,10 +148,13 @@ mkboot
+@@ -136,10 +148,13 @@ mkboot
  mkbugboot
  mkcpustr
  mkdep
@@ -18529,7 +19860,7 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  modules.order
  modversions.h*
  ncscope.*
-@@ -153,6 +167,7 @@ patches*
+@@ -152,6 +167,7 @@ patches*
  pca200e.bin
  pca200e_ecd.bin2
  piggy.gz
@@ -18537,7 +19868,7 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  piggyback
  pnmtologo
  ppc_defs.h*
-@@ -167,6 +182,7 @@ setup
+@@ -166,6 +182,7 @@ setup
  setup.bin
  setup.elf
  sImage
@@ -18545,7 +19876,7 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  sm_tbl*
  split-include
  syscalltab.h
-@@ -190,14 +206,20 @@ version.h*
+@@ -189,14 +206,20 @@ version.h*
  vmlinux
  vmlinux-*
  vmlinux.aout
@@ -18566,9 +19897,9 @@ diff -urNp linux-2.6.33.1/Documentation/dontdiff linux-2.6.33.1/Documentation/do
  zImage*
  zconf.hash.c
 +zoffset.h
-diff -urNp linux-2.6.33.1/Documentation/filesystems/sysfs.txt linux-2.6.33.1/Documentation/filesystems/sysfs.txt
---- linux-2.6.33.1/Documentation/filesystems/sysfs.txt 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/Documentation/filesystems/sysfs.txt 2010-03-20 16:58:39.077284706 -0400
+diff -urNp linux-2.6.34/Documentation/filesystems/sysfs.txt linux-2.6.34/Documentation/filesystems/sysfs.txt
+--- linux-2.6.34/Documentation/filesystems/sysfs.txt   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/Documentation/filesystems/sysfs.txt   2010-07-01 20:45:13.000000000 -0400
 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
  show and store methods of the attribute owners. 
  
@@ -18580,10 +19911,10 @@ diff -urNp linux-2.6.33.1/Documentation/filesystems/sysfs.txt linux-2.6.33.1/Doc
  };
  
  [ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.33.1/Documentation/kernel-parameters.txt linux-2.6.33.1/Documentation/kernel-parameters.txt
---- linux-2.6.33.1/Documentation/kernel-parameters.txt 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/Documentation/kernel-parameters.txt 2010-03-20 16:58:39.081342736 -0400
-@@ -1865,6 +1865,12 @@ and is between 256 and 4096 characters. 
+diff -urNp linux-2.6.34/Documentation/kernel-parameters.txt linux-2.6.34/Documentation/kernel-parameters.txt
+--- linux-2.6.34/Documentation/kernel-parameters.txt   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/Documentation/kernel-parameters.txt   2010-07-01 20:45:13.000000000 -0400
+@@ -1875,6 +1875,12 @@ and is between 256 and 4096 characters. 
                        the specified number of seconds.  This is to be used if
                        your oopses keep scrolling off the screen.
  
@@ -18596,10 +19927,10 @@ diff -urNp linux-2.6.33.1/Documentation/kernel-parameters.txt linux-2.6.33.1/Doc
        pcbit=          [HW,ISDN]
  
        pcd.            [PARIDE]
-diff -urNp linux-2.6.33.1/drivers/acpi/battery.c linux-2.6.33.1/drivers/acpi/battery.c
---- linux-2.6.33.1/drivers/acpi/battery.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/battery.c      2010-03-20 16:58:39.097283097 -0400
-@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff -urNp linux-2.6.34/drivers/acpi/battery.c linux-2.6.34/drivers/acpi/battery.c
+--- linux-2.6.34/drivers/acpi/battery.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/battery.c        2010-07-01 20:45:14.000000000 -0400
+@@ -810,7 +810,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
        }
  
  static struct battery_file {
@@ -18608,9 +19939,9 @@ diff -urNp linux-2.6.33.1/drivers/acpi/battery.c linux-2.6.33.1/drivers/acpi/bat
        mode_t mode;
        const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.33.1/drivers/acpi/blacklist.c linux-2.6.33.1/drivers/acpi/blacklist.c
---- linux-2.6.33.1/drivers/acpi/blacklist.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/blacklist.c    2010-03-20 16:58:39.097283097 -0400
+diff -urNp linux-2.6.34/drivers/acpi/blacklist.c linux-2.6.34/drivers/acpi/blacklist.c
+--- linux-2.6.34/drivers/acpi/blacklist.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/blacklist.c      2010-07-01 20:45:14.000000000 -0400
 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
        {"IBM   ", "TP600E  ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
         "Incorrect _ADR", 1},
@@ -18620,10 +19951,10 @@ diff -urNp linux-2.6.33.1/drivers/acpi/blacklist.c linux-2.6.33.1/drivers/acpi/b
  };
  
  #if   CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.33.1/drivers/acpi/dock.c linux-2.6.33.1/drivers/acpi/dock.c
---- linux-2.6.33.1/drivers/acpi/dock.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/dock.c 2010-03-20 16:58:39.097283097 -0400
-@@ -76,7 +76,7 @@ struct dock_dependent_device {
+diff -urNp linux-2.6.34/drivers/acpi/dock.c linux-2.6.34/drivers/acpi/dock.c
+--- linux-2.6.34/drivers/acpi/dock.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/dock.c   2010-07-01 20:45:14.000000000 -0400
+@@ -77,7 +77,7 @@ struct dock_dependent_device {
        struct list_head list;
        struct list_head hotplug_list;
        acpi_handle handle;
@@ -18632,7 +19963,7 @@ diff -urNp linux-2.6.33.1/drivers/acpi/dock.c linux-2.6.33.1/drivers/acpi/dock.c
        void *context;
  };
  
-@@ -588,7 +588,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi
+@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi
   * the dock driver after _DCK is executed.
   */
  int
@@ -18641,9 +19972,9 @@ diff -urNp linux-2.6.33.1/drivers/acpi/dock.c linux-2.6.33.1/drivers/acpi/dock.c
                             void *context)
  {
        struct dock_dependent_device *dd;
-diff -urNp linux-2.6.33.1/drivers/acpi/osl.c linux-2.6.33.1/drivers/acpi/osl.c
---- linux-2.6.33.1/drivers/acpi/osl.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/osl.c  2010-03-20 16:58:39.101703980 -0400
+diff -urNp linux-2.6.34/drivers/acpi/osl.c linux-2.6.34/drivers/acpi/osl.c
+--- linux-2.6.34/drivers/acpi/osl.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/osl.c    2010-07-01 20:45:14.000000000 -0400
 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
        void __iomem *virt_addr;
  
@@ -18662,10 +19993,60 @@ diff -urNp linux-2.6.33.1/drivers/acpi/osl.c linux-2.6.33.1/drivers/acpi/osl.c
  
        switch (width) {
        case 8:
-diff -urNp linux-2.6.33.1/drivers/acpi/processor_core.c linux-2.6.33.1/drivers/acpi/processor_core.c
---- linux-2.6.33.1/drivers/acpi/processor_core.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/processor_core.c       2010-03-20 16:58:39.109290821 -0400
-@@ -734,7 +734,7 @@ static int __cpuinit acpi_processor_add(
+diff -urNp linux-2.6.34/drivers/acpi/power_meter.c linux-2.6.34/drivers/acpi/power_meter.c
+--- linux-2.6.34/drivers/acpi/power_meter.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/power_meter.c    2010-07-01 20:45:14.000000000 -0400
+@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
+               return res;
+ 
+       temp /= 1000;
+-      if (temp < 0)
+-              return -EINVAL;
+ 
+       mutex_lock(&resource->lock);
+       resource->trip[attr->index - 7] = temp;
+diff -urNp linux-2.6.34/drivers/acpi/proc.c linux-2.6.34/drivers/acpi/proc.c
+--- linux-2.6.34/drivers/acpi/proc.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/proc.c   2010-07-01 20:45:14.000000000 -0400
+@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
+                               size_t count, loff_t * ppos)
+ {
+       struct list_head *node, *next;
+-      char strbuf[5];
+-      char str[5] = "";
+-      unsigned int len = count;
++      char strbuf[5] = {0};
+       struct acpi_device *found_dev = NULL;
+ 
+-      if (len > 4)
+-              len = 4;
+-      if (len < 0)
+-              return -EFAULT;
++      if (count > 4)
++              count = 4;
+ 
+-      if (copy_from_user(strbuf, buffer, len))
++      if (copy_from_user(strbuf, buffer, count))
+               return -EFAULT;
+-      strbuf[len] = '\0';
+-      sscanf(strbuf, "%s", str);
++      strbuf[count] = '\0';
+ 
+       mutex_lock(&acpi_device_lock);
+       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
+@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
+               if (!dev->wakeup.flags.valid)
+                       continue;
+ 
+-              if (!strncmp(dev->pnp.bus_id, str, 4)) {
++              if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
+                       dev->wakeup.state.enabled =
+                           dev->wakeup.state.enabled ? 0 : 1;
+                       found_dev = dev;
+diff -urNp linux-2.6.34/drivers/acpi/processor_driver.c linux-2.6.34/drivers/acpi/processor_driver.c
+--- linux-2.6.34/drivers/acpi/processor_driver.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/processor_driver.c       2010-07-01 20:45:14.000000000 -0400
+@@ -581,7 +581,7 @@ static int __cpuinit acpi_processor_add(
                return 0;
        }
  
@@ -18674,10 +20055,10 @@ diff -urNp linux-2.6.33.1/drivers/acpi/processor_core.c linux-2.6.33.1/drivers/a
  
        /*
         * Buggy BIOS check
-diff -urNp linux-2.6.33.1/drivers/acpi/processor_idle.c linux-2.6.33.1/drivers/acpi/processor_idle.c
---- linux-2.6.33.1/drivers/acpi/processor_idle.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/processor_idle.c       2010-03-20 16:58:39.109290821 -0400
-@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
+diff -urNp linux-2.6.34/drivers/acpi/processor_idle.c linux-2.6.34/drivers/acpi/processor_idle.c
+--- linux-2.6.34/drivers/acpi/processor_idle.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/processor_idle.c 2010-07-01 20:45:14.000000000 -0400
+@@ -119,7 +119,7 @@ static struct dmi_system_id __cpuinitdat
          DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
          DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
         (void *)1},
@@ -18686,9 +20067,9 @@ diff -urNp linux-2.6.33.1/drivers/acpi/processor_idle.c linux-2.6.33.1/drivers/a
  };
  
  
-diff -urNp linux-2.6.33.1/drivers/acpi/sleep.c linux-2.6.33.1/drivers/acpi/sleep.c
---- linux-2.6.33.1/drivers/acpi/sleep.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/sleep.c        2010-03-20 16:58:39.113276130 -0400
+diff -urNp linux-2.6.34/drivers/acpi/sleep.c linux-2.6.34/drivers/acpi/sleep.c
+--- linux-2.6.34/drivers/acpi/sleep.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/sleep.c  2010-07-01 20:45:14.000000000 -0400
 @@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp
        }
  }
@@ -18707,7 +20088,7 @@ diff -urNp linux-2.6.33.1/drivers/acpi/sleep.c linux-2.6.33.1/drivers/acpi/sleep
        .valid = acpi_suspend_state_valid,
        .begin = acpi_suspend_begin_old,
        .prepare_late = acpi_pm_disable_gpes,
-@@ -557,7 +557,7 @@ static void acpi_pm_enable_gpes(void)
+@@ -622,7 +622,7 @@ static void acpi_pm_restore_cleanup(void
        acpi_enable_all_runtime_gpes();
  }
  
@@ -18716,7 +20097,7 @@ diff -urNp linux-2.6.33.1/drivers/acpi/sleep.c linux-2.6.33.1/drivers/acpi/sleep
        .begin = acpi_hibernation_begin,
        .end = acpi_pm_end,
        .pre_snapshot = acpi_hibernation_pre_snapshot,
-@@ -610,7 +610,7 @@ static int acpi_hibernation_pre_snapshot
+@@ -675,7 +675,7 @@ static int acpi_hibernation_pre_snapshot
   * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
   * been requested.
   */
@@ -18725,10 +20106,10 @@ diff -urNp linux-2.6.33.1/drivers/acpi/sleep.c linux-2.6.33.1/drivers/acpi/sleep
        .begin = acpi_hibernation_begin_old,
        .end = acpi_pm_end,
        .pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.33.1/drivers/acpi/video.c linux-2.6.33.1/drivers/acpi/video.c
---- linux-2.6.33.1/drivers/acpi/video.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/acpi/video.c        2010-03-20 16:58:39.136890536 -0400
-@@ -366,7 +366,7 @@ static int acpi_video_set_brightness(str
+diff -urNp linux-2.6.34/drivers/acpi/video.c linux-2.6.34/drivers/acpi/video.c
+--- linux-2.6.34/drivers/acpi/video.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/acpi/video.c  2010-07-01 20:45:14.000000000 -0400
+@@ -367,7 +367,7 @@ static int acpi_video_set_brightness(str
                                vd->brightness->levels[request_level]);
  }
  
@@ -18737,10 +20118,10 @@ diff -urNp linux-2.6.33.1/drivers/acpi/video.c linux-2.6.33.1/drivers/acpi/video
        .get_brightness = acpi_video_get_brightness,
        .update_status  = acpi_video_set_brightness,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/ahci.c linux-2.6.33.1/drivers/ata/ahci.c
---- linux-2.6.33.1/drivers/ata/ahci.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/ahci.c  2010-03-20 16:58:39.153286662 -0400
-@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
+diff -urNp linux-2.6.34/drivers/ata/ahci.c linux-2.6.34/drivers/ata/ahci.c
+--- linux-2.6.34/drivers/ata/ahci.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/ahci.c    2010-07-01 20:45:14.000000000 -0400
+@@ -407,7 +407,7 @@ static struct scsi_host_template ahci_sh
        .sdev_attrs             = ahci_sdev_attrs,
  };
  
@@ -18748,8 +20129,8 @@ diff -urNp linux-2.6.33.1/drivers/ata/ahci.c linux-2.6.33.1/drivers/ata/ahci.c
 +static const struct ata_port_operations ahci_ops = {
        .inherits               = &sata_pmp_port_ops,
  
-       .qc_defer               = sata_pmp_qc_defer_cmd_switch,
-@@ -424,17 +424,17 @@ static struct ata_port_operations ahci_o
+       .qc_defer               = ahci_pmp_qc_defer,
+@@ -444,17 +444,17 @@ static struct ata_port_operations ahci_o
        .port_stop              = ahci_port_stop,
  };
  
@@ -18770,7 +20151,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/ahci.c linux-2.6.33.1/drivers/ata/ahci.c
        .inherits               = &ahci_ops,
        .softreset              = ahci_sb600_softreset,
        .pmp_softreset          = ahci_sb600_softreset,
-@@ -681,7 +681,7 @@ static const struct pci_device_id ahci_p
+@@ -722,7 +722,7 @@ static const struct pci_device_id ahci_p
        { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
          PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
  
@@ -18779,9 +20160,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/ahci.c linux-2.6.33.1/drivers/ata/ahci.c
  };
  
  
-diff -urNp linux-2.6.33.1/drivers/ata/ata_generic.c linux-2.6.33.1/drivers/ata/ata_generic.c
---- linux-2.6.33.1/drivers/ata/ata_generic.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/ata_generic.c   2010-03-20 16:58:39.156781730 -0400
+diff -urNp linux-2.6.34/drivers/ata/ata_generic.c linux-2.6.34/drivers/ata/ata_generic.c
+--- linux-2.6.34/drivers/ata/ata_generic.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/ata_generic.c     2010-07-01 20:45:14.000000000 -0400
 @@ -95,7 +95,7 @@ static struct scsi_host_template generic
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -18791,28 +20172,34 @@ diff -urNp linux-2.6.33.1/drivers/ata/ata_generic.c linux-2.6.33.1/drivers/ata/a
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_unknown,
        .set_mode       = generic_set_mode,
-diff -urNp linux-2.6.33.1/drivers/ata/ata_piix.c linux-2.6.33.1/drivers/ata/ata_piix.c
---- linux-2.6.33.1/drivers/ata/ata_piix.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/ata_piix.c      2010-03-20 16:58:39.160672594 -0400
-@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
-       { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
-       /* SATA Controller IDE (PCH) */
-       { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+diff -urNp linux-2.6.34/drivers/ata/ata_piix.c linux-2.6.34/drivers/ata/ata_piix.c
+--- linux-2.6.34/drivers/ata/ata_piix.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/ata_piix.c        2010-07-01 20:45:14.000000000 -0400
+@@ -301,7 +301,7 @@ static const struct pci_device_id piix_p
+       { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+       /* SATA Controller IDE (CPT) */
+       { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
 -      { }     /* terminate list */
 +      { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
  };
  
  static struct pci_driver piix_pci_driver = {
-@@ -309,7 +309,7 @@ static struct scsi_host_template piix_sh
+@@ -319,12 +319,12 @@ static struct scsi_host_template piix_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
+-static struct ata_port_operations piix_sata_ops = {
++static const struct ata_port_operations piix_sata_ops = {
+       .inherits               = &ata_bmdma32_port_ops,
+       .sff_irq_check          = piix_irq_check,
+ };
+ 
 -static struct ata_port_operations piix_pata_ops = {
 +static const struct ata_port_operations piix_pata_ops = {
-       .inherits               = &ata_bmdma32_port_ops,
+       .inherits               = &piix_sata_ops,
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = piix_set_piomode,
-@@ -317,22 +317,22 @@ static struct ata_port_operations piix_p
+@@ -332,18 +332,18 @@ static struct ata_port_operations piix_p
        .prereset               = piix_pata_prereset,
  };
  
@@ -18829,17 +20216,12 @@ diff -urNp linux-2.6.33.1/drivers/ata/ata_piix.c linux-2.6.33.1/drivers/ata/ata_
        .set_dmamode            = ich_set_dmamode,
  };
  
--static struct ata_port_operations piix_sata_ops = {
-+static const struct ata_port_operations piix_sata_ops = {
-       .inherits               = &ata_bmdma32_port_ops,
- };
- 
 -static struct ata_port_operations piix_sidpr_sata_ops = {
 +static const struct ata_port_operations piix_sidpr_sata_ops = {
        .inherits               = &piix_sata_ops,
        .hardreset              = sata_std_hardreset,
        .scr_read               = piix_sidpr_scr_read,
-@@ -608,7 +608,7 @@ static const struct ich_laptop ich_lapto
+@@ -619,7 +619,7 @@ static const struct ich_laptop ich_lapto
        { 0x2653, 0x1043, 0x82D8 },     /* ICH6M on Asus Eee 701 */
        { 0x27df, 0x104d, 0x900e },     /* ICH7 on Sony TZ-90 */
        /* end marker */
@@ -18848,7 +20230,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/ata_piix.c linux-2.6.33.1/drivers/ata/ata_
  };
  
  /**
-@@ -1086,7 +1086,7 @@ static int piix_broken_suspend(void)
+@@ -1105,7 +1105,7 @@ static int piix_broken_suspend(void)
                        },
                },
  
@@ -18857,10 +20239,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/ata_piix.c linux-2.6.33.1/drivers/ata/ata_
        };
        static const char *oemstrs[] = {
                "Tecra M3,",
-diff -urNp linux-2.6.33.1/drivers/ata/libata-acpi.c linux-2.6.33.1/drivers/ata/libata-acpi.c
---- linux-2.6.33.1/drivers/ata/libata-acpi.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/libata-acpi.c   2010-03-20 16:58:39.164792430 -0400
-@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
+diff -urNp linux-2.6.34/drivers/ata/libata-acpi.c linux-2.6.34/drivers/ata/libata-acpi.c
+--- linux-2.6.34/drivers/ata/libata-acpi.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/libata-acpi.c     2010-07-01 20:45:14.000000000 -0400
+@@ -224,12 +224,12 @@ static void ata_acpi_dev_uevent(acpi_han
        ata_acpi_uevent(dev->link->ap, dev, event);
  }
  
@@ -18875,10 +20257,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-acpi.c linux-2.6.33.1/drivers/ata/l
        .handler = ata_acpi_ap_notify_dock,
        .uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/libata-core.c
---- linux-2.6.33.1/drivers/ata/libata-core.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/libata-core.c   2010-03-20 16:58:39.176796856 -0400
-@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
+diff -urNp linux-2.6.34/drivers/ata/libata-core.c linux-2.6.34/drivers/ata/libata-core.c
+--- linux-2.6.34/drivers/ata/libata-core.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/libata-core.c     2010-07-01 20:45:14.000000000 -0400
+@@ -897,7 +897,7 @@ static const struct ata_xfer_ent {
        { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
        { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
        { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 },
@@ -18887,7 +20269,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  };
  
  /**
-@@ -3163,7 +3163,7 @@ static const struct ata_timing ata_timin
+@@ -3165,7 +3165,7 @@ static const struct ata_timing ata_timin
        { XFER_UDMA_5,     0,   0,   0,   0,   0,   0, 0,    0,  20 },
        { XFER_UDMA_6,     0,   0,   0,   0,   0,   0, 0,    0,  15 },
  
@@ -18896,7 +20278,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  };
  
  #define ENOUGH(v, unit)               (((v)-1)/(unit)+1)
-@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry 
+@@ -4410,7 +4410,7 @@ static const struct ata_blacklist_entry 
        { "PIONEER DVD-RW  DVRTD08",    "1.00", ATA_HORKAGE_NOSETXFER },
  
        /* End Marker */
@@ -18905,7 +20287,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  };
  
  static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device 
+@@ -5986,7 +5986,7 @@ static void ata_host_stop(struct device 
   *    LOCKING:
   *    None.
   */
@@ -18914,7 +20296,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  {
        static DEFINE_SPINLOCK(lock);
        const struct ata_port_operations *cur;
-@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct
+@@ -5998,6 +5998,7 @@ static void ata_finalize_port_ops(struct
                return;
  
        spin_lock(&lock);
@@ -18922,7 +20304,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  
        for (cur = ops->inherits; cur; cur = cur->inherits) {
                void **inherit = (void **)cur;
-@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct
+@@ -6011,8 +6012,9 @@ static void ata_finalize_port_ops(struct
                if (IS_ERR(*pp))
                        *pp = NULL;
  
@@ -18933,7 +20315,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
        spin_unlock(&lock);
  }
  
-@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host
+@@ -6109,7 +6111,7 @@ int ata_host_start(struct ata_host *host
   */
  /* KILLME - the only user left is ipr */
  void ata_host_init(struct ata_host *host, struct device *dev,
@@ -18942,7 +20324,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
  {
        spin_lock_init(&host->lock);
        host->dev = dev;
-@@ -6754,7 +6756,7 @@ static void ata_dummy_error_handler(stru
+@@ -6779,7 +6781,7 @@ static void ata_dummy_error_handler(stru
        /* truly dummy */
  }
  
@@ -18951,10 +20333,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-core.c linux-2.6.33.1/drivers/ata/l
        .qc_prep                = ata_noop_qc_prep,
        .qc_issue               = ata_dummy_qc_issue,
        .error_handler          = ata_dummy_error_handler,
-diff -urNp linux-2.6.33.1/drivers/ata/libata-eh.c linux-2.6.33.1/drivers/ata/libata-eh.c
---- linux-2.6.33.1/drivers/ata/libata-eh.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/libata-eh.c     2010-03-20 16:58:39.180707680 -0400
-@@ -3675,7 +3675,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.34/drivers/ata/libata-eh.c linux-2.6.34/drivers/ata/libata-eh.c
+--- linux-2.6.34/drivers/ata/libata-eh.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/libata-eh.c       2010-07-01 20:45:14.000000000 -0400
+@@ -3680,7 +3680,7 @@ void ata_do_eh(struct ata_port *ap, ata_
   */
  void ata_std_error_handler(struct ata_port *ap)
  {
@@ -18963,10 +20345,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-eh.c linux-2.6.33.1/drivers/ata/lib
        ata_reset_fn_t hardreset = ops->hardreset;
  
        /* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.33.1/drivers/ata/libata-pmp.c linux-2.6.33.1/drivers/ata/libata-pmp.c
---- linux-2.6.33.1/drivers/ata/libata-pmp.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/libata-pmp.c    2010-03-20 16:58:39.180707680 -0400
-@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
+diff -urNp linux-2.6.34/drivers/ata/libata-pmp.c linux-2.6.34/drivers/ata/libata-pmp.c
+--- linux-2.6.34/drivers/ata/libata-pmp.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/libata-pmp.c      2010-07-01 20:45:14.000000000 -0400
+@@ -842,7 +842,7 @@ static int sata_pmp_handle_link_fail(str
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
  {
@@ -18975,10 +20357,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/libata-pmp.c linux-2.6.33.1/drivers/ata/li
        int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
        struct ata_link *pmp_link = &ap->link;
        struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.33.1/drivers/ata/pata_acpi.c linux-2.6.33.1/drivers/ata/pata_acpi.c
---- linux-2.6.33.1/drivers/ata/pata_acpi.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_acpi.c     2010-03-20 16:58:39.188784803 -0400
-@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
+diff -urNp linux-2.6.34/drivers/ata/pata_acpi.c linux-2.6.34/drivers/ata/pata_acpi.c
+--- linux-2.6.34/drivers/ata/pata_acpi.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_acpi.c       2010-07-01 20:45:14.000000000 -0400
+@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -18987,10 +20369,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_acpi.c linux-2.6.33.1/drivers/ata/pat
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = pacpi_qc_issue,
        .cable_detect           = pacpi_cable_detect,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata_ali.c
---- linux-2.6.33.1/drivers/ata/pata_ali.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_ali.c      2010-03-20 16:58:39.188784803 -0400
-@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
+diff -urNp linux-2.6.34/drivers/ata/pata_ali.c linux-2.6.34/drivers/ata/pata_ali.c
+--- linux-2.6.34/drivers/ata/pata_ali.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_ali.c        2010-07-01 20:45:14.000000000 -0400
+@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
   *    Port operations for PIO only ALi
   */
  
@@ -18999,7 +20381,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = ali_set_piomode,
-@@ -382,7 +382,7 @@ static const struct ata_port_operations 
+@@ -380,7 +380,7 @@ static const struct ata_port_operations 
   *    Port operations for DMA capable ALi without cable
   *    detect
   */
@@ -19008,7 +20390,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ali_dma_base_ops,
        .cable_detect   = ata_cable_40wire,
        .mode_filter    = ali_20_filter,
-@@ -393,7 +393,7 @@ static struct ata_port_operations ali_20
+@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20
  /*
   *    Port operations for DMA capable ALi with cable detect
   */
@@ -19017,7 +20399,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ali_dma_base_ops,
        .check_atapi_dma = ali_check_atapi_dma,
        .cable_detect   = ali_c2_cable_detect,
-@@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2
+@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2
  /*
   *    Port operations for DMA capable ALi with cable detect
   */
@@ -19026,7 +20408,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ali_dma_base_ops,
        .check_atapi_dma = ali_check_atapi_dma,
        .cable_detect   = ali_c2_cable_detect,
-@@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4
+@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4
  /*
   *    Port operations for DMA capable ALi with cable detect and LBA48
   */
@@ -19035,9 +20417,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ali.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ali_dma_base_ops,
        .check_atapi_dma = ali_check_atapi_dma,
        .dev_config     = ali_warn_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_amd.c linux-2.6.33.1/drivers/ata/pata_amd.c
---- linux-2.6.33.1/drivers/ata/pata_amd.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_amd.c      2010-03-20 16:58:39.214454463 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_amd.c linux-2.6.34/drivers/ata/pata_amd.c
+--- linux-2.6.34/drivers/ata/pata_amd.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_amd.c        2010-07-01 20:45:14.000000000 -0400
 @@ -397,28 +397,28 @@ static const struct ata_port_operations 
        .prereset       = amd_pre_reset,
  };
@@ -19087,9 +20469,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_amd.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &nv_base_port_ops,
        .set_piomode    = nv133_set_piomode,
        .set_dmamode    = nv133_set_dmamode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_artop.c linux-2.6.33.1/drivers/ata/pata_artop.c
---- linux-2.6.33.1/drivers/ata/pata_artop.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_artop.c    2010-03-20 16:58:39.220796895 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_artop.c linux-2.6.34/drivers/ata/pata_artop.c
+--- linux-2.6.34/drivers/ata/pata_artop.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_artop.c      2010-07-01 20:45:14.000000000 -0400
 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19108,10 +20490,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_artop.c linux-2.6.33.1/drivers/ata/pa
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = artop6260_cable_detect,
        .set_piomode            = artop6260_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_at32.c linux-2.6.33.1/drivers/ata/pata_at32.c
---- linux-2.6.33.1/drivers/ata/pata_at32.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_at32.c     2010-03-20 16:58:39.220796895 -0400
-@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
+diff -urNp linux-2.6.34/drivers/ata/pata_at32.c linux-2.6.34/drivers/ata/pata_at32.c
+--- linux-2.6.34/drivers/ata/pata_at32.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_at32.c       2010-07-01 20:45:14.000000000 -0400
+@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
        ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -19120,10 +20502,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_at32.c linux-2.6.33.1/drivers/ata/pat
        .inherits               = &ata_sff_port_ops,
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = pata_at32_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_at91.c linux-2.6.33.1/drivers/ata/pata_at91.c
---- linux-2.6.33.1/drivers/ata/pata_at91.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_at91.c     2010-03-20 16:58:39.224661770 -0400
-@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
+diff -urNp linux-2.6.34/drivers/ata/pata_at91.c linux-2.6.34/drivers/ata/pata_at91.c
+--- linux-2.6.34/drivers/ata/pata_at91.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_at91.c       2010-07-01 20:45:14.000000000 -0400
+@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
        ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -19132,10 +20514,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_at91.c linux-2.6.33.1/drivers/ata/pat
        .inherits       = &ata_sff_port_ops,
  
        .sff_data_xfer  = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_atiixp.c linux-2.6.33.1/drivers/ata/pata_atiixp.c
---- linux-2.6.33.1/drivers/ata/pata_atiixp.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_atiixp.c   2010-03-20 16:58:39.224661770 -0400
-@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
+diff -urNp linux-2.6.34/drivers/ata/pata_atiixp.c linux-2.6.34/drivers/ata/pata_atiixp.c
+--- linux-2.6.34/drivers/ata/pata_atiixp.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_atiixp.c     2010-07-01 20:45:14.000000000 -0400
+@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
  };
  
@@ -19144,10 +20526,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_atiixp.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .qc_prep        = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_atp867x.c linux-2.6.33.1/drivers/ata/pata_atp867x.c
---- linux-2.6.33.1/drivers/ata/pata_atp867x.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_atp867x.c  2010-03-20 16:58:39.224661770 -0400
-@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
+diff -urNp linux-2.6.34/drivers/ata/pata_atp867x.c linux-2.6.34/drivers/ata/pata_atp867x.c
+--- linux-2.6.34/drivers/ata/pata_atp867x.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_atp867x.c    2010-07-01 20:45:14.000000000 -0400
+@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19156,9 +20538,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_atp867x.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = atp867x_cable_detect,
        .set_piomode            = atp867x_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_bf54x.c linux-2.6.33.1/drivers/ata/pata_bf54x.c
---- linux-2.6.33.1/drivers/ata/pata_bf54x.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_bf54x.c    2010-03-20 16:58:39.236808133 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_bf54x.c linux-2.6.34/drivers/ata/pata_bf54x.c
+--- linux-2.6.34/drivers/ata/pata_bf54x.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_bf54x.c      2010-07-01 20:45:14.000000000 -0400
 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
        .dma_boundary           = ATA_DMA_BOUNDARY,
  };
@@ -19168,10 +20550,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_bf54x.c linux-2.6.33.1/drivers/ata/pa
        .inherits               = &ata_sff_port_ops,
  
        .set_piomode            = bfin_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cmd640.c linux-2.6.33.1/drivers/ata/pata_cmd640.c
---- linux-2.6.33.1/drivers/ata/pata_cmd640.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cmd640.c   2010-03-20 16:58:39.244791590 -0400
-@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
+diff -urNp linux-2.6.34/drivers/ata/pata_cmd640.c linux-2.6.34/drivers/ata/pata_cmd640.c
+--- linux-2.6.34/drivers/ata/pata_cmd640.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cmd640.c     2010-07-01 20:45:14.000000000 -0400
+@@ -169,7 +169,7 @@ static struct scsi_host_template cmd640_
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19180,10 +20562,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cmd640.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
        /* In theory xfer_noirq is not needed once we kill the prefetcher */
        .sff_data_xfer  = ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cmd64x.c linux-2.6.33.1/drivers/ata/pata_cmd64x.c
---- linux-2.6.33.1/drivers/ata/pata_cmd64x.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cmd64x.c   2010-03-20 16:58:39.252794847 -0400
-@@ -275,18 +275,18 @@ static const struct ata_port_operations 
+diff -urNp linux-2.6.34/drivers/ata/pata_cmd64x.c linux-2.6.34/drivers/ata/pata_cmd64x.c
+--- linux-2.6.34/drivers/ata/pata_cmd64x.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cmd64x.c     2010-07-01 20:45:14.000000000 -0400
+@@ -274,18 +274,18 @@ static const struct ata_port_operations 
        .set_dmamode    = cmd64x_set_dmamode,
  };
  
@@ -19205,9 +20587,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cmd64x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &cmd64x_base_ops,
        .bmdma_stop     = cmd648_bmdma_stop,
        .cable_detect   = cmd648_cable_detect,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5520.c linux-2.6.33.1/drivers/ata/pata_cs5520.c
---- linux-2.6.33.1/drivers/ata/pata_cs5520.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cs5520.c   2010-03-20 16:58:39.268797665 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_cs5520.c linux-2.6.34/drivers/ata/pata_cs5520.c
+--- linux-2.6.34/drivers/ata/pata_cs5520.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cs5520.c     2010-07-01 20:45:14.000000000 -0400
 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
  };
@@ -19217,9 +20599,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5520.c linux-2.6.33.1/drivers/ata/p
        .inherits               = &ata_bmdma_port_ops,
        .qc_prep                = ata_sff_dumb_qc_prep,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5530.c linux-2.6.33.1/drivers/ata/pata_cs5530.c
---- linux-2.6.33.1/drivers/ata/pata_cs5530.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cs5530.c   2010-03-20 16:58:39.272512019 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_cs5530.c linux-2.6.34/drivers/ata/pata_cs5530.c
+--- linux-2.6.34/drivers/ata/pata_cs5530.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cs5530.c     2010-07-01 20:45:14.000000000 -0400
 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
  };
@@ -19229,9 +20611,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5530.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .qc_prep        = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5535.c linux-2.6.33.1/drivers/ata/pata_cs5535.c
---- linux-2.6.33.1/drivers/ata/pata_cs5535.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cs5535.c   2010-03-20 16:58:39.272512019 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_cs5535.c linux-2.6.34/drivers/ata/pata_cs5535.c
+--- linux-2.6.34/drivers/ata/pata_cs5535.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cs5535.c     2010-07-01 20:45:14.000000000 -0400
 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19241,9 +20623,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5535.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = cs5535_cable_detect,
        .set_piomode    = cs5535_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5536.c linux-2.6.33.1/drivers/ata/pata_cs5536.c
---- linux-2.6.33.1/drivers/ata/pata_cs5536.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cs5536.c   2010-03-20 16:58:39.272512019 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_cs5536.c linux-2.6.34/drivers/ata/pata_cs5536.c
+--- linux-2.6.34/drivers/ata/pata_cs5536.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cs5536.c     2010-07-01 20:45:14.000000000 -0400
 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19253,10 +20635,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cs5536.c linux-2.6.33.1/drivers/ata/p
        .inherits               = &ata_bmdma32_port_ops,
        .cable_detect           = cs5536_cable_detect,
        .set_piomode            = cs5536_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_cypress.c linux-2.6.33.1/drivers/ata/pata_cypress.c
---- linux-2.6.33.1/drivers/ata/pata_cypress.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_cypress.c  2010-03-20 16:58:39.272512019 -0400
-@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
+diff -urNp linux-2.6.34/drivers/ata/pata_cypress.c linux-2.6.34/drivers/ata/pata_cypress.c
+--- linux-2.6.34/drivers/ata/pata_cypress.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_cypress.c    2010-07-01 20:45:14.000000000 -0400
+@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19265,10 +20647,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_cypress.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = cy82c693_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_efar.c linux-2.6.33.1/drivers/ata/pata_efar.c
---- linux-2.6.33.1/drivers/ata/pata_efar.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_efar.c     2010-03-20 16:58:39.272512019 -0400
-@@ -223,7 +223,7 @@ static struct scsi_host_template efar_sh
+diff -urNp linux-2.6.34/drivers/ata/pata_efar.c linux-2.6.34/drivers/ata/pata_efar.c
+--- linux-2.6.34/drivers/ata/pata_efar.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_efar.c       2010-07-01 20:45:14.000000000 -0400
+@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19277,10 +20659,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_efar.c linux-2.6.33.1/drivers/ata/pat
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = efar_cable_detect,
        .set_piomode            = efar_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt366.c linux-2.6.33.1/drivers/ata/pata_hpt366.c
---- linux-2.6.33.1/drivers/ata/pata_hpt366.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_hpt366.c   2010-03-20 16:58:39.272512019 -0400
-@@ -280,7 +280,7 @@ static struct scsi_host_template hpt36x_
+diff -urNp linux-2.6.34/drivers/ata/pata_hpt366.c linux-2.6.34/drivers/ata/pata_hpt366.c
+--- linux-2.6.34/drivers/ata/pata_hpt366.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_hpt366.c     2010-07-01 20:45:14.000000000 -0400
+@@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_
   *    Configuration for HPT366/68
   */
  
@@ -19289,10 +20671,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt366.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = hpt36x_cable_detect,
        .mode_filter    = hpt366_filter,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt37x.c linux-2.6.33.1/drivers/ata/pata_hpt37x.c
---- linux-2.6.33.1/drivers/ata/pata_hpt37x.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_hpt37x.c   2010-03-20 16:58:39.272512019 -0400
-@@ -583,7 +583,7 @@ static struct scsi_host_template hpt37x_
+diff -urNp linux-2.6.34/drivers/ata/pata_hpt37x.c linux-2.6.34/drivers/ata/pata_hpt37x.c
+--- linux-2.6.34/drivers/ata/pata_hpt37x.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_hpt37x.c     2010-07-01 20:45:14.000000000 -0400
+@@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
   *    Configuration for HPT370
   */
  
@@ -19301,7 +20683,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt37x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .bmdma_stop     = hpt370_bmdma_stop,
-@@ -599,7 +599,7 @@ static struct ata_port_operations hpt370
+@@ -580,7 +580,7 @@ static struct ata_port_operations hpt370
   *    Configuration for HPT370A. Close to 370 but less filters
   */
  
@@ -19310,7 +20692,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt37x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &hpt370_port_ops,
        .mode_filter    = hpt370a_filter,
  };
-@@ -609,7 +609,7 @@ static struct ata_port_operations hpt370
+@@ -590,7 +590,7 @@ static struct ata_port_operations hpt370
   *    and DMA mode setting functionality.
   */
  
@@ -19319,7 +20701,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt37x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .bmdma_stop     = hpt37x_bmdma_stop,
-@@ -625,7 +625,7 @@ static struct ata_port_operations hpt372
+@@ -606,7 +606,7 @@ static struct ata_port_operations hpt372
   *    but we have a different cable detection procedure for function 1.
   */
  
@@ -19328,10 +20710,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt37x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &hpt372_port_ops,
        .cable_detect   = hpt374_fn1_cable_detect,
        .prereset       = hpt37x_pre_reset,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt3x2n.c linux-2.6.33.1/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.33.1/drivers/ata/pata_hpt3x2n.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_hpt3x2n.c  2010-03-20 16:58:39.276654661 -0400
-@@ -339,7 +339,7 @@ static struct scsi_host_template hpt3x2n
+diff -urNp linux-2.6.34/drivers/ata/pata_hpt3x2n.c linux-2.6.34/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.34/drivers/ata/pata_hpt3x2n.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_hpt3x2n.c    2010-07-01 20:45:14.000000000 -0400
+@@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
   *    Configuration for HPT3x2n.
   */
  
@@ -19340,9 +20722,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt3x2n.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
  
        .bmdma_stop     = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt3x3.c linux-2.6.33.1/drivers/ata/pata_hpt3x3.c
---- linux-2.6.33.1/drivers/ata/pata_hpt3x3.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_hpt3x3.c   2010-03-20 16:58:39.284801841 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_hpt3x3.c linux-2.6.34/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.34/drivers/ata/pata_hpt3x3.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_hpt3x3.c     2010-07-01 20:45:14.000000000 -0400
 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19352,10 +20734,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_hpt3x3.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = hpt3x3_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_icside.c linux-2.6.33.1/drivers/ata/pata_icside.c
---- linux-2.6.33.1/drivers/ata/pata_icside.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_icside.c   2010-03-20 16:58:39.284801841 -0400
-@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
+diff -urNp linux-2.6.34/drivers/ata/pata_icside.c linux-2.6.34/drivers/ata/pata_icside.c
+--- linux-2.6.34/drivers/ata/pata_icside.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_icside.c     2010-07-01 20:45:14.000000000 -0400
+@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
        }
  }
  
@@ -19364,9 +20746,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_icside.c linux-2.6.33.1/drivers/ata/p
        .inherits               = &ata_sff_port_ops,
        /* no need to build any PRD tables for DMA */
        .qc_prep                = ata_noop_qc_prep,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_isapnp.c linux-2.6.33.1/drivers/ata/pata_isapnp.c
---- linux-2.6.33.1/drivers/ata/pata_isapnp.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_isapnp.c   2010-03-20 16:58:39.292806212 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_isapnp.c linux-2.6.34/drivers/ata/pata_isapnp.c
+--- linux-2.6.34/drivers/ata/pata_isapnp.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_isapnp.c     2010-07-01 20:45:14.000000000 -0400
 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19382,9 +20764,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_isapnp.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        /* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.33.1/drivers/ata/pata_it8213.c linux-2.6.33.1/drivers/ata/pata_it8213.c
---- linux-2.6.33.1/drivers/ata/pata_it8213.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_it8213.c   2010-03-20 16:58:39.296567577 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_it8213.c linux-2.6.34/drivers/ata/pata_it8213.c
+--- linux-2.6.34/drivers/ata/pata_it8213.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_it8213.c     2010-07-01 20:45:14.000000000 -0400
 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
  };
  
@@ -19394,10 +20776,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_it8213.c linux-2.6.33.1/drivers/ata/p
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = it8213_cable_detect,
        .set_piomode            = it8213_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_it821x.c linux-2.6.33.1/drivers/ata/pata_it821x.c
---- linux-2.6.33.1/drivers/ata/pata_it821x.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_it821x.c   2010-03-20 16:58:39.296567577 -0400
-@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
+diff -urNp linux-2.6.34/drivers/ata/pata_it821x.c linux-2.6.34/drivers/ata/pata_it821x.c
+--- linux-2.6.34/drivers/ata/pata_it821x.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_it821x.c     2010-07-01 20:45:14.000000000 -0400
+@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19406,7 +20788,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_it821x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .check_atapi_dma= it821x_check_atapi_dma,
-@@ -814,7 +814,7 @@ static struct ata_port_operations it821x
+@@ -815,7 +815,7 @@ static struct ata_port_operations it821x
        .port_start     = it821x_port_start,
  };
  
@@ -19415,7 +20797,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_it821x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .check_atapi_dma= it821x_check_atapi_dma,
-@@ -830,7 +830,7 @@ static struct ata_port_operations it821x
+@@ -831,7 +831,7 @@ static struct ata_port_operations it821x
        .port_start     = it821x_port_start,
  };
  
@@ -19424,9 +20806,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_it821x.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
  
        .check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.33.1/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.33.1/drivers/ata/pata_ixp4xx_cf.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_ixp4xx_cf.c        2010-03-20 16:58:39.296567577 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_ixp4xx_cf.c  2010-07-01 20:45:14.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19436,9 +20818,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ixp4xx_cf.c linux-2.6.33.1/drivers/at
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ixp4xx_mmio_data_xfer,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_jmicron.c linux-2.6.33.1/drivers/ata/pata_jmicron.c
---- linux-2.6.33.1/drivers/ata/pata_jmicron.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_jmicron.c  2010-03-20 16:58:39.296567577 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_jmicron.c linux-2.6.34/drivers/ata/pata_jmicron.c
+--- linux-2.6.34/drivers/ata/pata_jmicron.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_jmicron.c    2010-07-01 20:45:14.000000000 -0400
 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19448,9 +20830,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_jmicron.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_bmdma_port_ops,
        .prereset               = jmicron_pre_reset,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/pata_legacy.c linux-2.6.33.1/drivers/ata/pata_legacy.c
---- linux-2.6.33.1/drivers/ata/pata_legacy.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_legacy.c   2010-03-20 16:58:39.296567577 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_legacy.c linux-2.6.34/drivers/ata/pata_legacy.c
+--- linux-2.6.34/drivers/ata/pata_legacy.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_legacy.c     2010-07-01 20:45:14.000000000 -0400
 @@ -113,7 +113,7 @@ struct legacy_probe {
  
  struct legacy_controller {
@@ -19562,10 +20944,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_legacy.c linux-2.6.33.1/drivers/ata/p
        struct legacy_data *ld = &legacy_data[probe->slot];
        struct ata_host *host = NULL;
        struct ata_port *ap;
-diff -urNp linux-2.6.33.1/drivers/ata/pata_macio.c linux-2.6.33.1/drivers/ata/pata_macio.c
---- linux-2.6.33.1/drivers/ata/pata_macio.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_macio.c    2010-03-20 16:58:39.300646647 -0400
-@@ -915,7 +915,7 @@ static struct scsi_host_template pata_ma
+diff -urNp linux-2.6.34/drivers/ata/pata_macio.c linux-2.6.34/drivers/ata/pata_macio.c
+--- linux-2.6.34/drivers/ata/pata_macio.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_macio.c      2010-07-01 20:45:14.000000000 -0400
+@@ -916,7 +916,7 @@ static struct scsi_host_template pata_ma
        .slave_configure        = pata_macio_slave_config,
  };
  
@@ -19574,9 +20956,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_macio.c linux-2.6.33.1/drivers/ata/pa
        .inherits               = &ata_sff_port_ops,
  
        .freeze                 = pata_macio_freeze,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_marvell.c linux-2.6.33.1/drivers/ata/pata_marvell.c
---- linux-2.6.33.1/drivers/ata/pata_marvell.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_marvell.c  2010-03-20 16:58:39.300646647 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_marvell.c linux-2.6.34/drivers/ata/pata_marvell.c
+--- linux-2.6.34/drivers/ata/pata_marvell.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_marvell.c    2010-07-01 20:45:14.000000000 -0400
 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19586,9 +20968,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_marvell.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = marvell_cable_detect,
        .prereset               = marvell_pre_reset,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_mpc52xx.c linux-2.6.33.1/drivers/ata/pata_mpc52xx.c
---- linux-2.6.33.1/drivers/ata/pata_mpc52xx.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_mpc52xx.c  2010-03-20 16:58:39.300646647 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_mpc52xx.c linux-2.6.34/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.34/drivers/ata/pata_mpc52xx.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_mpc52xx.c    2010-07-01 20:45:14.000000000 -0400
 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19598,9 +20980,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_mpc52xx.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_sff_port_ops,
        .sff_dev_select         = mpc52xx_ata_dev_select,
        .set_piomode            = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_mpiix.c linux-2.6.33.1/drivers/ata/pata_mpiix.c
---- linux-2.6.33.1/drivers/ata/pata_mpiix.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_mpiix.c    2010-03-20 16:58:39.300646647 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_mpiix.c linux-2.6.34/drivers/ata/pata_mpiix.c
+--- linux-2.6.34/drivers/ata/pata_mpiix.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_mpiix.c      2010-07-01 20:45:14.000000000 -0400
 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19610,9 +20992,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_mpiix.c linux-2.6.33.1/drivers/ata/pa
        .inherits       = &ata_sff_port_ops,
        .qc_issue       = mpiix_qc_issue,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_netcell.c linux-2.6.33.1/drivers/ata/pata_netcell.c
---- linux-2.6.33.1/drivers/ata/pata_netcell.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_netcell.c  2010-03-20 16:58:39.300646647 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_netcell.c linux-2.6.34/drivers/ata/pata_netcell.c
+--- linux-2.6.34/drivers/ata/pata_netcell.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_netcell.c    2010-07-01 20:45:14.000000000 -0400
 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19622,9 +21004,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_netcell.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_80wire,
        .read_id        = netcell_read_id,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_ninja32.c linux-2.6.33.1/drivers/ata/pata_ninja32.c
---- linux-2.6.33.1/drivers/ata/pata_ninja32.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_ninja32.c  2010-03-20 16:58:39.304517814 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_ninja32.c linux-2.6.34/drivers/ata/pata_ninja32.c
+--- linux-2.6.34/drivers/ata/pata_ninja32.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_ninja32.c    2010-07-01 20:45:14.000000000 -0400
 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19634,9 +21016,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ninja32.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
        .sff_dev_select = ninja32_dev_select,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_ns87410.c linux-2.6.33.1/drivers/ata/pata_ns87410.c
---- linux-2.6.33.1/drivers/ata/pata_ns87410.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_ns87410.c  2010-03-20 16:58:39.304517814 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_ns87410.c linux-2.6.34/drivers/ata/pata_ns87410.c
+--- linux-2.6.34/drivers/ata/pata_ns87410.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_ns87410.c    2010-07-01 20:45:14.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19646,9 +21028,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ns87410.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_sff_port_ops,
        .qc_issue       = ns87410_qc_issue,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_ns87415.c linux-2.6.33.1/drivers/ata/pata_ns87415.c
---- linux-2.6.33.1/drivers/ata/pata_ns87415.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_ns87415.c  2010-03-20 16:58:39.304517814 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_ns87415.c linux-2.6.34/drivers/ata/pata_ns87415.c
+--- linux-2.6.34/drivers/ata/pata_ns87415.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_ns87415.c    2010-07-01 20:45:14.000000000 -0400
 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
  }
  #endif                /* 87560 SuperIO Support */
@@ -19667,10 +21049,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_ns87415.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ns87415_pata_ops,
        .sff_tf_read            = ns87560_tf_read,
        .sff_check_status       = ns87560_check_status,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_octeon_cf.c linux-2.6.33.1/drivers/ata/pata_octeon_cf.c
---- linux-2.6.33.1/drivers/ata/pata_octeon_cf.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_octeon_cf.c        2010-03-20 16:58:39.304517814 -0400
-@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
+diff -urNp linux-2.6.34/drivers/ata/pata_octeon_cf.c linux-2.6.34/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.34/drivers/ata/pata_octeon_cf.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_octeon_cf.c  2010-07-01 20:45:14.000000000 -0400
+@@ -802,6 +802,7 @@ static unsigned int octeon_cf_qc_issue(s
        return 0;
  }
  
@@ -19678,9 +21060,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_octeon_cf.c linux-2.6.33.1/drivers/at
  static struct ata_port_operations octeon_cf_ops = {
        .inherits               = &ata_sff_port_ops,
        .check_atapi_dma        = octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_oldpiix.c linux-2.6.33.1/drivers/ata/pata_oldpiix.c
---- linux-2.6.33.1/drivers/ata/pata_oldpiix.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_oldpiix.c  2010-03-20 16:58:39.304517814 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_oldpiix.c linux-2.6.34/drivers/ata/pata_oldpiix.c
+--- linux-2.6.34/drivers/ata/pata_oldpiix.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_oldpiix.c    2010-07-01 20:45:14.000000000 -0400
 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19690,9 +21072,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_oldpiix.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = oldpiix_qc_issue,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_opti.c linux-2.6.33.1/drivers/ata/pata_opti.c
---- linux-2.6.33.1/drivers/ata/pata_opti.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_opti.c     2010-03-20 16:58:39.304517814 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_opti.c linux-2.6.34/drivers/ata/pata_opti.c
+--- linux-2.6.34/drivers/ata/pata_opti.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_opti.c       2010-07-01 20:45:14.000000000 -0400
 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19702,9 +21084,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_opti.c linux-2.6.33.1/drivers/ata/pat
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = opti_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_optidma.c linux-2.6.33.1/drivers/ata/pata_optidma.c
---- linux-2.6.33.1/drivers/ata/pata_optidma.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_optidma.c  2010-03-20 16:58:39.308536639 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_optidma.c linux-2.6.34/drivers/ata/pata_optidma.c
+--- linux-2.6.34/drivers/ata/pata_optidma.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_optidma.c    2010-07-01 20:45:14.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19723,9 +21105,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_optidma.c linux-2.6.33.1/drivers/ata/
        .inherits       = &optidma_port_ops,
        .set_piomode    = optiplus_set_pio_mode,
        .set_dmamode    = optiplus_set_dma_mode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_palmld.c linux-2.6.33.1/drivers/ata/pata_palmld.c
---- linux-2.6.33.1/drivers/ata/pata_palmld.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_palmld.c   2010-03-20 16:58:39.308536639 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_palmld.c linux-2.6.34/drivers/ata/pata_palmld.c
+--- linux-2.6.34/drivers/ata/pata_palmld.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_palmld.c     2010-07-01 20:45:14.000000000 -0400
 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19735,10 +21117,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_palmld.c linux-2.6.33.1/drivers/ata/p
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
        .cable_detect           = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_pcmcia.c linux-2.6.33.1/drivers/ata/pata_pcmcia.c
---- linux-2.6.33.1/drivers/ata/pata_pcmcia.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_pcmcia.c   2010-03-20 16:58:39.308536639 -0400
-@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
+diff -urNp linux-2.6.34/drivers/ata/pata_pcmcia.c linux-2.6.34/drivers/ata/pata_pcmcia.c
+--- linux-2.6.34/drivers/ata/pata_pcmcia.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_pcmcia.c     2010-07-01 20:45:14.000000000 -0400
+@@ -163,14 +163,14 @@ static struct scsi_host_template pcmcia_
        ATA_PIO_SHT(DRV_NAME),
  };
  
@@ -19755,7 +21137,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_pcmcia.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_sff_port_ops,
        .sff_data_xfer  = ata_data_xfer_8bit,
        .cable_detect   = ata_cable_40wire,
-@@ -253,7 +253,7 @@ static int pcmcia_init_one(struct pcmcia
+@@ -254,7 +254,7 @@ static int pcmcia_init_one(struct pcmcia
        unsigned long io_base, ctl_base;
        void __iomem *io_addr, *ctl_addr;
        int n_ports = 1;
@@ -19764,9 +21146,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_pcmcia.c linux-2.6.33.1/drivers/ata/p
  
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (info == NULL)
-diff -urNp linux-2.6.33.1/drivers/ata/pata_pdc2027x.c linux-2.6.33.1/drivers/ata/pata_pdc2027x.c
---- linux-2.6.33.1/drivers/ata/pata_pdc2027x.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_pdc2027x.c 2010-03-20 16:58:39.308536639 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_pdc2027x.c linux-2.6.34/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.34/drivers/ata/pata_pdc2027x.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_pdc2027x.c   2010-07-01 20:45:14.000000000 -0400
 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19784,10 +21166,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_pdc2027x.c linux-2.6.33.1/drivers/ata
        .inherits               = &pdc2027x_pata100_ops,
        .mode_filter            = pdc2027x_mode_filter,
        .set_piomode            = pdc2027x_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c     2010-03-20 16:58:39.308536639 -0400
-@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
+diff -urNp linux-2.6.34/drivers/ata/pata_pdc202xx_old.c linux-2.6.34/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.34/drivers/ata/pata_pdc202xx_old.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_pdc202xx_old.c       2010-07-01 20:45:14.000000000 -0400
+@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19796,8 +21178,8 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.33.1/drivers
        .inherits               = &ata_bmdma_port_ops,
  
        .cable_detect           = ata_cable_40wire,
-@@ -273,7 +273,7 @@ static struct ata_port_operations pdc202
-       .set_dmamode            = pdc202xx_set_dmamode,
+@@ -284,7 +284,7 @@ static struct ata_port_operations pdc202
+       .sff_exec_command       = pdc202xx_exec_command,
  };
  
 -static struct ata_port_operations pdc2026x_port_ops = {
@@ -19805,9 +21187,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_pdc202xx_old.c linux-2.6.33.1/drivers
        .inherits               = &pdc2024x_port_ops,
  
        .check_atapi_dma        = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_piccolo.c linux-2.6.33.1/drivers/ata/pata_piccolo.c
---- linux-2.6.33.1/drivers/ata/pata_piccolo.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_piccolo.c  2010-03-20 16:58:39.308536639 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_piccolo.c linux-2.6.34/drivers/ata/pata_piccolo.c
+--- linux-2.6.34/drivers/ata/pata_piccolo.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_piccolo.c    2010-07-01 20:45:14.000000000 -0400
 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19817,9 +21199,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_piccolo.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = ata_cable_unknown,
        .set_piomode    = tosh_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_platform.c linux-2.6.33.1/drivers/ata/pata_platform.c
---- linux-2.6.33.1/drivers/ata/pata_platform.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_platform.c 2010-03-20 16:58:39.312510954 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_platform.c linux-2.6.34/drivers/ata/pata_platform.c
+--- linux-2.6.34/drivers/ata/pata_platform.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_platform.c   2010-07-01 20:45:14.000000000 -0400
 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19829,9 +21211,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_platform.c linux-2.6.33.1/drivers/ata
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
        .cable_detect           = ata_cable_unknown,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_qdi.c linux-2.6.33.1/drivers/ata/pata_qdi.c
---- linux-2.6.33.1/drivers/ata/pata_qdi.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_qdi.c      2010-03-20 16:58:39.312510954 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_qdi.c linux-2.6.34/drivers/ata/pata_qdi.c
+--- linux-2.6.34/drivers/ata/pata_qdi.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_qdi.c        2010-07-01 20:45:14.000000000 -0400
 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19850,9 +21232,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_qdi.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &qdi6500_port_ops,
        .set_piomode    = qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/pata_radisys.c linux-2.6.33.1/drivers/ata/pata_radisys.c
---- linux-2.6.33.1/drivers/ata/pata_radisys.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_radisys.c  2010-03-20 16:58:39.312510954 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_radisys.c linux-2.6.34/drivers/ata/pata_radisys.c
+--- linux-2.6.34/drivers/ata/pata_radisys.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_radisys.c    2010-07-01 20:45:14.000000000 -0400
 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19862,10 +21244,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_radisys.c linux-2.6.33.1/drivers/ata/
        .inherits               = &ata_bmdma_port_ops,
        .qc_issue               = radisys_qc_issue,
        .cable_detect           = ata_cable_unknown,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_rb532_cf.c linux-2.6.33.1/drivers/ata/pata_rb532_cf.c
---- linux-2.6.33.1/drivers/ata/pata_rb532_cf.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_rb532_cf.c 2010-03-20 16:58:39.312510954 -0400
-@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
+diff -urNp linux-2.6.34/drivers/ata/pata_rb532_cf.c linux-2.6.34/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.34/drivers/ata/pata_rb532_cf.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_rb532_cf.c   2010-07-01 20:45:14.000000000 -0400
+@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
        return IRQ_HANDLED;
  }
  
@@ -19874,10 +21256,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_rb532_cf.c linux-2.6.33.1/drivers/ata
        .inherits               = &ata_sff_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/pata_rdc.c linux-2.6.33.1/drivers/ata/pata_rdc.c
---- linux-2.6.33.1/drivers/ata/pata_rdc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_rdc.c      2010-03-20 16:58:39.312510954 -0400
-@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
+diff -urNp linux-2.6.34/drivers/ata/pata_rdc.c linux-2.6.34/drivers/ata/pata_rdc.c
+--- linux-2.6.34/drivers/ata/pata_rdc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_rdc.c        2010-07-01 20:45:14.000000000 -0400
+@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
        pci_write_config_byte(dev, 0x48, udma_enable);
  }
  
@@ -19886,9 +21268,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_rdc.c linux-2.6.33.1/drivers/ata/pata
        .inherits               = &ata_bmdma32_port_ops,
        .cable_detect           = rdc_pata_cable_detect,
        .set_piomode            = rdc_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_rz1000.c linux-2.6.33.1/drivers/ata/pata_rz1000.c
---- linux-2.6.33.1/drivers/ata/pata_rz1000.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_rz1000.c   2010-03-20 16:58:39.312510954 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_rz1000.c linux-2.6.34/drivers/ata/pata_rz1000.c
+--- linux-2.6.34/drivers/ata/pata_rz1000.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_rz1000.c     2010-07-01 20:45:14.000000000 -0400
 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -19898,9 +21280,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_rz1000.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_sff_port_ops,
        .cable_detect   = ata_cable_40wire,
        .set_mode       = rz1000_set_mode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_sc1200.c linux-2.6.33.1/drivers/ata/pata_sc1200.c
---- linux-2.6.33.1/drivers/ata/pata_sc1200.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_sc1200.c   2010-03-20 16:58:39.312510954 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_sc1200.c linux-2.6.34/drivers/ata/pata_sc1200.c
+--- linux-2.6.34/drivers/ata/pata_sc1200.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_sc1200.c     2010-07-01 20:45:14.000000000 -0400
 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
  };
@@ -19910,9 +21292,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_sc1200.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma_port_ops,
        .qc_prep        = ata_sff_dumb_qc_prep,
        .qc_issue       = sc1200_qc_issue,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_scc.c linux-2.6.33.1/drivers/ata/pata_scc.c
---- linux-2.6.33.1/drivers/ata/pata_scc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_scc.c      2010-03-20 16:58:39.316539767 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_scc.c linux-2.6.34/drivers/ata/pata_scc.c
+--- linux-2.6.34/drivers/ata/pata_scc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_scc.c        2010-07-01 20:45:14.000000000 -0400
 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19922,9 +21304,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_scc.c linux-2.6.33.1/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
  
        .set_piomode            = scc_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_sch.c linux-2.6.33.1/drivers/ata/pata_sch.c
---- linux-2.6.33.1/drivers/ata/pata_sch.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_sch.c      2010-03-20 16:58:39.316539767 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_sch.c linux-2.6.34/drivers/ata/pata_sch.c
+--- linux-2.6.34/drivers/ata/pata_sch.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_sch.c        2010-07-01 20:45:14.000000000 -0400
 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19934,10 +21316,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_sch.c linux-2.6.33.1/drivers/ata/pata
        .inherits               = &ata_bmdma_port_ops,
        .cable_detect           = ata_cable_unknown,
        .set_piomode            = sch_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_serverworks.c linux-2.6.33.1/drivers/ata/pata_serverworks.c
---- linux-2.6.33.1/drivers/ata/pata_serverworks.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_serverworks.c      2010-03-20 16:58:39.316539767 -0400
-@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
+diff -urNp linux-2.6.34/drivers/ata/pata_serverworks.c linux-2.6.34/drivers/ata/pata_serverworks.c
+--- linux-2.6.34/drivers/ata/pata_serverworks.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_serverworks.c        2010-07-01 20:45:14.000000000 -0400
+@@ -300,7 +300,7 @@ static struct scsi_host_template serverw
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -19946,7 +21328,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_serverworks.c linux-2.6.33.1/drivers/
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = serverworks_cable_detect,
        .mode_filter    = serverworks_osb4_filter,
-@@ -307,7 +307,7 @@ static struct ata_port_operations server
+@@ -308,7 +308,7 @@ static struct ata_port_operations server
        .set_dmamode    = serverworks_set_dmamode,
  };
  
@@ -19955,9 +21337,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_serverworks.c linux-2.6.33.1/drivers/
        .inherits       = &serverworks_osb4_port_ops,
        .mode_filter    = serverworks_csb_filter,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/pata_sil680.c linux-2.6.33.1/drivers/ata/pata_sil680.c
---- linux-2.6.33.1/drivers/ata/pata_sil680.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_sil680.c   2010-03-20 16:58:39.316539767 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_sil680.c linux-2.6.34/drivers/ata/pata_sil680.c
+--- linux-2.6.34/drivers/ata/pata_sil680.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_sil680.c     2010-07-01 20:45:14.000000000 -0400
 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -19967,9 +21349,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_sil680.c linux-2.6.33.1/drivers/ata/p
        .inherits       = &ata_bmdma32_port_ops,
        .cable_detect   = sil680_cable_detect,
        .set_piomode    = sil680_set_piomode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_sis.c linux-2.6.33.1/drivers/ata/pata_sis.c
---- linux-2.6.33.1/drivers/ata/pata_sis.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_sis.c      2010-03-20 16:58:39.320616216 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_sis.c linux-2.6.34/drivers/ata/pata_sis.c
+--- linux-2.6.34/drivers/ata/pata_sis.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_sis.c        2010-07-01 20:45:14.000000000 -0400
 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -20025,9 +21407,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_sis.c linux-2.6.33.1/drivers/ata/pata
        .inherits               = &sis_base_ops,
        .set_piomode            = sis_old_set_piomode,
        .set_dmamode            = sis_old_set_dmamode,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_sl82c105.c linux-2.6.33.1/drivers/ata/pata_sl82c105.c
---- linux-2.6.33.1/drivers/ata/pata_sl82c105.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_sl82c105.c 2010-03-20 16:58:39.320616216 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_sl82c105.c linux-2.6.34/drivers/ata/pata_sl82c105.c
+--- linux-2.6.34/drivers/ata/pata_sl82c105.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_sl82c105.c   2010-07-01 20:45:14.000000000 -0400
 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -20037,9 +21419,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_sl82c105.c linux-2.6.33.1/drivers/ata
        .inherits       = &ata_bmdma_port_ops,
        .qc_defer       = sl82c105_qc_defer,
        .bmdma_start    = sl82c105_bmdma_start,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_triflex.c linux-2.6.33.1/drivers/ata/pata_triflex.c
---- linux-2.6.33.1/drivers/ata/pata_triflex.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_triflex.c  2010-03-20 16:58:39.320616216 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_triflex.c linux-2.6.34/drivers/ata/pata_triflex.c
+--- linux-2.6.34/drivers/ata/pata_triflex.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_triflex.c    2010-07-01 20:45:14.000000000 -0400
 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -20049,10 +21431,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_triflex.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_bmdma_port_ops,
        .bmdma_start    = triflex_bmdma_start,
        .bmdma_stop     = triflex_bmdma_stop,
-diff -urNp linux-2.6.33.1/drivers/ata/pata_via.c linux-2.6.33.1/drivers/ata/pata_via.c
---- linux-2.6.33.1/drivers/ata/pata_via.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_via.c      2010-03-20 16:58:39.320616216 -0400
-@@ -452,7 +452,7 @@ static struct scsi_host_template via_sht
+diff -urNp linux-2.6.34/drivers/ata/pata_via.c linux-2.6.34/drivers/ata/pata_via.c
+--- linux-2.6.34/drivers/ata/pata_via.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_via.c        2010-07-01 20:45:14.000000000 -0400
+@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20061,7 +21443,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_via.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &ata_bmdma_port_ops,
        .cable_detect   = via_cable_detect,
        .set_piomode    = via_set_piomode,
-@@ -463,7 +463,7 @@ static struct ata_port_operations via_po
+@@ -452,7 +452,7 @@ static struct ata_port_operations via_po
        .mode_filter    = via_mode_filter,
  };
  
@@ -20070,9 +21452,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_via.c linux-2.6.33.1/drivers/ata/pata
        .inherits       = &via_port_ops,
        .sff_data_xfer  = ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.33.1/drivers/ata/pata_winbond.c linux-2.6.33.1/drivers/ata/pata_winbond.c
---- linux-2.6.33.1/drivers/ata/pata_winbond.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pata_winbond.c  2010-03-20 16:58:39.346062317 -0400
+diff -urNp linux-2.6.34/drivers/ata/pata_winbond.c linux-2.6.34/drivers/ata/pata_winbond.c
+--- linux-2.6.34/drivers/ata/pata_winbond.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pata_winbond.c    2010-07-01 20:45:14.000000000 -0400
 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond
        ATA_PIO_SHT(DRV_NAME),
  };
@@ -20082,10 +21464,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pata_winbond.c linux-2.6.33.1/drivers/ata/
        .inherits       = &ata_sff_port_ops,
        .sff_data_xfer  = winbond_data_xfer,
        .cable_detect   = ata_cable_40wire,
-diff -urNp linux-2.6.33.1/drivers/ata/pdc_adma.c linux-2.6.33.1/drivers/ata/pdc_adma.c
---- linux-2.6.33.1/drivers/ata/pdc_adma.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/pdc_adma.c      2010-03-20 16:58:39.348522755 -0400
-@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
+diff -urNp linux-2.6.34/drivers/ata/pdc_adma.c linux-2.6.34/drivers/ata/pdc_adma.c
+--- linux-2.6.34/drivers/ata/pdc_adma.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/pdc_adma.c        2010-07-01 20:45:14.000000000 -0400
+@@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
        .dma_boundary           = ADMA_DMA_BOUNDARY,
  };
  
@@ -20094,10 +21476,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/pdc_adma.c linux-2.6.33.1/drivers/ata/pdc_
        .inherits               = &ata_sff_port_ops,
  
        .lost_interrupt         = ATA_OP_NULL,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_fsl.c linux-2.6.33.1/drivers/ata/sata_fsl.c
---- linux-2.6.33.1/drivers/ata/sata_fsl.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_fsl.c      2010-03-20 16:58:39.348522755 -0400
-@@ -1260,7 +1260,7 @@ static struct scsi_host_template sata_fs
+diff -urNp linux-2.6.34/drivers/ata/sata_fsl.c linux-2.6.34/drivers/ata/sata_fsl.c
+--- linux-2.6.34/drivers/ata/sata_fsl.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_fsl.c        2010-07-01 20:45:14.000000000 -0400
+@@ -1261,7 +1261,7 @@ static struct scsi_host_template sata_fs
        .dma_boundary = ATA_DMA_BOUNDARY,
  };
  
@@ -20106,10 +21488,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_fsl.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &sata_pmp_port_ops,
  
        .qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_inic162x.c linux-2.6.33.1/drivers/ata/sata_inic162x.c
---- linux-2.6.33.1/drivers/ata/sata_inic162x.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_inic162x.c 2010-03-20 16:58:39.348522755 -0400
-@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
+diff -urNp linux-2.6.34/drivers/ata/sata_inic162x.c linux-2.6.34/drivers/ata/sata_inic162x.c
+--- linux-2.6.34/drivers/ata/sata_inic162x.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_inic162x.c   2010-07-01 20:45:14.000000000 -0400
+@@ -722,7 +722,7 @@ static int inic_port_start(struct ata_po
        return 0;
  }
  
@@ -20118,10 +21500,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_inic162x.c linux-2.6.33.1/drivers/ata
        .inherits               = &sata_port_ops,
  
        .check_atapi_dma        = inic_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_mv.c linux-2.6.33.1/drivers/ata/sata_mv.c
---- linux-2.6.33.1/drivers/ata/sata_mv.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_mv.c       2010-03-20 16:58:39.352614445 -0400
-@@ -662,7 +662,7 @@ static struct scsi_host_template mv6_sht
+diff -urNp linux-2.6.34/drivers/ata/sata_mv.c linux-2.6.34/drivers/ata/sata_mv.c
+--- linux-2.6.34/drivers/ata/sata_mv.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_mv.c 2010-07-01 20:45:14.000000000 -0400
+@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
        .dma_boundary           = MV_DMA_BOUNDARY,
  };
  
@@ -20130,7 +21512,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_mv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &ata_sff_port_ops,
  
        .lost_interrupt         = ATA_OP_NULL,
-@@ -684,7 +684,7 @@ static struct ata_port_operations mv5_op
+@@ -685,7 +685,7 @@ static struct ata_port_operations mv5_op
        .port_stop              = mv_port_stop,
  };
  
@@ -20139,7 +21521,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_mv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &mv5_ops,
        .dev_config             = mv6_dev_config,
        .scr_read               = mv_scr_read,
-@@ -704,7 +704,7 @@ static struct ata_port_operations mv6_op
+@@ -705,7 +705,7 @@ static struct ata_port_operations mv6_op
        .bmdma_status           = mv_bmdma_status,
  };
  
@@ -20148,10 +21530,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_mv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &mv6_ops,
        .dev_config             = ATA_OP_NULL,
        .qc_prep                = mv_qc_prep_iie,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_nv.c linux-2.6.33.1/drivers/ata/sata_nv.c
---- linux-2.6.33.1/drivers/ata/sata_nv.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_nv.c       2010-03-20 16:58:39.352614445 -0400
-@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
+diff -urNp linux-2.6.34/drivers/ata/sata_nv.c linux-2.6.34/drivers/ata/sata_nv.c
+--- linux-2.6.34/drivers/ata/sata_nv.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_nv.c 2010-07-01 20:45:14.000000000 -0400
+@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
   */
@@ -20160,7 +21542,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_nv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &ata_bmdma_port_ops,
        .lost_interrupt         = ATA_OP_NULL,
        .scr_read               = nv_scr_read,
-@@ -472,20 +472,20 @@ static struct ata_port_operations nv_gen
+@@ -473,20 +473,20 @@ static struct ata_port_operations nv_gen
        .hardreset              = nv_hardreset,
  };
  
@@ -20184,7 +21566,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_nv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &nv_ck804_ops,
  
        .check_atapi_dma        = nv_adma_check_atapi_dma,
-@@ -509,7 +509,7 @@ static struct ata_port_operations nv_adm
+@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adm
        .host_stop              = nv_adma_host_stop,
  };
  
@@ -20193,10 +21575,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_nv.c linux-2.6.33.1/drivers/ata/sata_
        .inherits               = &nv_generic_ops,
  
        .qc_defer               = ata_std_qc_defer,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_promise.c linux-2.6.33.1/drivers/ata/sata_promise.c
---- linux-2.6.33.1/drivers/ata/sata_promise.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_promise.c  2010-03-20 16:58:39.352614445 -0400
-@@ -195,7 +195,7 @@ static const struct ata_port_operations 
+diff -urNp linux-2.6.34/drivers/ata/sata_promise.c linux-2.6.34/drivers/ata/sata_promise.c
+--- linux-2.6.34/drivers/ata/sata_promise.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_promise.c    2010-07-01 20:45:14.000000000 -0400
+@@ -196,7 +196,7 @@ static const struct ata_port_operations 
        .error_handler          = pdc_error_handler,
  };
  
@@ -20205,7 +21587,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_promise.c linux-2.6.33.1/drivers/ata/
        .inherits               = &pdc_common_ops,
        .cable_detect           = pdc_sata_cable_detect,
        .freeze                 = pdc_sata_freeze,
-@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sa
+@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sa
  
  /* First-generation chips need a more restrictive ->check_atapi_dma op,
     and ->freeze/thaw that ignore the hotplug controls. */
@@ -20222,10 +21604,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_promise.c linux-2.6.33.1/drivers/ata/
        .inherits               = &pdc_common_ops,
        .cable_detect           = pdc_pata_cable_detect,
        .freeze                 = pdc_freeze,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_qstor.c linux-2.6.33.1/drivers/ata/sata_qstor.c
---- linux-2.6.33.1/drivers/ata/sata_qstor.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_qstor.c    2010-03-20 16:58:39.356512831 -0400
-@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
+diff -urNp linux-2.6.34/drivers/ata/sata_qstor.c linux-2.6.34/drivers/ata/sata_qstor.c
+--- linux-2.6.34/drivers/ata/sata_qstor.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_qstor.c      2010-07-01 20:45:14.000000000 -0400
+@@ -133,7 +133,7 @@ static struct scsi_host_template qs_ata_
        .dma_boundary           = QS_DMA_BOUNDARY,
  };
  
@@ -20234,10 +21616,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_qstor.c linux-2.6.33.1/drivers/ata/sa
        .inherits               = &ata_sff_port_ops,
  
        .check_atapi_dma        = qs_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_sil24.c linux-2.6.33.1/drivers/ata/sata_sil24.c
---- linux-2.6.33.1/drivers/ata/sata_sil24.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_sil24.c    2010-03-20 16:58:39.364799637 -0400
-@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
+diff -urNp linux-2.6.34/drivers/ata/sata_sil24.c linux-2.6.34/drivers/ata/sata_sil24.c
+--- linux-2.6.34/drivers/ata/sata_sil24.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_sil24.c      2010-07-01 20:45:14.000000000 -0400
+@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
        .dma_boundary           = ATA_DMA_BOUNDARY,
  };
  
@@ -20246,9 +21628,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_sil24.c linux-2.6.33.1/drivers/ata/sa
        .inherits               = &sata_pmp_port_ops,
  
        .qc_defer               = sil24_qc_defer,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_sil.c linux-2.6.33.1/drivers/ata/sata_sil.c
---- linux-2.6.33.1/drivers/ata/sata_sil.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_sil.c      2010-03-20 16:58:39.368722008 -0400
+diff -urNp linux-2.6.34/drivers/ata/sata_sil.c linux-2.6.34/drivers/ata/sata_sil.c
+--- linux-2.6.34/drivers/ata/sata_sil.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_sil.c        2010-07-01 20:45:14.000000000 -0400
 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
        .sg_tablesize           = ATA_MAX_PRD
  };
@@ -20258,9 +21640,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_sil.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_bmdma32_port_ops,
        .dev_config             = sil_dev_config,
        .set_mode               = sil_set_mode,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_sis.c linux-2.6.33.1/drivers/ata/sata_sis.c
---- linux-2.6.33.1/drivers/ata/sata_sis.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_sis.c      2010-03-20 16:58:39.368722008 -0400
+diff -urNp linux-2.6.34/drivers/ata/sata_sis.c linux-2.6.34/drivers/ata/sata_sis.c
+--- linux-2.6.34/drivers/ata/sata_sis.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_sis.c        2010-07-01 20:45:14.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -20270,9 +21652,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_sis.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_bmdma_port_ops,
        .scr_read               = sis_scr_read,
        .scr_write              = sis_scr_write,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_svw.c linux-2.6.33.1/drivers/ata/sata_svw.c
---- linux-2.6.33.1/drivers/ata/sata_svw.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_svw.c      2010-03-20 16:58:39.368722008 -0400
+diff -urNp linux-2.6.34/drivers/ata/sata_svw.c linux-2.6.34/drivers/ata/sata_svw.c
+--- linux-2.6.34/drivers/ata/sata_svw.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_svw.c        2010-07-01 20:45:14.000000000 -0400
 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
  };
  
@@ -20282,10 +21664,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_svw.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_bmdma_port_ops,
        .sff_tf_load            = k2_sata_tf_load,
        .sff_tf_read            = k2_sata_tf_read,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_sx4.c linux-2.6.33.1/drivers/ata/sata_sx4.c
---- linux-2.6.33.1/drivers/ata/sata_sx4.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_sx4.c      2010-03-20 16:58:39.368722008 -0400
-@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
+diff -urNp linux-2.6.34/drivers/ata/sata_sx4.c linux-2.6.34/drivers/ata/sata_sx4.c
+--- linux-2.6.34/drivers/ata/sata_sx4.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_sx4.c        2010-07-01 20:45:14.000000000 -0400
+@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
  };
  
  /* TODO: inherit from base port_ops after converting to new EH */
@@ -20294,10 +21676,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_sx4.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_sff_port_ops,
  
        .check_atapi_dma        = pdc_check_atapi_dma,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_uli.c linux-2.6.33.1/drivers/ata/sata_uli.c
---- linux-2.6.33.1/drivers/ata/sata_uli.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_uli.c      2010-03-20 16:58:39.372783452 -0400
-@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
+diff -urNp linux-2.6.34/drivers/ata/sata_uli.c linux-2.6.34/drivers/ata/sata_uli.c
+--- linux-2.6.34/drivers/ata/sata_uli.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_uli.c        2010-07-01 20:45:14.000000000 -0400
+@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20306,10 +21688,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_uli.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_bmdma_port_ops,
        .scr_read               = uli_scr_read,
        .scr_write              = uli_scr_write,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_via.c linux-2.6.33.1/drivers/ata/sata_via.c
---- linux-2.6.33.1/drivers/ata/sata_via.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_via.c      2010-03-20 16:58:39.372783452 -0400
-@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
+diff -urNp linux-2.6.34/drivers/ata/sata_via.c linux-2.6.34/drivers/ata/sata_via.c
+--- linux-2.6.34/drivers/ata/sata_via.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_via.c        2010-07-01 20:45:14.000000000 -0400
+@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
        ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -20324,6 +21706,7 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_via.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &svia_base_ops,
        .freeze                 = svia_noop_freeze,
        .prereset               = vt6420_prereset,
+       .bmdma_start            = vt6420_bmdma_start,
  };
  
 -static struct ata_port_operations vt6421_pata_ops = {
@@ -20346,9 +21729,9 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_via.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &svia_base_ops,
        .hardreset              = sata_std_hardreset,
        .scr_read               = vt8251_scr_read,
-diff -urNp linux-2.6.33.1/drivers/ata/sata_vsc.c linux-2.6.33.1/drivers/ata/sata_vsc.c
---- linux-2.6.33.1/drivers/ata/sata_vsc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ata/sata_vsc.c      2010-03-20 16:58:39.372783452 -0400
+diff -urNp linux-2.6.34/drivers/ata/sata_vsc.c linux-2.6.34/drivers/ata/sata_vsc.c
+--- linux-2.6.34/drivers/ata/sata_vsc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ata/sata_vsc.c        2010-07-01 20:45:14.000000000 -0400
 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
  };
  
@@ -20358,10 +21741,10 @@ diff -urNp linux-2.6.33.1/drivers/ata/sata_vsc.c linux-2.6.33.1/drivers/ata/sata
        .inherits               = &ata_bmdma_port_ops,
        /* The IRQ handling is not quite standard SFF behaviour so we
           cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.33.1/drivers/atm/adummy.c linux-2.6.33.1/drivers/atm/adummy.c
---- linux-2.6.33.1/drivers/atm/adummy.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/adummy.c        2010-03-20 16:58:39.380807655 -0400
-@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 
+diff -urNp linux-2.6.34/drivers/atm/adummy.c linux-2.6.34/drivers/atm/adummy.c
+--- linux-2.6.34/drivers/atm/adummy.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/adummy.c  2010-07-01 20:45:14.000000000 -0400
+@@ -78,7 +78,7 @@ adummy_send(struct atm_vcc *vcc, struct 
                vcc->pop(vcc, skb);
        else
                dev_kfree_skb_any(skb);
@@ -20370,10 +21753,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/adummy.c linux-2.6.33.1/drivers/atm/adummy
  
        return 0;
  }
-diff -urNp linux-2.6.33.1/drivers/atm/ambassador.c linux-2.6.33.1/drivers/atm/ambassador.c
---- linux-2.6.33.1/drivers/atm/ambassador.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/ambassador.c    2010-03-20 16:58:39.414343197 -0400
-@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 
+diff -urNp linux-2.6.34/drivers/atm/ambassador.c linux-2.6.34/drivers/atm/ambassador.c
+--- linux-2.6.34/drivers/atm/ambassador.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/ambassador.c      2010-07-01 20:45:14.000000000 -0400
+@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
    // VC layer stats
@@ -20382,7 +21765,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/ambassador.c linux-2.6.33.1/drivers/atm/am
    
    // free the descriptor
    kfree (tx_descr);
-@@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev, 
+@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, 
          dump_skb ("<<<", vc, skb);
          
          // VC layer stats
@@ -20391,7 +21774,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/ambassador.c linux-2.6.33.1/drivers/atm/am
          __net_timestamp(skb);
          // end of our responsability
          atm_vcc->push (atm_vcc, skb);
-@@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev, 
+@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, 
        } else {
                PRINTK (KERN_INFO, "dropped over-size frame");
        // should we count this?
@@ -20400,7 +21783,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/ambassador.c linux-2.6.33.1/drivers/atm/am
        }
        
      } else {
-@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * at
+@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * at
    }
    
    if (check_area (skb->data, skb->len)) {
@@ -20409,10 +21792,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/ambassador.c linux-2.6.33.1/drivers/atm/am
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp.c
---- linux-2.6.33.1/drivers/atm/atmtcp.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/atmtcp.c        2010-03-20 16:58:39.414343197 -0400
-@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 
+diff -urNp linux-2.6.34/drivers/atm/atmtcp.c linux-2.6.34/drivers/atm/atmtcp.c
+--- linux-2.6.34/drivers/atm/atmtcp.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/atmtcp.c  2010-07-01 20:45:14.000000000 -0400
+@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
                if (vcc->pop) vcc->pop(vcc,skb);
                else dev_kfree_skb(skb);
                if (dev_data) return 0;
@@ -20421,7 +21804,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp
                return -ENOLINK;
        }
        size = skb->len+sizeof(struct atmtcp_hdr);
-@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc 
+@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc 
        if (!new_skb) {
                if (vcc->pop) vcc->pop(vcc,skb);
                else dev_kfree_skb(skb);
@@ -20430,7 +21813,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp
                return -ENOBUFS;
        }
        hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
-@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc 
+@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc 
        if (vcc->pop) vcc->pop(vcc,skb);
        else dev_kfree_skb(skb);
        out_vcc->push(out_vcc,new_skb);
@@ -20441,7 +21824,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp
        return 0;
  }
  
-@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc 
+@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc 
        out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
        read_unlock(&vcc_sklist_lock);
        if (!out_vcc) {
@@ -20450,7 +21833,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp
                goto done;
        }
        skb_pull(skb,sizeof(struct atmtcp_hdr));
-@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc 
+@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc 
        __net_timestamp(new_skb);
        skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
        out_vcc->push(out_vcc,new_skb);
@@ -20461,10 +21844,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/atmtcp.c linux-2.6.33.1/drivers/atm/atmtcp
  done:
        if (vcc->pop) vcc->pop(vcc,skb);
        else dev_kfree_skb(skb);
-diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
---- linux-2.6.33.1/drivers/atm/eni.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/eni.c   2010-03-20 16:58:39.441488287 -0400
-@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
+diff -urNp linux-2.6.34/drivers/atm/eni.c linux-2.6.34/drivers/atm/eni.c
+--- linux-2.6.34/drivers/atm/eni.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/eni.c     2010-07-01 20:45:14.000000000 -0400
+@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
                DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
                    vcc->dev->number);
                length = 0;
@@ -20473,7 +21856,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
        }
        else {
                length = ATM_CELL_SIZE-1; /* no HEC */
-@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
                            size);
                }
                eff = length = 0;
@@ -20482,7 +21865,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
        }
        else {
                size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
-@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
+@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
                            "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
                            vcc->dev->number,vcc->vci,length,size << 2,descr);
                        length = eff = 0;
@@ -20491,7 +21874,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
                }
        }
        skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
-@@ -770,7 +770,7 @@ rx_dequeued++;
+@@ -771,7 +771,7 @@ rx_dequeued++;
                        vcc->push(vcc,skb);
                        pushed++;
                }
@@ -20500,7 +21883,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
        }
        wake_up(&eni_dev->rx_wait);
  }
-@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *d
+@@ -1228,7 +1228,7 @@ static void dequeue_tx(struct atm_dev *d
                    PCI_DMA_TODEVICE);
                if (vcc->pop) vcc->pop(vcc,skb);
                else dev_kfree_skb_irq(skb);
@@ -20509,10 +21892,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/eni.c linux-2.6.33.1/drivers/atm/eni.c
                wake_up(&eni_dev->tx_wait);
  dma_complete++;
        }
-diff -urNp linux-2.6.33.1/drivers/atm/firestream.c linux-2.6.33.1/drivers/atm/firestream.c
---- linux-2.6.33.1/drivers/atm/firestream.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/firestream.c    2010-03-20 16:58:39.441488287 -0400
-@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
+diff -urNp linux-2.6.34/drivers/atm/firestream.c linux-2.6.34/drivers/atm/firestream.c
+--- linux-2.6.34/drivers/atm/firestream.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/firestream.c      2010-07-01 20:45:14.000000000 -0400
+@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
                                }
                        }
  
@@ -20521,7 +21904,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/firestream.c linux-2.6.33.1/drivers/atm/fi
  
                        fs_dprintk (FS_DEBUG_TXMEM, "i");
                        fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -815,7 +815,7 @@ static void process_incoming (struct fs_
+@@ -816,7 +816,7 @@ static void process_incoming (struct fs_
  #endif
                                skb_put (skb, qe->p1 & 0xffff); 
                                ATM_SKB(skb)->vcc = atm_vcc;
@@ -20530,7 +21913,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/firestream.c linux-2.6.33.1/drivers/atm/fi
                                __net_timestamp(skb);
                                fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
                                atm_vcc->push (atm_vcc, skb);
-@@ -836,12 +836,12 @@ static void process_incoming (struct fs_
+@@ -837,12 +837,12 @@ static void process_incoming (struct fs_
                                kfree (pe);
                        }
                        if (atm_vcc)
@@ -20545,9 +21928,9 @@ diff -urNp linux-2.6.33.1/drivers/atm/firestream.c linux-2.6.33.1/drivers/atm/fi
                        break;
                default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
                        printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.33.1/drivers/atm/fore200e.c linux-2.6.33.1/drivers/atm/fore200e.c
---- linux-2.6.33.1/drivers/atm/fore200e.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/fore200e.c      2010-03-20 16:58:39.457804294 -0400
+diff -urNp linux-2.6.34/drivers/atm/fore200e.c linux-2.6.34/drivers/atm/fore200e.c
+--- linux-2.6.34/drivers/atm/fore200e.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/fore200e.c        2010-07-01 20:45:14.000000000 -0400
 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
                /* check error condition */
@@ -20604,10 +21987,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/fore200e.c linux-2.6.33.1/drivers/atm/fore
  
            fore200e->tx_sat++;
            DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
---- linux-2.6.33.1/drivers/atm/he.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/he.c    2010-03-20 16:58:39.488806819 -0400
-@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+diff -urNp linux-2.6.34/drivers/atm/he.c linux-2.6.34/drivers/atm/he.c
+--- linux-2.6.34/drivers/atm/he.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/he.c      2010-07-01 20:45:14.000000000 -0400
+@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
                if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
                        hprintk("HBUF_ERR!  (cid 0x%x)\n", cid);
@@ -20616,7 +21999,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                        goto return_host_buffers;
                }
  
-@@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1803,7 +1803,7 @@ he_service_rbrq(struct he_dev *he_dev, i
                                RBRQ_LEN_ERR(he_dev->rbrq_head)
                                                        ? "LEN_ERR" : "",
                                                        vcc->vpi, vcc->vci);
@@ -20625,7 +22008,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                        goto return_host_buffers;
                }
  
-@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, i
+@@ -1862,7 +1862,7 @@ he_service_rbrq(struct he_dev *he_dev, i
                vcc->push(vcc, skb);
                spin_lock(&he_dev->global_lock);
  
@@ -20634,7 +22017,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
  
  return_host_buffers:
                ++pdus_assembled;
-@@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
+@@ -2207,7 +2207,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
                                        tpd->vcc->pop(tpd->vcc, tpd->skb);
                                else
                                        dev_kfree_skb_any(tpd->skb);
@@ -20643,7 +22026,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                        }
                        pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
                        return;
-@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2619,7 +2619,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
                        vcc->pop(vcc, skb);
                else
                        dev_kfree_skb_any(skb);
@@ -20652,7 +22035,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                return -EINVAL;
        }
  
-@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2630,7 +2630,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
                        vcc->pop(vcc, skb);
                else
                        dev_kfree_skb_any(skb);
@@ -20661,7 +22044,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                return -EINVAL;
        }
  #endif
-@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2642,7 +2642,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
                        vcc->pop(vcc, skb);
                else
                        dev_kfree_skb_any(skb);
@@ -20670,7 +22053,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                spin_unlock_irqrestore(&he_dev->global_lock, flags);
                return -ENOMEM;
        }
-@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2684,7 +2684,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
                                        vcc->pop(vcc, skb);
                                else
                                        dev_kfree_skb_any(skb);
@@ -20679,7 +22062,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
                                spin_unlock_irqrestore(&he_dev->global_lock, flags);
                                return -ENOMEM;
                        }
-@@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
+@@ -2715,7 +2715,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
        __enqueue_tpd(he_dev, tpd, cid);
        spin_unlock_irqrestore(&he_dev->global_lock, flags);
  
@@ -20688,10 +22071,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/he.c linux-2.6.33.1/drivers/atm/he.c
  
        return 0;
  }
-diff -urNp linux-2.6.33.1/drivers/atm/horizon.c linux-2.6.33.1/drivers/atm/horizon.c
---- linux-2.6.33.1/drivers/atm/horizon.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/horizon.c       2010-03-20 16:58:39.496821217 -0400
-@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 
+diff -urNp linux-2.6.34/drivers/atm/horizon.c linux-2.6.34/drivers/atm/horizon.c
+--- linux-2.6.34/drivers/atm/horizon.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/horizon.c 2010-07-01 20:45:14.000000000 -0400
+@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
        {
          struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
          // VC layer stats
@@ -20700,7 +22083,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/horizon.c linux-2.6.33.1/drivers/atm/horiz
          __net_timestamp(skb);
          // end of our responsability
          vcc->push (vcc, skb);
-@@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const
+@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const
        dev->tx_iovec = NULL;
        
        // VC layer stats
@@ -20709,10 +22092,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/horizon.c linux-2.6.33.1/drivers/atm/horiz
        
        // free the skb
        hrz_kfree_skb (skb);
-diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt77252.c
---- linux-2.6.33.1/drivers/atm/idt77252.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/idt77252.c      2010-03-20 16:58:39.496821217 -0400
-@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
+diff -urNp linux-2.6.34/drivers/atm/idt77252.c linux-2.6.34/drivers/atm/idt77252.c
+--- linux-2.6.34/drivers/atm/idt77252.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/idt77252.c        2010-07-01 20:45:14.000000000 -0400
+@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
                else
                        dev_kfree_skb(skb);
  
@@ -20721,7 +22104,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
        }
  
        atomic_dec(&scq->used);
-@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1074,13 +1074,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);
@@ -20737,7 +22120,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                                dev_kfree_skb(sb);
                                break;
                        }
-@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, st
                        ATM_SKB(sb)->vcc = vcc;
                        __net_timestamp(sb);
                        vcc->push(vcc, sb);
@@ -20746,7 +22129,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
  
                        cell += ATM_CELL_PAYLOAD;
                }
-@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1134,13 +1134,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);
@@ -20762,7 +22145,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                        return;
                }
                if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, st
                                RXPRINTK("%s: Can't alloc RX skb.\n",
                                         card->name);
                                recycle_rx_pool_skb(card, rpp);
@@ -20771,7 +22154,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                                return;
                        }
                        if (!atm_charge(vcc, skb->truesize)) {
-@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, st
                        __net_timestamp(skb);
  
                        vcc->push(vcc, skb);
@@ -20780,7 +22163,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
  
                        return;
                }
-@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, st
+@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st
                __net_timestamp(skb);
  
                vcc->push(vcc, skb);
@@ -20789,7 +22172,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
  
                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);
@@ -20806,7 +22189,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                        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);
@@ -20815,7 +22198,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
  
  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);
@@ -20831,7 +22214,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                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);
@@ -20848,7 +22231,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                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) {
@@ -20857,7 +22240,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                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);
@@ -20866,10 +22249,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/idt77252.c linux-2.6.33.1/drivers/atm/idt7
                return -ENOMEM;
        }
        atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase.c
---- linux-2.6.33.1/drivers/atm/iphase.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/iphase.c        2010-03-20 16:58:39.500808414 -0400
-@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)  
+diff -urNp linux-2.6.34/drivers/atm/iphase.c linux-2.6.34/drivers/atm/iphase.c
+--- linux-2.6.34/drivers/atm/iphase.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/iphase.c  2010-07-01 20:45:14.000000000 -0400
+@@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)  
        status = (u_short) (buf_desc_ptr->desc_mode);  
        if (status & (RX_CER | RX_PTE | RX_OFL))  
        {  
@@ -20878,7 +22261,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
                IF_ERR(printk("IA: bad packet, dropping it");)  
                  if (status & RX_CER) { 
                      IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)  
+@@ -1147,7 +1147,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);
@@ -20887,7 +22270,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
           goto out_free_desc;
          }
                  
-@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1297,7 +1297,7 @@ static void rx_dle_intr(struct atm_dev *
            ia_vcc = INPH_IA_VCC(vcc);
            if (ia_vcc == NULL)
            {
@@ -20896,7 +22279,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
               dev_kfree_skb_any(skb);
               atm_return(vcc, atm_guess_pdu2truesize(len));
               goto INCR_DLE;
-@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1309,7 +1309,7 @@ static void rx_dle_intr(struct atm_dev *
            if ((length > iadev->rx_buf_sz) || (length > 
                                (skb->len - sizeof(struct cpcs_trailer))))
            {
@@ -20905,7 +22288,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
               IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", 
                                                              length, skb->len);)
               dev_kfree_skb_any(skb);
-@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev *
+@@ -1325,7 +1325,7 @@ static void rx_dle_intr(struct atm_dev *
  
          IF_RX(printk("rx_dle_intr: skb push");)  
          vcc->push(vcc,skb);  
@@ -20914,7 +22297,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev,
+@@ -2807,15 +2807,15 @@ static int ia_ioctl(struct atm_dev *dev,
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -20939,7 +22322,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
           }
              ia_cmds.status = 0;
              break;
-@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -2920,7 +2920,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);) 
@@ -20948,7 +22331,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
                if (vcc->pop)   
                    vcc->pop(vcc, skb);   
                else  
-@@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
+@@ -3025,14 +3025,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -20965,10 +22348,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/iphase.c linux-2.6.33.1/drivers/atm/iphase
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
---- linux-2.6.33.1/drivers/atm/lanai.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/lanai.c 2010-03-20 16:58:39.504511968 -0400
-@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
+diff -urNp linux-2.6.34/drivers/atm/lanai.c linux-2.6.34/drivers/atm/lanai.c
+--- linux-2.6.34/drivers/atm/lanai.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/lanai.c   2010-07-01 20:45:14.000000000 -0400
+@@ -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);
        lanai_free_skb(lvcc->tx.atmvcc, skb);
@@ -20977,7 +22360,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
  }
  
  /* Try to fill the buffer - don't call unless there is backlog */
-@@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc
+@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc
        ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
        __net_timestamp(skb);
        lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
@@ -20986,7 +22369,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
      out:
        lvcc->rx.buf.ptr = end;
        cardvcc_write(lvcc, endptr, vcc_rxreadptr);
-@@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_d
+@@ -1668,7 +1668,7 @@ static int handle_service(struct lanai_d
                DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
                    "vcc %d\n", lanai->number, (unsigned int) s, vci);
                lanai->stats.service_rxnotaal5++;
@@ -20995,7 +22378,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
                return 0;
        }
        if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
-@@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_d
+@@ -1680,7 +1680,7 @@ static int handle_service(struct lanai_d
                int bytes;
                read_unlock(&vcc_sklist_lock);
                DPRINTK("got trashed rx pdu on vci %d\n", vci);
@@ -21004,7 +22387,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
                lvcc->stats.x.aal5.service_trash++;
                bytes = (SERVICE_GET_END(s) * 16) -
                    (((unsigned long) lvcc->rx.buf.ptr) -
-@@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_d
+@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_d
        }
        if (s & SERVICE_STREAM) {
                read_unlock(&vcc_sklist_lock);
@@ -21013,7 +22396,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
                lvcc->stats.x.aal5.service_stream++;
                printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
                    "PDU on VCI %d!\n", lanai->number, vci);
-@@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_d
+@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_d
                return 0;
        }
        DPRINTK("got rx crc error on vci %d\n", vci);
@@ -21022,10 +22405,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/lanai.c linux-2.6.33.1/drivers/atm/lanai.c
        lvcc->stats.x.aal5.service_rxcrc++;
        lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
        cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicstar.c
---- linux-2.6.33.1/drivers/atm/nicstar.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/nicstar.c       2010-03-20 16:58:39.504511968 -0400
-@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 
+diff -urNp linux-2.6.34/drivers/atm/nicstar.c linux-2.6.34/drivers/atm/nicstar.c
+--- linux-2.6.34/drivers/atm/nicstar.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/nicstar.c 2010-07-01 20:45:14.000000000 -0400
+@@ -1722,7 +1722,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if ((vc = (vc_map *) vcc->dev_data) == NULL)
     {
        printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
@@ -21034,7 +22417,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1730,7 +1730,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if (!vc->tx)
     {
        printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
@@ -21043,7 +22426,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1738,7 +1738,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
     {
        printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
@@ -21052,7 +22435,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1746,7 +1746,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if (skb_shinfo(skb)->nr_frags != 0)
     {
        printk("nicstar%d: No scatter-gather yet.\n", card->index);
@@ -21061,7 +22444,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
        dev_kfree_skb_any(skb);
        return -EINVAL;
     }
-@@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc, 
+@@ -1791,11 +1791,11 @@ static int ns_send(struct atm_vcc *vcc, 
  
     if (push_scqe(card, vc, scq, &scqe, skb) != 0)
     {
@@ -21075,7 +22458,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
  
     return 0;
  }
-@@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2110,14 +2110,14 @@ static void dequeue_rx(ns_dev *card, ns_
           {
              printk("nicstar%d: Can't allocate buffers for aal0.\n",
                     card->index);
@@ -21092,7 +22475,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              dev_kfree_skb_any(sb);
              break;
           }
-@@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2132,7 +2132,7 @@ static void dequeue_rx(ns_dev *card, ns_
           ATM_SKB(sb)->vcc = vcc;
         __net_timestamp(sb);
           vcc->push(vcc, sb);
@@ -21101,7 +22484,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           cell += ATM_CELL_PAYLOAD;
        }
  
-@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev *card, ns_
         if (iovb == NULL)
         {
            printk("nicstar%d: Out of iovec buffers.\n", card->index);
@@ -21110,7 +22493,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              recycle_rx_buf(card, skb);
              return;
         }
-@@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2181,7 +2181,7 @@ static void dequeue_rx(ns_dev *card, ns_
     else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
     {
        printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -21119,7 +22502,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
        recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
        NS_SKB(iovb)->iovcnt = 0;
        iovb->len = 0;
-@@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev *card, ns_
           printk("nicstar%d: Expected a small buffer, and this is not one.\n",
                card->index);
           which_list(card, skb);
@@ -21128,7 +22511,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           recycle_rx_buf(card, skb);
           vc->rx_iov = NULL;
           recycle_iov_buf(card, iovb);
-@@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2215,7 +2215,7 @@ static void dequeue_rx(ns_dev *card, ns_
           printk("nicstar%d: Expected a large buffer, and this is not one.\n",
                card->index);
           which_list(card, skb);
@@ -21137,7 +22520,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
                               NS_SKB(iovb)->iovcnt);
           vc->rx_iov = NULL;
-@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev *card, ns_
              printk(" - PDU size mismatch.\n");
           else
              printk(".\n");
@@ -21146,7 +22529,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
           NS_SKB(iovb)->iovcnt);
         vc->rx_iov = NULL;
-@@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2255,7 +2255,7 @@ static void dequeue_rx(ns_dev *card, ns_
           if (!atm_charge(vcc, skb->truesize))
           {
              push_rxbufs(card, skb);
@@ -21155,7 +22538,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           }
           else
         {
-@@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2267,7 +2267,7 @@ static void dequeue_rx(ns_dev *card, ns_
              ATM_SKB(skb)->vcc = vcc;
            __net_timestamp(skb);
              vcc->push(vcc, skb);
@@ -21164,7 +22547,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           }
        }
        else if (NS_SKB(iovb)->iovcnt == 2)     /* One small plus one large buffer */
-@@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2282,7 +2282,7 @@ static void dequeue_rx(ns_dev *card, ns_
              if (!atm_charge(vcc, sb->truesize))
              {
                 push_rxbufs(card, sb);
@@ -21173,7 +22556,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              }
              else
            {
-@@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2294,7 +2294,7 @@ static void dequeue_rx(ns_dev *card, ns_
                 ATM_SKB(sb)->vcc = vcc;
               __net_timestamp(sb);
                 vcc->push(vcc, sb);
@@ -21182,7 +22565,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              }
  
              push_rxbufs(card, skb);
-@@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2305,7 +2305,7 @@ static void dequeue_rx(ns_dev *card, ns_
              if (!atm_charge(vcc, skb->truesize))
              {
                 push_rxbufs(card, skb);
@@ -21191,7 +22574,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              }
              else
              {
-@@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2319,7 +2319,7 @@ static void dequeue_rx(ns_dev *card, ns_
                 ATM_SKB(skb)->vcc = vcc;
               __net_timestamp(skb);
                 vcc->push(vcc, skb);
@@ -21200,7 +22583,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
              }
  
              push_rxbufs(card, sb);
-@@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev *card, ns_
              if (hb == NULL)
              {
                 printk("nicstar%d: Out of huge buffers.\n", card->index);
@@ -21209,7 +22592,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
                 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
                                     NS_SKB(iovb)->iovcnt);
                 vc->rx_iov = NULL;
-@@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2392,7 +2392,7 @@ static void dequeue_rx(ns_dev *card, ns_
              }
            else
               dev_kfree_skb_any(hb);
@@ -21218,7 +22601,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           }
           else
         {
-@@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_
+@@ -2426,7 +2426,7 @@ static void dequeue_rx(ns_dev *card, ns_
  #endif /* NS_USE_DESTRUCTORS */
            __net_timestamp(hb);
              vcc->push(vcc, hb);
@@ -21227,10 +22610,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/nicstar.c linux-2.6.33.1/drivers/atm/nicst
           }
        }
  
-diff -urNp linux-2.6.33.1/drivers/atm/solos-pci.c linux-2.6.33.1/drivers/atm/solos-pci.c
---- linux-2.6.33.1/drivers/atm/solos-pci.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/solos-pci.c     2010-03-20 16:58:39.512795633 -0400
-@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
+diff -urNp linux-2.6.34/drivers/atm/solos-pci.c linux-2.6.34/drivers/atm/solos-pci.c
+--- linux-2.6.34/drivers/atm/solos-pci.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/solos-pci.c       2010-07-01 20:45:14.000000000 -0400
+@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
                                }
                                atm_charge(vcc, skb->truesize);
                                vcc->push(vcc, skb);
@@ -21239,7 +22622,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/solos-pci.c linux-2.6.33.1/drivers/atm/sol
                                break;
  
                        case PKT_STATUS:
-@@ -1017,7 +1017,7 @@ static uint32_t fpga_tx(struct solos_car
+@@ -1018,7 +1018,7 @@ static uint32_t fpga_tx(struct solos_car
                        vcc = SKB_CB(oldskb)->vcc;
  
                        if (vcc) {
@@ -21248,10 +22631,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/solos-pci.c linux-2.6.33.1/drivers/atm/sol
                                solos_pop(vcc, oldskb);
                        } else
                                dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.33.1/drivers/atm/suni.c linux-2.6.33.1/drivers/atm/suni.c
---- linux-2.6.33.1/drivers/atm/suni.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/suni.c  2010-03-20 16:58:39.516795609 -0400
-@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
+diff -urNp linux-2.6.34/drivers/atm/suni.c linux-2.6.34/drivers/atm/suni.c
+--- linux-2.6.34/drivers/atm/suni.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/suni.c    2010-07-01 20:45:14.000000000 -0400
+@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
  #define ADD_LIMITED(s,v) \
@@ -21262,10 +22645,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/suni.c linux-2.6.33.1/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.33.1/drivers/atm/uPD98402.c linux-2.6.33.1/drivers/atm/uPD98402.c
---- linux-2.6.33.1/drivers/atm/uPD98402.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/uPD98402.c      2010-03-20 16:58:39.516795609 -0400
-@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
+diff -urNp linux-2.6.34/drivers/atm/uPD98402.c linux-2.6.34/drivers/atm/uPD98402.c
+--- linux-2.6.34/drivers/atm/uPD98402.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/uPD98402.c        2010-07-01 20:45:14.000000000 -0400
+@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
        struct sonet_stats tmp;
        int error = 0;
  
@@ -21274,7 +22657,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/uPD98402.c linux-2.6.33.1/drivers/atm/uPD9
        sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
        if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
        if (zero && !error) {
-@@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev
+@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev
  
  
  #define ADD_LIMITED(s,v) \
@@ -21287,7 +22670,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/uPD98402.c linux-2.6.33.1/drivers/atm/uPD9
  
  
  static void stat_event(struct atm_dev *dev)
-@@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev 
+@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev 
                if (reason & uPD98402_INT_PFM) stat_event(dev);
                if (reason & uPD98402_INT_PCO) {
                        (void) GET(PCOCR); /* clear interrupt cause */
@@ -21296,7 +22679,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/uPD98402.c linux-2.6.33.1/drivers/atm/uPD9
                            &PRIV(dev)->sonet_stats.uncorr_hcs);
                }
                if ((reason & uPD98402_INT_RFO) && 
-@@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev
+@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev
        PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
          uPD98402_INT_LOS),PIMR); /* enable them */
        (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
@@ -21309,10 +22692,10 @@ diff -urNp linux-2.6.33.1/drivers/atm/uPD98402.c linux-2.6.33.1/drivers/atm/uPD9
        return 0;
  }
  
-diff -urNp linux-2.6.33.1/drivers/atm/zatm.c linux-2.6.33.1/drivers/atm/zatm.c
---- linux-2.6.33.1/drivers/atm/zatm.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/atm/zatm.c  2010-03-20 16:58:39.516795609 -0400
-@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+diff -urNp linux-2.6.34/drivers/atm/zatm.c linux-2.6.34/drivers/atm/zatm.c
+--- linux-2.6.34/drivers/atm/zatm.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/atm/zatm.c    2010-07-01 20:45:14.000000000 -0400
+@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                }
                if (!size) {
                        dev_kfree_skb_irq(skb);
@@ -21321,7 +22704,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/zatm.c linux-2.6.33.1/drivers/atm/zatm.c
                        continue;
                }
                if (!atm_charge(vcc,skb->truesize)) {
-@@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
+@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                skb->len = size;
                ATM_SKB(skb)->vcc = vcc;
                vcc->push(vcc,skb);
@@ -21330,7 +22713,7 @@ diff -urNp linux-2.6.33.1/drivers/atm/zatm.c linux-2.6.33.1/drivers/atm/zatm.c
        }
        zout(pos & 0xffff,MTA(mbx));
  #if 0 /* probably a stupid idea */
-@@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
+@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
                        skb_queue_head(&zatm_vcc->backlog,skb);
                        break;
                }
@@ -21339,117 +22722,9 @@ diff -urNp linux-2.6.33.1/drivers/atm/zatm.c linux-2.6.33.1/drivers/atm/zatm.c
        wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.33.1/drivers/base/bus.c linux-2.6.33.1/drivers/base/bus.c
---- linux-2.6.33.1/drivers/base/bus.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/base/bus.c  2010-03-20 16:58:39.548804768 -0400
-@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
-       return ret;
- }
- 
--static struct sysfs_ops driver_sysfs_ops = {
-+static const struct sysfs_ops driver_sysfs_ops = {
-       .show   = drv_attr_show,
-       .store  = drv_attr_store,
- };
-@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kob
-       return ret;
- }
- 
--static struct sysfs_ops bus_sysfs_ops = {
-+static const struct sysfs_ops bus_sysfs_ops = {
-       .show   = bus_attr_show,
-       .store  = bus_attr_store,
- };
-@@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset
-       return 0;
- }
- 
--static struct kset_uevent_ops bus_uevent_ops = {
-+static const struct kset_uevent_ops bus_uevent_ops = {
-       .filter = bus_uevent_filter,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/base/class.c linux-2.6.33.1/drivers/base/class.c
---- linux-2.6.33.1/drivers/base/class.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/base/class.c        2010-03-20 16:58:39.548804768 -0400
-@@ -63,7 +63,7 @@ static void class_release(struct kobject
-       kfree(cp);
- }
- 
--static struct sysfs_ops class_sysfs_ops = {
-+static const struct sysfs_ops class_sysfs_ops = {
-       .show   = class_attr_show,
-       .store  = class_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/base/core.c linux-2.6.33.1/drivers/base/core.c
---- linux-2.6.33.1/drivers/base/core.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/base/core.c 2010-03-20 16:58:39.548804768 -0400
-@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
-       return ret;
- }
- 
--static struct sysfs_ops dev_sysfs_ops = {
-+static const struct sysfs_ops dev_sysfs_ops = {
-       .show   = dev_attr_show,
-       .store  = dev_attr_store,
- };
-@@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset,
-       return retval;
- }
- 
--static struct kset_uevent_ops device_uevent_ops = {
-+static const struct kset_uevent_ops device_uevent_ops = {
-       .filter =       dev_uevent_filter,
-       .name =         dev_uevent_name,
-       .uevent =       dev_uevent,
-diff -urNp linux-2.6.33.1/drivers/base/memory.c linux-2.6.33.1/drivers/base/memory.c
---- linux-2.6.33.1/drivers/base/memory.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/base/memory.c       2010-03-20 16:58:39.553060820 -0400
-@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
-       return retval;
- }
- 
--static struct kset_uevent_ops memory_uevent_ops = {
-+static const struct kset_uevent_ops memory_uevent_ops = {
-       .name           = memory_uevent_name,
-       .uevent         = memory_uevent,
- };
-diff -urNp linux-2.6.33.1/drivers/base/sys.c linux-2.6.33.1/drivers/base/sys.c
---- linux-2.6.33.1/drivers/base/sys.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/base/sys.c  2010-03-20 16:58:39.553060820 -0400
-@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
-       return -EIO;
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
-       .show   = sysdev_show,
-       .store  = sysdev_store,
- };
-@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct
-       return -EIO;
- }
- 
--static struct sysfs_ops sysfs_class_ops = {
-+static const struct sysfs_ops sysfs_class_ops = {
-       .show   = sysdev_class_show,
-       .store  = sysdev_class_store,
- };
-diff -urNp linux-2.6.33.1/drivers/block/pktcdvd.c linux-2.6.33.1/drivers/block/pktcdvd.c
---- linux-2.6.33.1/drivers/block/pktcdvd.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/block/pktcdvd.c     2010-03-20 16:58:39.568810035 -0400
-@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
-       return len;
- }
- 
--static struct sysfs_ops kobj_pkt_ops = {
-+static const struct sysfs_ops kobj_pkt_ops = {
-       .show = kobj_pkt_show,
-       .store = kobj_pkt_store
- };
-diff -urNp linux-2.6.33.1/drivers/char/agp/frontend.c linux-2.6.33.1/drivers/char/agp/frontend.c
---- linux-2.6.33.1/drivers/char/agp/frontend.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/agp/frontend.c 2010-03-20 16:58:39.572812162 -0400
+diff -urNp linux-2.6.34/drivers/char/agp/frontend.c linux-2.6.34/drivers/char/agp/frontend.c
+--- linux-2.6.34/drivers/char/agp/frontend.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/agp/frontend.c   2010-07-01 20:45:14.000000000 -0400
 @@ -818,7 +818,7 @@ static int agpioc_reserve_wrap(struct ag
        if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
                return -EFAULT;
@@ -21459,138 +22734,63 @@ diff -urNp linux-2.6.33.1/drivers/char/agp/frontend.c linux-2.6.33.1/drivers/cha
                return -EFAULT;
  
        client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.33.1/drivers/char/agp/intel-agp.c linux-2.6.33.1/drivers/char/agp/intel-agp.c
---- linux-2.6.33.1/drivers/char/agp/intel-agp.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/agp/intel-agp.c        2010-03-20 16:58:39.588814817 -0400
-@@ -2575,7 +2575,7 @@ static struct pci_device_id agp_intel_pc
-       ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),
-       ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),
+diff -urNp linux-2.6.34/drivers/char/agp/intel-agp.c linux-2.6.34/drivers/char/agp/intel-agp.c
+--- linux-2.6.34/drivers/char/agp/intel-agp.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/agp/intel-agp.c  2010-07-01 20:45:14.000000000 -0400
+@@ -2697,7 +2697,7 @@ static struct pci_device_id agp_intel_pc
        ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),
+       ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
+       ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
 -      { }
 +      { 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.33.1/drivers/char/hpet.c linux-2.6.33.1/drivers/char/hpet.c
---- linux-2.6.33.1/drivers/char/hpet.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hpet.c 2010-03-20 16:58:39.592808427 -0400
-@@ -995,7 +995,7 @@ static struct acpi_driver hpet_acpi_driv
-               },
- };
+diff -urNp linux-2.6.34/drivers/char/hpet.c linux-2.6.34/drivers/char/hpet.c
+--- linux-2.6.34/drivers/char/hpet.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/hpet.c   2010-07-01 20:45:14.000000000 -0400
+@@ -429,7 +429,7 @@ static int hpet_release(struct inode *in
+       return 0;
+ }
  
--static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops };
-+static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops, {NULL, NULL}, NULL, NULL };
+-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
++static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
  
- static int __init hpet_init(void)
- {
-diff -urNp linux-2.6.33.1/drivers/char/hvc_beat.c linux-2.6.33.1/drivers/char/hvc_beat.c
---- linux-2.6.33.1/drivers/char/hvc_beat.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_beat.c     2010-03-20 16:58:39.596613651 -0400
-@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
-       return cnt;
+ static int
+ hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+@@ -549,7 +549,7 @@ static inline unsigned long hpet_time_di
  }
  
--static struct hv_ops hvc_beat_get_put_ops = {
-+static const struct hv_ops hvc_beat_get_put_ops = {
-       .get_chars = hvc_beat_get_chars,
-       .put_chars = hvc_beat_put_chars,
- };
-diff -urNp linux-2.6.33.1/drivers/char/hvc_console.c linux-2.6.33.1/drivers/char/hvc_console.c
---- linux-2.6.33.1/drivers/char/hvc_console.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_console.c  2010-03-20 16:58:39.596613651 -0400
-@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
-  * console interfaces but can still be used as a tty device.  This has to be
-  * static because kmalloc will not work during early console init.
-  */
--static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
-+static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
- static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
-       {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
- 
-@@ -247,7 +247,7 @@ static void destroy_hvc_struct(struct kr
-  * vty adapters do NOT get an hvc_instantiate() callback since they
-  * appear after early console init.
-  */
--int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
-+int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
+ static int
+-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
++hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
  {
-       struct hvc_struct *hp;
- 
-@@ -749,7 +749,7 @@ static const struct tty_operations hvc_o
+       struct hpet_timer __iomem *timer;
+       struct hpet __iomem *hpet;
+@@ -994,7 +994,7 @@ static struct acpi_driver hpet_acpi_driv
+               },
  };
  
- struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
--                                      struct hv_ops *ops, int outbuf_size)
-+                                      const struct hv_ops *ops, int outbuf_size)
- {
-       struct hvc_struct *hp;
-       int i;
-diff -urNp linux-2.6.33.1/drivers/char/hvc_console.h linux-2.6.33.1/drivers/char/hvc_console.h
---- linux-2.6.33.1/drivers/char/hvc_console.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_console.h  2010-03-20 16:58:39.596613651 -0400
-@@ -55,7 +55,7 @@ struct hvc_struct {
-       int outbuf_size;
-       int n_outbuf;
-       uint32_t vtermno;
--      struct hv_ops *ops;
-+      const struct hv_ops *ops;
-       int irq_requested;
-       int data;
-       struct winsize ws;
-@@ -76,11 +76,11 @@ struct hv_ops {
- };
- 
- /* Register a vterm and a slot index for use as a console (console_init) */
--extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
-+extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops);
+-static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops };
++static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops, {NULL, NULL}, NULL, NULL };
  
+ static int __init hpet_init(void)
+ {
+diff -urNp linux-2.6.34/drivers/char/hvc_console.h linux-2.6.34/drivers/char/hvc_console.h
+--- linux-2.6.34/drivers/char/hvc_console.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/hvc_console.h    2010-07-01 20:45:14.000000000 -0400
+@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
  /* register a vterm for hvc tty operation (module_init or hotplug add) */
- extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
--                              struct hv_ops *ops, int outbuf_size);
-+                              const struct hv_ops *ops, int outbuf_size);
+ extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
+                                    const struct hv_ops *ops, int outbuf_size);
++
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.33.1/drivers/char/hvc_iseries.c linux-2.6.33.1/drivers/char/hvc_iseries.c
---- linux-2.6.33.1/drivers/char/hvc_iseries.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_iseries.c  2010-03-20 16:58:39.596613651 -0400
-@@ -197,7 +197,7 @@ done:
-       return sent;
- }
- 
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
-       .get_chars = get_chars,
-       .put_chars = put_chars,
-       .notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.33.1/drivers/char/hvc_iucv.c linux-2.6.33.1/drivers/char/hvc_iucv.c
---- linux-2.6.33.1/drivers/char/hvc_iucv.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_iucv.c     2010-03-20 16:58:39.596613651 -0400
-@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
- 
- 
- /* HVC operations */
--static struct hv_ops hvc_iucv_ops = {
-+static const struct hv_ops hvc_iucv_ops = {
-       .get_chars = hvc_iucv_get_chars,
-       .put_chars = hvc_iucv_put_chars,
-       .notifier_add = hvc_iucv_notifier_add,
-diff -urNp linux-2.6.33.1/drivers/char/hvc_rtas.c linux-2.6.33.1/drivers/char/hvc_rtas.c
---- linux-2.6.33.1/drivers/char/hvc_rtas.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_rtas.c     2010-03-20 16:58:39.600817341 -0400
-@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
-       return i;
- }
- 
--static struct hv_ops hvc_rtas_get_put_ops = {
-+static const struct hv_ops hvc_rtas_get_put_ops = {
-       .get_chars = hvc_rtas_read_console,
-       .put_chars = hvc_rtas_write_console,
- };
-diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
---- linux-2.6.33.1/drivers/char/hvcs.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvcs.c 2010-03-20 16:58:39.600817341 -0400
-@@ -269,7 +269,7 @@ struct hvcs_struct {
+diff -urNp linux-2.6.34/drivers/char/hvcs.c linux-2.6.34/drivers/char/hvcs.c
+--- linux-2.6.34/drivers/char/hvcs.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/hvcs.c   2010-07-01 20:45:14.000000000 -0400
+@@ -270,7 +270,7 @@ struct hvcs_struct {
        unsigned int index;
  
        struct tty_struct *tty;
@@ -21599,7 +22799,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
  
        /*
         * Used to tell the driver kernel_thread what operations need to take
-@@ -419,7 +419,7 @@ static ssize_t hvcs_vterm_state_store(st
+@@ -420,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(st
  
        spin_lock_irqsave(&hvcsd->lock, flags);
  
@@ -21608,7 +22808,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
                spin_unlock_irqrestore(&hvcsd->lock, flags);
                printk(KERN_INFO "HVCS: vterm state unchanged.  "
                                "The hvcs device node is still in use.\n");
-@@ -1135,7 +1135,7 @@ static int hvcs_open(struct tty_struct *
+@@ -1136,7 +1136,7 @@ static int hvcs_open(struct tty_struct *
                if ((retval = hvcs_partner_connect(hvcsd)))
                        goto error_release;
  
@@ -21617,7 +22817,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
        hvcsd->tty = tty;
        tty->driver_data = hvcsd;
  
-@@ -1169,7 +1169,7 @@ fast_open:
+@@ -1170,7 +1170,7 @@ fast_open:
  
        spin_lock_irqsave(&hvcsd->lock, flags);
        kref_get(&hvcsd->kref);
@@ -21626,7 +22826,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
        hvcsd->todo_mask |= HVCS_SCHED_READ;
        spin_unlock_irqrestore(&hvcsd->lock, flags);
  
-@@ -1213,7 +1213,7 @@ static void hvcs_close(struct tty_struct
+@@ -1214,7 +1214,7 @@ static void hvcs_close(struct tty_struct
        hvcsd = tty->driver_data;
  
        spin_lock_irqsave(&hvcsd->lock, flags);
@@ -21635,7 +22835,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
  
                vio_disable_interrupts(hvcsd->vdev);
  
-@@ -1239,10 +1239,10 @@ static void hvcs_close(struct tty_struct
+@@ -1240,10 +1240,10 @@ static void hvcs_close(struct tty_struct
                free_irq(irq, hvcsd);
                kref_put(&hvcsd->kref, destroy_hvcs_struct);
                return;
@@ -21648,7 +22848,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
        }
  
        spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1258,7 +1258,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1259,7 +1259,7 @@ static void hvcs_hangup(struct tty_struc
  
        spin_lock_irqsave(&hvcsd->lock, flags);
        /* Preserve this so that we know how many kref refs to put */
@@ -21657,7 +22857,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
  
        /*
         * Don't kref put inside the spinlock because the destruction
-@@ -1273,7 +1273,7 @@ static void hvcs_hangup(struct tty_struc
+@@ -1274,7 +1274,7 @@ static void hvcs_hangup(struct tty_struc
        hvcsd->tty->driver_data = NULL;
        hvcsd->tty = NULL;
  
@@ -21666,7 +22866,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
  
        /* This will drop any buffered data on the floor which is OK in a hangup
         * scenario. */
-@@ -1344,7 +1344,7 @@ static int hvcs_write(struct tty_struct 
+@@ -1345,7 +1345,7 @@ static int hvcs_write(struct tty_struct 
         * the middle of a write operation?  This is a crummy place to do this
         * but we want to keep it all in the spinlock.
         */
@@ -21675,7 +22875,7 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
                spin_unlock_irqrestore(&hvcsd->lock, flags);
                return -ENODEV;
        }
-@@ -1418,7 +1418,7 @@ static int hvcs_write_room(struct tty_st
+@@ -1419,7 +1419,7 @@ static int hvcs_write_room(struct tty_st
  {
        struct hvcs_struct *hvcsd = tty->driver_data;
  
@@ -21684,45 +22884,9 @@ diff -urNp linux-2.6.33.1/drivers/char/hvcs.c linux-2.6.33.1/drivers/char/hvcs.c
                return 0;
  
        return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.33.1/drivers/char/hvc_udbg.c linux-2.6.33.1/drivers/char/hvc_udbg.c
---- linux-2.6.33.1/drivers/char/hvc_udbg.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_udbg.c     2010-03-20 16:58:39.600817341 -0400
-@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
-       return i;
- }
- 
--static struct hv_ops hvc_udbg_ops = {
-+static const struct hv_ops hvc_udbg_ops = {
-       .get_chars = hvc_udbg_get,
-       .put_chars = hvc_udbg_put,
- };
-diff -urNp linux-2.6.33.1/drivers/char/hvc_vio.c linux-2.6.33.1/drivers/char/hvc_vio.c
---- linux-2.6.33.1/drivers/char/hvc_vio.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_vio.c      2010-03-20 16:58:39.600817341 -0400
-@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
-       return got;
- }
- 
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
-       .get_chars = filtered_get_chars,
-       .put_chars = hvc_put_chars,
-       .notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.33.1/drivers/char/hvc_xen.c linux-2.6.33.1/drivers/char/hvc_xen.c
---- linux-2.6.33.1/drivers/char/hvc_xen.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/hvc_xen.c      2010-03-20 16:58:39.604556535 -0400
-@@ -122,7 +122,7 @@ static int read_console(uint32_t vtermno
-       return recv;
- }
- 
--static struct hv_ops hvc_ops = {
-+static const struct hv_ops hvc_ops = {
-       .get_chars = read_console,
-       .put_chars = write_console,
-       .notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c 2010-03-20 16:58:39.604556535 -0400
+diff -urNp linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/ipmi/ipmi_msghandler.c   2010-07-01 20:45:15.000000000 -0400
 @@ -414,7 +414,7 @@ struct ipmi_smi {
        struct proc_dir_entry *proc_dir;
        char                  proc_dir_name[10];
@@ -21744,7 +22908,7 @@ diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.33.1/dri
  
  static int is_lan_addr(struct ipmi_addr *addr)
  {
-@@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
+@@ -2818,7 +2818,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
        INIT_LIST_HEAD(&intf->cmd_rcvrs);
        init_waitqueue_head(&intf->waitq);
        for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -21753,9 +22917,9 @@ diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.33.1/dri
  
        intf->proc_dir = NULL;
  
-diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c    2010-03-20 16:58:39.608700771 -0400
+diff -urNp linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/ipmi/ipmi_si_intf.c      2010-07-01 20:45:15.000000000 -0400
 @@ -278,7 +278,7 @@ struct smi_info {
        unsigned char slave_addr;
  
@@ -21777,7 +22941,7 @@ diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.33.1/driver
  
  #define SI_MAX_PARMS 4
  
-@@ -3020,7 +3020,7 @@ static int try_smi_init(struct smi_info 
+@@ -3083,7 +3083,7 @@ static int try_smi_init(struct smi_info 
        atomic_set(&new_smi->req_events, 0);
        new_smi->run_to_completion = 0;
        for (i = 0; i < SI_NUM_STATS; i++)
@@ -21786,9 +22950,9 @@ diff -urNp linux-2.6.33.1/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.33.1/driver
  
        new_smi->interrupt_disabled = 0;
        atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.33.1/drivers/char/keyboard.c linux-2.6.33.1/drivers/char/keyboard.c
---- linux-2.6.33.1/drivers/char/keyboard.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/keyboard.c     2010-03-20 16:58:39.608700771 -0400
+diff -urNp linux-2.6.34/drivers/char/keyboard.c linux-2.6.34/drivers/char/keyboard.c
+--- linux-2.6.34/drivers/char/keyboard.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/keyboard.c       2010-07-01 20:45:16.000000000 -0400
 @@ -652,6 +652,16 @@ static void k_spec(struct vc_data *vc, u
             kbd->kbdmode == VC_MEDIUMRAW) &&
             value != KVAL(K_SAK))
@@ -21806,7 +22970,7 @@ diff -urNp linux-2.6.33.1/drivers/char/keyboard.c linux-2.6.33.1/drivers/char/ke
        fn_handler[value](vc);
  }
  
-@@ -1405,7 +1415,7 @@ static const struct input_device_id kbd_
+@@ -1407,7 +1417,7 @@ static const struct input_device_id kbd_
                  .evbit = { BIT_MASK(EV_SND) },
          },
  
@@ -21815,9 +22979,9 @@ diff -urNp linux-2.6.33.1/drivers/char/keyboard.c linux-2.6.33.1/drivers/char/ke
  };
  
  MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
---- linux-2.6.33.1/drivers/char/mem.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/mem.c  2010-03-20 16:58:39.608700771 -0400
+diff -urNp linux-2.6.34/drivers/char/mem.c linux-2.6.34/drivers/char/mem.c
+--- linux-2.6.34/drivers/char/mem.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/mem.c    2010-07-01 20:45:16.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -21837,7 +23001,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
  static inline unsigned long size_inside_page(unsigned long start,
                                             unsigned long size)
  {
-@@ -191,6 +196,11 @@ static ssize_t write_mem(struct file * f
+@@ -161,6 +166,11 @@ static ssize_t write_mem(struct file *fi
        if (!valid_phys_addr_range(p, count))
                return -EFAULT;
  
@@ -21849,7 +23013,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
        written = 0;
  
  #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
-@@ -311,6 +321,11 @@ static int mmap_mem(struct file * file, 
+@@ -316,6 +326,11 @@ static int mmap_mem(struct file *file, s
                                                &vma->vm_page_prot))
                return -EINVAL;
  
@@ -21861,7 +23025,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
        vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
                                                 size,
                                                 vma->vm_page_prot);
-@@ -527,6 +542,11 @@ static ssize_t write_kmem(struct file * 
+@@ -530,6 +545,11 @@ static ssize_t write_kmem(struct file *f
        char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
        int err = 0;
  
@@ -21873,7 +23037,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
        if (p < (unsigned long) high_memory) {
                unsigned long to_write = min_t(unsigned long, count,
                                               (unsigned long)high_memory - p);
-@@ -727,6 +747,16 @@ static loff_t memory_lseek(struct file *
+@@ -731,6 +751,16 @@ static loff_t memory_lseek(struct file *
  
  static int open_port(struct inode * inode, struct file * filp)
  {
@@ -21890,7 +23054,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
        return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
  }
  
-@@ -734,7 +764,6 @@ static int open_port(struct inode * inod
+@@ -738,7 +768,6 @@ static int open_port(struct inode * inod
  #define full_lseek      null_lseek
  #define write_zero    write_null
  #define read_full       read_zero
@@ -21898,7 +23062,7 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
  #define open_kmem     open_mem
  #define open_oldmem   open_mem
  
-@@ -850,6 +879,9 @@ static const struct memdev {
+@@ -854,6 +883,9 @@ static const struct memdev {
  #ifdef CONFIG_CRASH_DUMP
        [12] = { "oldmem", 0, &oldmem_fops, NULL },
  #endif
@@ -21908,10 +23072,22 @@ diff -urNp linux-2.6.33.1/drivers/char/mem.c linux-2.6.33.1/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.33.1/drivers/char/nvram.c linux-2.6.33.1/drivers/char/nvram.c
---- linux-2.6.33.1/drivers/char/nvram.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/nvram.c        2010-03-20 16:58:39.612523711 -0400
-@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
+diff -urNp linux-2.6.34/drivers/char/n_tty.c linux-2.6.34/drivers/char/n_tty.c
+--- linux-2.6.34/drivers/char/n_tty.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/n_tty.c  2010-07-01 20:45:15.000000000 -0400
+@@ -2105,6 +2105,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
+ {
+       *ops = tty_ldisc_N_TTY;
+       ops->owner = NULL;
+-      ops->refcount = ops->flags = 0;
++      atomic_set(&ops->refcount, 0);
++      ops->flags = 0;
+ }
+ EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
+diff -urNp linux-2.6.34/drivers/char/nvram.c linux-2.6.34/drivers/char/nvram.c
+--- linux-2.6.34/drivers/char/nvram.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/nvram.c  2010-07-01 20:45:15.000000000 -0400
+@@ -245,7 +245,7 @@ static ssize_t nvram_read(struct file *f
  
        spin_unlock_irq(&rtc_lock);
  
@@ -21920,7 +23096,7 @@ diff -urNp linux-2.6.33.1/drivers/char/nvram.c linux-2.6.33.1/drivers/char/nvram
                return -EFAULT;
  
        *ppos = i;
-@@ -434,7 +434,10 @@ static const struct file_operations nvra
+@@ -430,7 +430,10 @@ static const struct file_operations nvra
  static struct miscdevice nvram_dev = {
        NVRAM_MINOR,
        "nvram",
@@ -21932,9 +23108,9 @@ diff -urNp linux-2.6.33.1/drivers/char/nvram.c linux-2.6.33.1/drivers/char/nvram
  };
  
  static int __init nvram_init(void)
-diff -urNp linux-2.6.33.1/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.33.1/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.33.1/drivers/char/pcmcia/ipwireless/tty.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/pcmcia/ipwireless/tty.c        2010-03-20 16:58:39.612523711 -0400
+diff -urNp linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/pcmcia/ipwireless/tty.c  2010-07-01 20:45:15.000000000 -0400
 @@ -51,7 +51,7 @@ struct ipw_tty {
        int tty_type;
        struct ipw_network *network;
@@ -22049,10 +23225,10 @@ diff -urNp linux-2.6.33.1/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.33.1/dr
                                do_ipw_close(ttyj);
                        ipwireless_disassociate_network_ttys(network,
                                                             ttyj->channel_idx);
-diff -urNp linux-2.6.33.1/drivers/char/pty.c linux-2.6.33.1/drivers/char/pty.c
---- linux-2.6.33.1/drivers/char/pty.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/pty.c  2010-03-20 16:58:39.612523711 -0400
-@@ -676,7 +676,18 @@ static int ptmx_open(struct inode *inode
+diff -urNp linux-2.6.34/drivers/char/pty.c linux-2.6.34/drivers/char/pty.c
+--- linux-2.6.34/drivers/char/pty.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/pty.c    2010-07-01 20:45:15.000000000 -0400
+@@ -677,7 +677,18 @@ static int ptmx_open(struct inode *inode
        return ret;
  }
  
@@ -22072,7 +23248,7 @@ diff -urNp linux-2.6.33.1/drivers/char/pty.c linux-2.6.33.1/drivers/char/pty.c
  
  static void __init unix98_pty_init(void)
  {
-@@ -730,9 +741,6 @@ static void __init unix98_pty_init(void)
+@@ -731,9 +742,6 @@ static void __init unix98_pty_init(void)
        register_sysctl_table(pty_root_table);
  
        /* Now create the /dev/ptmx special device */
@@ -22082,9 +23258,9 @@ diff -urNp linux-2.6.33.1/drivers/char/pty.c linux-2.6.33.1/drivers/char/pty.c
        cdev_init(&ptmx_cdev, &ptmx_fops);
        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.33.1/drivers/char/random.c linux-2.6.33.1/drivers/char/random.c
---- linux-2.6.33.1/drivers/char/random.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/random.c       2010-03-20 16:58:39.620815282 -0400
+diff -urNp linux-2.6.34/drivers/char/random.c linux-2.6.34/drivers/char/random.c
+--- linux-2.6.34/drivers/char/random.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/random.c 2010-07-01 20:45:16.000000000 -0400
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -22135,10 +23311,10 @@ diff -urNp linux-2.6.33.1/drivers/char/random.c linux-2.6.33.1/drivers/char/rand
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.33.1/drivers/char/sonypi.c linux-2.6.33.1/drivers/char/sonypi.c
---- linux-2.6.33.1/drivers/char/sonypi.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/sonypi.c       2010-03-20 16:58:39.624516836 -0400
-@@ -490,7 +490,7 @@ static struct sonypi_device {
+diff -urNp linux-2.6.34/drivers/char/sonypi.c linux-2.6.34/drivers/char/sonypi.c
+--- linux-2.6.34/drivers/char/sonypi.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/sonypi.c 2010-07-01 20:45:15.000000000 -0400
+@@ -491,7 +491,7 @@ static struct sonypi_device {
        spinlock_t fifo_lock;
        wait_queue_head_t fifo_proc_list;
        struct fasync_struct *fifo_async;
@@ -22147,7 +23323,7 @@ diff -urNp linux-2.6.33.1/drivers/char/sonypi.c linux-2.6.33.1/drivers/char/sony
        int model;
        struct input_dev *input_jog_dev;
        struct input_dev *input_key_dev;
-@@ -897,7 +897,7 @@ static int sonypi_misc_fasync(int fd, st
+@@ -898,7 +898,7 @@ static int sonypi_misc_fasync(int fd, st
  static int sonypi_misc_release(struct inode *inode, struct file *file)
  {
        mutex_lock(&sonypi_device.lock);
@@ -22156,7 +23332,7 @@ diff -urNp linux-2.6.33.1/drivers/char/sonypi.c linux-2.6.33.1/drivers/char/sony
        mutex_unlock(&sonypi_device.lock);
        return 0;
  }
-@@ -906,9 +906,9 @@ static int sonypi_misc_open(struct inode
+@@ -907,9 +907,9 @@ static int sonypi_misc_open(struct inode
  {
        mutex_lock(&sonypi_device.lock);
        /* Flush input queue on first open */
@@ -22168,10 +23344,10 @@ diff -urNp linux-2.6.33.1/drivers/char/sonypi.c linux-2.6.33.1/drivers/char/sony
        mutex_unlock(&sonypi_device.lock);
  
        return 0;
-diff -urNp linux-2.6.33.1/drivers/char/tpm/tpm_bios.c linux-2.6.33.1/drivers/char/tpm/tpm_bios.c
---- linux-2.6.33.1/drivers/char/tpm/tpm_bios.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/tpm/tpm_bios.c 2010-03-20 16:58:39.624516836 -0400
-@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
+diff -urNp linux-2.6.34/drivers/char/tpm/tpm_bios.c linux-2.6.34/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.34/drivers/char/tpm/tpm_bios.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/tpm/tpm_bios.c   2010-07-01 20:45:15.000000000 -0400
+@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
        event = addr;
  
        if ((event->event_type == 0 && event->event_size == 0) ||
@@ -22180,7 +23356,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tpm/tpm_bios.c linux-2.6.33.1/drivers/cha
                return NULL;
  
        return addr;
-@@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next(
+@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(
                return NULL;
  
        if ((event->event_type == 0 && event->event_size == 0) ||
@@ -22189,7 +23365,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tpm/tpm_bios.c linux-2.6.33.1/drivers/cha
                return NULL;
  
        (*pos)++;
-@@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_
+@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_
        int i;
  
        for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
@@ -22199,7 +23375,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tpm/tpm_bios.c linux-2.6.33.1/drivers/cha
  
        return 0;
  }
-@@ -409,6 +410,11 @@ static int read_log(struct tpm_bios_log 
+@@ -410,6 +411,11 @@ 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);
@@ -22211,9 +23387,9 @@ diff -urNp linux-2.6.33.1/drivers/char/tpm/tpm_bios.c linux-2.6.33.1/drivers/cha
  
        memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_io.c
---- linux-2.6.33.1/drivers/char/tty_io.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/tty_io.c       2010-03-20 16:58:39.628796519 -0400
+diff -urNp linux-2.6.34/drivers/char/tty_io.c linux-2.6.34/drivers/char/tty_io.c
+--- linux-2.6.34/drivers/char/tty_io.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/tty_io.c 2010-07-01 20:45:15.000000000 -0400
 @@ -136,20 +136,10 @@ LIST_HEAD(tty_drivers);                  /* linked list
  DEFINE_MUTEX(tty_mutex);
  EXPORT_SYMBOL(tty_mutex);
@@ -22271,7 +23447,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  ssize_t redirected_tty_write(struct file *file, const char __user *buf,
                                                size_t count, loff_t *ppos)
  {
-@@ -1894,6 +1888,8 @@ got_driver:
+@@ -1897,6 +1891,8 @@ got_driver:
  
  
  
@@ -22280,7 +23456,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  /**
   *    tty_poll        -       check tty status
   *    @filp: file being polled
-@@ -1906,7 +1902,7 @@ got_driver:
+@@ -1909,7 +1905,7 @@ got_driver:
   *    may be re-entered freely by other callers.
   */
  
@@ -22289,7 +23465,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  {
        struct tty_struct *tty;
        struct tty_ldisc *ld;
-@@ -1923,7 +1919,9 @@ static unsigned int tty_poll(struct file
+@@ -1926,7 +1922,9 @@ static unsigned int tty_poll(struct file
        return ret;
  }
  
@@ -22300,7 +23476,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  {
        struct tty_struct *tty;
        unsigned long flags;
-@@ -1967,6 +1965,8 @@ out:
+@@ -1970,6 +1968,8 @@ out:
        return retval;
  }
  
@@ -22309,7 +23485,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  /**
   *    tiocsti                 -       fake input character
   *    @tty: tty to fake input into
-@@ -2599,8 +2599,10 @@ long tty_ioctl(struct file *file, unsign
+@@ -2602,8 +2602,10 @@ long tty_ioctl(struct file *file, unsign
        return retval;
  }
  
@@ -22321,7 +23497,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
                                unsigned long arg)
  {
        struct inode *inode = file->f_dentry->d_inode;
-@@ -2624,6 +2626,9 @@ static long tty_compat_ioctl(struct file
+@@ -2627,6 +2629,9 @@ static long tty_compat_ioctl(struct file
  
        return retval;
  }
@@ -22331,7 +23507,7 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  #endif
  
  /*
-@@ -3067,11 +3072,6 @@ struct tty_struct *get_current_tty(void)
+@@ -3070,11 +3075,6 @@ struct tty_struct *get_current_tty(void)
  }
  EXPORT_SYMBOL_GPL(get_current_tty);
  
@@ -22343,9 +23519,9 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_io.c linux-2.6.33.1/drivers/char/tty_
  /*
   * Initialize the console device. This is called *early*, so
   * we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.33.1/drivers/char/tty_ldisc.c linux-2.6.33.1/drivers/char/tty_ldisc.c
---- linux-2.6.33.1/drivers/char/tty_ldisc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/tty_ldisc.c    2010-03-20 16:58:39.628796519 -0400
+diff -urNp linux-2.6.34/drivers/char/tty_ldisc.c linux-2.6.34/drivers/char/tty_ldisc.c
+--- linux-2.6.34/drivers/char/tty_ldisc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/tty_ldisc.c      2010-07-01 20:45:15.000000000 -0400
 @@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *
        if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
                struct tty_ldisc_ops *ldo = ld->ops;
@@ -22391,20 +23567,9 @@ diff -urNp linux-2.6.33.1/drivers/char/tty_ldisc.c linux-2.6.33.1/drivers/char/t
        module_put(ldops->owner);
        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.33.1/drivers/char/virtio_console.c linux-2.6.33.1/drivers/char/virtio_console.c
---- linux-2.6.33.1/drivers/char/virtio_console.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/virtio_console.c       2010-03-20 16:58:39.628796519 -0400
-@@ -44,6 +44,7 @@ static unsigned int in_len;
- static char *in, *inbuf;
- 
- /* The operations for our console. */
-+/* cannot be const */
- static struct hv_ops virtio_cons;
- 
- /* The hvc device */
-diff -urNp linux-2.6.33.1/drivers/char/vt_ioctl.c linux-2.6.33.1/drivers/char/vt_ioctl.c
---- linux-2.6.33.1/drivers/char/vt_ioctl.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/char/vt_ioctl.c     2010-03-20 16:58:39.632763861 -0400
+diff -urNp linux-2.6.34/drivers/char/vt_ioctl.c linux-2.6.34/drivers/char/vt_ioctl.c
+--- linux-2.6.34/drivers/char/vt_ioctl.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/char/vt_ioctl.c       2010-07-01 20:45:16.000000000 -0400
 @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
        case KDSKBENT:
                if (!perm)
@@ -22432,66 +23597,21 @@ diff -urNp linux-2.6.33.1/drivers/char/vt_ioctl.c linux-2.6.33.1/drivers/char/vt
                q = func_table[i];
                first_free = funcbufptr + (funcbufsize - funcbufleft);
                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-diff -urNp linux-2.6.33.1/drivers/cpufreq/cpufreq.c linux-2.6.33.1/drivers/cpufreq/cpufreq.c
---- linux-2.6.33.1/drivers/cpufreq/cpufreq.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/cpufreq/cpufreq.c   2010-03-20 16:58:39.632763861 -0400
-@@ -766,7 +766,7 @@ static void cpufreq_sysfs_release(struct
-       complete(&policy->kobj_unregister);
- }
- 
--static struct sysfs_ops sysfs_ops = {
-+static const struct sysfs_ops sysfs_ops = {
-       .show   = show,
-       .store  = store,
- };
-diff -urNp linux-2.6.33.1/drivers/cpuidle/sysfs.c linux-2.6.33.1/drivers/cpuidle/sysfs.c
---- linux-2.6.33.1/drivers/cpuidle/sysfs.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/cpuidle/sysfs.c     2010-03-20 16:58:39.640816327 -0400
-@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
-       return ret;
- }
- 
--static struct sysfs_ops cpuidle_sysfs_ops = {
-+static const struct sysfs_ops cpuidle_sysfs_ops = {
-       .show = cpuidle_show,
-       .store = cpuidle_store,
- };
-@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct
-       return ret;
- }
- 
--static struct sysfs_ops cpuidle_state_sysfs_ops = {
-+static const struct sysfs_ops cpuidle_state_sysfs_ops = {
-       .show = cpuidle_state_show,
+diff -urNp linux-2.6.34/drivers/cpuidle/sysfs.c linux-2.6.34/drivers/cpuidle/sysfs.c
+--- linux-2.6.34/drivers/cpuidle/sysfs.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/cpuidle/sysfs.c       2010-07-01 20:45:15.000000000 -0400
+@@ -299,7 +299,7 @@ static struct kobj_type ktype_state_cpui
+       .release = cpuidle_state_sysfs_release,
  };
  
-diff -urNp linux-2.6.33.1/drivers/dma/ioat/dma.c linux-2.6.33.1/drivers/dma/ioat/dma.c
---- linux-2.6.33.1/drivers/dma/ioat/dma.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/dma/ioat/dma.c      2010-03-20 16:58:39.664561584 -0400
-@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
-       return entry->show(&chan->common, page);
- }
- 
--struct sysfs_ops ioat_sysfs_ops = {
-+const struct sysfs_ops ioat_sysfs_ops = {
-       .show   = ioat_attr_show,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/dma/ioat/dma.h linux-2.6.33.1/drivers/dma/ioat/dma.h
---- linux-2.6.33.1/drivers/dma/ioat/dma.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/dma/ioat/dma.h      2010-03-20 16:58:39.664561584 -0400
-@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
-                          unsigned long *phys_complete);
- void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
- void ioat_kobject_del(struct ioatdma_device *device);
--extern struct sysfs_ops ioat_sysfs_ops;
-+extern const struct sysfs_ops ioat_sysfs_ops;
- extern struct ioat_sysfs_entry ioat_version_attr;
- extern struct ioat_sysfs_entry ioat_cap_attr;
- #endif /* IOATDMA_H */
-diff -urNp linux-2.6.33.1/drivers/edac/edac_core.h linux-2.6.33.1/drivers/edac/edac_core.h
---- linux-2.6.33.1/drivers/edac/edac_core.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/edac/edac_core.h    2010-03-20 16:58:39.668813885 -0400
+-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
++static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
+ {
+       kobject_put(&device->kobjs[i]->kobj);
+       wait_for_completion(&device->kobjs[i]->kobj_unregister);
+diff -urNp linux-2.6.34/drivers/edac/edac_core.h linux-2.6.34/drivers/edac/edac_core.h
+--- linux-2.6.34/drivers/edac/edac_core.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/edac/edac_core.h      2010-07-01 20:45:15.000000000 -0400
 @@ -100,11 +100,11 @@ extern const char *edac_mem_types[];
  
  #else                         /* !CONFIG_EDAC_DEBUG */
@@ -22509,82 +23629,23 @@ diff -urNp linux-2.6.33.1/drivers/edac/edac_core.h linux-2.6.33.1/drivers/edac/e
  
  #endif                                /* !CONFIG_EDAC_DEBUG */
  
-diff -urNp linux-2.6.33.1/drivers/edac/edac_device_sysfs.c linux-2.6.33.1/drivers/edac/edac_device_sysfs.c
---- linux-2.6.33.1/drivers/edac/edac_device_sysfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/edac/edac_device_sysfs.c    2010-03-20 16:58:39.672639279 -0400
-@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
- }
- 
- /* edac_dev file operations for an 'ctl_info' */
--static struct sysfs_ops device_ctl_info_ops = {
-+static const struct sysfs_ops device_ctl_info_ops = {
-       .show = edac_dev_ctl_info_show,
-       .store = edac_dev_ctl_info_store
- };
-@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(s
- }
- 
- /* edac_dev file operations for an 'instance' */
--static struct sysfs_ops device_instance_ops = {
-+static const struct sysfs_ops device_instance_ops = {
-       .show = edac_dev_instance_show,
-       .store = edac_dev_instance_store
- };
-@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(stru
- }
- 
- /* edac_dev file operations for a 'block' */
--static struct sysfs_ops device_block_ops = {
-+static const struct sysfs_ops device_block_ops = {
-       .show = edac_dev_block_show,
-       .store = edac_dev_block_store
- };
-diff -urNp linux-2.6.33.1/drivers/edac/edac_mc_sysfs.c linux-2.6.33.1/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.33.1/drivers/edac/edac_mc_sysfs.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/edac/edac_mc_sysfs.c        2010-03-20 16:58:39.676823381 -0400
-@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
-       return -EIO;
- }
- 
--static struct sysfs_ops csrowfs_ops = {
-+static const struct sysfs_ops csrowfs_ops = {
-       .show = csrowdev_show,
-       .store = csrowdev_store
- };
-@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobje
- }
- 
- /* Intermediate show/store table */
--static struct sysfs_ops mci_ops = {
-+static const struct sysfs_ops mci_ops = {
-       .show = mcidev_show,
-       .store = mcidev_store
- };
-diff -urNp linux-2.6.33.1/drivers/edac/edac_pci_sysfs.c linux-2.6.33.1/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.33.1/drivers/edac/edac_pci_sysfs.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/edac/edac_pci_sysfs.c       2010-03-20 16:58:39.680817937 -0400
-@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
- }
+diff -urNp linux-2.6.34/drivers/firewire/core-cdev.c linux-2.6.34/drivers/firewire/core-cdev.c
+--- linux-2.6.34/drivers/firewire/core-cdev.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/firewire/core-cdev.c  2010-07-01 20:45:15.000000000 -0400
+@@ -1195,8 +1195,7 @@ static int init_iso_resource(struct clie
+       int ret;
  
- /* fs_ops table */
--static struct sysfs_ops pci_instance_ops = {
-+static const struct sysfs_ops pci_instance_ops = {
-       .show = edac_pci_instance_show,
-       .store = edac_pci_instance_store
- };
-@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct
-       return -EIO;
- }
+       if ((request->channels == 0 && request->bandwidth == 0) ||
+-          request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
+-          request->bandwidth < 0)
++          request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
+               return -EINVAL;
  
--static struct sysfs_ops edac_pci_sysfs_ops = {
-+static const struct sysfs_ops edac_pci_sysfs_ops = {
-       .show = edac_pci_dev_show,
-       .store = edac_pci_dev_store
- };
-diff -urNp linux-2.6.33.1/drivers/firmware/dmi_scan.c linux-2.6.33.1/drivers/firmware/dmi_scan.c
---- linux-2.6.33.1/drivers/firmware/dmi_scan.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/firmware/dmi_scan.c 2010-03-20 16:58:39.680817937 -0400
-@@ -388,11 +388,6 @@ void __init dmi_scan_machine(void)
+       r  = kmalloc(sizeof(*r), GFP_KERNEL);
+diff -urNp linux-2.6.34/drivers/firmware/dmi_scan.c linux-2.6.34/drivers/firmware/dmi_scan.c
+--- linux-2.6.34/drivers/firmware/dmi_scan.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/firmware/dmi_scan.c   2010-07-01 20:45:15.000000000 -0400
+@@ -387,11 +387,6 @@ void __init dmi_scan_machine(void)
                }
        }
        else {
@@ -22596,58 +23657,10 @@ diff -urNp linux-2.6.33.1/drivers/firmware/dmi_scan.c linux-2.6.33.1/drivers/fir
                p = dmi_ioremap(0xF0000, 0x10000);
                if (p == NULL)
                        goto error;
-diff -urNp linux-2.6.33.1/drivers/firmware/edd.c linux-2.6.33.1/drivers/firmware/edd.c
---- linux-2.6.33.1/drivers/firmware/edd.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/firmware/edd.c      2010-03-20 16:58:39.680817937 -0400
-@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
-       return ret;
- }
- 
--static struct sysfs_ops edd_attr_ops = {
-+static const struct sysfs_ops edd_attr_ops = {
-       .show = edd_attr_show,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/firmware/efivars.c linux-2.6.33.1/drivers/firmware/efivars.c
---- linux-2.6.33.1/drivers/firmware/efivars.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/firmware/efivars.c  2010-03-20 16:58:39.680817937 -0400
-@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 
-       return ret;
- }
- 
--static struct sysfs_ops efivar_attr_ops = {
-+static const struct sysfs_ops efivar_attr_ops = {
-       .show = efivar_attr_show,
-       .store = efivar_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/firmware/iscsi_ibft.c linux-2.6.33.1/drivers/firmware/iscsi_ibft.c
---- linux-2.6.33.1/drivers/firmware/iscsi_ibft.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/firmware/iscsi_ibft.c       2010-03-20 16:58:39.680817937 -0400
-@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
-       return ret;
- }
- 
--static struct sysfs_ops ibft_attr_ops = {
-+static const struct sysfs_ops ibft_attr_ops = {
-       .show = ibft_show_attribute,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/firmware/memmap.c linux-2.6.33.1/drivers/firmware/memmap.c
---- linux-2.6.33.1/drivers/firmware/memmap.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/firmware/memmap.c   2010-03-20 16:58:39.684538507 -0400
-@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
-       NULL
- };
- 
--static struct sysfs_ops memmap_attr_ops = {
-+static const struct sysfs_ops memmap_attr_ops = {
-       .show = memmap_attr_show,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_drv.c linux-2.6.33.1/drivers/gpu/drm/drm_drv.c
---- linux-2.6.33.1/drivers/gpu/drm/drm_drv.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/drm_drv.c   2010-03-20 16:58:39.696814507 -0400
-@@ -448,7 +448,7 @@ long drm_ioctl(struct file *filp,
+diff -urNp linux-2.6.34/drivers/gpu/drm/drm_drv.c linux-2.6.34/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.34/drivers/gpu/drm/drm_drv.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/drm_drv.c     2010-07-01 20:45:15.000000000 -0400
+@@ -449,7 +449,7 @@ long drm_ioctl(struct file *filp,
  
        dev = file_priv->minor->dev;
        atomic_inc(&dev->ioctl_count);
@@ -22656,10 +23669,10 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_drv.c linux-2.6.33.1/drivers/gpu/d
        ++file_priv->ioctl_count;
  
        DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/drm/drm_fops.c
---- linux-2.6.33.1/drivers/gpu/drm/drm_fops.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/drm_fops.c  2010-03-20 16:58:39.704802989 -0400
-@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
+diff -urNp linux-2.6.34/drivers/gpu/drm/drm_fops.c linux-2.6.34/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.34/drivers/gpu/drm/drm_fops.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/drm_fops.c    2010-07-01 20:45:15.000000000 -0400
+@@ -67,7 +67,7 @@ static int drm_setup(struct drm_device *
        }
  
        for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
@@ -22668,7 +23681,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/
  
        dev->sigdata.lock = NULL;
  
-@@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct
+@@ -131,9 +131,9 @@ int drm_open(struct inode *inode, struct
  
        retcode = drm_open_helper(inode, filp, dev);
        if (!retcode) {
@@ -22680,7 +23693,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/
                        spin_unlock(&dev->count_lock);
                        retcode = drm_setup(dev);
                        goto out;
-@@ -472,7 +472,7 @@ int drm_release(struct inode *inode, str
+@@ -475,7 +475,7 @@ int drm_release(struct inode *inode, str
  
        lock_kernel();
  
@@ -22689,7 +23702,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/
  
        if (dev->driver->preclose)
                dev->driver->preclose(dev, file_priv);
-@@ -484,7 +484,7 @@ int drm_release(struct inode *inode, str
+@@ -487,7 +487,7 @@ int drm_release(struct inode *inode, str
        DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
                  task_pid_nr(current),
                  (long)old_encode_dev(file_priv->minor->device),
@@ -22698,7 +23711,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/
  
        /* if the master has gone away we can't do anything with the lock */
        if (file_priv->minor->master)
-@@ -565,9 +565,9 @@ int drm_release(struct inode *inode, str
+@@ -568,9 +568,9 @@ int drm_release(struct inode *inode, str
         * End inline drm_release
         */
  
@@ -22710,9 +23723,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_fops.c linux-2.6.33.1/drivers/gpu/
                if (atomic_read(&dev->ioctl_count)) {
                        DRM_ERROR("Device busy: %d\n",
                                  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.33.1/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.33.1/drivers/gpu/drm/drm_ioctl.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/drm_ioctl.c 2010-03-20 16:58:39.704802989 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/drm_ioctl.c linux-2.6.34/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.34/drivers/gpu/drm/drm_ioctl.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/drm_ioctl.c   2010-07-01 20:45:15.000000000 -0400
 @@ -283,7 +283,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);
@@ -22722,9 +23735,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_ioctl.c linux-2.6.33.1/drivers/gpu
                stats->data[i].type = dev->types[i];
        }
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_lock.c linux-2.6.33.1/drivers/gpu/drm/drm_lock.c
---- linux-2.6.33.1/drivers/gpu/drm/drm_lock.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/drm_lock.c  2010-03-20 16:58:39.712815966 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/drm_lock.c linux-2.6.34/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.34/drivers/gpu/drm/drm_lock.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/drm_lock.c    2010-07-01 20:45:15.000000000 -0400
 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
                if (drm_lock_take(&master->lock, lock->context)) {
                        master->lock.file_priv = file_priv;
@@ -22743,10 +23756,10 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/drm_lock.c linux-2.6.33.1/drivers/gpu/
  
        /* kernel_context_switch isn't used by any of the x86 drm
         * modules but is required by the Sparc driver.
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c     2010-03-20 16:58:39.712815966 -0400
-@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
+diff -urNp linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i810/i810_dma.c       2010-07-01 20:45:15.000000000 -0400
+@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
                                 dma->buflist[vertex->idx],
                                 vertex->discard, vertex->used);
  
@@ -22757,7 +23770,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.33.1/drivers
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-@@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device
+@@ -1116,8 +1116,8 @@ static int i810_dma_mc(struct drm_device
        i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
                             mc->last_render);
  
@@ -22768,9 +23781,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i810/i810_dma.c linux-2.6.33.1/drivers
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7017.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7017.c   2010-03-20 16:58:39.720824119 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7017.c     2010-07-01 20:45:15.000000000 -0400
 @@ -444,7 +444,7 @@ static void ch7017_destroy(struct intel_
        }
  }
@@ -22780,9 +23793,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.33.1/drive
        .init = ch7017_init,
        .detect = ch7017_detect,
        .mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7xxx.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7xxx.c   2010-03-20 16:58:39.724540120 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ch7xxx.c     2010-07-01 20:45:15.000000000 -0400
 @@ -358,7 +358,7 @@ static void ch7xxx_destroy(struct intel_
        }
  }
@@ -22792,9 +23805,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.33.1/drive
        .init = ch7xxx_init,
        .detect = ch7xxx_detect,
        .mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo.h linux-2.6.33.1/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo.h  2010-03-20 16:58:39.724540120 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo.h linux-2.6.34/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo.h    2010-07-01 20:45:15.000000000 -0400
 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
         *
         * \return singly-linked list of modes or NULL if no modes found.
@@ -22827,9 +23840,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo.h linux-2.6.33.1/drivers/gpu/
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ivch.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ivch.c     2010-03-20 16:58:39.724540120 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo_ivch.c       2010-07-01 20:45:15.000000000 -0400
 @@ -431,7 +431,7 @@ static void ivch_destroy(struct intel_dv
        }
  }
@@ -22839,9 +23852,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.33.1/drivers
        .init = ivch_init,
        .dpms = ivch_dpms,
        .save = ivch_save,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.33.1/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo_sil164.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo_sil164.c   2010-03-20 16:58:39.724540120 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo_sil164.c     2010-07-01 20:45:15.000000000 -0400
 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
        }
  }
@@ -22851,9 +23864,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.33.1/drive
        .init = sil164_init,
        .detect = sil164_detect,
        .mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.33.1/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/dvo_tfp410.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/dvo_tfp410.c   2010-03-20 16:58:39.724540120 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/dvo_tfp410.c     2010-07-01 20:45:15.000000000 -0400
 @@ -325,7 +325,7 @@ static void tfp410_destroy(struct intel_
        }
  }
@@ -22863,10 +23876,10 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.33.1/drive
        .init = tfp410_init,
        .detect = tfp410_detect,
        .mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.33.1/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.33.1/drivers/gpu/drm/i915/i915_drv.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/i915/i915_drv.c     2010-03-20 16:58:39.724540120 -0400
-@@ -470,7 +470,7 @@ const struct dev_pm_ops i915_pm_ops = {
+diff -urNp linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/i915/i915_drv.c       2010-07-01 20:45:15.000000000 -0400
+@@ -484,7 +484,7 @@ const struct dev_pm_ops i915_pm_ops = {
       .restore = i915_pm_resume,
  };
  
@@ -22875,9 +23888,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/i915/i915_drv.c linux-2.6.33.1/drivers
        .fault = i915_gem_fault,
        .open = drm_gem_vm_open,
        .close = drm_gem_vm_close,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.33.1/drivers/gpu/drm/nouveau/nouveau_backlight.c
---- linux-2.6.33.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-03-20 16:58:39.737935163 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c
+--- linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/nouveau/nouveau_backlight.c   2010-07-01 20:45:15.000000000 -0400
 @@ -58,7 +58,7 @@ static int nv40_set_intensity(struct bac
        return 0;
  }
@@ -22896,9 +23909,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.
        .options = BL_CORE_SUSPENDRESUME,
        .get_brightness = nv50_get_intensity,
        .update_status = nv50_set_intensity,
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.33.1/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.33.1/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/radeon/mkregtable.c 2010-03-20 16:58:39.737935163 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/mkregtable.c   2010-07-01 20:45:15.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
        regex_t mask_rex;
        regmatch_t match[4];
@@ -22916,10 +23929,10 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.33.1/dri
  
        if (regcomp
            (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_atombios.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_atombios.c    2010-03-20 16:58:39.737935163 -0400
-@@ -637,14 +637,14 @@ static uint16_t atombios_get_connector_o
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_atombios.c      2010-07-01 20:45:15.000000000 -0400
+@@ -659,14 +659,14 @@ static uint16_t atombios_get_connector_o
        }
  }
  
@@ -22936,18 +23949,42 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.33.
  
  bool radeon_get_atom_connector_info_from_supported_devices_table(struct
                                                                 drm_device
-@@ -660,7 +660,6 @@ bool radeon_get_atom_connector_info_from
+@@ -682,7 +682,6 @@ bool radeon_get_atom_connector_info_from
        uint8_t dac;
        union atom_supported_devices *supported_devices;
        int i, j, max_device;
 -      struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
  
-       atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
+       if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
+               return false;
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_device.c        2010-07-01 20:45:15.000000000 -0400
+@@ -560,7 +560,7 @@ static bool radeon_switcheroo_can_switch
+       bool can_switch;
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c       2010-03-20 16:58:39.757317099 -0400
-@@ -2139,7 +2139,7 @@ static int radeon_cp_clear(struct drm_de
+       spin_lock(&dev->count_lock);
+-      can_switch = (dev->open_count == 0);
++      can_switch = (atomic_read(&dev->open_count) == 0);
+       spin_unlock(&dev->count_lock);
+       return can_switch;
+ }
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_display.c       2010-07-01 20:45:15.000000000 -0400
+@@ -560,7 +560,7 @@ static void radeon_compute_pll_legacy(st
+ 
+                                       if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
+                                               error = freq - current_freq;
+-                                              error = error < 0 ? 0xffffffff : error;
++                                              error = (int32_t)error < 0 ? 0xffffffff : error;
+                                       } else
+                                               error = abs(current_freq - freq);
+                                       vco_diff = abs(vco - best_vco);
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_state.c 2010-07-01 20:45:15.000000000 -0400
+@@ -2167,7 +2167,7 @@ static int radeon_cp_clear(struct drm_de
        if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
                sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
  
@@ -22956,7 +23993,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.33.1/d
                               sarea_priv->nbox * sizeof(depth_boxes[0])))
                return -EFAULT;
  
-@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
+@@ -3030,7 +3030,7 @@ static int radeon_cp_getparam(struct drm
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
        drm_radeon_getparam_t *param = data;
@@ -22965,10 +24002,10 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.33.1/d
  
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-20 16:58:39.760772786 -0400
-@@ -564,27 +564,10 @@ void radeon_ttm_fini(struct radeon_devic
+diff -urNp linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/radeon/radeon_ttm.c   2010-07-01 20:45:15.000000000 -0400
+@@ -565,27 +565,10 @@ void radeon_ttm_fini(struct radeon_devic
        DRM_INFO("radeon: ttm finalized\n");
  }
  
@@ -22996,7 +24033,7 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.33.1/dri
  
        if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
                return drm_mmap(filp, vma);
-@@ -592,20 +575,9 @@ int radeon_mmap(struct file *filp, struc
+@@ -593,20 +576,9 @@ int radeon_mmap(struct file *filp, struc
  
        file_priv = (struct drm_file *)filp->private_data;
        rdev = file_priv->minor->dev->dev_private;
@@ -23019,21 +24056,21 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.33.1/dri
  }
  
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo.c        2010-03-20 16:58:39.760772786 -0400
-@@ -128,7 +128,7 @@ static struct attribute *ttm_bo_global_a
-       NULL
- };
+diff -urNp linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo.c  2010-07-01 20:45:15.000000000 -0400
+@@ -47,7 +47,7 @@
+ #include <linux/module.h>
  
--static struct sysfs_ops ttm_bo_global_ops = {
-+static const struct sysfs_ops ttm_bo_global_ops = {
-       .show = &ttm_bo_global_show
- };
+ #define TTM_ASSERT_LOCKED(param)
+-#define TTM_DEBUG(fmt, arg...)
++#define TTM_DEBUG(fmt, arg...) do {} while (0)
+ #define TTM_BO_HASH_ORDER 13
  
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo_vm.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo_vm.c     2010-03-20 16:58:39.760772786 -0400
+ static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
+diff -urNp linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_bo_vm.c       2010-07-01 20:45:15.000000000 -0400
 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
  {
        struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -23054,9 +24091,9 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.33.1/drivers
        /*
         * Work around locking order reversal in fault / nopfn
         * between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_global.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_global.c    2010-03-20 16:58:39.764713262 -0400
+diff -urNp linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/gpu/drm/ttm/ttm_global.c      2010-07-01 20:45:15.000000000 -0400
 @@ -36,7 +36,7 @@
  struct ttm_global_item {
        struct mutex mutex;
@@ -23114,21 +24151,21 @@ diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.33.1/driver
                ref->release(ref);
                item->object = NULL;
        }
-diff -urNp linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_memory.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/gpu/drm/ttm/ttm_memory.c    2010-03-20 16:58:39.764713262 -0400
-@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
-       NULL
- };
+diff -urNp linux-2.6.34/drivers/hid/usbhid/hiddev.c linux-2.6.34/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.34/drivers/hid/usbhid/hiddev.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hid/usbhid/hiddev.c   2010-07-01 20:45:15.000000000 -0400
+@@ -615,7 +615,7 @@ static long hiddev_ioctl(struct file *fi
+               return put_user(HID_VERSION, (int __user *)arg);
  
--static struct sysfs_ops ttm_mem_zone_ops = {
-+static const struct sysfs_ops ttm_mem_zone_ops = {
-       .show = &ttm_mem_zone_show,
-       .store = &ttm_mem_zone_store
- };
-diff -urNp linux-2.6.33.1/drivers/hwmon/k8temp.c linux-2.6.33.1/drivers/hwmon/k8temp.c
---- linux-2.6.33.1/drivers/hwmon/k8temp.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/hwmon/k8temp.c      2010-03-20 16:58:39.764713262 -0400
+       case HIDIOCAPPLICATION:
+-              if (arg < 0 || arg >= hid->maxapplication)
++              if (arg >= hid->maxapplication)
+                       return -EINVAL;
+ 
+               for (i = 0; i < hid->maxcollection; i++)
+diff -urNp linux-2.6.34/drivers/hwmon/k8temp.c linux-2.6.34/drivers/hwmon/k8temp.c
+--- linux-2.6.34/drivers/hwmon/k8temp.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hwmon/k8temp.c        2010-07-01 20:45:15.000000000 -0400
 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
  
  static const struct pci_device_id k8temp_ids[] = {
@@ -23138,9 +24175,9 @@ diff -urNp linux-2.6.33.1/drivers/hwmon/k8temp.c linux-2.6.33.1/drivers/hwmon/k8
  };
  
  MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.33.1/drivers/hwmon/sis5595.c linux-2.6.33.1/drivers/hwmon/sis5595.c
---- linux-2.6.33.1/drivers/hwmon/sis5595.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/hwmon/sis5595.c     2010-03-20 16:58:39.772823109 -0400
+diff -urNp linux-2.6.34/drivers/hwmon/sis5595.c linux-2.6.34/drivers/hwmon/sis5595.c
+--- linux-2.6.34/drivers/hwmon/sis5595.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hwmon/sis5595.c       2010-07-01 20:45:15.000000000 -0400
 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
  
  static const struct pci_device_id sis5595_pci_ids[] = {
@@ -23150,9 +24187,9 @@ diff -urNp linux-2.6.33.1/drivers/hwmon/sis5595.c linux-2.6.33.1/drivers/hwmon/s
  };
  
  MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.33.1/drivers/hwmon/via686a.c linux-2.6.33.1/drivers/hwmon/via686a.c
---- linux-2.6.33.1/drivers/hwmon/via686a.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/hwmon/via686a.c     2010-03-20 16:58:39.780824922 -0400
+diff -urNp linux-2.6.34/drivers/hwmon/via686a.c linux-2.6.34/drivers/hwmon/via686a.c
+--- linux-2.6.34/drivers/hwmon/via686a.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hwmon/via686a.c       2010-07-01 20:45:15.000000000 -0400
 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
  
  static const struct pci_device_id via686a_pci_ids[] = {
@@ -23162,9 +24199,9 @@ diff -urNp linux-2.6.33.1/drivers/hwmon/via686a.c linux-2.6.33.1/drivers/hwmon/v
  };
  
  MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.33.1/drivers/hwmon/vt8231.c linux-2.6.33.1/drivers/hwmon/vt8231.c
---- linux-2.6.33.1/drivers/hwmon/vt8231.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/hwmon/vt8231.c      2010-03-20 16:58:39.784811184 -0400
+diff -urNp linux-2.6.34/drivers/hwmon/vt8231.c linux-2.6.34/drivers/hwmon/vt8231.c
+--- linux-2.6.34/drivers/hwmon/vt8231.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hwmon/vt8231.c        2010-07-01 20:45:15.000000000 -0400
 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
  
  static const struct pci_device_id vt8231_pci_ids[] = {
@@ -23174,9 +24211,9 @@ diff -urNp linux-2.6.33.1/drivers/hwmon/vt8231.c linux-2.6.33.1/drivers/hwmon/vt
  };
  
  MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.33.1/drivers/hwmon/w83791d.c linux-2.6.33.1/drivers/hwmon/w83791d.c
---- linux-2.6.33.1/drivers/hwmon/w83791d.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/hwmon/w83791d.c     2010-03-20 16:58:39.796811468 -0400
+diff -urNp linux-2.6.34/drivers/hwmon/w83791d.c linux-2.6.34/drivers/hwmon/w83791d.c
+--- linux-2.6.34/drivers/hwmon/w83791d.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/hwmon/w83791d.c       2010-07-01 20:45:15.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);
@@ -23188,21 +24225,21 @@ diff -urNp linux-2.6.33.1/drivers/hwmon/w83791d.c linux-2.6.33.1/drivers/hwmon/w
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-i801.c linux-2.6.33.1/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.33.1/drivers/i2c/busses/i2c-i801.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/i2c/busses/i2c-i801.c       2010-03-20 16:58:39.804825087 -0400
-@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] =
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
+diff -urNp linux-2.6.34/drivers/i2c/busses/i2c-i801.c linux-2.6.34/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.34/drivers/i2c/busses/i2c-i801.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/i2c/busses/i2c-i801.c 2010-07-01 20:45:15.000000000 -0400
+@@ -582,7 +582,7 @@ static const struct pci_device_id i801_i
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
 -      { 0, }
 +      { 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE (pci, i801_ids);
-diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c      2010-03-20 16:58:39.821741415 -0400
+diff -urNp linux-2.6.34/drivers/i2c/busses/i2c-piix4.c linux-2.6.34/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.34/drivers/i2c/busses/i2c-piix4.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/i2c/busses/i2c-piix4.c        2010-07-01 20:45:15.000000000 -0400
 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
                .ident = "IBM",
                .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -23212,7 +24249,7 @@ diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.33.1/drivers/
  };
  
  static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
-@@ -491,7 +491,7 @@ static struct pci_device_id piix4_ids[] 
+@@ -491,7 +491,7 @@ static const struct pci_device_id piix4_
                     PCI_DEVICE_ID_SERVERWORKS_HT1000SB) },
        { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
                     PCI_DEVICE_ID_SERVERWORKS_HT1100LD) },
@@ -23221,11 +24258,11 @@ diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-piix4.c linux-2.6.33.1/drivers/
  };
  
  MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-sis630.c linux-2.6.33.1/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.33.1/drivers/i2c/busses/i2c-sis630.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/i2c/busses/i2c-sis630.c     2010-03-20 16:58:39.832567311 -0400
+diff -urNp linux-2.6.34/drivers/i2c/busses/i2c-sis630.c linux-2.6.34/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.34/drivers/i2c/busses/i2c-sis630.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/i2c/busses/i2c-sis630.c       2010-07-01 20:45:15.000000000 -0400
 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
- static struct pci_device_id sis630_ids[] __devinitdata = {
+ static const struct pci_device_id sis630_ids[] __devinitconst = {
        { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
        { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) },
 -      { 0, }
@@ -23233,21 +24270,21 @@ diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-sis630.c linux-2.6.33.1/drivers
  };
  
  MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.33.1/drivers/i2c/busses/i2c-sis96x.c linux-2.6.33.1/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.33.1/drivers/i2c/busses/i2c-sis96x.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/i2c/busses/i2c-sis96x.c     2010-03-20 16:58:39.832567311 -0400
+diff -urNp linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/i2c/busses/i2c-sis96x.c       2010-07-01 20:45:15.000000000 -0400
 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
  
- static struct pci_device_id sis96x_ids[] = {
+ static const struct pci_device_id sis96x_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
 -      { 0, }
 +      { 0, 0, 0, 0, 0, 0, 0 }
  };
  
  MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.33.1/drivers/ide/ide-cd.c linux-2.6.33.1/drivers/ide/ide-cd.c
---- linux-2.6.33.1/drivers/ide/ide-cd.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ide/ide-cd.c        2010-03-20 16:58:39.844814079 -0400
+diff -urNp linux-2.6.34/drivers/ide/ide-cd.c linux-2.6.34/drivers/ide/ide-cd.c
+--- linux-2.6.34/drivers/ide/ide-cd.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ide/ide-cd.c  2010-07-01 20:45:15.000000000 -0400
 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
                alignment = queue_dma_alignment(q) | q->dma_pad_mask;
                if ((unsigned long)buf & alignment
@@ -23257,9 +24294,9 @@ diff -urNp linux-2.6.33.1/drivers/ide/ide-cd.c linux-2.6.33.1/drivers/ide/ide-cd
                        drive->dma = 0;
        }
  }
-diff -urNp linux-2.6.33.1/drivers/ieee1394/dv1394.c linux-2.6.33.1/drivers/ieee1394/dv1394.c
---- linux-2.6.33.1/drivers/ieee1394/dv1394.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/dv1394.c   2010-03-20 16:58:39.856823569 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/dv1394.c linux-2.6.34/drivers/ieee1394/dv1394.c
+--- linux-2.6.34/drivers/ieee1394/dv1394.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/dv1394.c     2010-07-01 20:45:15.000000000 -0400
 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
        based upon DIF section and sequence
  */
@@ -23278,9 +24315,9 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/dv1394.c linux-2.6.33.1/drivers/ieee1
  };
  
  MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.33.1/drivers/ieee1394/eth1394.c linux-2.6.33.1/drivers/ieee1394/eth1394.c
---- linux-2.6.33.1/drivers/ieee1394/eth1394.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/eth1394.c  2010-03-20 16:58:39.865827641 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/eth1394.c linux-2.6.34/drivers/ieee1394/eth1394.c
+--- linux-2.6.34/drivers/ieee1394/eth1394.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/eth1394.c    2010-07-01 20:45:15.000000000 -0400
 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
                .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
                .version = ETHER1394_GASP_VERSION,
@@ -23290,9 +24327,9 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/eth1394.c linux-2.6.33.1/drivers/ieee
  };
  
  MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.33.1/drivers/ieee1394/hosts.c linux-2.6.33.1/drivers/ieee1394/hosts.c
---- linux-2.6.33.1/drivers/ieee1394/hosts.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/hosts.c    2010-03-20 16:58:39.865827641 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/hosts.c linux-2.6.34/drivers/ieee1394/hosts.c
+--- linux-2.6.34/drivers/ieee1394/hosts.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/hosts.c      2010-07-01 20:45:15.000000000 -0400
 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 
  }
  
@@ -23301,9 +24338,9 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/hosts.c linux-2.6.33.1/drivers/ieee13
        .transmit_packet = dummy_transmit_packet,
        .devctl =          dummy_devctl,
        .isoctl =          dummy_isoctl
-diff -urNp linux-2.6.33.1/drivers/ieee1394/ohci1394.c linux-2.6.33.1/drivers/ieee1394/ohci1394.c
---- linux-2.6.33.1/drivers/ieee1394/ohci1394.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/ohci1394.c 2010-03-20 16:58:39.873869022 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/ohci1394.c linux-2.6.34/drivers/ieee1394/ohci1394.c
+--- linux-2.6.34/drivers/ieee1394/ohci1394.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/ohci1394.c   2010-07-01 20:45:15.000000000 -0400
 @@ -148,9 +148,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
  printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
  
@@ -23325,9 +24362,9 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/ohci1394.c linux-2.6.33.1/drivers/iee
  };
  
  MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.33.1/drivers/ieee1394/raw1394.c linux-2.6.33.1/drivers/ieee1394/raw1394.c
---- linux-2.6.33.1/drivers/ieee1394/raw1394.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/raw1394.c  2010-03-20 16:58:39.873869022 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/raw1394.c linux-2.6.34/drivers/ieee1394/raw1394.c
+--- linux-2.6.34/drivers/ieee1394/raw1394.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/raw1394.c    2010-07-01 20:45:15.000000000 -0400
 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
         .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
         .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -23337,10 +24374,10 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/raw1394.c linux-2.6.33.1/drivers/ieee
  };
  
  MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.33.1/drivers/ieee1394/sbp2.c linux-2.6.33.1/drivers/ieee1394/sbp2.c
---- linux-2.6.33.1/drivers/ieee1394/sbp2.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/sbp2.c     2010-03-20 16:58:39.877823938 -0400
-@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
+diff -urNp linux-2.6.34/drivers/ieee1394/sbp2.c linux-2.6.34/drivers/ieee1394/sbp2.c
+--- linux-2.6.34/drivers/ieee1394/sbp2.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/sbp2.c       2010-07-01 20:45:15.000000000 -0400
+@@ -289,7 +289,7 @@ static const struct ieee1394_device_id s
         .match_flags   = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
         .specifier_id  = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
         .version       = SBP2_SW_VERSION_ENTRY & 0xffffff},
@@ -23349,7 +24386,7 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/sbp2.c linux-2.6.33.1/drivers/ieee139
  };
  MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
  
-@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
+@@ -2110,7 +2110,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
  MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
  MODULE_LICENSE("GPL");
  
@@ -23358,9 +24395,9 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/sbp2.c linux-2.6.33.1/drivers/ieee139
  {
        int ret;
  
-diff -urNp linux-2.6.33.1/drivers/ieee1394/video1394.c linux-2.6.33.1/drivers/ieee1394/video1394.c
---- linux-2.6.33.1/drivers/ieee1394/video1394.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/ieee1394/video1394.c        2010-03-20 16:58:39.877823938 -0400
+diff -urNp linux-2.6.34/drivers/ieee1394/video1394.c linux-2.6.34/drivers/ieee1394/video1394.c
+--- linux-2.6.34/drivers/ieee1394/video1394.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/ieee1394/video1394.c  2010-07-01 20:45:15.000000000 -0400
 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
                  .specifier_id   = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
                  .version        = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -23370,10 +24407,10 @@ diff -urNp linux-2.6.33.1/drivers/ieee1394/video1394.c linux-2.6.33.1/drivers/ie
  };
  
  MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/infiniband/core/cm.c
---- linux-2.6.33.1/drivers/infiniband/core/cm.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/infiniband/core/cm.c        2010-03-20 16:58:39.905667556 -0400
-@@ -112,7 +112,7 @@ static char const counter_group_names[CM
+diff -urNp linux-2.6.34/drivers/infiniband/core/cm.c linux-2.6.34/drivers/infiniband/core/cm.c
+--- linux-2.6.34/drivers/infiniband/core/cm.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/infiniband/core/cm.c  2010-07-01 20:45:15.000000000 -0400
+@@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
        struct kobject obj;
@@ -23382,7 +24419,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
  };
  
  struct cm_counter_attribute {
-@@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm
+@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm
        struct ib_mad_send_buf *msg = NULL;
        int ret;
  
@@ -23391,7 +24428,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                        counter[CM_REQ_COUNTER]);
  
        /* Quick state check to discard duplicate REQs. */
-@@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm
+@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm
        if (!cm_id_priv)
                return;
  
@@ -23400,7 +24437,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                        counter[CM_REP_COUNTER]);
        ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
        if (ret)
-@@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work
+@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work
        if (cm_id_priv->id.state != IB_CM_REP_SENT &&
            cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
                spin_unlock_irq(&cm_id_priv->lock);
@@ -23409,7 +24446,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_RTU_COUNTER]);
                goto out;
        }
-@@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_wor
        cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
                                   dreq_msg->local_comm_id);
        if (!cm_id_priv) {
@@ -23418,7 +24455,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_DREQ_COUNTER]);
                cm_issue_drep(work->port, work->mad_recv_wc);
                return -EINVAL;
-@@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_wor
        case IB_CM_MRA_REP_RCVD:
                break;
        case IB_CM_TIMEWAIT:
@@ -23427,7 +24464,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_DREQ_COUNTER]);
                if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
                        goto unlock;
-@@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_wor
+@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_wor
                        cm_free_msg(msg);
                goto deref;
        case IB_CM_DREQ_RCVD:
@@ -23436,7 +24473,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_DREQ_COUNTER]);
                goto unlock;
        default:
-@@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2502,7 +2502,7 @@ static int cm_mra_handler(struct cm_work
                    ib_modify_mad(cm_id_priv->av.port->mad_agent,
                                  cm_id_priv->msg, timeout)) {
                        if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
@@ -23445,7 +24482,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                                counter_group[CM_RECV_DUPLICATES].
                                                counter[CM_MRA_COUNTER]);
                        goto out;
-@@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work
+@@ -2511,7 +2511,7 @@ static int cm_mra_handler(struct cm_work
                break;
        case IB_CM_MRA_REQ_RCVD:
        case IB_CM_MRA_REP_RCVD:
@@ -23454,7 +24491,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_MRA_COUNTER]);
                /* fall through */
        default:
-@@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2673,7 +2673,7 @@ static int cm_lap_handler(struct cm_work
        case IB_CM_LAP_IDLE:
                break;
        case IB_CM_MRA_LAP_SENT:
@@ -23463,7 +24500,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_LAP_COUNTER]);
                if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
                        goto unlock;
-@@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work
+@@ -2689,7 +2689,7 @@ static int cm_lap_handler(struct cm_work
                        cm_free_msg(msg);
                goto deref;
        case IB_CM_LAP_RCVD:
@@ -23472,7 +24509,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_LAP_COUNTER]);
                goto unlock;
        default:
-@@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm
+@@ -2973,7 +2973,7 @@ static int cm_sidr_req_handler(struct cm
        cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
        if (cur_cm_id_priv) {
                spin_unlock_irq(&cm.lock);
@@ -23481,7 +24518,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                counter[CM_SIDR_REQ_COUNTER]);
                goto out; /* Duplicate message. */
        }
-@@ -3183,10 +3183,10 @@ static void cm_send_handler(struct ib_ma
+@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_ma
        if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
                msg->retries = 1;
  
@@ -23494,7 +24531,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                                &port->counter_group[CM_XMIT_RETRIES].
                                counter[attr_index]);
  
-@@ -3396,7 +3396,7 @@ static void cm_recv_handler(struct ib_ma
+@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_ma
        }
  
        attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -23503,7 +24540,7 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
                        counter[attr_id - CM_ATTR_ID_OFFSET]);
  
        work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3594,10 +3594,10 @@ static ssize_t cm_show_counter(struct ko
+@@ -3595,7 +3595,7 @@ static ssize_t cm_show_counter(struct ko
        cm_attr = container_of(attr, struct cm_counter_attribute, attr);
  
        return sprintf(buf, "%ld\n",
@@ -23511,27 +24548,11 @@ diff -urNp linux-2.6.33.1/drivers/infiniband/core/cm.c linux-2.6.33.1/drivers/in
 +                     atomic_long_read_unchecked(&group->counter[cm_attr->index]));
  }
  
--static struct sysfs_ops cm_counter_ops = {
-+static const struct sysfs_ops cm_counter_ops = {
-       .show = cm_show_counter
- };
- 
-diff -urNp linux-2.6.33.1/drivers/infiniband/core/sysfs.c linux-2.6.33.1/drivers/infiniband/core/sysfs.c
---- linux-2.6.33.1/drivers/infiniband/core/sysfs.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/infiniband/core/sysfs.c     2010-03-20 16:58:39.912829502 -0400
-@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
-       return port_attr->show(p, port_attr, buf);
- }
- 
--static struct sysfs_ops port_sysfs_ops = {
-+static const struct sysfs_ops port_sysfs_ops = {
-       .show = port_attr_show
- };
- 
-diff -urNp linux-2.6.33.1/drivers/input/keyboard/atkbd.c linux-2.6.33.1/drivers/input/keyboard/atkbd.c
---- linux-2.6.33.1/drivers/input/keyboard/atkbd.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/keyboard/atkbd.c      2010-03-20 16:58:39.929160943 -0400
-@@ -1229,7 +1229,7 @@ static struct serio_device_id atkbd_seri
+ static const struct sysfs_ops cm_counter_ops = {
+diff -urNp linux-2.6.34/drivers/input/keyboard/atkbd.c linux-2.6.34/drivers/input/keyboard/atkbd.c
+--- linux-2.6.34/drivers/input/keyboard/atkbd.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/keyboard/atkbd.c        2010-07-01 20:45:15.000000000 -0400
+@@ -1240,7 +1240,7 @@ static struct serio_device_id atkbd_seri
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
        },
@@ -23540,10 +24561,10 @@ diff -urNp linux-2.6.33.1/drivers/input/keyboard/atkbd.c linux-2.6.33.1/drivers/
  };
  
  MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.33.1/drivers/input/mouse/lifebook.c linux-2.6.33.1/drivers/input/mouse/lifebook.c
---- linux-2.6.33.1/drivers/input/mouse/lifebook.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/mouse/lifebook.c      2010-03-20 16:58:39.929160943 -0400
-@@ -122,7 +122,7 @@ static const struct dmi_system_id __init
+diff -urNp linux-2.6.34/drivers/input/mouse/lifebook.c linux-2.6.34/drivers/input/mouse/lifebook.c
+--- linux-2.6.34/drivers/input/mouse/lifebook.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/mouse/lifebook.c        2010-07-01 20:45:15.000000000 -0400
+@@ -123,7 +123,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
                },
        },
@@ -23552,10 +24573,10 @@ diff -urNp linux-2.6.33.1/drivers/input/mouse/lifebook.c linux-2.6.33.1/drivers/
  };
  
  void __init lifebook_module_init(void)
-diff -urNp linux-2.6.33.1/drivers/input/mouse/psmouse-base.c linux-2.6.33.1/drivers/input/mouse/psmouse-base.c
---- linux-2.6.33.1/drivers/input/mouse/psmouse-base.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/mouse/psmouse-base.c  2010-03-20 16:58:39.936833108 -0400
-@@ -1442,7 +1442,7 @@ static struct serio_device_id psmouse_se
+diff -urNp linux-2.6.34/drivers/input/mouse/psmouse-base.c linux-2.6.34/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.34/drivers/input/mouse/psmouse-base.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/mouse/psmouse-base.c    2010-07-01 20:45:15.000000000 -0400
+@@ -1460,7 +1460,7 @@ static struct serio_device_id psmouse_se
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
        },
@@ -23564,10 +24585,10 @@ diff -urNp linux-2.6.33.1/drivers/input/mouse/psmouse-base.c linux-2.6.33.1/driv
  };
  
  MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.33.1/drivers/input/mouse/synaptics.c linux-2.6.33.1/drivers/input/mouse/synaptics.c
---- linux-2.6.33.1/drivers/input/mouse/synaptics.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/mouse/synaptics.c     2010-03-20 16:58:39.944836883 -0400
-@@ -438,7 +438,7 @@ static void synaptics_process_packet(str
+diff -urNp linux-2.6.34/drivers/input/mouse/synaptics.c linux-2.6.34/drivers/input/mouse/synaptics.c
+--- linux-2.6.34/drivers/input/mouse/synaptics.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/mouse/synaptics.c       2010-07-01 20:45:15.000000000 -0400
+@@ -458,7 +458,7 @@ static void synaptics_process_packet(str
                                break;
                        case 2:
                                if (SYN_MODEL_PEN(priv->model_id))
@@ -23576,7 +24597,7 @@ diff -urNp linux-2.6.33.1/drivers/input/mouse/synaptics.c linux-2.6.33.1/drivers
                                break;
                        case 4 ... 15:
                                if (SYN_CAP_PALMDETECT(priv->capabilities))
-@@ -654,7 +654,6 @@ static const struct dmi_system_id __init
+@@ -680,7 +680,6 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
                },
@@ -23584,7 +24605,7 @@ diff -urNp linux-2.6.33.1/drivers/input/mouse/synaptics.c linux-2.6.33.1/drivers
        },
        {
                /* Toshiba Portege M300 */
-@@ -663,9 +662,8 @@ static const struct dmi_system_id __init
+@@ -689,9 +688,8 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
                        DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
                },
@@ -23595,10 +24616,10 @@ diff -urNp linux-2.6.33.1/drivers/input/mouse/synaptics.c linux-2.6.33.1/drivers
  #endif
  };
  
-diff -urNp linux-2.6.33.1/drivers/input/mousedev.c linux-2.6.33.1/drivers/input/mousedev.c
---- linux-2.6.33.1/drivers/input/mousedev.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/mousedev.c    2010-03-20 16:58:39.952834604 -0400
-@@ -760,7 +760,7 @@ static ssize_t mousedev_read(struct file
+diff -urNp linux-2.6.34/drivers/input/mousedev.c linux-2.6.34/drivers/input/mousedev.c
+--- linux-2.6.34/drivers/input/mousedev.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/mousedev.c      2010-07-01 20:45:15.000000000 -0400
+@@ -754,7 +754,7 @@ static ssize_t mousedev_read(struct file
  
        spin_unlock_irq(&client->packet_lock);
  
@@ -23607,7 +24628,7 @@ diff -urNp linux-2.6.33.1/drivers/input/mousedev.c linux-2.6.33.1/drivers/input/
                return -EFAULT;
  
        return count;
-@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
+@@ -1051,7 +1051,7 @@ static struct input_handler mousedev_han
  
  #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
  static struct miscdevice psaux_mouse = {
@@ -23616,9 +24637,9 @@ diff -urNp linux-2.6.33.1/drivers/input/mousedev.c linux-2.6.33.1/drivers/input/
  };
  static int psaux_registered;
  #endif
-diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h       2010-03-20 16:58:39.964826079 -0400
+diff -urNp linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/serio/i8042-x86ia64io.h 2010-07-01 20:45:15.000000000 -0400
 @@ -172,7 +172,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
                },
@@ -23637,7 +24658,7 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/d
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
-@@ -469,7 +469,7 @@ static const struct dmi_system_id __init
+@@ -476,7 +476,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
                },
        },
@@ -23646,7 +24667,7 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/d
  };
  
  #ifdef CONFIG_PNP
-@@ -488,7 +488,7 @@ static const struct dmi_system_id __init
+@@ -495,7 +495,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
                },
        },
@@ -23655,7 +24676,7 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/d
  };
  
  static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
-@@ -512,7 +512,7 @@ static const struct dmi_system_id __init
+@@ -519,7 +519,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
                },
        },
@@ -23664,7 +24685,7 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/d
  };
  #endif
  
-@@ -586,7 +586,7 @@ static const struct dmi_system_id __init
+@@ -593,7 +593,7 @@ static const struct dmi_system_id __init
                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
                },
        },
@@ -23673,10 +24694,10 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/i8042-x86ia64io.h linux-2.6.33.1/d
  };
  
  #endif /* CONFIG_X86 */
-diff -urNp linux-2.6.33.1/drivers/input/serio/serio_raw.c linux-2.6.33.1/drivers/input/serio/serio_raw.c
---- linux-2.6.33.1/drivers/input/serio/serio_raw.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/input/serio/serio_raw.c     2010-03-20 16:58:39.964826079 -0400
-@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
+diff -urNp linux-2.6.34/drivers/input/serio/serio_raw.c linux-2.6.34/drivers/input/serio/serio_raw.c
+--- linux-2.6.34/drivers/input/serio/serio_raw.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/input/serio/serio_raw.c       2010-07-01 20:45:15.000000000 -0400
+@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
                .id     = SERIO_ANY,
                .extra  = SERIO_ANY,
        },
@@ -23685,10 +24706,10 @@ diff -urNp linux-2.6.33.1/drivers/input/serio/serio_raw.c linux-2.6.33.1/drivers
  };
  
  MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/common.c linux-2.6.33.1/drivers/isdn/gigaset/common.c
---- linux-2.6.33.1/drivers/isdn/gigaset/common.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/isdn/gigaset/common.c       2010-03-20 16:58:39.984838298 -0400
-@@ -732,7 +732,7 @@ struct cardstate *gigaset_initcs(struct 
+diff -urNp linux-2.6.34/drivers/isdn/gigaset/common.c linux-2.6.34/drivers/isdn/gigaset/common.c
+--- linux-2.6.34/drivers/isdn/gigaset/common.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/isdn/gigaset/common.c 2010-07-01 20:45:15.000000000 -0400
+@@ -733,7 +733,7 @@ struct cardstate *gigaset_initcs(struct 
        cs->commands_pending = 0;
        cs->cur_at_seq = 0;
        cs->gotfwver = -1;
@@ -23697,10 +24718,10 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/common.c linux-2.6.33.1/drivers/i
        cs->dev = NULL;
        cs->tty = NULL;
        cs->tty_dev = NULL;
-diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/gigaset.h linux-2.6.33.1/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.33.1/drivers/isdn/gigaset/gigaset.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/isdn/gigaset/gigaset.h      2010-03-20 16:58:39.988819691 -0400
-@@ -440,7 +440,7 @@ struct cardstate {
+diff -urNp linux-2.6.34/drivers/isdn/gigaset/gigaset.h linux-2.6.34/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.34/drivers/isdn/gigaset/gigaset.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/isdn/gigaset/gigaset.h        2010-07-01 20:45:15.000000000 -0400
+@@ -443,7 +443,7 @@ struct cardstate {
        spinlock_t cmdlock;
        unsigned curlen, cmdbytes;
  
@@ -23709,10 +24730,10 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/gigaset.h linux-2.6.33.1/drivers/
        struct tty_struct *tty;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;
-diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/drivers/isdn/gigaset/interface.c
---- linux-2.6.33.1/drivers/isdn/gigaset/interface.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/isdn/gigaset/interface.c    2010-03-20 16:58:39.996850965 -0400
-@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
+diff -urNp linux-2.6.34/drivers/isdn/gigaset/interface.c linux-2.6.34/drivers/isdn/gigaset/interface.c
+--- linux-2.6.34/drivers/isdn/gigaset/interface.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/isdn/gigaset/interface.c      2010-07-01 20:45:15.000000000 -0400
+@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
                return -ERESTARTSYS;
        tty->driver_data = cs;
  
@@ -23723,7 +24744,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                spin_lock_irqsave(&cs->lock, flags);
                cs->tty = tty;
                spin_unlock_irqrestore(&cs->lock, flags);
-@@ -195,10 +193,10 @@ static void if_close(struct tty_struct *
+@@ -190,10 +188,10 @@ static void if_close(struct tty_struct *
  
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
@@ -23736,7 +24757,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                        spin_lock_irqsave(&cs->lock, flags);
                        cs->tty = NULL;
                        spin_unlock_irqrestore(&cs->lock, flags);
-@@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *t
+@@ -228,7 +226,7 @@ static int if_ioctl(struct tty_struct *t
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
@@ -23745,7 +24766,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else {
                retval = 0;
-@@ -360,7 +358,7 @@ static int if_write(struct tty_struct *t
+@@ -355,7 +353,7 @@ static int if_write(struct tty_struct *t
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
@@ -23754,7 +24775,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else if (cs->mstate != MS_LOCKED) {
                dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -394,7 +392,7 @@ static int if_write_room(struct tty_stru
+@@ -389,7 +387,7 @@ static int if_write_room(struct tty_stru
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
@@ -23763,7 +24784,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else if (cs->mstate != MS_LOCKED) {
                dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -424,7 +422,7 @@ static int if_chars_in_buffer(struct tty
+@@ -419,7 +417,7 @@ static int if_chars_in_buffer(struct tty
  
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");
@@ -23772,7 +24793,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else if (cs->mstate != MS_LOCKED)
                dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -452,7 +450,7 @@ static void if_throttle(struct tty_struc
+@@ -447,7 +445,7 @@ static void if_throttle(struct tty_struc
  
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
@@ -23780,8 +24801,8 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
 +      else if (!atomic_read(&cs->open_count))
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else
-               gig_dbg(DEBUG_ANY, "%s: not implemented\n", __func__);
-@@ -476,7 +474,7 @@ static void if_unthrottle(struct tty_str
+               gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -471,7 +469,7 @@ static void if_unthrottle(struct tty_str
  
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
@@ -23789,8 +24810,8 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
 +      else if (!atomic_read(&cs->open_count))
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else
-               gig_dbg(DEBUG_ANY, "%s: not implemented\n", __func__);
-@@ -507,7 +505,7 @@ static void if_set_termios(struct tty_st
+               gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
+@@ -502,7 +500,7 @@ static void if_set_termios(struct tty_st
                goto out;
        }
  
@@ -23799,10 +24820,10 @@ diff -urNp linux-2.6.33.1/drivers/isdn/gigaset/interface.c linux-2.6.33.1/driver
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
                goto out;
        }
-diff -urNp linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c      2010-03-20 16:58:40.004515803 -0400
-@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
+diff -urNp linux-2.6.34/drivers/isdn/hardware/avm/b1.c linux-2.6.34/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.34/drivers/isdn/hardware/avm/b1.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/isdn/hardware/avm/b1.c        2010-07-01 20:45:16.000000000 -0400
+@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
        }
        if (left) {
                if (t4file->user) {
@@ -23811,7 +24832,7 @@ diff -urNp linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c linux-2.6.33.1/drivers/
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
-@@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capilo
+@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capilo
        }
        if (left) {
                if (config->user) {
@@ -23820,10 +24841,10 @@ diff -urNp linux-2.6.33.1/drivers/isdn/hardware/avm/b1.c linux-2.6.33.1/drivers/
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
-diff -urNp linux-2.6.33.1/drivers/isdn/icn/icn.c linux-2.6.33.1/drivers/isdn/icn/icn.c
---- linux-2.6.33.1/drivers/isdn/icn/icn.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/isdn/icn/icn.c      2010-03-20 16:58:40.012833882 -0400
-@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
+diff -urNp linux-2.6.34/drivers/isdn/icn/icn.c linux-2.6.34/drivers/isdn/icn/icn.c
+--- linux-2.6.34/drivers/isdn/icn/icn.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/isdn/icn/icn.c        2010-07-01 20:45:16.000000000 -0400
+@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
                if (count > len)
                        count = len;
                if (user) {
@@ -23832,10 +24853,10 @@ diff -urNp linux-2.6.33.1/drivers/isdn/icn/icn.c linux-2.6.33.1/drivers/isdn/icn
                                return -EFAULT;
                } else
                        memcpy(msg, buf, count);
-diff -urNp linux-2.6.33.1/drivers/lguest/core.c linux-2.6.33.1/drivers/lguest/core.c
---- linux-2.6.33.1/drivers/lguest/core.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/lguest/core.c       2010-03-20 16:58:40.012833882 -0400
-@@ -91,9 +91,17 @@ static __init int map_switcher(void)
+diff -urNp linux-2.6.34/drivers/lguest/core.c linux-2.6.34/drivers/lguest/core.c
+--- linux-2.6.34/drivers/lguest/core.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/lguest/core.c 2010-07-01 20:45:15.000000000 -0400
+@@ -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.
         */
@@ -23853,9 +24874,9 @@ diff -urNp linux-2.6.33.1/drivers/lguest/core.c linux-2.6.33.1/drivers/lguest/co
        if (!switcher_vma) {
                err = -ENOMEM;
                printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.33.1/drivers/macintosh/via-pmu-backlight.c linux-2.6.33.1/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.33.1/drivers/macintosh/via-pmu-backlight.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/macintosh/via-pmu-backlight.c       2010-03-20 16:58:40.016740354 -0400
+diff -urNp linux-2.6.34/drivers/macintosh/via-pmu-backlight.c linux-2.6.34/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.34/drivers/macintosh/via-pmu-backlight.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/macintosh/via-pmu-backlight.c 2010-07-01 20:45:15.000000000 -0400
 @@ -15,7 +15,7 @@
  
  #define MAX_PMU_LEVEL 0xFF
@@ -23874,9 +24895,9 @@ diff -urNp linux-2.6.33.1/drivers/macintosh/via-pmu-backlight.c linux-2.6.33.1/d
        .get_brightness = pmu_backlight_get_brightness,
        .update_status  = pmu_backlight_update_status,
  
-diff -urNp linux-2.6.33.1/drivers/macintosh/via-pmu.c linux-2.6.33.1/drivers/macintosh/via-pmu.c
---- linux-2.6.33.1/drivers/macintosh/via-pmu.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/macintosh/via-pmu.c 2010-03-20 16:58:40.028838991 -0400
+diff -urNp linux-2.6.34/drivers/macintosh/via-pmu.c linux-2.6.34/drivers/macintosh/via-pmu.c
+--- linux-2.6.34/drivers/macintosh/via-pmu.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/macintosh/via-pmu.c   2010-07-01 20:45:15.000000000 -0400
 @@ -2254,7 +2254,7 @@ static int pmu_sleep_valid(suspend_state
                && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
  }
@@ -23886,9 +24907,9 @@ diff -urNp linux-2.6.33.1/drivers/macintosh/via-pmu.c linux-2.6.33.1/drivers/mac
        .enter = powerbook_sleep,
        .valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.33.1/drivers/md/bitmap.c linux-2.6.33.1/drivers/md/bitmap.c
---- linux-2.6.33.1/drivers/md/bitmap.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/md/bitmap.c 2010-03-20 16:58:40.032827823 -0400
+diff -urNp linux-2.6.34/drivers/md/bitmap.c linux-2.6.34/drivers/md/bitmap.c
+--- linux-2.6.34/drivers/md/bitmap.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/md/bitmap.c   2010-07-01 20:45:15.000000000 -0400
 @@ -58,7 +58,7 @@
  #  if DEBUG > 0
  #    define PRINTK(x...) printk(KERN_DEBUG x)
@@ -23898,21 +24919,9 @@ diff -urNp linux-2.6.33.1/drivers/md/bitmap.c linux-2.6.33.1/drivers/md/bitmap.c
  #  endif
  #endif
  
-diff -urNp linux-2.6.33.1/drivers/md/dm-sysfs.c linux-2.6.33.1/drivers/md/dm-sysfs.c
---- linux-2.6.33.1/drivers/md/dm-sysfs.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/md/dm-sysfs.c       2010-03-20 16:58:40.040842627 -0400
-@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
-       NULL,
- };
- 
--static struct sysfs_ops dm_sysfs_ops = {
-+static const struct sysfs_ops dm_sysfs_ops = {
-       .show   = dm_attr_show,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/md/dm-table.c linux-2.6.33.1/drivers/md/dm-table.c
---- linux-2.6.33.1/drivers/md/dm-table.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/md/dm-table.c       2010-03-20 16:58:40.048835074 -0400
+diff -urNp linux-2.6.34/drivers/md/dm-table.c linux-2.6.34/drivers/md/dm-table.c
+--- linux-2.6.34/drivers/md/dm-table.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/md/dm-table.c 2010-07-01 20:45:15.000000000 -0400
 @@ -363,7 +363,7 @@ static int device_area_is_invalid(struct
        if (!dev_size)
                return 0;
@@ -23922,28 +24931,10 @@ diff -urNp linux-2.6.33.1/drivers/md/dm-table.c linux-2.6.33.1/drivers/md/dm-tab
                DMWARN("%s: %s too small for target: "
                       "start=%llu, len=%llu, dev_size=%llu",
                       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.33.1/drivers/md/md.c linux-2.6.33.1/drivers/md/md.c
---- linux-2.6.33.1/drivers/md/md.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/md/md.c     2010-03-20 16:58:40.084837077 -0400
-@@ -2642,7 +2642,7 @@ static void rdev_free(struct kobject *ko
-       mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
-       kfree(rdev);
- }
--static struct sysfs_ops rdev_sysfs_ops = {
-+static const struct sysfs_ops rdev_sysfs_ops = {
-       .show           = rdev_attr_show,
-       .store          = rdev_attr_store,
- };
-@@ -4059,7 +4059,7 @@ static void md_free(struct kobject *ko)
-       kfree(mddev);
- }
- 
--static struct sysfs_ops md_sysfs_ops = {
-+static const struct sysfs_ops md_sysfs_ops = {
-       .show   = md_attr_show,
-       .store  = md_attr_store,
- };
-@@ -6187,7 +6187,7 @@ static int md_seq_show(struct seq_file *
+diff -urNp linux-2.6.34/drivers/md/md.c linux-2.6.34/drivers/md/md.c
+--- linux-2.6.34/drivers/md/md.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/md/md.c       2010-07-01 20:45:15.000000000 -0400
+@@ -6194,7 +6194,7 @@ static int md_seq_show(struct seq_file *
                                chunk_kb ? "KB" : "B");
                        if (bitmap->file) {
                                seq_printf(seq, ", file: ");
@@ -23952,7 +24943,7 @@ diff -urNp linux-2.6.33.1/drivers/md/md.c linux-2.6.33.1/drivers/md/md.c
                        }
  
                        seq_printf(seq, "\n");
-@@ -6281,7 +6281,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6288,7 +6288,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]) -
@@ -23961,9 +24952,9 @@ diff -urNp linux-2.6.33.1/drivers/md/md.c linux-2.6.33.1/drivers/md/md.c
                /* sync IO will cause sync_io to increase before the disk_stats
                 * as sync_io is counted when a request starts, and
                 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.33.1/drivers/md/md.h linux-2.6.33.1/drivers/md/md.h
---- linux-2.6.33.1/drivers/md/md.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/md/md.h     2010-03-20 16:58:40.084837077 -0400
+diff -urNp linux-2.6.34/drivers/md/md.h linux-2.6.34/drivers/md/md.h
+--- linux-2.6.34/drivers/md/md.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/md/md.h       2010-07-01 20:45:15.000000000 -0400
 @@ -327,7 +327,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -23973,20 +24964,20 @@ diff -urNp linux-2.6.33.1/drivers/md/md.h linux-2.6.33.1/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.33.1/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.33.1/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.33.1/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-20 16:58:40.088543139 -0400
+diff -urNp linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/media/dvb/dvb-core/dvbdev.c   2010-07-01 20:45:15.000000000 -0400
 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
                        const struct dvb_device *template, void *priv, int type)
  {
        struct dvb_device *dvbdev;
-+      /* cannot be const */
++      /* cannot be const, see this function */
        struct file_operations *dvbdevfops;
        struct device *clsdev;
        int minor;
-diff -urNp linux-2.6.33.1/drivers/media/radio/radio-cadet.c linux-2.6.33.1/drivers/media/radio/radio-cadet.c
---- linux-2.6.33.1/drivers/media/radio/radio-cadet.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/media/radio/radio-cadet.c   2010-03-20 16:58:40.096832684 -0400
+diff -urNp linux-2.6.34/drivers/media/radio/radio-cadet.c linux-2.6.34/drivers/media/radio/radio-cadet.c
+--- linux-2.6.34/drivers/media/radio/radio-cadet.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/media/radio/radio-cadet.c     2010-07-01 20:45:16.000000000 -0400
 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
        while (i < count && dev->rdsin != dev->rdsout)
                readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -23996,10 +24987,73 @@ diff -urNp linux-2.6.33.1/drivers/media/radio/radio-cadet.c linux-2.6.33.1/drive
                return -EFAULT;
        return i;
  }
-diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/message/i2o/i2o_proc.c
---- linux-2.6.33.1/drivers/message/i2o/i2o_proc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/message/i2o/i2o_proc.c      2010-03-20 16:58:40.104831679 -0400
-@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
+diff -urNp linux-2.6.34/drivers/message/fusion/mptdebug.h linux-2.6.34/drivers/message/fusion/mptdebug.h
+--- linux-2.6.34/drivers/message/fusion/mptdebug.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/message/fusion/mptdebug.h     2010-07-01 20:45:15.000000000 -0400
+@@ -71,7 +71,7 @@
+               CMD;                                            \
+ }
+ #else
+-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
+ #endif
+ 
+ 
+diff -urNp linux-2.6.34/drivers/message/fusion/mptsas.c linux-2.6.34/drivers/message/fusion/mptsas.c
+--- linux-2.6.34/drivers/message/fusion/mptsas.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/message/fusion/mptsas.c       2010-07-01 20:45:15.000000000 -0400
+@@ -437,6 +437,23 @@ mptsas_is_end_device(struct mptsas_devin
+               return 0;
+ }
+ 
++static inline void
++mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
++{
++      if (phy_info->port_details) {
++              phy_info->port_details->rphy = rphy;
++              dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
++                  ioc->name, rphy));
++      }
++
++      if (rphy) {
++              dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
++                  &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
++              dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
++                  ioc->name, rphy, rphy->dev.release));
++      }
++}
++
+ /* no mutex */
+ static void
+ mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
+@@ -475,23 +492,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
+               return NULL;
+ }
+ 
+-static inline void
+-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
+-{
+-      if (phy_info->port_details) {
+-              phy_info->port_details->rphy = rphy;
+-              dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
+-                  ioc->name, rphy));
+-      }
+-
+-      if (rphy) {
+-              dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
+-                  &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
+-              dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
+-                  ioc->name, rphy, rphy->dev.release));
+-      }
+-}
+-
+ static inline struct sas_port *
+ mptsas_get_port(struct mptsas_phyinfo *phy_info)
+ {
+diff -urNp linux-2.6.34/drivers/message/i2o/i2o_proc.c linux-2.6.34/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.34/drivers/message/i2o/i2o_proc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/message/i2o/i2o_proc.c        2010-07-01 20:45:15.000000000 -0400
+@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
        "Array Controller Device"
  };
  
@@ -24013,7 +25067,7 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
  static int i2o_report_query_status(struct seq_file *seq, int block_status,
                                   char *group)
  {
-@@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct
+@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct
  
                seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
                seq_printf(seq, "%-#8x", ddm_table.module_id);
@@ -24023,7 +25077,7 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
                seq_printf(seq, "%9d  ", ddm_table.data_size);
                seq_printf(seq, "%8d", ddm_table.code_size);
  
-@@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(s
+@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(s
  
                seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
                seq_printf(seq, "%-#8x", dst->module_id);
@@ -24034,7 +25088,7 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
                seq_printf(seq, "%8d ", dst->module_size);
                seq_printf(seq, "%8d ", dst->mpb_size);
                seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(str
+@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(str
        seq_printf(seq, "Device Class  : %s\n", i2o_get_class_name(work16[0]));
        seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
        seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
@@ -24053,7 +25107,7 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
  
        seq_printf(seq, "Serial number : ");
        print_serial_number(seq, (u8 *) (work32 + 16),
-@@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(str
+@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(str
        }
  
        seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
@@ -24066,7 +25120,7 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
  
        seq_printf(seq, "Serial number       : ");
        print_serial_number(seq, result.serial_number, sizeof(result) - 36);
-@@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq
+@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq
                return 0;
        }
  
@@ -24085,9 +25139,9 @@ diff -urNp linux-2.6.33.1/drivers/message/i2o/i2o_proc.c linux-2.6.33.1/drivers/
  
        return 0;
  }
-diff -urNp linux-2.6.33.1/drivers/misc/kgdbts.c linux-2.6.33.1/drivers/misc/kgdbts.c
---- linux-2.6.33.1/drivers/misc/kgdbts.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/misc/kgdbts.c       2010-03-20 16:58:40.120597489 -0400
+diff -urNp linux-2.6.34/drivers/misc/kgdbts.c linux-2.6.34/drivers/misc/kgdbts.c
+--- linux-2.6.34/drivers/misc/kgdbts.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/misc/kgdbts.c 2010-07-01 20:45:15.000000000 -0400
 @@ -118,7 +118,7 @@
        } while (0)
  #define MAX_CONFIG_LEN                40
@@ -24097,7 +25151,7 @@ diff -urNp linux-2.6.33.1/drivers/misc/kgdbts.c linux-2.6.33.1/drivers/misc/kgdb
  static char get_buf[BUFMAX];
  static int get_buf_cnt;
  static char put_buf[BUFMAX];
-@@ -1108,7 +1108,7 @@ static void kgdbts_post_exp_handler(void
+@@ -1114,7 +1114,7 @@ static void kgdbts_post_exp_handler(void
                module_put(THIS_MODULE);
  }
  
@@ -24106,9 +25160,9 @@ diff -urNp linux-2.6.33.1/drivers/misc/kgdbts.c linux-2.6.33.1/drivers/misc/kgdb
        .name                   = "kgdbts",
        .read_char              = kgdbts_get_char,
        .write_char             = kgdbts_put_char,
-diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.33.1/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.33.1/drivers/misc/sgi-gru/gruhandles.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/misc/sgi-gru/gruhandles.c   2010-03-20 16:58:40.120597489 -0400
+diff -urNp linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/misc/sgi-gru/gruhandles.c     2010-07-01 20:45:15.000000000 -0400
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
        unsigned long nsec;
  
@@ -24120,9 +25174,9 @@ diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/gruhandles.c linux-2.6.33.1/drive
        if (mcs_op_statistics[op].max < nsec)
                mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.33.1/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.33.1/drivers/misc/sgi-gru/gruprocfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/misc/sgi-gru/gruprocfs.c    2010-03-20 16:58:40.120597489 -0400
+diff -urNp linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/misc/sgi-gru/gruprocfs.c      2010-07-01 20:45:15.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)               printstat_val(s, &gru_stats.f, #f)
@@ -24146,9 +25200,9 @@ diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.33.1/driver
                max = mcs_op_statistics[op].max;
                seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
                           count ? total / count : 0, max);
-diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/grutables.h linux-2.6.33.1/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.33.1/drivers/misc/sgi-gru/grutables.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/misc/sgi-gru/grutables.h    2010-03-20 16:58:40.124833908 -0400
+diff -urNp linux-2.6.34/drivers/misc/sgi-gru/grutables.h linux-2.6.34/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.34/drivers/misc/sgi-gru/grutables.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/misc/sgi-gru/grutables.h      2010-07-01 20:45:15.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -24328,9 +25382,9 @@ diff -urNp linux-2.6.33.1/drivers/misc/sgi-gru/grutables.h linux-2.6.33.1/driver
                        } while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.33.1/drivers/mtd/devices/doc2000.c linux-2.6.33.1/drivers/mtd/devices/doc2000.c
---- linux-2.6.33.1/drivers/mtd/devices/doc2000.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/mtd/devices/doc2000.c       2010-03-20 16:58:40.128534904 -0400
+diff -urNp linux-2.6.34/drivers/mtd/devices/doc2000.c linux-2.6.34/drivers/mtd/devices/doc2000.c
+--- linux-2.6.34/drivers/mtd/devices/doc2000.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/mtd/devices/doc2000.c 2010-07-01 20:45:15.000000000 -0400
 @@ -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 */
@@ -24340,9 +25394,9 @@ diff -urNp linux-2.6.33.1/drivers/mtd/devices/doc2000.c linux-2.6.33.1/drivers/m
                        printk(KERN_WARNING
                               "ECC needs a full sector write (adr: %lx size %lx)\n",
                               (long) to, (long) len);
-diff -urNp linux-2.6.33.1/drivers/mtd/devices/doc2001.c linux-2.6.33.1/drivers/mtd/devices/doc2001.c
---- linux-2.6.33.1/drivers/mtd/devices/doc2001.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/mtd/devices/doc2001.c       2010-03-20 17:13:45.197003644 -0400
+diff -urNp linux-2.6.34/drivers/mtd/devices/doc2001.c linux-2.6.34/drivers/mtd/devices/doc2001.c
+--- linux-2.6.34/drivers/mtd/devices/doc2001.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/mtd/devices/doc2001.c 2010-07-01 20:45:15.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
        struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -24352,10 +25406,10 @@ diff -urNp linux-2.6.33.1/drivers/mtd/devices/doc2001.c linux-2.6.33.1/drivers/m
                return -EINVAL;
  
        /* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.33.1/drivers/mtd/ubi/build.c linux-2.6.33.1/drivers/mtd/ubi/build.c
---- linux-2.6.33.1/drivers/mtd/ubi/build.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/mtd/ubi/build.c     2010-03-20 16:58:40.128534904 -0400
-@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
+diff -urNp linux-2.6.34/drivers/mtd/ubi/build.c linux-2.6.34/drivers/mtd/ubi/build.c
+--- linux-2.6.34/drivers/mtd/ubi/build.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/mtd/ubi/build.c       2010-07-01 20:45:15.000000000 -0400
+@@ -1296,7 +1296,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
        char *endp;
@@ -24364,7 +25418,7 @@ diff -urNp linux-2.6.33.1/drivers/mtd/ubi/build.c linux-2.6.33.1/drivers/mtd/ubi
  
        result = simple_strtoul(str, &endp, 0);
        if (str == endp || result >= INT_MAX) {
-@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const
+@@ -1307,11 +1307,11 @@ static int __init bytes_str_to_int(const
  
        switch (*endp) {
        case 'G':
@@ -24379,7 +25433,7 @@ diff -urNp linux-2.6.33.1/drivers/mtd/ubi/build.c linux-2.6.33.1/drivers/mtd/ubi
                if (endp[1] == 'i' && endp[2] == 'B')
                        endp += 2;
        case '\0':
-@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const
+@@ -1322,7 +1322,13 @@ static int __init bytes_str_to_int(const
                return -EINVAL;
        }
  
@@ -24394,9 +25448,9 @@ diff -urNp linux-2.6.33.1/drivers/mtd/ubi/build.c linux-2.6.33.1/drivers/mtd/ubi
  }
  
  /**
-diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/e1000e/82571.c
---- linux-2.6.33.1/drivers/net/e1000e/82571.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/e1000e/82571.c  2010-03-20 16:58:40.152824721 -0400
+diff -urNp linux-2.6.34/drivers/net/e1000e/82571.c linux-2.6.34/drivers/net/e1000e/82571.c
+--- linux-2.6.34/drivers/net/e1000e/82571.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/e1000e/82571.c    2010-07-01 20:45:15.000000000 -0400
 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_82571(s
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -24405,7 +25459,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        struct e1000_mac_operations *func = &mac->ops;
        u32 swsm = 0;
        u32 swsm2 = 0;
-@@ -1688,7 +1689,7 @@ static void e1000_clear_hw_cntrs_82571(s
+@@ -1692,7 +1693,7 @@ static void e1000_clear_hw_cntrs_82571(s
        er32(ICRXDMTC);
  }
  
@@ -24414,8 +25468,8 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        /* .check_mng_mode: mac type dependent */
        /* .check_for_link: media type dependent */
        .id_led_init            = e1000e_id_led_init,
-@@ -1708,7 +1709,7 @@ static struct e1000_mac_operations e8257
-       .setup_led              = e1000e_setup_led_generic,
+@@ -1714,7 +1715,7 @@ static struct e1000_mac_operations e8257
+       .read_mac_addr          = e1000_read_mac_addr_82571,
  };
  
 -static struct e1000_phy_operations e82_phy_ops_igp = {
@@ -24423,7 +25477,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_igp,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1726,7 +1727,7 @@ static struct e1000_phy_operations e82_p
+@@ -1732,7 +1733,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -24432,7 +25486,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_m88,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1744,7 +1745,7 @@ static struct e1000_phy_operations e82_p
+@@ -1750,7 +1751,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -24441,7 +25495,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        .acquire                = e1000_get_hw_semaphore_82571,
        .check_polarity         = e1000_check_polarity_m88,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1762,7 +1763,7 @@ static struct e1000_phy_operations e82_p
+@@ -1768,7 +1769,7 @@ static struct e1000_phy_operations e82_p
        .cfg_on_link_up         = NULL,
  };
  
@@ -24450,9 +25504,9 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/82571.c linux-2.6.33.1/drivers/net/
        .acquire                = e1000_acquire_nvm_82571,
        .read                   = e1000e_read_nvm_eerd,
        .release                = e1000_release_nvm_82571,
-diff -urNp linux-2.6.33.1/drivers/net/e1000e/e1000.h linux-2.6.33.1/drivers/net/e1000e/e1000.h
---- linux-2.6.33.1/drivers/net/e1000e/e1000.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/e1000e/e1000.h  2010-03-20 16:58:40.152824721 -0400
+diff -urNp linux-2.6.34/drivers/net/e1000e/e1000.h linux-2.6.34/drivers/net/e1000e/e1000.h
+--- linux-2.6.34/drivers/net/e1000e/e1000.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/e1000e/e1000.h    2010-07-01 20:45:15.000000000 -0400
 @@ -379,9 +379,9 @@ struct e1000_info {
        u32                     pba;
        u32                     max_hw_frame_size;
@@ -24466,9 +25520,9 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/e1000.h linux-2.6.33.1/drivers/net/
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.33.1/drivers/net/e1000e/es2lan.c linux-2.6.33.1/drivers/net/e1000e/es2lan.c
---- linux-2.6.33.1/drivers/net/e1000e/es2lan.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/e1000e/es2lan.c 2010-03-20 16:58:40.152824721 -0400
+diff -urNp linux-2.6.34/drivers/net/e1000e/es2lan.c linux-2.6.34/drivers/net/e1000e/es2lan.c
+--- linux-2.6.34/drivers/net/e1000e/es2lan.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/e1000e/es2lan.c   2010-07-01 20:45:15.000000000 -0400
 @@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -24477,16 +25531,16 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/es2lan.c linux-2.6.33.1/drivers/net
        struct e1000_mac_operations *func = &mac->ops;
  
        /* Set media type */
-@@ -1402,7 +1403,7 @@ static void e1000_clear_hw_cntrs_80003es
+@@ -1430,7 +1431,7 @@ static void e1000_clear_hw_cntrs_80003es
        er32(ICRXDMTC);
  }
  
 -static struct e1000_mac_operations es2_mac_ops = {
 +static const struct e1000_mac_operations es2_mac_ops = {
+       .read_mac_addr          = e1000_read_mac_addr_80003es2lan,
        .id_led_init            = e1000e_id_led_init,
        .check_mng_mode         = e1000e_check_mng_mode_generic,
-       /* check_for_link dependent on media type */
-@@ -1422,7 +1423,7 @@ static struct e1000_mac_operations es2_m
+@@ -1452,7 +1453,7 @@ static struct e1000_mac_operations es2_m
        .setup_led              = e1000e_setup_led_generic,
  };
  
@@ -24495,7 +25549,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/es2lan.c linux-2.6.33.1/drivers/net
        .acquire                = e1000_acquire_phy_80003es2lan,
        .check_polarity         = e1000_check_polarity_m88,
        .check_reset_block      = e1000e_check_reset_block_generic,
-@@ -1440,7 +1441,7 @@ static struct e1000_phy_operations es2_p
+@@ -1470,7 +1471,7 @@ static struct e1000_phy_operations es2_p
        .cfg_on_link_up         = e1000_cfg_on_link_up_80003es2lan,
  };
  
@@ -24504,10 +25558,10 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/es2lan.c linux-2.6.33.1/drivers/net
        .acquire                = e1000_acquire_nvm_80003es2lan,
        .read                   = e1000e_read_nvm_eerd,
        .release                = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.33.1/drivers/net/e1000e/hw.h linux-2.6.33.1/drivers/net/e1000e/hw.h
---- linux-2.6.33.1/drivers/net/e1000e/hw.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/e1000e/hw.h     2010-03-20 16:58:40.156835598 -0400
-@@ -783,13 +783,13 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.34/drivers/net/e1000e/hw.h linux-2.6.34/drivers/net/e1000e/hw.h
+--- linux-2.6.34/drivers/net/e1000e/hw.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/e1000e/hw.h       2010-07-01 20:45:15.000000000 -0400
+@@ -788,13 +788,13 @@ struct e1000_phy_operations {
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
@@ -24528,7 +25582,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/hw.h linux-2.6.33.1/drivers/net/e10
  };
  
  struct e1000_mac_info {
-@@ -864,6 +864,7 @@ struct e1000_phy_info {
+@@ -873,6 +873,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -24536,10 +25590,10 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/hw.h linux-2.6.33.1/drivers/net/e10
        struct e1000_nvm_operations ops;
  
        enum e1000_nvm_type type;
-diff -urNp linux-2.6.33.1/drivers/net/e1000e/ich8lan.c linux-2.6.33.1/drivers/net/e1000e/ich8lan.c
---- linux-2.6.33.1/drivers/net/e1000e/ich8lan.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/e1000e/ich8lan.c        2010-03-20 16:58:40.168822418 -0400
-@@ -3361,7 +3361,7 @@ static void e1000_clear_hw_cntrs_ich8lan
+diff -urNp linux-2.6.34/drivers/net/e1000e/ich8lan.c linux-2.6.34/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.34/drivers/net/e1000e/ich8lan.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/e1000e/ich8lan.c  2010-07-01 20:45:15.000000000 -0400
+@@ -3371,7 +3371,7 @@ static void e1000_clear_hw_cntrs_ich8lan
        }
  }
  
@@ -24548,7 +25602,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/ich8lan.c linux-2.6.33.1/drivers/ne
        .id_led_init            = e1000e_id_led_init,
        .check_mng_mode         = e1000_check_mng_mode_ich8lan,
        .check_for_link         = e1000_check_for_copper_link_ich8lan,
-@@ -3379,7 +3379,7 @@ static struct e1000_mac_operations ich8_
+@@ -3390,7 +3390,7 @@ static struct e1000_mac_operations ich8_
        /* id_led_init dependent on mac type */
  };
  
@@ -24557,7 +25611,7 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/ich8lan.c linux-2.6.33.1/drivers/ne
        .acquire                = e1000_acquire_swflag_ich8lan,
        .check_reset_block      = e1000_check_reset_block_ich8lan,
        .commit                 = NULL,
-@@ -3393,7 +3393,7 @@ static struct e1000_phy_operations ich8_
+@@ -3404,7 +3404,7 @@ static struct e1000_phy_operations ich8_
        .write_reg              = e1000e_write_phy_reg_igp,
  };
  
@@ -24566,22 +25620,10 @@ diff -urNp linux-2.6.33.1/drivers/net/e1000e/ich8lan.c linux-2.6.33.1/drivers/ne
        .acquire                = e1000_acquire_nvm_ich8lan,
        .read                   = e1000_read_nvm_ich8lan,
        .release                = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.33.1/drivers/net/ibmveth.c linux-2.6.33.1/drivers/net/ibmveth.c
---- linux-2.6.33.1/drivers/net/ibmveth.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/ibmveth.c       2010-03-20 16:58:40.180852292 -0400
-@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
-       NULL,
- };
- 
--static struct sysfs_ops veth_pool_ops = {
-+static const struct sysfs_ops veth_pool_ops = {
-       .show   = veth_pool_show,
-       .store  = veth_pool_store,
- };
-diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_82575.c linux-2.6.33.1/drivers/net/igb/e1000_82575.c
---- linux-2.6.33.1/drivers/net/igb/e1000_82575.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/igb/e1000_82575.c       2010-03-20 16:58:40.192835070 -0400
-@@ -1583,7 +1583,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
+diff -urNp linux-2.6.34/drivers/net/igb/e1000_82575.c linux-2.6.34/drivers/net/igb/e1000_82575.c
+--- linux-2.6.34/drivers/net/igb/e1000_82575.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/igb/e1000_82575.c 2010-07-01 20:45:15.000000000 -0400
+@@ -1610,7 +1610,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
        return ret_val;
  }
  
@@ -24590,7 +25632,7 @@ diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_82575.c linux-2.6.33.1/drivers/n
        .init_hw              = igb_init_hw_82575,
        .check_for_link       = igb_check_for_link_82575,
        .rar_set              = igb_rar_set,
-@@ -1591,13 +1591,13 @@ static struct e1000_mac_operations e1000
+@@ -1618,13 +1618,13 @@ static struct e1000_mac_operations e1000
        .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
  };
  
@@ -24606,10 +25648,10 @@ diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_82575.c linux-2.6.33.1/drivers/n
        .acquire              = igb_acquire_nvm_82575,
        .read                 = igb_read_nvm_eerd,
        .release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_hw.h linux-2.6.33.1/drivers/net/igb/e1000_hw.h
---- linux-2.6.33.1/drivers/net/igb/e1000_hw.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/igb/e1000_hw.h  2010-03-20 16:58:40.192835070 -0400
-@@ -316,17 +316,17 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.34/drivers/net/igb/e1000_hw.h linux-2.6.34/drivers/net/igb/e1000_hw.h
+--- linux-2.6.34/drivers/net/igb/e1000_hw.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/igb/e1000_hw.h    2010-07-01 20:45:15.000000000 -0400
+@@ -317,17 +317,17 @@ struct e1000_phy_operations {
  };
  
  struct e1000_nvm_operations {
@@ -24634,7 +25676,7 @@ diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_hw.h linux-2.6.33.1/drivers/net/
  };
  
  extern const struct e1000_info e1000_82575_info;
-@@ -412,6 +412,7 @@ struct e1000_phy_info {
+@@ -406,6 +406,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
@@ -24642,9 +25684,9 @@ diff -urNp linux-2.6.33.1/drivers/net/igb/e1000_hw.h linux-2.6.33.1/drivers/net/
        struct e1000_nvm_operations ops;
  
        enum e1000_nvm_type type;
-diff -urNp linux-2.6.33.1/drivers/net/irda/vlsi_ir.c linux-2.6.33.1/drivers/net/irda/vlsi_ir.c
---- linux-2.6.33.1/drivers/net/irda/vlsi_ir.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/irda/vlsi_ir.c  2010-03-20 16:58:40.204836200 -0400
+diff -urNp linux-2.6.34/drivers/net/irda/vlsi_ir.c linux-2.6.34/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.34/drivers/net/irda/vlsi_ir.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/irda/vlsi_ir.c    2010-07-01 20:45:15.000000000 -0400
 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
                        /* no race - tx-ring already empty */
                        vlsi_set_baud(idev, iobase);
@@ -24661,31 +25703,10 @@ diff -urNp linux-2.6.33.1/drivers/net/irda/vlsi_ir.c linux-2.6.33.1/drivers/net/
                spin_unlock_irqrestore(&idev->lock, flags);
                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
-diff -urNp linux-2.6.33.1/drivers/net/iseries_veth.c linux-2.6.33.1/drivers/net/iseries_veth.c
---- linux-2.6.33.1/drivers/net/iseries_veth.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/iseries_veth.c  2010-03-20 16:58:40.227948499 -0400
-@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
-       NULL
- };
- 
--static struct sysfs_ops veth_cnx_sysfs_ops = {
-+static const struct sysfs_ops veth_cnx_sysfs_ops = {
-               .show = veth_cnx_attribute_show
- };
- 
-@@ -441,7 +441,7 @@ static struct attribute *veth_port_defau
-       NULL
- };
- 
--static struct sysfs_ops veth_port_sysfs_ops = {
-+static const struct sysfs_ops veth_port_sysfs_ops = {
-       .show = veth_port_attribute_show
- };
- 
-diff -urNp linux-2.6.33.1/drivers/net/pcnet32.c linux-2.6.33.1/drivers/net/pcnet32.c
---- linux-2.6.33.1/drivers/net/pcnet32.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/pcnet32.c       2010-03-20 16:58:40.232840159 -0400
-@@ -80,7 +80,7 @@ static int cards_found;
+diff -urNp linux-2.6.34/drivers/net/pcnet32.c linux-2.6.34/drivers/net/pcnet32.c
+--- linux-2.6.34/drivers/net/pcnet32.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/pcnet32.c 2010-07-01 20:45:15.000000000 -0400
+@@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
   */
@@ -24693,11 +25714,11 @@ diff -urNp linux-2.6.33.1/drivers/net/pcnet32.c linux-2.6.33.1/drivers/net/pcnet
 +static unsigned int pcnet32_portlist[] __devinitdata =
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
- static int pcnet32_debug = 0;
-diff -urNp linux-2.6.33.1/drivers/net/ppp_generic.c linux-2.6.33.1/drivers/net/ppp_generic.c
---- linux-2.6.33.1/drivers/net/ppp_generic.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/ppp_generic.c   2010-03-20 16:58:40.236519222 -0400
-@@ -988,7 +988,6 @@ ppp_net_ioctl(struct net_device *dev, st
+ static int pcnet32_debug;
+diff -urNp linux-2.6.34/drivers/net/ppp_generic.c linux-2.6.34/drivers/net/ppp_generic.c
+--- linux-2.6.34/drivers/net/ppp_generic.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/ppp_generic.c     2010-07-01 20:45:15.000000000 -0400
+@@ -992,7 +992,6 @@ ppp_net_ioctl(struct net_device *dev, st
        void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
        struct ppp_stats stats;
        struct ppp_comp_stats cstats;
@@ -24705,7 +25726,7 @@ diff -urNp linux-2.6.33.1/drivers/net/ppp_generic.c linux-2.6.33.1/drivers/net/p
  
        switch (cmd) {
        case SIOCGPPPSTATS:
-@@ -1010,8 +1009,7 @@ ppp_net_ioctl(struct net_device *dev, st
+@@ -1014,8 +1013,7 @@ ppp_net_ioctl(struct net_device *dev, st
                break;
  
        case SIOCGPPPVER:
@@ -24715,10 +25736,10 @@ diff -urNp linux-2.6.33.1/drivers/net/ppp_generic.c linux-2.6.33.1/drivers/net/p
                        break;
                err = 0;
                break;
-diff -urNp linux-2.6.33.1/drivers/net/tg3.h linux-2.6.33.1/drivers/net/tg3.h
---- linux-2.6.33.1/drivers/net/tg3.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/tg3.h   2010-03-20 16:58:40.244857185 -0400
-@@ -101,6 +101,7 @@
+diff -urNp linux-2.6.34/drivers/net/tg3.h linux-2.6.34/drivers/net/tg3.h
+--- linux-2.6.34/drivers/net/tg3.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/tg3.h     2010-07-01 20:45:15.000000000 -0400
+@@ -133,6 +133,7 @@
  #define  CHIPREV_ID_5750_A0            0x4000
  #define  CHIPREV_ID_5750_A1            0x4001
  #define  CHIPREV_ID_5750_A3            0x4003
@@ -24726,10 +25747,10 @@ diff -urNp linux-2.6.33.1/drivers/net/tg3.h linux-2.6.33.1/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2            0x4202
  #define  CHIPREV_ID_5752_A0_HW                 0x5000
  #define  CHIPREV_ID_5752_A0            0x6000
-diff -urNp linux-2.6.33.1/drivers/net/tulip/de4x5.c linux-2.6.33.1/drivers/net/tulip/de4x5.c
---- linux-2.6.33.1/drivers/net/tulip/de4x5.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/tulip/de4x5.c   2010-03-20 16:58:40.269912385 -0400
-@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
+diff -urNp linux-2.6.34/drivers/net/tulip/de4x5.c linux-2.6.34/drivers/net/tulip/de4x5.c
+--- linux-2.6.34/drivers/net/tulip/de4x5.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/tulip/de4x5.c     2010-07-01 20:45:16.000000000 -0400
+@@ -5470,7 +5470,7 @@ de4x5_ioctl(struct net_device *dev, stru
        for (i=0; i<ETH_ALEN; i++) {
            tmp.addr[i] = dev->dev_addr[i];
        }
@@ -24738,7 +25759,7 @@ diff -urNp linux-2.6.33.1/drivers/net/tulip/de4x5.c linux-2.6.33.1/drivers/net/t
        break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
-@@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, stru
+@@ -5510,7 +5510,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);
@@ -24747,9 +25768,9 @@ diff -urNp linux-2.6.33.1/drivers/net/tulip/de4x5.c linux-2.6.33.1/drivers/net/t
                return -EFAULT;
        break;
      }
-diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/hso.c
---- linux-2.6.33.1/drivers/net/usb/hso.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/usb/hso.c       2010-03-20 16:58:40.272671924 -0400
+diff -urNp linux-2.6.34/drivers/net/usb/hso.c linux-2.6.34/drivers/net/usb/hso.c
+--- linux-2.6.34/drivers/net/usb/hso.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/usb/hso.c 2010-07-01 20:45:15.000000000 -0400
 @@ -258,7 +258,7 @@ struct hso_serial {
  
        /* from usb_serial_port */
@@ -24759,7 +25780,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
        spinlock_t serial_lock;
  
        int (*write_data) (struct hso_serial *serial);
-@@ -1203,7 +1203,7 @@ static void put_rxbuf_data_and_resubmit_
+@@ -1200,7 +1200,7 @@ static void put_rxbuf_data_and_resubmit_
        struct urb *urb;
  
        urb = serial->rx_urb[0];
@@ -24768,7 +25789,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                count = put_rxbuf_data(urb, serial);
                if (count == -1)
                        return;
-@@ -1239,7 +1239,7 @@ static void hso_std_serial_read_bulk_cal
+@@ -1236,7 +1236,7 @@ static void hso_std_serial_read_bulk_cal
        DUMP1(urb->transfer_buffer, urb->actual_length);
  
        /* Anyone listening? */
@@ -24777,7 +25798,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                return;
  
        if (status == 0) {
-@@ -1334,8 +1334,7 @@ static int hso_serial_open(struct tty_st
+@@ -1331,8 +1331,7 @@ static int hso_serial_open(struct tty_st
        spin_unlock_irq(&serial->serial_lock);
  
        /* check for port already opened, if not set the termios */
@@ -24787,7 +25808,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                tty->low_latency = 1;
                serial->rx_state = RX_IDLE;
                /* Force default termio settings */
-@@ -1348,7 +1347,7 @@ static int hso_serial_open(struct tty_st
+@@ -1345,7 +1344,7 @@ static int hso_serial_open(struct tty_st
                result = hso_start_serial_device(serial->parent, GFP_KERNEL);
                if (result) {
                        hso_stop_serial_device(serial->parent);
@@ -24796,7 +25817,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                        kref_put(&serial->parent->ref, hso_serial_ref_free);
                }
        } else {
-@@ -1385,10 +1384,10 @@ static void hso_serial_close(struct tty_
+@@ -1382,10 +1381,10 @@ static void hso_serial_close(struct tty_
  
        /* reset the rts and dtr */
        /* do the actual close */
@@ -24810,7 +25831,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                spin_lock_irq(&serial->serial_lock);
                if (serial->tty == tty) {
                        serial->tty->driver_data = NULL;
-@@ -1470,7 +1469,7 @@ static void hso_serial_set_termios(struc
+@@ -1467,7 +1466,7 @@ static void hso_serial_set_termios(struc
  
        /* the actual setup */
        spin_lock_irqsave(&serial->serial_lock, flags);
@@ -24819,7 +25840,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                _hso_serial_set_termios(tty, old);
        else
                tty->termios = old;
-@@ -1933,7 +1932,7 @@ static void intr_callback(struct urb *ur
+@@ -1930,7 +1929,7 @@ static void intr_callback(struct urb *ur
                                D1("Pending read interrupt on port %d\n", i);
                                spin_lock(&serial->serial_lock);
                                if (serial->rx_state == RX_IDLE &&
@@ -24828,7 +25849,7 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                                        /* Setup and send a ctrl req read on
                                         * port i */
                                        if (!serial->rx_urb_filled[0]) {
-@@ -3124,7 +3123,7 @@ static int hso_resume(struct usb_interfa
+@@ -3121,7 +3120,7 @@ static int hso_resume(struct usb_interfa
        /* Start all serial ports */
        for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
                if (serial_table[i] && (serial_table[i]->interface == iface)) {
@@ -24837,9 +25858,9 @@ diff -urNp linux-2.6.33.1/drivers/net/usb/hso.c linux-2.6.33.1/drivers/net/usb/h
                                result =
                                    hso_start_serial_device(serial_table[i], GFP_NOIO);
                                hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.33.1/drivers/net/wireless/b43/debugfs.c linux-2.6.33.1/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.33.1/drivers/net/wireless/b43/debugfs.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/b43/debugfs.c  2010-03-20 16:58:40.276838321 -0400
+diff -urNp linux-2.6.34/drivers/net/wireless/b43/debugfs.c linux-2.6.34/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.34/drivers/net/wireless/b43/debugfs.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/wireless/b43/debugfs.c    2010-07-01 20:45:15.000000000 -0400
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
        ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -24849,9 +25870,9 @@ diff -urNp linux-2.6.33.1/drivers/net/wireless/b43/debugfs.c linux-2.6.33.1/driv
        /* Offset of struct b43_dfs_file in struct b43_dfsentry */
        size_t file_struct_offset;
  };
-diff -urNp linux-2.6.33.1/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.33.1/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.33.1/drivers/net/wireless/b43legacy/debugfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/b43legacy/debugfs.c    2010-03-20 16:58:40.292572897 -0400
+diff -urNp linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/wireless/b43legacy/debugfs.c      2010-07-01 20:45:15.000000000 -0400
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
        ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -24861,88 +25882,24 @@ diff -urNp linux-2.6.33.1/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.33.
        /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
        size_t file_struct_offset;
        /* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-1000.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-1000.c     2010-03-20 16:58:40.296852154 -0400
-@@ -140,7 +140,7 @@ static struct iwl_lib_ops iwl1000_lib = 
-        },
- };
- 
--static struct iwl_ops iwl1000_ops = {
-+static const struct iwl_ops iwl1000_ops = {
-       .ucode = &iwl5000_ucode,
-       .lib = &iwl1000_lib,
-       .hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-3945.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-3945.c     2010-03-20 16:58:40.308852389 -0400
-@@ -2804,7 +2804,7 @@ static struct iwl_hcmd_utils_ops iwl3945
-       .rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,
- };
- 
--static struct iwl_ops iwl3945_ops = {
-+static const struct iwl_ops iwl3945_ops = {
-       .ucode = &iwl3945_ucode,
-       .lib = &iwl3945_lib,
-       .hcmd = &iwl3945_hcmd,
-diff -urNp linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-4965.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-4965.c     2010-03-20 16:58:40.316840649 -0400
-@@ -2208,7 +2208,7 @@ static struct iwl_lib_ops iwl4965_lib = 
-       },
- };
- 
--static struct iwl_ops iwl4965_ops = {
-+static const struct iwl_ops iwl4965_ops = {
-       .ucode = &iwl4965_ucode,
-       .lib = &iwl4965_lib,
-       .hcmd = &iwl4965_hcmd,
-diff -urNp linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-5000.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-5000.c     2010-03-20 16:58:40.338443044 -0400
-@@ -1553,7 +1553,7 @@ static struct iwl_lib_ops iwl5150_lib = 
-        },
- };
- 
--static struct iwl_ops iwl5000_ops = {
-+static const struct iwl_ops iwl5000_ops = {
-       .ucode = &iwl5000_ucode,
-       .lib = &iwl5000_lib,
-       .hcmd = &iwl5000_hcmd,
-@@ -1561,7 +1561,7 @@ static struct iwl_ops iwl5000_ops = {
-       .led = &iwlagn_led_ops,
- };
- 
--static struct iwl_ops iwl5150_ops = {
-+static const struct iwl_ops iwl5150_ops = {
-       .ucode = &iwl5000_ucode,
-       .lib = &iwl5150_lib,
-       .hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-6000.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/iwlwifi/iwl-6000.c     2010-03-20 16:58:40.338443044 -0400
-@@ -252,7 +252,7 @@ static struct iwl_lib_ops iwl6000_lib = 
-        },
- };
+diff -urNp linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/wireless/iwlwifi/iwl-debug.h      2010-07-01 20:45:15.000000000 -0400
+@@ -68,8 +68,8 @@ do {                                    
+ } while (0)
  
--static struct iwl_ops iwl6000_ops = {
-+static const struct iwl_ops iwl6000_ops = {
-       .ucode = &iwl5000_ucode,
-       .lib = &iwl6000_lib,
-       .hcmd = &iwl5000_hcmd,
-@@ -267,7 +267,7 @@ static struct iwl_hcmd_utils_ops iwl6050
-       .calc_rssi = iwl5000_calc_rssi,
- };
- 
--static struct iwl_ops iwl6050_ops = {
-+static const struct iwl_ops iwl6050_ops = {
-       .ucode = &iwl5000_ucode,
-       .lib = &iwl6000_lib,
-       .hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.33.1/drivers/net/wireless/libertas/debugfs.c linux-2.6.33.1/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.33.1/drivers/net/wireless/libertas/debugfs.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/net/wireless/libertas/debugfs.c     2010-03-20 16:58:40.348846186 -0400
-@@ -717,7 +717,7 @@ out_unlock:
+ #else
+-#define IWL_DEBUG(__priv, level, fmt, args...)
+-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
+ static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
+                                     void *p, u32 len)
+ {}
+diff -urNp linux-2.6.34/drivers/net/wireless/libertas/debugfs.c linux-2.6.34/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.34/drivers/net/wireless/libertas/debugfs.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/wireless/libertas/debugfs.c       2010-07-01 20:45:15.000000000 -0400
+@@ -718,7 +718,7 @@ out_unlock:
  struct lbs_debugfs_files {
        const char *name;
        int perm;
@@ -24951,10 +25908,22 @@ diff -urNp linux-2.6.33.1/drivers/net/wireless/libertas/debugfs.c linux-2.6.33.1
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.33.1/drivers/oprofile/buffer_sync.c linux-2.6.33.1/drivers/oprofile/buffer_sync.c
---- linux-2.6.33.1/drivers/oprofile/buffer_sync.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/buffer_sync.c      2010-03-20 16:58:40.357847963 -0400
-@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
+diff -urNp linux-2.6.34/drivers/net/wireless/rndis_wlan.c linux-2.6.34/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.34/drivers/net/wireless/rndis_wlan.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/net/wireless/rndis_wlan.c     2010-07-01 20:45:15.000000000 -0400
+@@ -1185,7 +1185,7 @@ static int set_rts_threshold(struct usbn
+ 
+       netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
+ 
+-      if (rts_threshold < 0 || rts_threshold > 2347)
++      if (rts_threshold > 2347)
+               rts_threshold = 2347;
+ 
+       tmp = cpu_to_le32(rts_threshold);
+diff -urNp linux-2.6.34/drivers/oprofile/buffer_sync.c linux-2.6.34/drivers/oprofile/buffer_sync.c
+--- linux-2.6.34/drivers/oprofile/buffer_sync.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/buffer_sync.c        2010-07-01 20:45:15.000000000 -0400
+@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
                if (cookie == NO_COOKIE)
                        offset = pc;
                if (cookie == INVALID_COOKIE) {
@@ -24963,7 +25932,7 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/buffer_sync.c linux-2.6.33.1/drivers/
                        offset = pc;
                }
                if (cookie != last_cookie) {
-@@ -384,14 +384,14 @@ add_sample(struct mm_struct *mm, struct 
+@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct 
        /* add userspace sample */
  
        if (!mm) {
@@ -24980,7 +25949,7 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/buffer_sync.c linux-2.6.33.1/drivers/
                return 0;
        }
  
-@@ -560,7 +560,7 @@ void sync_buffer(int cpu)
+@@ -561,7 +561,7 @@ void sync_buffer(int cpu)
                /* ignore backtraces if failed to add a sample */
                if (state == sb_bt_start) {
                        state = sb_bt_ignore;
@@ -24989,9 +25958,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/buffer_sync.c linux-2.6.33.1/drivers/
                }
        }
        release_mm(mm);
-diff -urNp linux-2.6.33.1/drivers/oprofile/event_buffer.c linux-2.6.33.1/drivers/oprofile/event_buffer.c
---- linux-2.6.33.1/drivers/oprofile/event_buffer.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/event_buffer.c     2010-03-20 16:58:40.360587811 -0400
+diff -urNp linux-2.6.34/drivers/oprofile/event_buffer.c linux-2.6.34/drivers/oprofile/event_buffer.c
+--- linux-2.6.34/drivers/oprofile/event_buffer.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/event_buffer.c       2010-07-01 20:45:15.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
        }
  
@@ -25001,9 +25970,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/event_buffer.c linux-2.6.33.1/drivers
                return;
        }
  
-diff -urNp linux-2.6.33.1/drivers/oprofile/oprof.c linux-2.6.33.1/drivers/oprofile/oprof.c
---- linux-2.6.33.1/drivers/oprofile/oprof.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/oprof.c    2010-03-20 16:58:40.368849108 -0400
+diff -urNp linux-2.6.34/drivers/oprofile/oprof.c linux-2.6.34/drivers/oprofile/oprof.c
+--- linux-2.6.34/drivers/oprofile/oprof.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/oprof.c      2010-07-01 20:45:15.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
        if (oprofile_ops.switch_events())
                return;
@@ -25013,9 +25982,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/oprof.c linux-2.6.33.1/drivers/oprofi
        start_switch_worker();
  }
  
-diff -urNp linux-2.6.33.1/drivers/oprofile/oprofilefs.c linux-2.6.33.1/drivers/oprofile/oprofilefs.c
---- linux-2.6.33.1/drivers/oprofile/oprofilefs.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/oprofilefs.c       2010-03-20 16:58:40.372843891 -0400
+diff -urNp linux-2.6.34/drivers/oprofile/oprofilefs.c linux-2.6.34/drivers/oprofile/oprofilefs.c
+--- linux-2.6.34/drivers/oprofile/oprofilefs.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/oprofilefs.c 2010-07-01 20:45:15.000000000 -0400
 @@ -187,7 +187,7 @@ static const struct file_operations atom
  
  
@@ -25025,9 +25994,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/oprofilefs.c linux-2.6.33.1/drivers/o
  {
        struct dentry *d = __oprofilefs_create_file(sb, root, name,
                                                     &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.33.1/drivers/oprofile/oprofile_stats.c linux-2.6.33.1/drivers/oprofile/oprofile_stats.c
---- linux-2.6.33.1/drivers/oprofile/oprofile_stats.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/oprofile_stats.c   2010-03-20 16:58:40.376630331 -0400
+diff -urNp linux-2.6.34/drivers/oprofile/oprofile_stats.c linux-2.6.34/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.34/drivers/oprofile/oprofile_stats.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/oprofile_stats.c     2010-07-01 20:45:15.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
                cpu_buf->sample_invalid_eip = 0;
        }
@@ -25045,9 +26014,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/oprofile_stats.c linux-2.6.33.1/drive
  }
  
  
-diff -urNp linux-2.6.33.1/drivers/oprofile/oprofile_stats.h linux-2.6.33.1/drivers/oprofile/oprofile_stats.h
---- linux-2.6.33.1/drivers/oprofile/oprofile_stats.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/oprofile/oprofile_stats.h   2010-03-20 16:58:40.376630331 -0400
+diff -urNp linux-2.6.34/drivers/oprofile/oprofile_stats.h linux-2.6.34/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.34/drivers/oprofile/oprofile_stats.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/oprofile/oprofile_stats.h     2010-07-01 20:45:15.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -25065,21 +26034,9 @@ diff -urNp linux-2.6.33.1/drivers/oprofile/oprofile_stats.h linux-2.6.33.1/drive
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.33.1/drivers/parisc/pdc_stable.c linux-2.6.33.1/drivers/parisc/pdc_stable.c
---- linux-2.6.33.1/drivers/parisc/pdc_stable.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/parisc/pdc_stable.c 2010-03-20 16:58:40.392862259 -0400
-@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
-       return ret;
- }
- 
--static struct sysfs_ops pdcspath_attr_ops = {
-+static const struct sysfs_ops pdcspath_attr_ops = {
-       .show = pdcspath_attr_show,
-       .store = pdcspath_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/parport/procfs.c linux-2.6.33.1/drivers/parport/procfs.c
---- linux-2.6.33.1/drivers/parport/procfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/parport/procfs.c    2010-03-20 16:58:40.392862259 -0400
+diff -urNp linux-2.6.34/drivers/parport/procfs.c linux-2.6.34/drivers/parport/procfs.c
+--- linux-2.6.34/drivers/parport/procfs.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/parport/procfs.c      2010-07-01 20:45:16.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
        *ppos += len;
@@ -25098,10 +26055,10 @@ diff -urNp linux-2.6.33.1/drivers/parport/procfs.c linux-2.6.33.1/drivers/parpor
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.33.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.33.1/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.33.1/drivers/pci/hotplug/acpiphp_glue.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/hotplug/acpiphp_glue.c  2010-03-20 16:58:40.418811417 -0400
-@@ -109,7 +109,7 @@ static int post_dock_fixups(struct notif
+diff -urNp linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/hotplug/acpiphp_glue.c    2010-07-01 20:45:15.000000000 -0400
+@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
  }
  
  
@@ -25110,9 +26067,9 @@ diff -urNp linux-2.6.33.1/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.33.1/driv
        .handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.33.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.33.1/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.33.1/drivers/pci/hotplug/cpqphp_nvram.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/hotplug/cpqphp_nvram.c  2010-03-20 16:58:40.420729851 -0400
+diff -urNp linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/hotplug/cpqphp_nvram.c    2010-07-01 20:45:15.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -25127,21 +26084,9 @@ diff -urNp linux-2.6.33.1/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.33.1/driv
        dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
        /* initialize our int15 lock */
-diff -urNp linux-2.6.33.1/drivers/pci/hotplug/fakephp.c linux-2.6.33.1/drivers/pci/hotplug/fakephp.c
---- linux-2.6.33.1/drivers/pci/hotplug/fakephp.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/hotplug/fakephp.c       2010-03-20 16:58:40.420729851 -0400
-@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
- }
- 
- static struct kobj_type legacy_ktype = {
--      .sysfs_ops = &(struct sysfs_ops){
-+      .sysfs_ops = &(const struct sysfs_ops){
-               .store = legacy_store, .show = legacy_show
-       },
-       .release = &legacy_release,
-diff -urNp linux-2.6.33.1/drivers/pci/intel-iommu.c linux-2.6.33.1/drivers/pci/intel-iommu.c
---- linux-2.6.33.1/drivers/pci/intel-iommu.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/intel-iommu.c   2010-03-20 16:58:40.428854036 -0400
+diff -urNp linux-2.6.34/drivers/pci/intel-iommu.c linux-2.6.34/drivers/pci/intel-iommu.c
+--- linux-2.6.34/drivers/pci/intel-iommu.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/intel-iommu.c     2010-07-01 20:45:15.000000000 -0400
 @@ -2940,7 +2940,7 @@ static int intel_mapping_error(struct de
        return !dma_addr;
  }
@@ -25151,9 +26096,9 @@ diff -urNp linux-2.6.33.1/drivers/pci/intel-iommu.c linux-2.6.33.1/drivers/pci/i
        .alloc_coherent = intel_alloc_coherent,
        .free_coherent = intel_free_coherent,
        .map_sg = intel_map_sg,
-diff -urNp linux-2.6.33.1/drivers/pci/pcie/portdrv_pci.c linux-2.6.33.1/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.33.1/drivers/pci/pcie/portdrv_pci.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/pcie/portdrv_pci.c      2010-03-20 16:58:40.432849247 -0400
+diff -urNp linux-2.6.34/drivers/pci/pcie/portdrv_pci.c linux-2.6.34/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.34/drivers/pci/pcie/portdrv_pci.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/pcie/portdrv_pci.c        2010-07-01 20:45:15.000000000 -0400
 @@ -250,7 +250,7 @@ static void pcie_portdrv_err_resume(stru
  static const struct pci_device_id port_pci_ids[] = { {
        /* handle any PCI-Express port */
@@ -25163,10 +26108,30 @@ diff -urNp linux-2.6.33.1/drivers/pci/pcie/portdrv_pci.c linux-2.6.33.1/drivers/
  };
  MODULE_DEVICE_TABLE(pci, port_pci_ids);
  
-diff -urNp linux-2.6.33.1/drivers/pci/proc.c linux-2.6.33.1/drivers/pci/proc.c
---- linux-2.6.33.1/drivers/pci/proc.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/proc.c  2010-03-20 16:58:40.432849247 -0400
-@@ -480,7 +480,16 @@ static const struct file_operations proc
+diff -urNp linux-2.6.34/drivers/pci/probe.c linux-2.6.34/drivers/pci/probe.c
+--- linux-2.6.34/drivers/pci/probe.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/probe.c   2010-07-01 20:45:15.000000000 -0400
+@@ -63,14 +63,14 @@ static ssize_t pci_bus_show_cpuaffinity(
+       return ret;
+ }
+ 
+-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
++static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+ {
+       return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
+ }
+ 
+-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
++static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
+ {
+diff -urNp linux-2.6.34/drivers/pci/proc.c linux-2.6.34/drivers/pci/proc.c
+--- linux-2.6.34/drivers/pci/proc.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pci/proc.c    2010-07-01 20:45:16.000000000 -0400
+@@ -481,7 +481,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
        struct pci_dev *dev = NULL;
@@ -25183,22 +26148,10 @@ diff -urNp linux-2.6.33.1/drivers/pci/proc.c linux-2.6.33.1/drivers/pci/proc.c
        proc_create("devices", 0, proc_bus_pci_dir,
                    &proc_bus_pci_dev_operations);
        proc_initialized = 1;
-diff -urNp linux-2.6.33.1/drivers/pci/slot.c linux-2.6.33.1/drivers/pci/slot.c
---- linux-2.6.33.1/drivers/pci/slot.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pci/slot.c  2010-03-20 16:58:40.436850488 -0400
-@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
-       return attribute->store ? attribute->store(slot, buf, len) : -EIO;
- }
- 
--static struct sysfs_ops pci_slot_sysfs_ops = {
-+static const struct sysfs_ops pci_slot_sysfs_ops = {
-       .show = pci_slot_attr_show,
-       .store = pci_slot_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/pcmcia/ti113x.h linux-2.6.33.1/drivers/pcmcia/ti113x.h
---- linux-2.6.33.1/drivers/pcmcia/ti113x.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pcmcia/ti113x.h     2010-03-20 16:58:40.444846583 -0400
-@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
+diff -urNp linux-2.6.34/drivers/pcmcia/ti113x.h linux-2.6.34/drivers/pcmcia/ti113x.h
+--- linux-2.6.34/drivers/pcmcia/ti113x.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pcmcia/ti113x.h       2010-07-01 20:45:15.000000000 -0400
+@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
        DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
                ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
  
@@ -25207,10 +26160,10 @@ diff -urNp linux-2.6.33.1/drivers/pcmcia/ti113x.h linux-2.6.33.1/drivers/pcmcia/
  };
  
  static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.33.1/drivers/pcmcia/yenta_socket.c linux-2.6.33.1/drivers/pcmcia/yenta_socket.c
---- linux-2.6.33.1/drivers/pcmcia/yenta_socket.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pcmcia/yenta_socket.c       2010-03-20 16:58:40.460864210 -0400
-@@ -1432,7 +1432,7 @@ static struct pci_device_id yenta_table[
+diff -urNp linux-2.6.34/drivers/pcmcia/yenta_socket.c linux-2.6.34/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.34/drivers/pcmcia/yenta_socket.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pcmcia/yenta_socket.c 2010-07-01 20:45:15.000000000 -0400
+@@ -1436,7 +1436,7 @@ static struct pci_device_id yenta_table[
  
        /* match any cardbus bridge */
        CB_ID(PCI_ANY_ID, PCI_ANY_ID, DEFAULT),
@@ -25219,10 +26172,10 @@ diff -urNp linux-2.6.33.1/drivers/pcmcia/yenta_socket.c linux-2.6.33.1/drivers/p
  };
  MODULE_DEVICE_TABLE(pci, yenta_table);
  
-diff -urNp linux-2.6.33.1/drivers/platform/x86/acer-wmi.c linux-2.6.33.1/drivers/platform/x86/acer-wmi.c
---- linux-2.6.33.1/drivers/platform/x86/acer-wmi.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/acer-wmi.c     2010-03-20 16:58:40.464856812 -0400
-@@ -915,7 +915,7 @@ static int update_bl_status(struct backl
+diff -urNp linux-2.6.34/drivers/platform/x86/acer-wmi.c linux-2.6.34/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.34/drivers/platform/x86/acer-wmi.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/acer-wmi.c       2010-07-01 20:45:15.000000000 -0400
+@@ -916,7 +916,7 @@ static int update_bl_status(struct backl
        return 0;
  }
  
@@ -25231,9 +26184,9 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/acer-wmi.c linux-2.6.33.1/drivers
        .get_brightness = read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/asus_acpi.c linux-2.6.33.1/drivers/platform/x86/asus_acpi.c
---- linux-2.6.33.1/drivers/platform/x86/asus_acpi.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/asus_acpi.c    2010-03-20 16:58:40.480866604 -0400
+diff -urNp linux-2.6.34/drivers/platform/x86/asus_acpi.c linux-2.6.34/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.34/drivers/platform/x86/asus_acpi.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/asus_acpi.c      2010-07-01 20:45:15.000000000 -0400
 @@ -1464,7 +1464,7 @@ static int asus_hotk_remove(struct acpi_
        return 0;
  }
@@ -25243,34 +26196,30 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/asus_acpi.c linux-2.6.33.1/driver
        .get_brightness = read_brightness,
        .update_status  = set_brightness_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/asus-laptop.c linux-2.6.33.1/drivers/platform/x86/asus-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/asus-laptop.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/asus-laptop.c  2010-03-20 16:58:40.480866604 -0400
-@@ -251,7 +251,7 @@ static struct backlight_device *asus_bac
-  */
- static int read_brightness(struct backlight_device *bd);
- static int update_bl_status(struct backlight_device *bd);
+diff -urNp linux-2.6.34/drivers/platform/x86/asus-laptop.c linux-2.6.34/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.34/drivers/platform/x86/asus-laptop.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/asus-laptop.c    2010-07-01 20:45:15.000000000 -0400
+@@ -224,7 +224,6 @@ struct asus_laptop {
+       struct asus_led gled;
+       struct asus_led kled;
+       struct workqueue_struct *led_workqueue;
+-
+       int wireless_status;
+       bool have_rsts;
+       int lcd_state;
+@@ -621,7 +620,7 @@ static int update_bl_status(struct backl
+       return asus_lcd_set(asus, value);
+ }
+ 
 -static struct backlight_ops asusbl_ops = {
 +static const struct backlight_ops asusbl_ops = {
-       .get_brightness = read_brightness,
+       .get_brightness = asus_read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/classmate-laptop.c linux-2.6.33.1/drivers/platform/x86/classmate-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/classmate-laptop.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/classmate-laptop.c     2010-03-20 16:58:40.484567094 -0400
-@@ -452,7 +452,7 @@ static int cmpc_bl_update_status(struct 
-               return -1;
- }
- 
--static struct backlight_ops cmpc_bl_ops = {
-+static const struct backlight_ops cmpc_bl_ops = {
-       .get_brightness = cmpc_bl_get_brightness,
-       .update_status = cmpc_bl_update_status
- };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/compal-laptop.c linux-2.6.33.1/drivers/platform/x86/compal-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/compal-laptop.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/compal-laptop.c        2010-03-20 16:58:40.484567094 -0400
-@@ -162,7 +162,7 @@ static int bl_update_status(struct backl
+diff -urNp linux-2.6.34/drivers/platform/x86/compal-laptop.c linux-2.6.34/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.34/drivers/platform/x86/compal-laptop.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/compal-laptop.c  2010-07-01 20:45:15.000000000 -0400
+@@ -168,7 +168,7 @@ static int bl_update_status(struct backl
        return set_lcd_level(b->props.brightness);
  }
  
@@ -25279,11 +26228,11 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/compal-laptop.c linux-2.6.33.1/dr
        .get_brightness = bl_get_brightness,
        .update_status  = bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/dell-laptop.c linux-2.6.33.1/drivers/platform/x86/dell-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/dell-laptop.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/dell-laptop.c  2010-03-20 16:58:40.484567094 -0400
-@@ -333,7 +333,7 @@ static int dell_get_intensity(struct bac
-       return buffer.output[1];
+diff -urNp linux-2.6.34/drivers/platform/x86/dell-laptop.c linux-2.6.34/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.34/drivers/platform/x86/dell-laptop.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/dell-laptop.c    2010-07-01 20:45:15.000000000 -0400
+@@ -462,7 +462,7 @@ out:
+       return buffer->output[1];
  }
  
 -static struct backlight_ops dell_ops = {
@@ -25291,10 +26240,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/dell-laptop.c linux-2.6.33.1/driv
        .get_brightness = dell_get_intensity,
        .update_status  = dell_send_intensity,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/eeepc-laptop.c linux-2.6.33.1/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/eeepc-laptop.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/eeepc-laptop.c 2010-03-20 16:58:40.484567094 -0400
-@@ -1096,7 +1096,7 @@ static int update_bl_status(struct backl
+diff -urNp linux-2.6.34/drivers/platform/x86/eeepc-laptop.c linux-2.6.34/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.34/drivers/platform/x86/eeepc-laptop.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/eeepc-laptop.c   2010-07-01 20:45:15.000000000 -0400
+@@ -1114,7 +1114,7 @@ static int update_bl_status(struct backl
        return set_brightness(bd, bd->props.brightness);
  }
  
@@ -25303,10 +26252,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/eeepc-laptop.c linux-2.6.33.1/dri
        .get_brightness = read_brightness,
        .update_status = update_bl_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/fujitsu-laptop.c linux-2.6.33.1/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/fujitsu-laptop.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/fujitsu-laptop.c       2010-03-20 16:58:40.488600423 -0400
-@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
+diff -urNp linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/fujitsu-laptop.c 2010-07-01 20:45:15.000000000 -0400
+@@ -437,7 +437,7 @@ static int bl_update_status(struct backl
        return ret;
  }
  
@@ -25315,10 +26264,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/fujitsu-laptop.c linux-2.6.33.1/d
        .get_brightness = bl_get_brightness,
        .update_status = bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/msi-laptop.c linux-2.6.33.1/drivers/platform/x86/msi-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/msi-laptop.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/msi-laptop.c   2010-03-20 16:58:40.488600423 -0400
-@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
+diff -urNp linux-2.6.34/drivers/platform/x86/msi-laptop.c linux-2.6.34/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.34/drivers/platform/x86/msi-laptop.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/msi-laptop.c     2010-07-01 20:45:15.000000000 -0400
+@@ -254,7 +254,7 @@ static int bl_update_status(struct backl
        return set_lcd_level(b->props.brightness);
  }
  
@@ -25327,34 +26276,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/msi-laptop.c linux-2.6.33.1/drive
        .get_brightness = bl_get_brightness,
        .update_status  = bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/msi-wmi.c linux-2.6.33.1/drivers/platform/x86/msi-wmi.c
---- linux-2.6.33.1/drivers/platform/x86/msi-wmi.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/msi-wmi.c      2010-03-20 16:58:40.488600423 -0400
-@@ -138,7 +138,7 @@ static int bl_set_status(struct backligh
-       return msi_wmi_set_block(0, backlight_map[bright]);
- }
- 
--static struct backlight_ops msi_backlight_ops = {
-+static const struct backlight_ops msi_backlight_ops = {
-       .get_brightness = bl_get,
-       .update_status  = bl_set_status,
- };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/panasonic-laptop.c linux-2.6.33.1/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/panasonic-laptop.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/panasonic-laptop.c     2010-03-20 16:58:40.488600423 -0400
-@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
-       return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
- }
- 
--static struct backlight_ops pcc_backlight_ops = {
-+static const struct backlight_ops pcc_backlight_ops = {
-       .get_brightness = bl_get,
-       .update_status  = bl_set_status,
- };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/sony-laptop.c linux-2.6.33.1/drivers/platform/x86/sony-laptop.c
---- linux-2.6.33.1/drivers/platform/x86/sony-laptop.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/sony-laptop.c  2010-03-20 16:58:40.508859925 -0400
-@@ -853,7 +853,7 @@ static int sony_backlight_get_brightness
+diff -urNp linux-2.6.34/drivers/platform/x86/sony-laptop.c linux-2.6.34/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.34/drivers/platform/x86/sony-laptop.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/sony-laptop.c    2010-07-01 20:45:15.000000000 -0400
+@@ -857,7 +857,7 @@ static int sony_backlight_get_brightness
  }
  
  static struct backlight_device *sony_backlight_device;
@@ -25363,10 +26288,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/sony-laptop.c linux-2.6.33.1/driv
        .update_status = sony_backlight_update_status,
        .get_brightness = sony_backlight_get_brightness,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/thinkpad_acpi.c linux-2.6.33.1/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.33.1/drivers/platform/x86/thinkpad_acpi.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/thinkpad_acpi.c        2010-03-20 16:58:40.516859801 -0400
-@@ -6131,7 +6131,7 @@ static void tpacpi_brightness_notify_cha
+diff -urNp linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/thinkpad_acpi.c  2010-07-01 20:45:15.000000000 -0400
+@@ -6132,7 +6132,7 @@ static void tpacpi_brightness_notify_cha
                               BACKLIGHT_UPDATE_HOTKEY);
  }
  
@@ -25375,10 +26300,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/thinkpad_acpi.c linux-2.6.33.1/dr
        .get_brightness = brightness_get,
        .update_status  = brightness_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/platform/x86/toshiba_acpi.c linux-2.6.33.1/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.33.1/drivers/platform/x86/toshiba_acpi.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/platform/x86/toshiba_acpi.c 2010-03-20 16:58:40.520536360 -0400
-@@ -706,7 +706,7 @@ static acpi_status remove_device(void)
+diff -urNp linux-2.6.34/drivers/platform/x86/toshiba_acpi.c linux-2.6.34/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.34/drivers/platform/x86/toshiba_acpi.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/platform/x86/toshiba_acpi.c   2010-07-01 20:45:15.000000000 -0400
+@@ -741,7 +741,7 @@ static acpi_status remove_device(void)
        return AE_OK;
  }
  
@@ -25387,10 +26312,10 @@ diff -urNp linux-2.6.33.1/drivers/platform/x86/toshiba_acpi.c linux-2.6.33.1/dri
          .get_brightness = get_lcd,
          .update_status  = set_lcd_status,
  };
-diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c     2010-03-20 16:58:40.524855697 -0400
-@@ -60,7 +60,7 @@ do { \
+diff -urNp linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pnp/pnpbios/bioscalls.c       2010-07-01 20:45:15.000000000 -0400
+@@ -59,7 +59,7 @@ do { \
        set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
  
@@ -25399,7 +26324,7 @@ diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers
                        (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
  
  /*
-@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func
+@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func
  
        cpu = get_cpu();
        save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
@@ -25410,7 +26335,7 @@ diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers
  
        /* On some boxes IRQ's during PnP BIOS calls are deadly.  */
        spin_lock_irqsave(&pnp_bios_lock, flags);
-@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func
+@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func
                             :"memory");
        spin_unlock_irqrestore(&pnp_bios_lock, flags);
  
@@ -25421,7 +26346,7 @@ diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers
        put_cpu();
  
        /* If we get here and this is set then the PnP BIOS faulted on us. */
-@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 n
+@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 n
        return status;
  }
  
@@ -25430,7 +26355,7 @@ diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers
  {
        int i;
  
-@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_i
+@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_i
        pnp_bios_callpoint.offset = header->fields.pm16offset;
        pnp_bios_callpoint.segment = PNP_CS16;
  
@@ -25439,16 +26364,16 @@ diff -urNp linux-2.6.33.1/drivers/pnp/pnpbios/bioscalls.c linux-2.6.33.1/drivers
        for_each_possible_cpu(i) {
                struct desc_struct *gdt = get_cpu_gdt_table(i);
                if (!gdt)
-@@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_i
+@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_i
                set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
                         (unsigned long)__va(header->fields.pm16dseg));
        }
 +
 +      pax_close_kernel();
  }
-diff -urNp linux-2.6.33.1/drivers/pnp/quirks.c linux-2.6.33.1/drivers/pnp/quirks.c
---- linux-2.6.33.1/drivers/pnp/quirks.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pnp/quirks.c        2010-03-20 16:58:40.528847437 -0400
+diff -urNp linux-2.6.34/drivers/pnp/quirks.c linux-2.6.34/drivers/pnp/quirks.c
+--- linux-2.6.34/drivers/pnp/quirks.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pnp/quirks.c  2010-07-01 20:45:15.000000000 -0400
 @@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
        /* PnP resources that might overlap PCI BARs */
        {"PNP0c01", quirk_system_pci_resources},
@@ -25458,10 +26383,10 @@ diff -urNp linux-2.6.33.1/drivers/pnp/quirks.c linux-2.6.33.1/drivers/pnp/quirks
  };
  
  void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.33.1/drivers/pnp/resource.c linux-2.6.33.1/drivers/pnp/resource.c
---- linux-2.6.33.1/drivers/pnp/resource.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/pnp/resource.c      2010-03-20 16:58:40.532529204 -0400
-@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
+diff -urNp linux-2.6.34/drivers/pnp/resource.c linux-2.6.34/drivers/pnp/resource.c
+--- linux-2.6.34/drivers/pnp/resource.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/pnp/resource.c        2010-07-01 20:45:15.000000000 -0400
+@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
                return 1;
  
        /* check if the resource is valid */
@@ -25470,7 +26395,7 @@ diff -urNp linux-2.6.33.1/drivers/pnp/resource.c linux-2.6.33.1/drivers/pnp/reso
                return 0;
  
        /* check if the resource is reserved */
-@@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
+@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
                return 1;
  
        /* check if the resource is valid */
@@ -25479,10 +26404,10 @@ diff -urNp linux-2.6.33.1/drivers/pnp/resource.c linux-2.6.33.1/drivers/pnp/reso
                return 0;
  
        /* check if the resource is reserved */
-diff -urNp linux-2.6.33.1/drivers/s390/cio/qdio_debug.c linux-2.6.33.1/drivers/s390/cio/qdio_debug.c
---- linux-2.6.33.1/drivers/s390/cio/qdio_debug.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/s390/cio/qdio_debug.c       2010-03-20 16:58:40.552847675 -0400
-@@ -215,7 +215,7 @@ static int qperf_seq_open(struct inode *
+diff -urNp linux-2.6.34/drivers/s390/cio/qdio_debug.c linux-2.6.34/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.34/drivers/s390/cio/qdio_debug.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/s390/cio/qdio_debug.c 2010-07-01 20:45:15.000000000 -0400
+@@ -233,7 +233,7 @@ static int qperf_seq_open(struct inode *
                           filp->f_path.dentry->d_inode->i_private);
  }
  
@@ -25491,10 +26416,10 @@ diff -urNp linux-2.6.33.1/drivers/s390/cio/qdio_debug.c linux-2.6.33.1/drivers/s
        .owner   = THIS_MODULE,
        .open    = qperf_seq_open,
        .read    = seq_read,
-diff -urNp linux-2.6.33.1/drivers/scsi/ipr.c linux-2.6.33.1/drivers/scsi/ipr.c
---- linux-2.6.33.1/drivers/scsi/ipr.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/scsi/ipr.c  2010-03-20 16:58:40.596672237 -0400
-@@ -5291,7 +5291,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
+diff -urNp linux-2.6.34/drivers/scsi/ipr.c linux-2.6.34/drivers/scsi/ipr.c
+--- linux-2.6.34/drivers/scsi/ipr.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/ipr.c    2010-07-01 20:45:15.000000000 -0400
+@@ -6055,7 +6055,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
        return true;
  }
  
@@ -25503,9 +26428,9 @@ diff -urNp linux-2.6.33.1/drivers/scsi/ipr.c linux-2.6.33.1/drivers/scsi/ipr.c
        .phy_reset = ipr_ata_phy_reset,
        .hardreset = ipr_sata_reset,
        .post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.33.1/drivers/scsi/libfc/fc_exch.c linux-2.6.33.1/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.33.1/drivers/scsi/libfc/fc_exch.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/scsi/libfc/fc_exch.c        2010-03-20 16:58:40.600909572 -0400
+diff -urNp linux-2.6.34/drivers/scsi/libfc/fc_exch.c linux-2.6.34/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.34/drivers/scsi/libfc/fc_exch.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/libfc/fc_exch.c  2010-07-01 20:45:15.000000000 -0400
 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
         * all together if not used XXX
         */
@@ -25627,10 +26552,10 @@ diff -urNp linux-2.6.33.1/drivers/scsi/libfc/fc_exch.c linux-2.6.33.1/drivers/sc
  
        fc_frame_free(fp);
  }
-diff -urNp linux-2.6.33.1/drivers/scsi/libsas/sas_ata.c linux-2.6.33.1/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.33.1/drivers/scsi/libsas/sas_ata.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/scsi/libsas/sas_ata.c       2010-03-20 16:58:40.625874020 -0400
-@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
+diff -urNp linux-2.6.34/drivers/scsi/libsas/sas_ata.c linux-2.6.34/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.34/drivers/scsi/libsas/sas_ata.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/libsas/sas_ata.c 2010-07-01 20:45:15.000000000 -0400
+@@ -344,7 +344,7 @@ static int sas_ata_scr_read(struct ata_l
        }
  }
  
@@ -25639,9 +26564,21 @@ diff -urNp linux-2.6.33.1/drivers/scsi/libsas/sas_ata.c linux-2.6.33.1/drivers/s
        .phy_reset              = sas_ata_phy_reset,
        .post_internal_cmd      = sas_ata_post_internal,
        .qc_prep                = ata_noop_qc_prep,
-diff -urNp linux-2.6.33.1/drivers/scsi/scsi_logging.h linux-2.6.33.1/drivers/scsi/scsi_logging.h
---- linux-2.6.33.1/drivers/scsi/scsi_logging.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/scsi/scsi_logging.h 2010-03-20 16:58:40.673358427 -0400
+diff -urNp linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/mpt2sas/mpt2sas_debug.h  2010-07-01 20:45:15.000000000 -0400
+@@ -79,7 +79,7 @@
+               CMD;                                            \
+ }
+ #else
+-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
+ #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
+ 
+ 
+diff -urNp linux-2.6.34/drivers/scsi/scsi_logging.h linux-2.6.34/drivers/scsi/scsi_logging.h
+--- linux-2.6.34/drivers/scsi/scsi_logging.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/scsi_logging.h   2010-07-01 20:45:15.000000000 -0400
 @@ -51,7 +51,7 @@ do {                                                         \
                } while (0);                                    \
  } while (0)
@@ -25651,10 +26588,10 @@ diff -urNp linux-2.6.33.1/drivers/scsi/scsi_logging.h linux-2.6.33.1/drivers/scs
  #endif /* CONFIG_SCSI_LOGGING */
  
  /*
-diff -urNp linux-2.6.33.1/drivers/scsi/sg.c linux-2.6.33.1/drivers/scsi/sg.c
---- linux-2.6.33.1/drivers/scsi/sg.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/scsi/sg.c   2010-03-20 16:58:40.692870926 -0400
-@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
+diff -urNp linux-2.6.34/drivers/scsi/sg.c linux-2.6.34/drivers/scsi/sg.c
+--- linux-2.6.34/drivers/scsi/sg.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/scsi/sg.c     2010-07-01 20:45:15.000000000 -0400
+@@ -2291,7 +2291,7 @@ struct sg_proc_leaf {
        const struct file_operations * fops;
  };
  
@@ -25663,7 +26600,7 @@ diff -urNp linux-2.6.33.1/drivers/scsi/sg.c linux-2.6.33.1/drivers/scsi/sg.c
        {"allow_dio", &adio_fops},
        {"debug", &debug_fops},
        {"def_reserved_size", &dressz_fops},
-@@ -2307,7 +2307,7 @@ sg_proc_init(void)
+@@ -2306,7 +2306,7 @@ sg_proc_init(void)
  {
        int k, mask;
        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
@@ -25672,10 +26609,10 @@ diff -urNp linux-2.6.33.1/drivers/scsi/sg.c linux-2.6.33.1/drivers/scsi/sg.c
  
        sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
        if (!sg_proc_sgp)
-diff -urNp linux-2.6.33.1/drivers/serial/8250_pci.c linux-2.6.33.1/drivers/serial/8250_pci.c
---- linux-2.6.33.1/drivers/serial/8250_pci.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/serial/8250_pci.c   2010-03-20 16:58:40.736223750 -0400
-@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
+diff -urNp linux-2.6.34/drivers/serial/8250_pci.c linux-2.6.34/drivers/serial/8250_pci.c
+--- linux-2.6.34/drivers/serial/8250_pci.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/serial/8250_pci.c     2010-07-01 20:45:15.000000000 -0400
+@@ -3693,7 +3693,7 @@ static struct pci_device_id serial_pci_t
                PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
                0xffff00, pbn_default },
@@ -25684,9 +26621,9 @@ diff -urNp linux-2.6.33.1/drivers/serial/8250_pci.c linux-2.6.33.1/drivers/seria
  };
  
  static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.33.1/drivers/serial/kgdboc.c linux-2.6.33.1/drivers/serial/kgdboc.c
---- linux-2.6.33.1/drivers/serial/kgdboc.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/serial/kgdboc.c     2010-03-20 16:58:40.745176799 -0400
+diff -urNp linux-2.6.34/drivers/serial/kgdboc.c linux-2.6.34/drivers/serial/kgdboc.c
+--- linux-2.6.34/drivers/serial/kgdboc.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/serial/kgdboc.c       2010-07-01 20:45:15.000000000 -0400
 @@ -18,7 +18,7 @@
  
  #define MAX_CONFIG_LEN                40
@@ -25705,30 +26642,9 @@ diff -urNp linux-2.6.33.1/drivers/serial/kgdboc.c linux-2.6.33.1/drivers/serial/
        .name                   = "kgdboc",
        .read_char              = kgdboc_get_char,
        .write_char             = kgdboc_put_char,
-diff -urNp linux-2.6.33.1/drivers/staging/b3dfg/b3dfg.c linux-2.6.33.1/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.33.1/drivers/staging/b3dfg/b3dfg.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/b3dfg/b3dfg.c       2010-03-20 16:58:40.760695484 -0400
-@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
-       return VM_FAULT_NOPAGE;
- }
- 
--static struct vm_operations_struct b3dfg_vm_ops = {
-+static const struct vm_operations_struct b3dfg_vm_ops = {
-       .fault = b3dfg_vma_fault,
- };
- 
-@@ -836,7 +836,7 @@ static int b3dfg_mmap(struct file *filp,
-       return r;
- }
- 
--static struct file_operations b3dfg_fops = {
-+static const struct file_operations b3dfg_fops = {
-       .owner = THIS_MODULE,
-       .open = b3dfg_open,
-       .release = b3dfg_release,
-diff -urNp linux-2.6.33.1/drivers/staging/comedi/comedi_fops.c linux-2.6.33.1/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.33.1/drivers/staging/comedi/comedi_fops.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/comedi/comedi_fops.c        2010-03-20 16:58:40.772884102 -0400
+diff -urNp linux-2.6.34/drivers/staging/comedi/comedi_fops.c linux-2.6.34/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.34/drivers/staging/comedi/comedi_fops.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/comedi/comedi_fops.c  2010-07-01 20:45:15.000000000 -0400
 @@ -1384,7 +1384,7 @@ void comedi_unmap(struct vm_area_struct 
        mutex_unlock(&dev->mutex);
  }
@@ -25738,10 +26654,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/comedi/comedi_fops.c linux-2.6.33.1/dr
        .close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.33.1/drivers/staging/dream/pmem.c linux-2.6.33.1/drivers/staging/dream/pmem.c
---- linux-2.6.33.1/drivers/staging/dream/pmem.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/pmem.c        2010-03-20 16:58:40.792529665 -0400
-@@ -174,7 +174,7 @@ static int pmem_mmap(struct file *, stru
+diff -urNp linux-2.6.34/drivers/staging/dream/pmem.c linux-2.6.34/drivers/staging/dream/pmem.c
+--- linux-2.6.34/drivers/staging/dream/pmem.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/pmem.c  2010-07-01 20:45:15.000000000 -0400
+@@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, stru
  static int pmem_open(struct inode *, struct file *);
  static long pmem_ioctl(struct file *, unsigned int, unsigned long);
  
@@ -25750,7 +26666,7 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/pmem.c linux-2.6.33.1/drivers/st
        .release = pmem_release,
        .mmap = pmem_mmap,
        .open = pmem_open,
-@@ -1202,7 +1202,7 @@ static ssize_t debug_read(struct file *f
+@@ -1201,7 +1201,7 @@ static ssize_t debug_read(struct file *f
        return simple_read_from_buffer(buf, count, ppos, buffer, n);
  }
  
@@ -25759,10 +26675,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/pmem.c linux-2.6.33.1/drivers/st
        .read = debug_read,
        .open = debug_open,
  };
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.33.1/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/adsp_driver.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/adsp_driver.c   2010-03-20 16:58:40.796888570 -0400
-@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/adsp_driver.c     2010-07-01 20:45:15.000000000 -0400
+@@ -577,7 +577,7 @@ static struct adsp_device *inode_to_devi
  static dev_t adsp_devno;
  static struct class *adsp_class;
  
@@ -25771,10 +26687,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.33
        .owner = THIS_MODULE,
        .open = adsp_open,
        .unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_aac.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_aac.c     2010-03-20 16:58:40.808875958 -0400
-@@ -1022,7 +1022,7 @@ done:
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_aac.c       2010-07-01 20:45:15.000000000 -0400
+@@ -1023,7 +1023,7 @@ done:
        return rc;
  }
  
@@ -25783,10 +26699,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.33.1
        .owner = THIS_MODULE,
        .open = audio_open,
        .release = audio_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_amrnb.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_amrnb.c   2010-03-20 16:58:40.808875958 -0400
-@@ -833,7 +833,7 @@ done:
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_amrnb.c     2010-07-01 20:45:15.000000000 -0400
+@@ -834,7 +834,7 @@ done:
        return rc;
  }
  
@@ -25795,10 +26711,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.33
        .owner = THIS_MODULE,
        .open = audamrnb_open,
        .release = audamrnb_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_evrc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_evrc.c    2010-03-20 16:58:40.812532082 -0400
-@@ -805,7 +805,7 @@ dma_fail:
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_evrc.c      2010-07-01 20:45:15.000000000 -0400
+@@ -806,7 +806,7 @@ dma_fail:
        return rc;
  }
  
@@ -25807,10 +26723,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.33.
        .owner = THIS_MODULE,
        .open = audevrc_open,
        .release = audevrc_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c      2010-03-20 16:58:40.812532082 -0400
-@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_in.c        2010-07-01 20:45:15.000000000 -0400
+@@ -914,7 +914,7 @@ static int audpre_open(struct inode *ino
        return 0;
  }
  
@@ -25819,7 +26735,7 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.33.1/
        .owner          = THIS_MODULE,
        .open           = audio_in_open,
        .release        = audio_in_release,
-@@ -922,7 +922,7 @@ static struct file_operations audio_fops
+@@ -923,7 +923,7 @@ static struct file_operations audio_fops
        .unlocked_ioctl = audio_in_ioctl,
  };
  
@@ -25828,9 +26744,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.33.1/
        .owner          = THIS_MODULE,
        .open           = audpre_open,
        .unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_mp3.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_mp3.c     2010-03-20 16:58:40.812532082 -0400
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_mp3.c       2010-07-01 20:45:15.000000000 -0400
 @@ -941,7 +941,7 @@ done:
        return rc;
  }
@@ -25840,10 +26756,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.33.1
        .owner          = THIS_MODULE,
        .open           = audio_open,
        .release        = audio_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c     2010-03-20 16:58:40.812532082 -0400
-@@ -806,7 +806,7 @@ static int audpp_open(struct inode *inod
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_out.c       2010-07-01 20:45:15.000000000 -0400
+@@ -807,7 +807,7 @@ static int audpp_open(struct inode *inod
        return 0;
  }
  
@@ -25852,7 +26768,7 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.33.1
        .owner          = THIS_MODULE,
        .open           = audio_open,
        .release        = audio_release,
-@@ -815,7 +815,7 @@ static struct file_operations audio_fops
+@@ -816,7 +816,7 @@ static struct file_operations audio_fops
        .unlocked_ioctl = audio_ioctl,
  };
  
@@ -25861,10 +26777,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.33.1
        .owner          = THIS_MODULE,
        .open           = audpp_open,
        .unlocked_ioctl = audpp_ioctl,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_qcelp.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_qcelp.c   2010-03-20 16:58:40.816705807 -0400
-@@ -816,7 +816,7 @@ err:
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/audio_qcelp.c     2010-07-01 20:45:15.000000000 -0400
+@@ -817,7 +817,7 @@ err:
        return rc;
  }
  
@@ -25873,9 +26789,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.33
        .owner = THIS_MODULE,
        .open = audqcelp_open,
        .release = audqcelp_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/snd.c linux-2.6.33.1/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.33.1/drivers/staging/dream/qdsp5/snd.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/qdsp5/snd.c   2010-03-20 16:58:40.816705807 -0400
+diff -urNp linux-2.6.34/drivers/staging/dream/qdsp5/snd.c linux-2.6.34/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.34/drivers/staging/dream/qdsp5/snd.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/qdsp5/snd.c     2010-07-01 20:45:15.000000000 -0400
 @@ -242,7 +242,7 @@ err:
        return rc;
  }
@@ -25885,9 +26801,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/qdsp5/snd.c linux-2.6.33.1/drive
        .owner          = THIS_MODULE,
        .open           = snd_open,
        .release        = snd_release,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/smd/smd_qmi.c linux-2.6.33.1/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.33.1/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/smd/smd_qmi.c 2010-03-20 16:58:40.828884259 -0400
+diff -urNp linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/smd/smd_qmi.c   2010-07-01 20:45:15.000000000 -0400
 @@ -788,7 +788,7 @@ static int qmi_release(struct inode *ip,
        return 0;
  }
@@ -25897,10 +26813,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/smd/smd_qmi.c linux-2.6.33.1/dri
        .owner = THIS_MODULE,
        .read = qmi_read,
        .write = qmi_write,
-diff -urNp linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c    2010-03-20 16:58:40.828884259 -0400
-@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 
+diff -urNp linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dream/smd/smd_rpcrouter_device.c      2010-07-01 20:45:15.000000000 -0400
+@@ -215,7 +215,7 @@ static long rpcrouter_ioctl(struct file 
        return rc;
  }
  
@@ -25909,7 +26825,7 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c linux
        .owner   = THIS_MODULE,
        .open    = rpcrouter_open,
        .release = rpcrouter_release,
-@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_
+@@ -225,7 +225,7 @@ static struct file_operations rpcrouter_
        .unlocked_ioctl  = rpcrouter_ioctl,
  };
  
@@ -25918,10 +26834,22 @@ diff -urNp linux-2.6.33.1/drivers/staging/dream/smd/smd_rpcrouter_device.c linux
        .owner   = THIS_MODULE,
        .open    = rpcrouter_open,
        .release = rpcrouter_release,
-diff -urNp linux-2.6.33.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6.33.1/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.33.1/drivers/staging/go7007/go7007-v4l2.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/go7007/go7007-v4l2.c        2010-03-20 16:58:40.858660027 -0400
-@@ -1674,7 +1674,7 @@ static int go7007_vm_fault(struct vm_are
+diff -urNp linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c
+--- linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/dt3155/dt3155_drv.c   2010-07-01 20:45:15.000000000 -0400
+@@ -841,7 +841,7 @@ static unsigned int dt3155_poll (struct 
+  *  needed by init_module
+  *  register_chrdev
+  *****************************************************/
+-static struct file_operations dt3155_fops = {
++static const struct file_operations dt3155_fops = {
+   read:               dt3155_read,
+   ioctl:              dt3155_ioctl,
+   mmap:               dt3155_mmap,
+diff -urNp linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/go7007/go7007-v4l2.c  2010-07-01 20:45:15.000000000 -0400
+@@ -1675,7 +1675,7 @@ static int go7007_vm_fault(struct vm_are
        return 0;
  }
  
@@ -25930,10 +26858,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/go7007/go7007-v4l2.c linux-2.6.33.1/dr
        .open   = go7007_vm_open,
        .close  = go7007_vm_close,
        .fault  = go7007_vm_fault,
-diff -urNp linux-2.6.33.1/drivers/staging/hv/blkvsc_drv.c linux-2.6.33.1/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.33.1/drivers/staging/hv/blkvsc_drv.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/hv/blkvsc_drv.c     2010-03-20 16:58:40.876878598 -0400
-@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
+diff -urNp linux-2.6.34/drivers/staging/hv/blkvsc_drv.c linux-2.6.34/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.34/drivers/staging/hv/blkvsc_drv.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/hv/blkvsc_drv.c       2010-07-01 20:45:15.000000000 -0400
+@@ -155,7 +155,7 @@ static int blkvsc_ringbuffer_size = BLKV
  /* The one and only one */
  static struct blkvsc_driver_context g_blkvsc_drv;
  
@@ -25942,10 +26870,22 @@ diff -urNp linux-2.6.33.1/drivers/staging/hv/blkvsc_drv.c linux-2.6.33.1/drivers
        .owner = THIS_MODULE,
        .open = blkvsc_open,
        .release = blkvsc_release,
-diff -urNp linux-2.6.33.1/drivers/staging/panel/panel.c linux-2.6.33.1/drivers/staging/panel/panel.c
---- linux-2.6.33.1/drivers/staging/panel/panel.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/panel/panel.c       2010-03-20 16:58:40.888879754 -0400
-@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
+diff -urNp linux-2.6.34/drivers/staging/hv/Hv.c linux-2.6.34/drivers/staging/hv/Hv.c
+--- linux-2.6.34/drivers/staging/hv/Hv.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/hv/Hv.c       2010-07-01 20:45:15.000000000 -0400
+@@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
+       u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
+       u32 outputAddressHi = outputAddress >> 32;
+       u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
+-      volatile void *hypercallPage = gHvContext.HypercallPage;
++      volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage);
+ 
+       DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
+                  Control, Input, Output);
+diff -urNp linux-2.6.34/drivers/staging/panel/panel.c linux-2.6.34/drivers/staging/panel/panel.c
+--- linux-2.6.34/drivers/staging/panel/panel.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/panel/panel.c 2010-07-01 20:45:15.000000000 -0400
+@@ -1304,7 +1304,7 @@ static int lcd_release(struct inode *ino
        return 0;
  }
  
@@ -25954,7 +26894,7 @@ diff -urNp linux-2.6.33.1/drivers/staging/panel/panel.c linux-2.6.33.1/drivers/s
        .write   = lcd_write,
        .open    = lcd_open,
        .release = lcd_release,
-@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode *
+@@ -1564,7 +1564,7 @@ static int keypad_release(struct inode *
        return 0;
  }
  
@@ -25963,9 +26903,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/panel/panel.c linux-2.6.33.1/drivers/s
        .read    = keypad_read,         /* read */
        .open    = keypad_open,         /* open */
        .release = keypad_release,      /* close */
-diff -urNp linux-2.6.33.1/drivers/staging/phison/phison.c linux-2.6.33.1/drivers/staging/phison/phison.c
---- linux-2.6.33.1/drivers/staging/phison/phison.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/phison/phison.c     2010-03-20 16:58:40.896878917 -0400
+diff -urNp linux-2.6.34/drivers/staging/phison/phison.c linux-2.6.34/drivers/staging/phison/phison.c
+--- linux-2.6.34/drivers/staging/phison/phison.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/phison/phison.c       2010-07-01 20:45:15.000000000 -0400
 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
        ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25975,10 +26915,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/phison/phison.c linux-2.6.33.1/drivers
        .inherits               = &ata_bmdma_port_ops,
        .prereset               = phison_pre_reset,
  };
-diff -urNp linux-2.6.33.1/drivers/staging/poch/poch.c linux-2.6.33.1/drivers/staging/poch/poch.c
---- linux-2.6.33.1/drivers/staging/poch/poch.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/poch/poch.c 2010-03-20 16:58:40.920050870 -0400
-@@ -1032,7 +1032,7 @@ static int poch_ioctl(struct inode *inod
+diff -urNp linux-2.6.34/drivers/staging/poch/poch.c linux-2.6.34/drivers/staging/poch/poch.c
+--- linux-2.6.34/drivers/staging/poch/poch.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/poch/poch.c   2010-07-01 20:45:15.000000000 -0400
+@@ -1033,7 +1033,7 @@ static int poch_ioctl(struct inode *inod
        return 0;
  }
  
@@ -25987,9 +26927,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/poch/poch.c linux-2.6.33.1/drivers/sta
        .owner = THIS_MODULE,
        .open = poch_open,
        .release = poch_release,
-diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/inode.c linux-2.6.33.1/drivers/staging/pohmelfs/inode.c
---- linux-2.6.33.1/drivers/staging/pohmelfs/inode.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/pohmelfs/inode.c    2010-03-20 16:58:40.936891697 -0400
+diff -urNp linux-2.6.34/drivers/staging/pohmelfs/inode.c linux-2.6.34/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.34/drivers/staging/pohmelfs/inode.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/pohmelfs/inode.c      2010-07-01 20:45:15.000000000 -0400
 @@ -1854,7 +1854,7 @@ static int pohmelfs_fill_super(struct su
        mutex_init(&psb->mcache_lock);
        psb->mcache_root = RB_ROOT;
@@ -25999,9 +26939,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/inode.c linux-2.6.33.1/driver
  
        psb->trans_max_pages = 100;
  
-diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/mcache.c linux-2.6.33.1/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.33.1/drivers/staging/pohmelfs/mcache.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/pohmelfs/mcache.c   2010-03-20 16:58:40.936891697 -0400
+diff -urNp linux-2.6.34/drivers/staging/pohmelfs/mcache.c linux-2.6.34/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.34/drivers/staging/pohmelfs/mcache.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/pohmelfs/mcache.c     2010-07-01 20:45:15.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
        m->data = data;
        m->start = start;
@@ -26011,9 +26951,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/mcache.c linux-2.6.33.1/drive
  
        mutex_lock(&psb->mcache_lock);
        err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/netfs.h linux-2.6.33.1/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.33.1/drivers/staging/pohmelfs/netfs.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/pohmelfs/netfs.h    2010-03-20 16:58:40.940661223 -0400
+diff -urNp linux-2.6.34/drivers/staging/pohmelfs/netfs.h linux-2.6.34/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.34/drivers/staging/pohmelfs/netfs.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/pohmelfs/netfs.h      2010-07-01 20:45:15.000000000 -0400
 @@ -571,7 +571,7 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
        struct rb_root          mcache_root;
@@ -26023,10 +26963,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/pohmelfs/netfs.h linux-2.6.33.1/driver
        unsigned long           mcache_timeout;
  
        unsigned int            idx;
-diff -urNp linux-2.6.33.1/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.33.1/drivers/staging/ramzswap/ramzswap_drv.c
---- linux-2.6.33.1/drivers/staging/ramzswap/ramzswap_drv.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/ramzswap/ramzswap_drv.c     2010-03-20 16:58:40.944873774 -0400
-@@ -1288,7 +1288,7 @@ out:
+diff -urNp linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c
+--- linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/ramzswap/ramzswap_drv.c       2010-07-01 20:45:15.000000000 -0400
+@@ -1295,7 +1295,7 @@ out:
        return ret;
  }
  
@@ -26035,9 +26975,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.33.1
        .ioctl = ramzswap_ioctl,
        .owner = THIS_MODULE,
  };
-diff -urNp linux-2.6.33.1/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.33.1/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.33.1/drivers/staging/rtl8192u/ieee80211/proc.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/rtl8192u/ieee80211/proc.c   2010-03-20 16:58:40.944873774 -0400
+diff -urNp linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/rtl8192u/ieee80211/proc.c     2010-07-01 20:45:15.000000000 -0400
 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
        return seq_open(file, &crypto_seq_ops);
  }
@@ -26047,10 +26987,10 @@ diff -urNp linux-2.6.33.1/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.33
        .open           = crypto_info_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-diff -urNp linux-2.6.33.1/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.33.1/drivers/staging/samsung-laptop/samsung-laptop.c
---- linux-2.6.33.1/drivers/staging/samsung-laptop/samsung-laptop.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/samsung-laptop/samsung-laptop.c     2010-03-20 16:58:40.952877179 -0400
-@@ -268,7 +268,7 @@ static int update_status(struct backligh
+diff -urNp linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c
+--- linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/samsung-laptop/samsung-laptop.c       2010-07-01 20:45:15.000000000 -0400
+@@ -269,7 +269,7 @@ static int update_status(struct backligh
        return 0;
  }
  
@@ -26059,22 +26999,22 @@ diff -urNp linux-2.6.33.1/drivers/staging/samsung-laptop/samsung-laptop.c linux-
        .get_brightness = get_brightness,
        .update_status  = update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/staging/sep/sep_driver.c linux-2.6.33.1/drivers/staging/sep/sep_driver.c
---- linux-2.6.33.1/drivers/staging/sep/sep_driver.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/sep/sep_driver.c    2010-03-20 16:58:40.956865691 -0400
-@@ -2605,7 +2605,7 @@ static struct pci_driver sep_pci_driver 
+diff -urNp linux-2.6.34/drivers/staging/sep/sep_driver.c linux-2.6.34/drivers/staging/sep/sep_driver.c
+--- linux-2.6.34/drivers/staging/sep/sep_driver.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/sep/sep_driver.c      2010-07-01 20:45:15.000000000 -0400
+@@ -2610,7 +2610,7 @@ static struct pci_driver sep_pci_driver 
  static dev_t sep_devno;
  
  /* the files operations structure of the driver */
 -static struct file_operations sep_file_operations = {
 +static const struct file_operations sep_file_operations = {
        .owner = THIS_MODULE,
-       .ioctl = sep_ioctl,
+       .unlocked_ioctl = sep_ioctl,
        .poll = sep_poll,
-diff -urNp linux-2.6.33.1/drivers/staging/vme/devices/vme_user.c linux-2.6.33.1/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.33.1/drivers/staging/vme/devices/vme_user.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/staging/vme/devices/vme_user.c      2010-03-20 16:58:40.956865691 -0400
-@@ -135,7 +135,7 @@ static int vme_user_ioctl(struct inode *
+diff -urNp linux-2.6.34/drivers/staging/vme/devices/vme_user.c linux-2.6.34/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.34/drivers/staging/vme/devices/vme_user.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/staging/vme/devices/vme_user.c        2010-07-01 20:45:15.000000000 -0400
+@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
  static int __init vme_user_probe(struct device *, int, int);
  static int __exit vme_user_remove(struct device *, int, int);
  
@@ -26083,30 +27023,9 @@ diff -urNp linux-2.6.33.1/drivers/staging/vme/devices/vme_user.c linux-2.6.33.1/
          .open = vme_user_open,
          .release = vme_user_release,
          .read = vme_user_read,
-diff -urNp linux-2.6.33.1/drivers/uio/uio.c linux-2.6.33.1/drivers/uio/uio.c
---- linux-2.6.33.1/drivers/uio/uio.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/uio/uio.c   2010-03-20 16:58:40.964892465 -0400
-@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
-       return entry->show(mem, buf);
- }
- 
--static struct sysfs_ops map_sysfs_ops = {
-+static const struct sysfs_ops map_sysfs_ops = {
-       .show = map_type_show,
- };
- 
-@@ -217,7 +217,7 @@ static ssize_t portio_type_show(struct k
-       return entry->show(port, buf);
- }
- 
--static struct sysfs_ops portio_sysfs_ops = {
-+static const struct sysfs_ops portio_sysfs_ops = {
-       .show = portio_type_show,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/usb/atm/usbatm.c linux-2.6.33.1/drivers/usb/atm/usbatm.c
---- linux-2.6.33.1/drivers/usb/atm/usbatm.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/atm/usbatm.c    2010-03-20 16:58:40.976907794 -0400
+diff -urNp linux-2.6.34/drivers/usb/atm/usbatm.c linux-2.6.34/drivers/usb/atm/usbatm.c
+--- linux-2.6.34/drivers/usb/atm/usbatm.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/atm/usbatm.c      2010-07-01 20:45:15.000000000 -0400
 @@ -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",
@@ -26186,10 +27105,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/atm/usbatm.c linux-2.6.33.1/drivers/usb/at
  
        if (!left--) {
                if (instance->disconnected)
-diff -urNp linux-2.6.33.1/drivers/usb/class/cdc-acm.c linux-2.6.33.1/drivers/usb/class/cdc-acm.c
---- linux-2.6.33.1/drivers/usb/class/cdc-acm.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/class/cdc-acm.c 2010-03-20 16:58:40.993421809 -0400
-@@ -1590,7 +1590,7 @@ static struct usb_device_id acm_ids[] = 
+diff -urNp linux-2.6.34/drivers/usb/class/cdc-acm.c linux-2.6.34/drivers/usb/class/cdc-acm.c
+--- linux-2.6.34/drivers/usb/class/cdc-acm.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/class/cdc-acm.c   2010-07-01 20:45:15.000000000 -0400
+@@ -1616,7 +1616,7 @@ static const struct usb_device_id acm_id
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
                USB_CDC_ACM_PROTO_AT_CDMA) },
  
@@ -26198,10 +27117,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/class/cdc-acm.c linux-2.6.33.1/drivers/usb
  };
  
  MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.33.1/drivers/usb/class/usblp.c linux-2.6.33.1/drivers/usb/class/usblp.c
---- linux-2.6.33.1/drivers/usb/class/usblp.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/class/usblp.c   2010-03-20 16:58:41.016571934 -0400
-@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
+diff -urNp linux-2.6.34/drivers/usb/class/usblp.c linux-2.6.34/drivers/usb/class/usblp.c
+--- linux-2.6.34/drivers/usb/class/usblp.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/class/usblp.c     2010-07-01 20:45:15.000000000 -0400
+@@ -226,7 +226,7 @@ static const struct quirk_printer_struct
        { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
        { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
        { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */
@@ -26210,7 +27129,7 @@ diff -urNp linux-2.6.33.1/drivers/usb/class/usblp.c linux-2.6.33.1/drivers/usb/c
  };
  
  static int usblp_wwait(struct usblp *usblp, int nonblock);
-@@ -1412,7 +1412,7 @@ static struct usb_device_id usblp_ids []
+@@ -1398,7 +1398,7 @@ static const struct usb_device_id usblp_
        { USB_INTERFACE_INFO(7, 1, 2) },
        { USB_INTERFACE_INFO(7, 1, 3) },
        { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */
@@ -26219,10 +27138,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/class/usblp.c linux-2.6.33.1/drivers/usb/c
  };
  
  MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.c linux-2.6.33.1/drivers/usb/core/hcd.c
---- linux-2.6.33.1/drivers/usb/core/hcd.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/core/hcd.c      2010-03-20 16:58:41.020890314 -0400
-@@ -2266,7 +2266,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
+diff -urNp linux-2.6.34/drivers/usb/core/hcd.c linux-2.6.34/drivers/usb/core/hcd.c
+--- linux-2.6.34/drivers/usb/core/hcd.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/core/hcd.c        2010-07-01 20:45:15.000000000 -0400
+@@ -2275,7 +2275,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
@@ -26231,7 +27150,7 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.c linux-2.6.33.1/drivers/usb/core
  
  /*
   * The registration is unlocked.
-@@ -2276,7 +2276,7 @@ struct usb_mon_operations *mon_ops;
+@@ -2285,7 +2285,7 @@ struct usb_mon_operations *mon_ops;
   * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
   */
   
@@ -26240,10 +27159,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.c linux-2.6.33.1/drivers/usb/core
  {
  
        if (mon_ops)
-diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.h linux-2.6.33.1/drivers/usb/core/hcd.h
---- linux-2.6.33.1/drivers/usb/core/hcd.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/core/hcd.h      2010-03-20 16:58:41.032566122 -0400
-@@ -501,13 +501,13 @@ static inline void usbfs_cleanup(void) {
+diff -urNp linux-2.6.34/drivers/usb/core/hcd.h linux-2.6.34/drivers/usb/core/hcd.h
+--- linux-2.6.34/drivers/usb/core/hcd.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/core/hcd.h        2010-07-01 20:45:15.000000000 -0400
+@@ -506,13 +506,13 @@ static inline void usbfs_cleanup(void) {
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
  struct usb_mon_operations {
@@ -26261,7 +27180,7 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.h linux-2.6.33.1/drivers/usb/core
  
  static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
  {
-@@ -529,7 +529,7 @@ static inline void usbmon_urb_complete(s
+@@ -534,7 +534,7 @@ static inline void usbmon_urb_complete(s
                (*mon_ops->urb_complete)(bus, urb, status);
  }
  
@@ -26270,10 +27189,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/hcd.h linux-2.6.33.1/drivers/usb/core
  void usb_mon_deregister(void);
  
  #else
-diff -urNp linux-2.6.33.1/drivers/usb/core/hub.c linux-2.6.33.1/drivers/usb/core/hub.c
---- linux-2.6.33.1/drivers/usb/core/hub.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/core/hub.c      2010-03-20 16:58:41.044569139 -0400
-@@ -3462,7 +3462,7 @@ static struct usb_device_id hub_id_table
+diff -urNp linux-2.6.34/drivers/usb/core/hub.c linux-2.6.34/drivers/usb/core/hub.c
+--- linux-2.6.34/drivers/usb/core/hub.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/core/hub.c        2010-07-01 20:45:15.000000000 -0400
+@@ -3437,7 +3437,7 @@ static const struct usb_device_id hub_id
        .bDeviceClass = USB_CLASS_HUB},
      { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
        .bInterfaceClass = USB_CLASS_HUB},
@@ -26282,9 +27201,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/hub.c linux-2.6.33.1/drivers/usb/core
  };
  
  MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.33.1/drivers/usb/core/message.c linux-2.6.33.1/drivers/usb/core/message.c
---- linux-2.6.33.1/drivers/usb/core/message.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/core/message.c  2010-03-20 16:58:41.048891316 -0400
+diff -urNp linux-2.6.34/drivers/usb/core/message.c linux-2.6.34/drivers/usb/core/message.c
+--- linux-2.6.34/drivers/usb/core/message.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/core/message.c    2010-07-01 20:45:15.000000000 -0400
 @@ -909,8 +909,8 @@ char *usb_cache_string(struct usb_device
        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
        if (buf) {
@@ -26296,9 +27215,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/core/message.c linux-2.6.33.1/drivers/usb/
                        if (!smallbuf)
                                return buf;
                        memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.33.1/drivers/usb/host/ehci-pci.c linux-2.6.33.1/drivers/usb/host/ehci-pci.c
---- linux-2.6.33.1/drivers/usb/host/ehci-pci.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/host/ehci-pci.c 2010-03-20 16:58:41.060592249 -0400
+diff -urNp linux-2.6.34/drivers/usb/host/ehci-pci.c linux-2.6.34/drivers/usb/host/ehci-pci.c
+--- linux-2.6.34/drivers/usb/host/ehci-pci.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/host/ehci-pci.c   2010-07-01 20:45:15.000000000 -0400
 @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
        .driver_data =  (unsigned long) &ehci_pci_hc_driver,
@@ -26308,9 +27227,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/host/ehci-pci.c linux-2.6.33.1/drivers/usb
  };
  MODULE_DEVICE_TABLE(pci, pci_ids);
  
-diff -urNp linux-2.6.33.1/drivers/usb/host/uhci-hcd.c linux-2.6.33.1/drivers/usb/host/uhci-hcd.c
---- linux-2.6.33.1/drivers/usb/host/uhci-hcd.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/host/uhci-hcd.c 2010-03-20 16:58:41.072592318 -0400
+diff -urNp linux-2.6.34/drivers/usb/host/uhci-hcd.c linux-2.6.34/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.34/drivers/usb/host/uhci-hcd.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/host/uhci-hcd.c   2010-07-01 20:45:15.000000000 -0400
 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
        /* handle any USB UHCI controller */
        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -26320,22 +27239,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/host/uhci-hcd.c linux-2.6.33.1/drivers/usb
  };
  
  MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.33.1/drivers/usb/misc/appledisplay.c linux-2.6.33.1/drivers/usb/misc/appledisplay.c
---- linux-2.6.33.1/drivers/usb/misc/appledisplay.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/misc/appledisplay.c     2010-03-20 16:58:41.076561776 -0400
-@@ -179,7 +179,7 @@ static int appledisplay_bl_get_brightnes
-               return pdata->msgdata[1];
- }
- 
--static struct backlight_ops appledisplay_bl_data = {
-+static const struct backlight_ops appledisplay_bl_data = {
-       .get_brightness = appledisplay_bl_get_brightness,
-       .update_status  = appledisplay_bl_update_status,
- };
-diff -urNp linux-2.6.33.1/drivers/usb/mon/mon_main.c linux-2.6.33.1/drivers/usb/mon/mon_main.c
---- linux-2.6.33.1/drivers/usb/mon/mon_main.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/mon/mon_main.c  2010-03-20 16:58:41.084588620 -0400
-@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
+diff -urNp linux-2.6.34/drivers/usb/mon/mon_main.c linux-2.6.34/drivers/usb/mon/mon_main.c
+--- linux-2.6.34/drivers/usb/mon/mon_main.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/mon/mon_main.c    2010-07-01 20:45:15.000000000 -0400
+@@ -239,7 +239,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
   */
@@ -26344,9 +27251,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/mon/mon_main.c linux-2.6.33.1/drivers/usb/
        .urb_submit =   mon_submit,
        .urb_submit_error = mon_submit_error,
        .urb_complete = mon_complete,
-diff -urNp linux-2.6.33.1/drivers/usb/storage/debug.h linux-2.6.33.1/drivers/usb/storage/debug.h
---- linux-2.6.33.1/drivers/usb/storage/debug.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/storage/debug.h 2010-03-20 16:58:41.084588620 -0400
+diff -urNp linux-2.6.34/drivers/usb/storage/debug.h linux-2.6.34/drivers/usb/storage/debug.h
+--- linux-2.6.34/drivers/usb/storage/debug.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/storage/debug.h   2010-07-01 20:45:15.000000000 -0400
 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 
  #define US_DEBUGPX(x...) printk( x )
  #define US_DEBUG(x) x 
@@ -26360,9 +27267,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/storage/debug.h linux-2.6.33.1/drivers/usb
  #endif
  
  #endif
-diff -urNp linux-2.6.33.1/drivers/usb/storage/usb.c linux-2.6.33.1/drivers/usb/storage/usb.c
---- linux-2.6.33.1/drivers/usb/storage/usb.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/storage/usb.c   2010-03-20 16:58:41.084588620 -0400
+diff -urNp linux-2.6.34/drivers/usb/storage/usb.c linux-2.6.34/drivers/usb/storage/usb.c
+--- linux-2.6.34/drivers/usb/storage/usb.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/storage/usb.c     2010-07-01 20:45:15.000000000 -0400
 @@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
  
  static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -26372,9 +27279,9 @@ diff -urNp linux-2.6.33.1/drivers/usb/storage/usb.c linux-2.6.33.1/drivers/usb/s
  };
  
  #undef UNUSUAL_DEV
-diff -urNp linux-2.6.33.1/drivers/usb/storage/usual-tables.c linux-2.6.33.1/drivers/usb/storage/usual-tables.c
---- linux-2.6.33.1/drivers/usb/storage/usual-tables.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/usb/storage/usual-tables.c  2010-03-20 16:58:41.084588620 -0400
+diff -urNp linux-2.6.34/drivers/usb/storage/usual-tables.c linux-2.6.34/drivers/usb/storage/usual-tables.c
+--- linux-2.6.34/drivers/usb/storage/usual-tables.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/usb/storage/usual-tables.c    2010-07-01 20:45:15.000000000 -0400
 @@ -48,7 +48,7 @@
  
  struct usb_device_id usb_storage_usb_ids[] = {
@@ -26384,10 +27291,10 @@ diff -urNp linux-2.6.33.1/drivers/usb/storage/usual-tables.c linux-2.6.33.1/driv
  };
  EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
  
-diff -urNp linux-2.6.33.1/drivers/uwb/wlp/messages.c linux-2.6.33.1/drivers/uwb/wlp/messages.c
---- linux-2.6.33.1/drivers/uwb/wlp/messages.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/uwb/wlp/messages.c  2010-03-20 16:58:41.096879476 -0400
-@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
+diff -urNp linux-2.6.34/drivers/uwb/wlp/messages.c linux-2.6.34/drivers/uwb/wlp/messages.c
+--- linux-2.6.34/drivers/uwb/wlp/messages.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/uwb/wlp/messages.c    2010-07-01 20:45:15.000000000 -0400
+@@ -920,7 +920,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
        size_t len = skb->len;
        size_t used;
        ssize_t result;
@@ -26396,23 +27303,10 @@ diff -urNp linux-2.6.33.1/drivers/uwb/wlp/messages.c linux-2.6.33.1/drivers/uwb/
        enum wlp_assc_error assc_err;
        char enonce_buf[WLP_WSS_NONCE_STRSIZE];
        char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.33.1/drivers/uwb/wlp/sysfs.c linux-2.6.33.1/drivers/uwb/wlp/sysfs.c
---- linux-2.6.33.1/drivers/uwb/wlp/sysfs.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/uwb/wlp/sysfs.c     2010-03-20 16:58:41.104559489 -0400
-@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
-       return ret;
- }
- 
--static
--struct sysfs_ops wss_sysfs_ops = {
-+static const struct sysfs_ops wss_sysfs_ops = {
-       .show   = wlp_wss_attr_show,
-       .store  = wlp_wss_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/video/atmel_lcdfb.c linux-2.6.33.1/drivers/video/atmel_lcdfb.c
---- linux-2.6.33.1/drivers/video/atmel_lcdfb.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/atmel_lcdfb.c 2010-03-20 16:58:41.116887355 -0400
-@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
+diff -urNp linux-2.6.34/drivers/video/atmel_lcdfb.c linux-2.6.34/drivers/video/atmel_lcdfb.c
+--- linux-2.6.34/drivers/video/atmel_lcdfb.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/atmel_lcdfb.c   2010-07-01 20:45:15.000000000 -0400
+@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
        return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
  }
  
@@ -26421,10 +27315,10 @@ diff -urNp linux-2.6.33.1/drivers/video/atmel_lcdfb.c linux-2.6.33.1/drivers/vid
        .update_status = atmel_bl_update_status,
        .get_brightness = atmel_bl_get_brightness,
  };
-diff -urNp linux-2.6.33.1/drivers/video/aty/aty128fb.c linux-2.6.33.1/drivers/video/aty/aty128fb.c
---- linux-2.6.33.1/drivers/video/aty/aty128fb.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/aty/aty128fb.c        2010-03-20 16:58:41.141056447 -0400
-@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
+diff -urNp linux-2.6.34/drivers/video/aty/aty128fb.c linux-2.6.34/drivers/video/aty/aty128fb.c
+--- linux-2.6.34/drivers/video/aty/aty128fb.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/aty/aty128fb.c  2010-07-01 20:45:15.000000000 -0400
+@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
        return bd->props.brightness;
  }
  
@@ -26433,9 +27327,9 @@ diff -urNp linux-2.6.33.1/drivers/video/aty/aty128fb.c linux-2.6.33.1/drivers/vi
        .get_brightness = aty128_bl_get_brightness,
        .update_status  = aty128_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/aty/atyfb_base.c linux-2.6.33.1/drivers/video/aty/atyfb_base.c
---- linux-2.6.33.1/drivers/video/aty/atyfb_base.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/aty/atyfb_base.c      2010-03-20 16:58:41.141056447 -0400
+diff -urNp linux-2.6.34/drivers/video/aty/atyfb_base.c linux-2.6.34/drivers/video/aty/atyfb_base.c
+--- linux-2.6.34/drivers/video/aty/atyfb_base.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/aty/atyfb_base.c        2010-07-01 20:45:15.000000000 -0400
 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 
        return bd->props.brightness;
  }
@@ -26445,10 +27339,10 @@ diff -urNp linux-2.6.33.1/drivers/video/aty/atyfb_base.c linux-2.6.33.1/drivers/
        .get_brightness = aty_bl_get_brightness,
        .update_status  = aty_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/aty/radeon_backlight.c linux-2.6.33.1/drivers/video/aty/radeon_backlight.c
---- linux-2.6.33.1/drivers/video/aty/radeon_backlight.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/aty/radeon_backlight.c        2010-03-20 16:58:41.144609392 -0400
-@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
+diff -urNp linux-2.6.34/drivers/video/aty/radeon_backlight.c linux-2.6.34/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.34/drivers/video/aty/radeon_backlight.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/aty/radeon_backlight.c  2010-07-01 20:45:15.000000000 -0400
+@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
        return bd->props.brightness;
  }
  
@@ -26457,33 +27351,46 @@ diff -urNp linux-2.6.33.1/drivers/video/aty/radeon_backlight.c linux-2.6.33.1/dr
        .get_brightness = radeon_bl_get_brightness,
        .update_status  = radeon_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/bf54x-lq043fb.c linux-2.6.33.1/drivers/video/bf54x-lq043fb.c
---- linux-2.6.33.1/drivers/video/bf54x-lq043fb.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/bf54x-lq043fb.c       2010-03-20 16:58:41.172899299 -0400
-@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
-       return 0;
- }
- 
--static struct backlight_ops bfin_lq043fb_bl_ops = {
-+static const struct backlight_ops bfin_lq043fb_bl_ops = {
-       .get_brightness = bl_get_brightness,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/video/bfin-t350mcqb-fb.c linux-2.6.33.1/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.33.1/drivers/video/bfin-t350mcqb-fb.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/bfin-t350mcqb-fb.c    2010-03-20 16:58:41.172899299 -0400
-@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
-       return 0;
+diff -urNp linux-2.6.34/drivers/video/backlight/88pm860x_bl.c linux-2.6.34/drivers/video/backlight/88pm860x_bl.c
+--- linux-2.6.34/drivers/video/backlight/88pm860x_bl.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/backlight/88pm860x_bl.c 2010-07-01 20:45:15.000000000 -0400
+@@ -155,7 +155,7 @@ out:
+       return -EINVAL;
+ }
+ 
+-static struct backlight_ops pm860x_backlight_ops = {
++static const struct backlight_ops pm860x_backlight_ops = {
+       .options        = BL_CORE_SUSPENDRESUME,
+       .update_status  = pm860x_backlight_update_status,
+       .get_brightness = pm860x_backlight_get_brightness,
+diff -urNp linux-2.6.34/drivers/video/backlight/max8925_bl.c linux-2.6.34/drivers/video/backlight/max8925_bl.c
+--- linux-2.6.34/drivers/video/backlight/max8925_bl.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/backlight/max8925_bl.c  2010-07-01 20:45:15.000000000 -0400
+@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
+       return ret;
  }
  
--static struct backlight_ops bfin_lq043fb_bl_ops = {
-+static const struct backlight_ops bfin_lq043fb_bl_ops = {
-       .get_brightness = bl_get_brightness,
- };
- 
-diff -urNp linux-2.6.33.1/drivers/video/fbmem.c linux-2.6.33.1/drivers/video/fbmem.c
---- linux-2.6.33.1/drivers/video/fbmem.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/fbmem.c       2010-03-20 16:58:41.176758490 -0400
+-static struct backlight_ops max8925_backlight_ops = {
++static const struct backlight_ops max8925_backlight_ops = {
+       .options        = BL_CORE_SUSPENDRESUME,
+       .update_status  = max8925_backlight_update_status,
+       .get_brightness = max8925_backlight_get_brightness,
+diff -urNp linux-2.6.34/drivers/video/fbcmap.c linux-2.6.34/drivers/video/fbcmap.c
+--- linux-2.6.34/drivers/video/fbcmap.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/fbcmap.c        2010-07-01 20:45:15.000000000 -0400
+@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
+               rc = -ENODEV;
+               goto out;
+       }
+-      if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+-                              !info->fbops->fb_setcmap)) {
++      if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
+               rc = -EINVAL;
+               goto out1;
+       }
+diff -urNp linux-2.6.34/drivers/video/fbmem.c linux-2.6.34/drivers/video/fbmem.c
+--- linux-2.6.34/drivers/video/fbmem.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/fbmem.c 2010-07-01 20:45:15.000000000 -0400
 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
                        image->dx += image->width + 8;
                }
@@ -26511,10 +27418,10 @@ diff -urNp linux-2.6.33.1/drivers/video/fbmem.c linux-2.6.33.1/drivers/video/fbm
                        return -EINVAL;
                if (!registered_fb[con2fb.framebuffer])
                        request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.33.1/drivers/video/fbmon.c linux-2.6.33.1/drivers/video/fbmon.c
---- linux-2.6.33.1/drivers/video/fbmon.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/fbmon.c       2010-03-20 16:58:41.184890729 -0400
-@@ -45,7 +45,7 @@
+diff -urNp linux-2.6.34/drivers/video/fbmon.c linux-2.6.34/drivers/video/fbmon.c
+--- linux-2.6.34/drivers/video/fbmon.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/fbmon.c 2010-07-01 20:45:15.000000000 -0400
+@@ -46,7 +46,7 @@
  #ifdef DEBUG
  #define DPRINTK(fmt, args...) printk(fmt,## args)
  #else
@@ -26523,9 +27430,9 @@ diff -urNp linux-2.6.33.1/drivers/video/fbmon.c linux-2.6.33.1/drivers/video/fbm
  #endif
  
  #define FBMON_FIX_HEADER  1
-diff -urNp linux-2.6.33.1/drivers/video/i810/i810_accel.c linux-2.6.33.1/drivers/video/i810/i810_accel.c
---- linux-2.6.33.1/drivers/video/i810/i810_accel.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/i810/i810_accel.c     2010-03-20 16:58:41.188702176 -0400
+diff -urNp linux-2.6.34/drivers/video/i810/i810_accel.c linux-2.6.34/drivers/video/i810/i810_accel.c
+--- linux-2.6.34/drivers/video/i810/i810_accel.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/i810/i810_accel.c       2010-07-01 20:45:15.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
                }
        }
@@ -26534,9 +27441,9 @@ diff -urNp linux-2.6.33.1/drivers/video/i810/i810_accel.c linux-2.6.33.1/drivers
        i810_report_error(mmio); 
        par->dev_flags |= LOCKUP;
        info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.33.1/drivers/video/i810/i810_main.c linux-2.6.33.1/drivers/video/i810/i810_main.c
---- linux-2.6.33.1/drivers/video/i810/i810_main.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/i810/i810_main.c      2010-03-20 16:58:41.196891711 -0400
+diff -urNp linux-2.6.34/drivers/video/i810/i810_main.c linux-2.6.34/drivers/video/i810/i810_main.c
+--- linux-2.6.34/drivers/video/i810/i810_main.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/i810/i810_main.c        2010-07-01 20:45:15.000000000 -0400
 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -26546,10 +27453,10 @@ diff -urNp linux-2.6.33.1/drivers/video/i810/i810_main.c linux-2.6.33.1/drivers/
  };
  
  static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.33.1/drivers/video/modedb.c linux-2.6.33.1/drivers/video/modedb.c
---- linux-2.6.33.1/drivers/video/modedb.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/modedb.c      2010-03-20 16:58:41.200859456 -0400
-@@ -39,240 +39,240 @@ static const struct fb_videomode modedb[
+diff -urNp linux-2.6.34/drivers/video/modedb.c linux-2.6.34/drivers/video/modedb.c
+--- linux-2.6.34/drivers/video/modedb.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/modedb.c        2010-07-01 20:45:15.000000000 -0400
+@@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
      {
        /* 640x400 @ 70 Hz, 31.5 kHz hsync */
        NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,
@@ -26849,9 +27756,9 @@ diff -urNp linux-2.6.33.1/drivers/video/modedb.c linux-2.6.33.1/drivers/video/mo
      },
  };
  
-diff -urNp linux-2.6.33.1/drivers/video/nvidia/nv_backlight.c linux-2.6.33.1/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.33.1/drivers/video/nvidia/nv_backlight.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/nvidia/nv_backlight.c 2010-03-20 16:58:41.200859456 -0400
+diff -urNp linux-2.6.34/drivers/video/nvidia/nv_backlight.c linux-2.6.34/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.34/drivers/video/nvidia/nv_backlight.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/nvidia/nv_backlight.c   2010-07-01 20:45:15.000000000 -0400
 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
        return bd->props.brightness;
  }
@@ -26861,10 +27768,10 @@ diff -urNp linux-2.6.33.1/drivers/video/nvidia/nv_backlight.c linux-2.6.33.1/dri
        .get_brightness = nvidia_bl_get_brightness,
        .update_status  = nvidia_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/omap2/displays/panel-taal.c linux-2.6.33.1/drivers/video/omap2/displays/panel-taal.c
---- linux-2.6.33.1/drivers/video/omap2/displays/panel-taal.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/omap2/displays/panel-taal.c   2010-03-20 16:58:41.208900904 -0400
-@@ -313,7 +313,7 @@ static int taal_bl_get_intensity(struct 
+diff -urNp linux-2.6.34/drivers/video/omap2/displays/panel-taal.c linux-2.6.34/drivers/video/omap2/displays/panel-taal.c
+--- linux-2.6.34/drivers/video/omap2/displays/panel-taal.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/omap2/displays/panel-taal.c     2010-07-01 20:45:15.000000000 -0400
+@@ -316,7 +316,7 @@ static int taal_bl_get_intensity(struct 
        return 0;
  }
  
@@ -26873,33 +27780,9 @@ diff -urNp linux-2.6.33.1/drivers/video/omap2/displays/panel-taal.c linux-2.6.33
        .get_brightness = taal_bl_get_intensity,
        .update_status  = taal_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/omap2/dss/manager.c linux-2.6.33.1/drivers/video/omap2/dss/manager.c
---- linux-2.6.33.1/drivers/video/omap2/dss/manager.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/omap2/dss/manager.c   2010-03-20 16:58:41.220903696 -0400
-@@ -341,7 +341,7 @@ static ssize_t manager_attr_store(struct
-       return manager_attr->store(manager, buf, size);
- }
- 
--static struct sysfs_ops manager_sysfs_ops = {
-+static const struct sysfs_ops manager_sysfs_ops = {
-       .show = manager_attr_show,
-       .store = manager_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/video/omap2/dss/overlay.c linux-2.6.33.1/drivers/video/omap2/dss/overlay.c
---- linux-2.6.33.1/drivers/video/omap2/dss/overlay.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/omap2/dss/overlay.c   2010-03-20 16:58:41.220903696 -0400
-@@ -320,7 +320,7 @@ static ssize_t overlay_attr_store(struct
-       return overlay_attr->store(overlay, buf, size);
- }
- 
--static struct sysfs_ops overlay_sysfs_ops = {
-+static const struct sysfs_ops overlay_sysfs_ops = {
-       .show = overlay_attr_show,
-       .store = overlay_attr_store,
- };
-diff -urNp linux-2.6.33.1/drivers/video/riva/fbdev.c linux-2.6.33.1/drivers/video/riva/fbdev.c
---- linux-2.6.33.1/drivers/video/riva/fbdev.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/riva/fbdev.c  2010-03-20 16:58:41.252568052 -0400
+diff -urNp linux-2.6.34/drivers/video/riva/fbdev.c linux-2.6.34/drivers/video/riva/fbdev.c
+--- linux-2.6.34/drivers/video/riva/fbdev.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/riva/fbdev.c    2010-07-01 20:45:15.000000000 -0400
 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
        return bd->props.brightness;
  }
@@ -26909,18 +27792,18 @@ diff -urNp linux-2.6.33.1/drivers/video/riva/fbdev.c linux-2.6.33.1/drivers/vide
        .get_brightness = riva_bl_get_brightness,
        .update_status  = riva_bl_update_status,
  };
-diff -urNp linux-2.6.33.1/drivers/video/uvesafb.c linux-2.6.33.1/drivers/video/uvesafb.c
---- linux-2.6.33.1/drivers/video/uvesafb.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/uvesafb.c     2010-03-20 16:58:41.260895734 -0400
-@@ -18,6 +18,7 @@
- #include <linux/fb.h>
+diff -urNp linux-2.6.34/drivers/video/uvesafb.c linux-2.6.34/drivers/video/uvesafb.c
+--- linux-2.6.34/drivers/video/uvesafb.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/uvesafb.c       2010-07-01 20:45:15.000000000 -0400
+@@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
+ #include <linux/slab.h>
 +#include <linux/moduleloader.h>
  #include <video/edid.h>
  #include <video/uvesafb.h>
  #ifdef CONFIG_X86
-@@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
+@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
                NULL,
        };
  
@@ -26929,7 +27812,7 @@ diff -urNp linux-2.6.33.1/drivers/video/uvesafb.c linux-2.6.33.1/drivers/video/u
  }
  
  /*
-@@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(
+@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(
        if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
                par->pmi_setpal = par->ypan = 0;
        } else {
@@ -26962,7 +27845,7 @@ diff -urNp linux-2.6.33.1/drivers/video/uvesafb.c linux-2.6.33.1/drivers/video/u
                printk(KERN_INFO "uvesafb: protected mode interface info at "
                                 "%04x:%04x\n",
                                 (u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -1799,6 +1822,11 @@ out:
+@@ -1800,6 +1823,11 @@ out:
        if (par->vbe_modes)
                kfree(par->vbe_modes);
  
@@ -26974,7 +27857,7 @@ diff -urNp linux-2.6.33.1/drivers/video/uvesafb.c linux-2.6.33.1/drivers/video/u
        framebuffer_release(info);
        return err;
  }
-@@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platfor
+@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platfor
                                kfree(par->vbe_state_orig);
                        if (par->vbe_state_saved)
                                kfree(par->vbe_state_saved);
@@ -26987,9 +27870,9 @@ diff -urNp linux-2.6.33.1/drivers/video/uvesafb.c linux-2.6.33.1/drivers/video/u
                }
  
                framebuffer_release(info);
-diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/vesafb.c
---- linux-2.6.33.1/drivers/video/vesafb.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/video/vesafb.c      2010-03-20 16:58:41.264903169 -0400
+diff -urNp linux-2.6.34/drivers/video/vesafb.c linux-2.6.34/drivers/video/vesafb.c
+--- linux-2.6.34/drivers/video/vesafb.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/drivers/video/vesafb.c        2010-07-01 20:45:15.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -26998,7 +27881,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-@@ -53,8 +54,8 @@ static int   vram_remap __initdata;          /* 
+@@ -52,8 +53,8 @@ static int   vram_remap __initdata;          /* 
  static int   vram_total __initdata;           /* Set total amount of memory */
  static int   pmi_setpal __read_mostly = 1;    /* pmi for palette changes ??? */
  static int   ypan       __read_mostly;                /* 0..nothing, 1..ypan, 2..ywrap */
@@ -27009,7 +27892,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
  static int   depth      __read_mostly;
  static int   vga_compat __read_mostly;
  /* --------------------------------------------------------------------- */
-@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct pl
+@@ -232,6 +233,7 @@ static int __init vesafb_probe(struct pl
        unsigned int size_vmode;
        unsigned int size_remap;
        unsigned int size_total;
@@ -27017,7 +27900,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
  
        if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
                return -ENODEV;
-@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct pl
+@@ -274,10 +276,6 @@ static int __init vesafb_probe(struct pl
                size_remap = size_total;
        vesafb_fix.smem_len = size_remap;
  
@@ -27028,7 +27911,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
        if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
                printk(KERN_WARNING
                       "vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -315,9 +313,21 @@ static int __init vesafb_probe(struct pl
+@@ -314,9 +312,21 @@ static int __init vesafb_probe(struct pl
        printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
               vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
  
@@ -27052,7 +27935,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
        }
  
        if (screen_info.vesapm_seg < 0xc000)
-@@ -325,9 +335,25 @@ static int __init vesafb_probe(struct pl
+@@ -324,9 +334,25 @@ static int __init vesafb_probe(struct pl
  
        if (ypan || pmi_setpal) {
                unsigned short *pmi_base;
@@ -27081,7 +27964,7 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
                printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
                if (pmi_base[3]) {
                        printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -469,6 +495,11 @@ static int __init vesafb_probe(struct pl
+@@ -468,6 +494,11 @@ static int __init vesafb_probe(struct pl
               info->node, info->fix.id);
        return 0;
  err:
@@ -27093,22 +27976,10 @@ diff -urNp linux-2.6.33.1/drivers/video/vesafb.c linux-2.6.33.1/drivers/video/ve
        if (info->screen_base)
                iounmap(info->screen_base);
        framebuffer_release(info);
-diff -urNp linux-2.6.33.1/drivers/xen/sys-hypervisor.c linux-2.6.33.1/drivers/xen/sys-hypervisor.c
---- linux-2.6.33.1/drivers/xen/sys-hypervisor.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/drivers/xen/sys-hypervisor.c        2010-03-20 16:58:41.272886902 -0400
-@@ -426,7 +426,7 @@ static ssize_t hyp_sysfs_store(struct ko
-       return 0;
- }
- 
--static struct sysfs_ops hyp_sysfs_ops = {
-+static const struct sysfs_ops hyp_sysfs_ops = {
-       .show = hyp_sysfs_show,
-       .store = hyp_sysfs_store,
- };
-diff -urNp linux-2.6.33.1/fs/9p/vfs_inode.c linux-2.6.33.1/fs/9p/vfs_inode.c
---- linux-2.6.33.1/fs/9p/vfs_inode.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/9p/vfs_inode.c   2010-03-20 16:58:41.284893283 -0400
-@@ -1041,7 +1041,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-2.6.34/fs/9p/vfs_inode.c linux-2.6.34/fs/9p/vfs_inode.c
+--- linux-2.6.34/fs/9p/vfs_inode.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/9p/vfs_inode.c     2010-07-01 20:45:15.000000000 -0400
+@@ -1067,7 +1067,7 @@ static void *v9fs_vfs_follow_link(struct
  static void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -27117,9 +27988,9 @@ diff -urNp linux-2.6.33.1/fs/9p/vfs_inode.c linux-2.6.33.1/fs/9p/vfs_inode.c
  
        P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
                IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.33.1/fs/aio.c linux-2.6.33.1/fs/aio.c
---- linux-2.6.33.1/fs/aio.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/aio.c    2010-03-20 16:58:41.305540612 -0400
+diff -urNp linux-2.6.34/fs/aio.c linux-2.6.34/fs/aio.c
+--- linux-2.6.34/fs/aio.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/aio.c      2010-07-01 20:45:15.000000000 -0400
 @@ -129,7 +129,7 @@ static int aio_setup_ring(struct kioctx 
        size += sizeof(struct io_event) * nr_events;
        nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -27129,21 +28000,21 @@ diff -urNp linux-2.6.33.1/fs/aio.c linux-2.6.33.1/fs/aio.c
                return -EINVAL;
  
        nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.33.1/fs/attr.c linux-2.6.33.1/fs/attr.c
---- linux-2.6.33.1/fs/attr.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/attr.c   2010-03-20 16:58:41.305540612 -0400
-@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 
+diff -urNp linux-2.6.34/fs/attr.c linux-2.6.34/fs/attr.c
+--- linux-2.6.34/fs/attr.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/attr.c     2010-07-01 20:49:07.000000000 -0400
+@@ -82,6 +82,7 @@ int inode_newsize_ok(const struct inode 
                unsigned long limit;
  
-               limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
+               limit = rlimit(RLIMIT_FSIZE);
 +              gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
                if (limit != RLIM_INFINITY && offset > limit)
                        goto out_sig;
                if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.33.1/fs/autofs/root.c linux-2.6.33.1/fs/autofs/root.c
---- linux-2.6.33.1/fs/autofs/root.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/autofs/root.c    2010-03-20 16:58:41.316888614 -0400
-@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
+diff -urNp linux-2.6.34/fs/autofs/root.c linux-2.6.34/fs/autofs/root.c
+--- linux-2.6.34/fs/autofs/root.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/autofs/root.c      2010-07-01 20:45:15.000000000 -0400
+@@ -300,7 +300,8 @@ static int autofs_root_symlink(struct in
        set_bit(n,sbi->symlink_bitmap);
        sl = &sbi->symlink[n];
        sl->len = strlen(symname);
@@ -27153,9 +28024,9 @@ diff -urNp linux-2.6.33.1/fs/autofs/root.c linux-2.6.33.1/fs/autofs/root.c
        if (!sl->data) {
                clear_bit(n,sbi->symlink_bitmap);
                unlock_kernel();
-diff -urNp linux-2.6.33.1/fs/autofs4/symlink.c linux-2.6.33.1/fs/autofs4/symlink.c
---- linux-2.6.33.1/fs/autofs4/symlink.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/autofs4/symlink.c        2010-03-20 16:58:41.324896891 -0400
+diff -urNp linux-2.6.34/fs/autofs4/symlink.c linux-2.6.34/fs/autofs4/symlink.c
+--- linux-2.6.34/fs/autofs4/symlink.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/autofs4/symlink.c  2010-07-01 20:45:15.000000000 -0400
 @@ -15,7 +15,7 @@
  static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
@@ -27165,9 +28036,9 @@ diff -urNp linux-2.6.33.1/fs/autofs4/symlink.c linux-2.6.33.1/fs/autofs4/symlink
        return NULL;
  }
  
-diff -urNp linux-2.6.33.1/fs/befs/linuxvfs.c linux-2.6.33.1/fs/befs/linuxvfs.c
---- linux-2.6.33.1/fs/befs/linuxvfs.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/befs/linuxvfs.c  2010-03-20 16:58:41.332900573 -0400
+diff -urNp linux-2.6.34/fs/befs/linuxvfs.c linux-2.6.34/fs/befs/linuxvfs.c
+--- linux-2.6.34/fs/befs/linuxvfs.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/befs/linuxvfs.c    2010-07-01 20:45:15.000000000 -0400
 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 
  {
        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -27177,9 +28048,9 @@ diff -urNp linux-2.6.33.1/fs/befs/linuxvfs.c linux-2.6.33.1/fs/befs/linuxvfs.c
                if (!IS_ERR(link))
                        kfree(link);
        }
-diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
---- linux-2.6.33.1/fs/binfmt_aout.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/binfmt_aout.c    2010-03-20 16:58:41.336873242 -0400
+diff -urNp linux-2.6.34/fs/binfmt_aout.c linux-2.6.34/fs/binfmt_aout.c
+--- linux-2.6.34/fs/binfmt_aout.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/binfmt_aout.c      2010-07-01 21:15:16.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -27188,7 +28059,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
  #include <linux/stat.h>
  #include <linux/fcntl.h>
  #include <linux/ptrace.h>
-@@ -114,10 +115,12 @@ static int aout_core_dump(struct coredum
+@@ -97,10 +98,12 @@ static int aout_core_dump(struct coredum
  
  /* If the size of the dump file exceeds the rlimit, then see what would happen
     if we wrote the stack, but not the data area.  */
@@ -27201,8 +28072,8 @@ diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
        if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
                dump.u_ssize = 0;
  
-@@ -250,6 +253,8 @@ static int load_aout_binary(struct linux
-       rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+@@ -238,6 +241,8 @@ static int load_aout_binary(struct linux
+       rlim = rlimit(RLIMIT_DATA);
        if (rlim >= RLIM_INFINITY)
                rlim = ~0;
 +
@@ -27210,7 +28081,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
        if (ex.a_data + ex.a_bss > rlim)
                return -ENOMEM;
  
-@@ -278,6 +283,27 @@ static int load_aout_binary(struct linux
+@@ -266,6 +271,27 @@ static int load_aout_binary(struct linux
        install_exec_creds(bprm);
        current->flags &= ~PF_FORKNOEXEC;
  
@@ -27238,7 +28109,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
        if (N_MAGIC(ex) == OMAGIC) {
                unsigned long text_addr, map_size;
                loff_t pos;
-@@ -350,7 +376,7 @@ static int load_aout_binary(struct linux
+@@ -338,7 +364,7 @@ static int load_aout_binary(struct linux
  
                down_write(&current->mm->mmap_sem);
                error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
@@ -27247,10 +28118,10 @@ diff -urNp linux-2.6.33.1/fs/binfmt_aout.c linux-2.6.33.1/fs/binfmt_aout.c
                                MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
                                fd_offset + ex.a_text);
                up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
---- linux-2.6.33.1/fs/binfmt_elf.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/binfmt_elf.c     2010-03-20 16:58:41.348904798 -0400
-@@ -50,6 +50,10 @@ static int elf_core_dump(struct coredump
+diff -urNp linux-2.6.34/fs/binfmt_elf.c linux-2.6.34/fs/binfmt_elf.c
+--- linux-2.6.34/fs/binfmt_elf.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/binfmt_elf.c       2010-07-01 21:17:45.000000000 -0400
+@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump NULL
  #endif
  
@@ -27261,7 +28132,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
  #if ELF_EXEC_PAGESIZE > PAGE_SIZE
  #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
  #else
-@@ -69,6 +73,11 @@ static struct linux_binfmt elf_format = 
+@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = 
                .load_binary    = load_elf_binary,
                .load_shlib     = load_elf_library,
                .core_dump      = elf_core_dump,
@@ -27273,7 +28144,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                .min_coredump   = ELF_EXEC_PAGESIZE,
                .hasvdso        = 1
  };
-@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = 
+@@ -78,6 +87,8 @@ static struct linux_binfmt elf_format = 
  
  static int set_brk(unsigned long start, unsigned long end)
  {
@@ -27282,7 +28153,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        start = ELF_PAGEALIGN(start);
        end = ELF_PAGEALIGN(end);
        if (end > start) {
-@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, 
+@@ -88,7 +99,7 @@ static int set_brk(unsigned long start, 
                if (BAD_ADDR(addr))
                        return addr;
        }
@@ -27291,7 +28162,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        return 0;
  }
  
-@@ -148,7 +159,7 @@ create_elf_tables(struct linux_binprm *b
+@@ -149,7 +160,7 @@ create_elf_tables(struct linux_binprm *b
        elf_addr_t __user *u_rand_bytes;
        const char *k_platform = ELF_PLATFORM;
        const char *k_base_platform = ELF_BASE_PLATFORM;
@@ -27300,18 +28171,22 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        int items;
        elf_addr_t *elf_info;
        int ei_index = 0;
-@@ -195,6 +206,10 @@ create_elf_tables(struct linux_binprm *b
+@@ -196,8 +207,12 @@ create_elf_tables(struct linux_binprm *b
         * Generate 16 random bytes for userspace PRNG seeding.
         */
        get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
+-      u_rand_bytes = (elf_addr_t __user *)
+-                     STACK_ALLOC(p, sizeof(k_rand_bytes));
 +      srandom32(k_rand_bytes[0] ^ random32());
 +      srandom32(k_rand_bytes[1] ^ random32());
 +      srandom32(k_rand_bytes[2] ^ random32());
 +      srandom32(k_rand_bytes[3] ^ random32());
-       u_rand_bytes = (elf_addr_t __user *)
-                      STACK_ALLOC(p, sizeof(k_rand_bytes));
++      p = STACK_ROUND(p, sizeof(k_rand_bytes));
++      u_rand_bytes = (elf_addr_t __user *) p;
        if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
-@@ -385,10 +400,10 @@ static unsigned long load_elf_interp(str
+               return -EFAULT;
+ 
+@@ -386,10 +401,10 @@ static unsigned long load_elf_interp(str
  {
        struct elf_phdr *elf_phdata;
        struct elf_phdr *eppnt;
@@ -27324,7 +28199,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        unsigned long total_size;
        int retval, i, size;
  
-@@ -434,6 +449,11 @@ static unsigned long load_elf_interp(str
+@@ -435,6 +450,11 @@ static unsigned long load_elf_interp(str
                goto out_close;
        }
  
@@ -27336,7 +28211,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        eppnt = elf_phdata;
        for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
                if (eppnt->p_type == PT_LOAD) {
-@@ -477,8 +497,8 @@ static unsigned long load_elf_interp(str
+@@ -478,8 +498,8 @@ static unsigned long load_elf_interp(str
                        k = load_addr + eppnt->p_vaddr;
                        if (BAD_ADDR(k) ||
                            eppnt->p_filesz > eppnt->p_memsz ||
@@ -27347,7 +28222,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                                error = -ENOMEM;
                                goto out_close;
                        }
-@@ -532,6 +552,177 @@ out:
+@@ -533,6 +553,177 @@ out:
        return error;
  }
  
@@ -27525,7 +28400,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
  /*
   * These are the functions used to load ELF style executables and shared
   * libraries.  There is no binary dependent code anywhere else.
-@@ -548,6 +739,11 @@ static unsigned long randomize_stack_top
+@@ -549,6 +740,11 @@ static unsigned long randomize_stack_top
  {
        unsigned int random_variable = 0;
  
@@ -27537,7 +28412,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        if ((current->flags & PF_RANDOMIZE) &&
                !(current->personality & ADDR_NO_RANDOMIZE)) {
                random_variable = get_random_int() & STACK_RND_MASK;
-@@ -566,7 +762,7 @@ static int load_elf_binary(struct linux_
+@@ -567,7 +763,7 @@ static int load_elf_binary(struct linux_
        unsigned long load_addr = 0, load_bias = 0;
        int load_addr_set = 0;
        char * elf_interpreter = NULL;
@@ -27546,7 +28421,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        struct elf_phdr *elf_ppnt, *elf_phdata;
        unsigned long elf_bss, elf_brk;
        int retval, i;
-@@ -576,11 +772,11 @@ static int load_elf_binary(struct linux_
+@@ -577,11 +773,11 @@ static int load_elf_binary(struct linux_
        unsigned long start_code, end_code, start_data, end_data;
        unsigned long reloc_func_desc = 0;
        int executable_stack = EXSTACK_DEFAULT;
@@ -27559,7 +28434,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
  
        loc = kmalloc(sizeof(*loc), GFP_KERNEL);
        if (!loc) {
-@@ -718,11 +914,80 @@ static int load_elf_binary(struct linux_
+@@ -719,11 +915,80 @@ static int load_elf_binary(struct linux_
  
        /* OK, This is the point of no return */
        current->flags &= ~PF_FORKNOEXEC;
@@ -27641,7 +28516,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        if (elf_read_implies_exec(loc->elf_ex, executable_stack))
                current->personality |= READ_IMPLIES_EXEC;
  
-@@ -804,6 +1069,20 @@ static int load_elf_binary(struct linux_
+@@ -805,6 +1070,20 @@ static int load_elf_binary(struct linux_
  #else
                        load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -27662,7 +28537,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                }
  
                error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -836,9 +1115,9 @@ static int load_elf_binary(struct linux_
+@@ -837,9 +1116,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.
                 */
@@ -27675,7 +28550,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                        /* set_brk can never work. Avoid overflows. */
                        send_sig(SIGKILL, current, 0);
                        retval = -EINVAL;
-@@ -866,6 +1145,11 @@ static int load_elf_binary(struct linux_
+@@ -867,6 +1146,11 @@ static int load_elf_binary(struct linux_
        start_data += load_bias;
        end_data += load_bias;
  
@@ -27687,7 +28562,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/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
-@@ -877,9 +1161,11 @@ static int load_elf_binary(struct linux_
+@@ -878,9 +1162,11 @@ static int load_elf_binary(struct linux_
                goto out_free_dentry;
        }
        if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -27702,19 +28577,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        }
  
        if (elf_interpreter) {
-@@ -1107,8 +1393,10 @@ static int dump_seek(struct file *file, 
-                       unsigned long n = off;
-                       if (n > PAGE_SIZE)
-                               n = PAGE_SIZE;
--                      if (!dump_write(file, buf, n))
-+                      if (!dump_write(file, buf, n)) {
-+                              free_page((unsigned long)buf);
-                               return 0;
-+                      }
-                       off -= n;
-               }
-               free_page((unsigned long)buf);
-@@ -1120,7 +1408,7 @@ static int dump_seek(struct file *file, 
+@@ -1091,7 +1377,7 @@ out:
   * Decide what to dump of a segment, part, all or none.
   */
  static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -27723,7 +28586,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
  {
  #define FILTER(type)  (mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1154,7 +1442,7 @@ static unsigned long vma_dump_size(struc
+@@ -1125,7 +1411,7 @@ static unsigned long vma_dump_size(struc
        if (vma->vm_file == NULL)
                return 0;
  
@@ -27732,21 +28595,7 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                goto whole;
  
        /*
-@@ -1250,9 +1538,12 @@ static int writenote(struct memelfnote *
- #undef DUMP_WRITE
- 
- #define DUMP_WRITE(addr, nr)                          \
-+      do {                                            \
-+      gr_learn_resource(current, RLIMIT_CORE, size + (nr), 1); \
-       if ((size += (nr)) > cprm->limit ||             \
-           !dump_write(cprm->file, (addr), (nr)))      \
--              goto end_coredump;
-+              goto end_coredump;                      \
-+      } while (0);
- 
- static void fill_elf_header(struct elfhdr *elf, int segs,
-                           u16 machine, u32 flags, u8 osabi)
-@@ -1381,9 +1672,9 @@ static void fill_auxv_note(struct memelf
+@@ -1347,9 +1633,9 @@ static void fill_auxv_note(struct memelf
  {
        elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
        int i = 0;
@@ -27758,25 +28607,72 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
        fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1969,7 +2260,7 @@ static int elf_core_dump(struct coredump
+@@ -1855,14 +2141,14 @@ static void fill_extnum_info(struct elfh
+ }
+ 
+ static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
+-                                   unsigned long mm_flags)
++                                   struct coredump_params *cprm)
+ {
+       struct vm_area_struct *vma;
+       size_t size = 0;
+ 
+       for (vma = first_vma(current, gate_vma); vma != NULL;
+            vma = next_vma(vma, gate_vma))
+-              size += vma_dump_size(vma, mm_flags);
++              size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
+       return size;
+ }
+ 
+@@ -1956,7 +2242,7 @@ static int elf_core_dump(struct coredump
+ 
+       dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
+ 
+-      offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
++      offset += elf_core_vma_data_size(gate_vma, cprm);
+       offset += elf_core_extra_data_size();
+       e_shoff = offset;
+ 
+@@ -1970,10 +2256,12 @@ static int elf_core_dump(struct coredump
+       offset = dataoff;
+ 
+       size += sizeof(*elf);
++      gr_learn_resource(current, RLIMIT_CORE, size, 1);
+       if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
+               goto end_coredump;
+ 
+       size += sizeof(*phdr4note);
++      gr_learn_resource(current, RLIMIT_CORE, size, 1);
+       if (size > cprm->limit
+           || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
+               goto end_coredump;
+@@ -1987,7 +2275,7 @@ static int elf_core_dump(struct coredump
                phdr.p_offset = offset;
                phdr.p_vaddr = vma->vm_start;
                phdr.p_paddr = 0;
--              phdr.p_filesz = vma_dump_size(vma, mm_flags);
-+              phdr.p_filesz = vma_dump_size(vma, mm_flags, cprm->signr);
+-              phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
++              phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
                phdr.p_memsz = vma->vm_end - vma->vm_start;
                offset += phdr.p_filesz;
                phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2002,7 +2293,7 @@ static int elf_core_dump(struct coredump
+@@ -1998,6 +2286,7 @@ static int elf_core_dump(struct coredump
+               phdr.p_align = ELF_EXEC_PAGESIZE;
+ 
+               size += sizeof(phdr);
++              gr_learn_resource(current, RLIMIT_CORE, size, 1);
+               if (size > cprm->limit
+                   || !dump_write(cprm->file, &phdr, sizeof(phdr)))
+                       goto end_coredump;
+@@ -2022,7 +2311,7 @@ static int elf_core_dump(struct coredump
                unsigned long addr;
                unsigned long end;
  
--              end = vma->vm_start + vma_dump_size(vma, mm_flags);
-+              end = vma->vm_start + vma_dump_size(vma, mm_flags, cprm->signr);
+-              end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
++              end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
  
                for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
                        struct page *page;
-@@ -2011,6 +2302,7 @@ static int elf_core_dump(struct coredump
+@@ -2031,6 +2320,7 @@ static int elf_core_dump(struct coredump
                        page = get_dump_page(addr);
                        if (page) {
                                void *kaddr = kmap(page);
@@ -27784,7 +28680,15 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
                                stop = ((size += PAGE_SIZE) > cprm->limit) ||
                                        !dump_write(cprm->file, kaddr,
                                                    PAGE_SIZE);
-@@ -2039,6 +2331,97 @@ out:
+@@ -2048,6 +2338,7 @@ static int elf_core_dump(struct coredump
+ 
+       if (e_phnum == PN_XNUM) {
+               size += sizeof(*shdr4extnum);
++              gr_learn_resource(current, RLIMIT_CORE, size, 1);
+               if (size > cprm->limit
+                   || !dump_write(cprm->file, shdr4extnum,
+                                  sizeof(*shdr4extnum)))
+@@ -2068,6 +2359,97 @@ out:
  
  #endif                /* CONFIG_ELF_CORE */
  
@@ -27882,9 +28786,9 @@ diff -urNp linux-2.6.33.1/fs/binfmt_elf.c linux-2.6.33.1/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
        return register_binfmt(&elf_format);
-diff -urNp linux-2.6.33.1/fs/binfmt_flat.c linux-2.6.33.1/fs/binfmt_flat.c
---- linux-2.6.33.1/fs/binfmt_flat.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/binfmt_flat.c    2010-03-20 16:58:41.369218937 -0400
+diff -urNp linux-2.6.34/fs/binfmt_flat.c linux-2.6.34/fs/binfmt_flat.c
+--- linux-2.6.34/fs/binfmt_flat.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/binfmt_flat.c      2010-07-01 20:45:15.000000000 -0400
 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
                                realdatastart = (unsigned long) -ENOMEM;
                        printk("Unable to allocate RAM for process data, errno %d\n",
@@ -27917,9 +28821,9 @@ diff -urNp linux-2.6.33.1/fs/binfmt_flat.c linux-2.6.33.1/fs/binfmt_flat.c
                        ret = result;
                        goto err;
                }
-diff -urNp linux-2.6.33.1/fs/binfmt_misc.c linux-2.6.33.1/fs/binfmt_misc.c
---- linux-2.6.33.1/fs/binfmt_misc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/binfmt_misc.c    2010-03-20 16:58:41.384059578 -0400
+diff -urNp linux-2.6.34/fs/binfmt_misc.c linux-2.6.34/fs/binfmt_misc.c
+--- linux-2.6.34/fs/binfmt_misc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/binfmt_misc.c      2010-07-01 20:45:15.000000000 -0400
 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
        static struct tree_descr bm_files[] = {
                [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -27929,10 +28833,10 @@ diff -urNp linux-2.6.33.1/fs/binfmt_misc.c linux-2.6.33.1/fs/binfmt_misc.c
        };
        int err = simple_fill_super(sb, 0x42494e4d, bm_files);
        if (!err)
-diff -urNp linux-2.6.33.1/fs/bio.c linux-2.6.33.1/fs/bio.c
---- linux-2.6.33.1/fs/bio.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/bio.c    2010-03-20 16:58:41.384547944 -0400
-@@ -1217,7 +1217,7 @@ static void bio_copy_kern_endio(struct b
+diff -urNp linux-2.6.34/fs/bio.c linux-2.6.34/fs/bio.c
+--- linux-2.6.34/fs/bio.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/bio.c      2010-07-01 20:45:15.000000000 -0400
+@@ -1213,7 +1213,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;
@@ -27941,10 +28845,22 @@ diff -urNp linux-2.6.33.1/fs/bio.c linux-2.6.33.1/fs/bio.c
  
        __bio_for_each_segment(bvec, bio, i, 0) {
                char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.33.1/fs/btrfs/ctree.c linux-2.6.33.1/fs/btrfs/ctree.c
---- linux-2.6.33.1/fs/btrfs/ctree.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/ctree.c    2010-03-20 16:58:41.388867884 -0400
-@@ -3645,7 +3645,6 @@ setup_items_for_insert(struct btrfs_tran
+diff -urNp linux-2.6.34/fs/block_dev.c linux-2.6.34/fs/block_dev.c
+--- linux-2.6.34/fs/block_dev.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/block_dev.c        2010-07-01 20:45:15.000000000 -0400
+@@ -681,7 +681,7 @@ int bd_claim(struct block_device *bdev, 
+       else if (bdev->bd_contains == bdev)
+               res = 0;         /* is a whole device which isn't held */
+ 
+-      else if (bdev->bd_contains->bd_holder == bd_claim)
++      else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
+               res = 0;         /* is a partition of a device that is being partitioned */
+       else if (bdev->bd_contains->bd_holder != NULL)
+               res = -EBUSY;    /* is a partition of a held device */
+diff -urNp linux-2.6.34/fs/btrfs/ctree.c linux-2.6.34/fs/btrfs/ctree.c
+--- linux-2.6.34/fs/btrfs/ctree.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/btrfs/ctree.c      2010-07-01 20:45:15.000000000 -0400
+@@ -3650,7 +3650,6 @@ setup_items_for_insert(struct btrfs_tran
  
        ret = 0;
        if (slot == 0) {
@@ -27952,10 +28868,10 @@ diff -urNp linux-2.6.33.1/fs/btrfs/ctree.c linux-2.6.33.1/fs/btrfs/ctree.c
                btrfs_cpu_key_to_disk(&disk_key, cpu_key);
                ret = fixup_low_keys(trans, root, path, &disk_key, 1);
        }
-diff -urNp linux-2.6.33.1/fs/btrfs/disk-io.c linux-2.6.33.1/fs/btrfs/disk-io.c
---- linux-2.6.33.1/fs/btrfs/disk-io.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/disk-io.c  2010-03-20 16:58:41.388867884 -0400
-@@ -39,7 +39,7 @@
+diff -urNp linux-2.6.34/fs/btrfs/disk-io.c linux-2.6.34/fs/btrfs/disk-io.c
+--- linux-2.6.34/fs/btrfs/disk-io.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/btrfs/disk-io.c    2010-07-01 20:45:15.000000000 -0400
+@@ -40,7 +40,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
  
@@ -27964,7 +28880,7 @@ diff -urNp linux-2.6.33.1/fs/btrfs/disk-io.c linux-2.6.33.1/fs/btrfs/disk-io.c
  static void end_workqueue_fn(struct btrfs_work *work);
  static void free_fs_root(struct btrfs_root *root);
  
-@@ -2605,7 +2605,7 @@ out:
+@@ -2603,7 +2603,7 @@ out:
        return 0;
  }
  
@@ -27973,9 +28889,9 @@ diff -urNp linux-2.6.33.1/fs/btrfs/disk-io.c linux-2.6.33.1/fs/btrfs/disk-io.c
        .write_cache_pages_lock_hook = btree_lock_page_hook,
        .readpage_end_io_hook = btree_readpage_end_io_hook,
        .submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.33.1/fs/btrfs/extent_io.h linux-2.6.33.1/fs/btrfs/extent_io.h
---- linux-2.6.33.1/fs/btrfs/extent_io.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/extent_io.h        2010-03-20 16:58:41.392898040 -0400
+diff -urNp linux-2.6.34/fs/btrfs/extent_io.h linux-2.6.34/fs/btrfs/extent_io.h
+--- linux-2.6.34/fs/btrfs/extent_io.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/btrfs/extent_io.h  2010-07-01 20:45:15.000000000 -0400
 @@ -49,36 +49,36 @@ typedef    int (extent_submit_bio_hook_t)(s
                                       struct bio *bio, int mirror_num,
                                       unsigned long bio_flags);
@@ -28036,10 +28952,10 @@ diff -urNp linux-2.6.33.1/fs/btrfs/extent_io.h linux-2.6.33.1/fs/btrfs/extent_io
  };
  
  struct extent_state {
-diff -urNp linux-2.6.33.1/fs/btrfs/free-space-cache.c linux-2.6.33.1/fs/btrfs/free-space-cache.c
---- linux-2.6.33.1/fs/btrfs/free-space-cache.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/free-space-cache.c 2010-03-20 16:58:41.392898040 -0400
-@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
+diff -urNp linux-2.6.34/fs/btrfs/free-space-cache.c linux-2.6.34/fs/btrfs/free-space-cache.c
+--- linux-2.6.34/fs/btrfs/free-space-cache.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/btrfs/free-space-cache.c   2010-07-01 20:45:15.000000000 -0400
+@@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  
        while(1) {
                if (entry->bytes < bytes || entry->offset < min_start) {
@@ -28048,7 +28964,7 @@ diff -urNp linux-2.6.33.1/fs/btrfs/free-space-cache.c linux-2.6.33.1/fs/btrfs/fr
                        node = rb_next(&entry->offset_index);
                        if (!node)
                                break;
-@@ -1226,7 +1224,7 @@ again:
+@@ -1227,7 +1225,7 @@ again:
         */
        while (entry->bitmap || found_bitmap ||
               (!entry->bitmap && entry->bytes < min_bytes)) {
@@ -28057,10 +28973,10 @@ diff -urNp linux-2.6.33.1/fs/btrfs/free-space-cache.c linux-2.6.33.1/fs/btrfs/fr
  
                if (entry->bitmap && entry->bytes > bytes + empty_size) {
                        ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.33.1/fs/btrfs/inode.c linux-2.6.33.1/fs/btrfs/inode.c
---- linux-2.6.33.1/fs/btrfs/inode.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/inode.c    2010-03-20 16:58:41.396902904 -0400
-@@ -63,7 +63,7 @@ static const struct inode_operations btr
+diff -urNp linux-2.6.34/fs/btrfs/inode.c linux-2.6.34/fs/btrfs/inode.c
+--- linux-2.6.34/fs/btrfs/inode.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/btrfs/inode.c      2010-07-01 20:45:15.000000000 -0400
+@@ -64,7 +64,7 @@ static const struct inode_operations btr
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
  static const struct file_operations btrfs_dir_file_operations;
@@ -28069,7 +28985,7 @@ diff -urNp linux-2.6.33.1/fs/btrfs/inode.c linux-2.6.33.1/fs/btrfs/inode.c
  
  static struct kmem_cache *btrfs_inode_cachep;
  struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -5973,7 +5973,7 @@ static const struct file_operations btrf
+@@ -5956,7 +5956,7 @@ static const struct file_operations btrf
        .fsync          = btrfs_sync_file,
  };
  
@@ -28078,27 +28994,9 @@ diff -urNp linux-2.6.33.1/fs/btrfs/inode.c linux-2.6.33.1/fs/btrfs/inode.c
        .fill_delalloc = run_delalloc_range,
        .submit_bio_hook = btrfs_submit_bio_hook,
        .merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.33.1/fs/btrfs/sysfs.c linux-2.6.33.1/fs/btrfs/sysfs.c
---- linux-2.6.33.1/fs/btrfs/sysfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/btrfs/sysfs.c    2010-03-20 16:58:41.404901120 -0400
-@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
-       complete(&root->kobj_unregister);
- }
- 
--static struct sysfs_ops btrfs_super_attr_ops = {
-+static const struct sysfs_ops btrfs_super_attr_ops = {
-       .show   = btrfs_super_attr_show,
-       .store  = btrfs_super_attr_store,
- };
- 
--static struct sysfs_ops btrfs_root_attr_ops = {
-+static const struct sysfs_ops btrfs_root_attr_ops = {
-       .show   = btrfs_root_attr_show,
-       .store  = btrfs_root_attr_store,
- };
-diff -urNp linux-2.6.33.1/fs/buffer.c linux-2.6.33.1/fs/buffer.c
---- linux-2.6.33.1/fs/buffer.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/buffer.c 2010-03-20 16:58:41.408897047 -0400
+diff -urNp linux-2.6.34/fs/buffer.c linux-2.6.34/fs/buffer.c
+--- linux-2.6.34/fs/buffer.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/buffer.c   2010-07-01 20:45:16.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/percpu.h>
  #include <linux/slab.h>
@@ -28107,9 +29005,28 @@ diff -urNp linux-2.6.33.1/fs/buffer.c linux-2.6.33.1/fs/buffer.c
  #include <linux/blkdev.h>
  #include <linux/file.h>
  #include <linux/quotaops.h>
-diff -urNp linux-2.6.33.1/fs/cachefiles/daemon.c linux-2.6.33.1/fs/cachefiles/daemon.c
---- linux-2.6.33.1/fs/cachefiles/daemon.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/cachefiles/daemon.c      2010-03-20 16:58:41.408897047 -0400
+diff -urNp linux-2.6.34/fs/cachefiles/bind.c linux-2.6.34/fs/cachefiles/bind.c
+--- linux-2.6.34/fs/cachefiles/bind.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/cachefiles/bind.c  2010-07-01 20:45:15.000000000 -0400
+@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
+              args);
+ 
+       /* start by checking things over */
+-      ASSERT(cache->fstop_percent >= 0 &&
+-             cache->fstop_percent < cache->fcull_percent &&
++      ASSERT(cache->fstop_percent < cache->fcull_percent &&
+              cache->fcull_percent < cache->frun_percent &&
+              cache->frun_percent  < 100);
+ 
+-      ASSERT(cache->bstop_percent >= 0 &&
+-             cache->bstop_percent < cache->bcull_percent &&
++      ASSERT(cache->bstop_percent < cache->bcull_percent &&
+              cache->bcull_percent < cache->brun_percent &&
+              cache->brun_percent  < 100);
+ 
+diff -urNp linux-2.6.34/fs/cachefiles/daemon.c linux-2.6.34/fs/cachefiles/daemon.c
+--- linux-2.6.34/fs/cachefiles/daemon.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/cachefiles/daemon.c        2010-07-01 20:45:15.000000000 -0400
 @@ -195,7 +195,7 @@ static ssize_t cachefiles_daemon_read(st
        if (n > buflen)
                return -EMSGSIZE;
@@ -28119,10 +29036,37 @@ diff -urNp linux-2.6.33.1/fs/cachefiles/daemon.c linux-2.6.33.1/fs/cachefiles/da
                return -EFAULT;
  
        return n;
-diff -urNp linux-2.6.33.1/fs/cachefiles/rdwr.c linux-2.6.33.1/fs/cachefiles/rdwr.c
---- linux-2.6.33.1/fs/cachefiles/rdwr.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/cachefiles/rdwr.c        2010-03-20 16:58:41.412812404 -0400
-@@ -944,7 +944,7 @@ int cachefiles_write_page(struct fscache
+@@ -221,7 +221,7 @@ static ssize_t cachefiles_daemon_write(s
+       if (test_bit(CACHEFILES_DEAD, &cache->flags))
+               return -EIO;
+ 
+-      if (datalen < 0 || datalen > PAGE_SIZE - 1)
++      if (datalen > PAGE_SIZE - 1)
+               return -EOPNOTSUPP;
+ 
+       /* drag the command string into the kernel so we can parse it */
+@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
+       if (args[0] != '%' || args[1] != '\0')
+               return -EINVAL;
+ 
+-      if (fstop < 0 || fstop >= cache->fcull_percent)
++      if (fstop >= cache->fcull_percent)
+               return cachefiles_daemon_range_error(cache, args);
+ 
+       cache->fstop_percent = fstop;
+@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
+       if (args[0] != '%' || args[1] != '\0')
+               return -EINVAL;
+ 
+-      if (bstop < 0 || bstop >= cache->bcull_percent)
++      if (bstop >= cache->bcull_percent)
+               return cachefiles_daemon_range_error(cache, args);
+ 
+       cache->bstop_percent = bstop;
+diff -urNp linux-2.6.34/fs/cachefiles/rdwr.c linux-2.6.34/fs/cachefiles/rdwr.c
+--- linux-2.6.34/fs/cachefiles/rdwr.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/cachefiles/rdwr.c  2010-07-01 20:45:15.000000000 -0400
+@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
                        old_fs = get_fs();
                        set_fs(KERNEL_DS);
                        ret = file->f_op->write(
@@ -28131,9 +29075,9 @@ diff -urNp linux-2.6.33.1/fs/cachefiles/rdwr.c linux-2.6.33.1/fs/cachefiles/rdwr
                        set_fs(old_fs);
                        kunmap(page);
                        if (ret != len)
-diff -urNp linux-2.6.33.1/fs/cifs/cifs_uniupr.h linux-2.6.33.1/fs/cifs/cifs_uniupr.h
---- linux-2.6.33.1/fs/cifs/cifs_uniupr.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/cifs/cifs_uniupr.h       2010-03-20 16:58:41.416893406 -0400
+diff -urNp linux-2.6.34/fs/cifs/cifs_uniupr.h linux-2.6.34/fs/cifs/cifs_uniupr.h
+--- linux-2.6.34/fs/cifs/cifs_uniupr.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/cifs/cifs_uniupr.h 2010-07-01 20:45:15.000000000 -0400
 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
        {0x0490, 0x04cc, UniCaseRangeU0490},
        {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -28143,10 +29087,10 @@ diff -urNp linux-2.6.33.1/fs/cifs/cifs_uniupr.h linux-2.6.33.1/fs/cifs/cifs_uniu
  };
  #endif
  
-diff -urNp linux-2.6.33.1/fs/cifs/link.c linux-2.6.33.1/fs/cifs/link.c
---- linux-2.6.33.1/fs/cifs/link.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/cifs/link.c      2010-03-20 16:58:41.416893406 -0400
-@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
+diff -urNp linux-2.6.34/fs/cifs/link.c linux-2.6.34/fs/cifs/link.c
+--- linux-2.6.34/fs/cifs/link.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/cifs/link.c        2010-07-01 20:45:15.000000000 -0400
+@@ -216,7 +216,7 @@ cifs_symlink(struct inode *inode, struct
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -28155,26 +29099,27 @@ diff -urNp linux-2.6.33.1/fs/cifs/link.c linux-2.6.33.1/fs/cifs/link.c
        if (!IS_ERR(p))
                kfree(p);
  }
-diff -urNp linux-2.6.33.1/fs/compat_binfmt_elf.c linux-2.6.33.1/fs/compat_binfmt_elf.c
---- linux-2.6.33.1/fs/compat_binfmt_elf.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/compat_binfmt_elf.c      2010-03-20 16:58:41.424927933 -0400
-@@ -29,10 +29,12 @@
- #undef        elfhdr
+diff -urNp linux-2.6.34/fs/compat_binfmt_elf.c linux-2.6.34/fs/compat_binfmt_elf.c
+--- linux-2.6.34/fs/compat_binfmt_elf.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/compat_binfmt_elf.c        2010-07-01 20:45:15.000000000 -0400
+@@ -30,11 +30,13 @@
  #undef        elf_phdr
+ #undef        elf_shdr
  #undef        elf_note
 +#undef        elf_dyn
  #undef        elf_addr_t
  #define elfhdr                elf32_hdr
  #define elf_phdr      elf32_phdr
+ #define elf_shdr      elf32_shdr
  #define elf_note      elf32_note
 +#define elf_dyn               Elf32_Dyn
  #define elf_addr_t    Elf32_Addr
  
  /*
-diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
---- linux-2.6.33.1/fs/compat.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/compat.c 2010-03-20 16:58:41.424927933 -0400
-@@ -1408,14 +1408,12 @@ static int compat_copy_strings(int argc,
+diff -urNp linux-2.6.34/fs/compat.c linux-2.6.34/fs/compat.c
+--- linux-2.6.34/fs/compat.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/compat.c   2010-07-01 20:45:16.000000000 -0400
+@@ -1409,14 +1409,12 @@ static int compat_copy_strings(int argc,
                        if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
                                struct page *page;
  
@@ -28189,7 +29134,7 @@ diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
                                ret = get_user_pages(current, bprm->mm, pos,
                                                     1, 1, 1, &page, NULL);
                                if (ret <= 0) {
-@@ -1461,6 +1459,11 @@ int compat_do_execve(char * filename,
+@@ -1462,6 +1460,11 @@ int compat_do_execve(char * filename,
        compat_uptr_t __user *envp,
        struct pt_regs * regs)
  {
@@ -28201,7 +29146,7 @@ diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-@@ -1497,6 +1500,14 @@ int compat_do_execve(char * filename,
+@@ -1498,6 +1501,14 @@ int compat_do_execve(char * filename,
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -28216,7 +29161,7 @@ diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1526,9 +1537,40 @@ int compat_do_execve(char * filename,
+@@ -1527,9 +1538,40 @@ int compat_do_execve(char * filename,
        if (retval < 0)
                goto out;
  
@@ -28256,9 +29201,9 @@ diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
 +              fput(old_exec_file);
 +#endif
  
-       current->stack_start = current->mm->start_stack;
- 
-@@ -1541,6 +1583,14 @@ int compat_do_execve(char * filename,
+       /* execve succeeded */
+       current->fs->in_exec = 0;
+@@ -1540,6 +1582,14 @@ int compat_do_execve(char * filename,
                put_files_struct(displaced);
        return retval;
  
@@ -28273,10 +29218,10 @@ diff -urNp linux-2.6.33.1/fs/compat.c linux-2.6.33.1/fs/compat.c
  out:
        if (bprm->mm)
                mmput(bprm->mm);
-diff -urNp linux-2.6.33.1/fs/debugfs/inode.c linux-2.6.33.1/fs/debugfs/inode.c
---- linux-2.6.33.1/fs/debugfs/inode.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/debugfs/inode.c  2010-03-20 16:58:41.432715858 -0400
-@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
+diff -urNp linux-2.6.34/fs/debugfs/inode.c linux-2.6.34/fs/debugfs/inode.c
+--- linux-2.6.34/fs/debugfs/inode.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/debugfs/inode.c    2010-07-01 20:45:15.000000000 -0400
+@@ -129,7 +129,7 @@ static inline int debugfs_positive(struc
  
  static int debug_fill_super(struct super_block *sb, void *data, int silent)
  {
@@ -28285,22 +29230,22 @@ diff -urNp linux-2.6.33.1/fs/debugfs/inode.c linux-2.6.33.1/fs/debugfs/inode.c
  
        return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
  }
-diff -urNp linux-2.6.33.1/fs/dlm/lockspace.c linux-2.6.33.1/fs/dlm/lockspace.c
---- linux-2.6.33.1/fs/dlm/lockspace.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/dlm/lockspace.c  2010-03-20 16:58:41.444895285 -0400
-@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
-       kfree(ls);
+diff -urNp linux-2.6.34/fs/dlm/lockspace.c linux-2.6.34/fs/dlm/lockspace.c
+--- linux-2.6.34/fs/dlm/lockspace.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/dlm/lockspace.c    2010-07-01 20:45:15.000000000 -0400
+@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
+       return 0;
  }
  
--static struct sysfs_ops dlm_attr_ops = {
-+static const struct sysfs_ops dlm_attr_ops = {
-       .show  = dlm_attr_show,
-       .store = dlm_attr_store,
+-static struct kset_uevent_ops dlm_uevent_ops = {
++static const struct kset_uevent_ops dlm_uevent_ops = {
+       .uevent = dlm_uevent,
  };
-diff -urNp linux-2.6.33.1/fs/ecryptfs/inode.c linux-2.6.33.1/fs/ecryptfs/inode.c
---- linux-2.6.33.1/fs/ecryptfs/inode.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ecryptfs/inode.c 2010-03-20 16:58:41.460901500 -0400
-@@ -685,7 +685,7 @@ ecryptfs_readlink(struct dentry *dentry,
+ 
+diff -urNp linux-2.6.34/fs/ecryptfs/inode.c linux-2.6.34/fs/ecryptfs/inode.c
+--- linux-2.6.34/fs/ecryptfs/inode.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ecryptfs/inode.c   2010-07-01 20:45:15.000000000 -0400
+@@ -666,7 +666,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,
@@ -28308,8 +29253,8 @@ diff -urNp linux-2.6.33.1/fs/ecryptfs/inode.c linux-2.6.33.1/fs/ecryptfs/inode.c
 +                                                 (__force char __user *)lower_buf,
                                                   lower_bufsiz);
        set_fs(old_fs);
-       if (rc >= 0) {
-@@ -729,7 +729,7 @@ static void *ecryptfs_follow_link(struct
+       if (rc < 0)
+@@ -712,7 +712,7 @@ static void *ecryptfs_follow_link(struct
        }
        old_fs = get_fs();
        set_fs(get_ds());
@@ -28318,7 +29263,7 @@ diff -urNp linux-2.6.33.1/fs/ecryptfs/inode.c linux-2.6.33.1/fs/ecryptfs/inode.c
        set_fs(old_fs);
        if (rc < 0) {
                kfree(buf);
-@@ -744,7 +744,7 @@ out:
+@@ -727,7 +727,7 @@ out:
  static void
  ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
  {
@@ -28327,10 +29272,10 @@ diff -urNp linux-2.6.33.1/fs/ecryptfs/inode.c linux-2.6.33.1/fs/ecryptfs/inode.c
        if (!IS_ERR(buf)) {
                /* Free the char* */
                kfree(buf);
-diff -urNp linux-2.6.33.1/fs/ecryptfs/miscdev.c linux-2.6.33.1/fs/ecryptfs/miscdev.c
---- linux-2.6.33.1/fs/ecryptfs/miscdev.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ecryptfs/miscdev.c       2010-03-20 16:58:41.460901500 -0400
-@@ -327,7 +327,7 @@ check_list:
+diff -urNp linux-2.6.34/fs/ecryptfs/miscdev.c linux-2.6.34/fs/ecryptfs/miscdev.c
+--- linux-2.6.34/fs/ecryptfs/miscdev.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ecryptfs/miscdev.c 2010-07-01 20:45:15.000000000 -0400
+@@ -328,7 +328,7 @@ check_list:
                goto out_unlock_msg_ctx;
        i = 5;
        if (msg_ctx->msg) {
@@ -28339,9 +29284,9 @@ diff -urNp linux-2.6.33.1/fs/ecryptfs/miscdev.c linux-2.6.33.1/fs/ecryptfs/miscd
                        goto out_unlock_msg_ctx;
                i += packet_length_size;
                if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
---- linux-2.6.33.1/fs/exec.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/exec.c   2010-03-20 16:58:41.472962075 -0400
+diff -urNp linux-2.6.34/fs/exec.c linux-2.6.34/fs/exec.c
+--- linux-2.6.34/fs/exec.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/exec.c     2010-07-01 20:45:16.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/fsnotify.h>
  #include <linux/fs_struct.h>
@@ -28408,9 +29353,9 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
 +#endif
 +
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+       INIT_LIST_HEAD(&vma->anon_vma_chain);
        err = insert_vm_struct(mm, vma);
-       if (err)
-@@ -253,6 +262,12 @@ static int __bprm_mm_init(struct linux_b
+@@ -254,6 +263,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 *);
@@ -28423,7 +29368,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        return 0;
  err:
        up_write(&mm->mmap_sem);
-@@ -474,7 +489,7 @@ int copy_strings_kernel(int argc,char **
+@@ -475,7 +490,7 @@ int copy_strings_kernel(int argc,char **
        int r;
        mm_segment_t oldfs = get_fs();
        set_fs(KERNEL_DS);
@@ -28432,7 +29377,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        set_fs(oldfs);
        return r;
  }
-@@ -504,7 +519,8 @@ static int shift_arg_pages(struct vm_are
+@@ -505,7 +520,8 @@ static int shift_arg_pages(struct vm_are
        unsigned long new_end = old_end - shift;
        struct mmu_gather *tlb;
  
@@ -28442,7 +29387,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
  
        /*
         * ensure there are no vmas between where we want to go
-@@ -513,6 +529,10 @@ static int shift_arg_pages(struct vm_are
+@@ -514,6 +530,10 @@ static int shift_arg_pages(struct vm_are
        if (vma != find_vma(mm, new_start))
                return -EFAULT;
  
@@ -28493,7 +29438,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
 -                      goto out_unlock;
 -      }
 -
-       stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
+       stack_expand = 131072UL; /* randomly 32*4k (or 2*64k) pages */
        stack_size = vma->vm_end - vma->vm_start;
        /*
 @@ -666,7 +699,7 @@ struct file *open_exec(const char *name)
@@ -28514,7 +29459,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        set_fs(old_fs);
        return result;
  }
-@@ -1120,7 +1153,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1121,7 +1154,7 @@ int check_unsafe_exec(struct linux_binpr
        }
        rcu_read_unlock();
  
@@ -28523,7 +29468,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
                bprm->unsafe |= LSM_UNSAFE_SHARE;
        } else {
                res = -EAGAIN;
-@@ -1316,6 +1349,11 @@ int do_execve(char * filename,
+@@ -1317,6 +1350,11 @@ int do_execve(char * filename,
        char __user *__user *envp,
        struct pt_regs * regs)
  {
@@ -28535,7 +29480,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-@@ -1352,6 +1390,18 @@ int do_execve(char * filename,
+@@ -1353,6 +1391,18 @@ int do_execve(char * filename,
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -28554,7 +29499,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1381,10 +1431,41 @@ int do_execve(char * filename,
+@@ -1382,10 +1432,41 @@ int do_execve(char * filename,
        if (retval < 0)
                goto out;
  
@@ -28595,9 +29540,9 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
 +              fput(old_exec_file);
 +#endif
  
-       current->stack_start = current->mm->start_stack;
- 
-@@ -1397,6 +1478,14 @@ int do_execve(char * filename,
+       /* execve succeeded */
+       current->fs->in_exec = 0;
+@@ -1396,6 +1477,14 @@ int do_execve(char * filename,
                put_files_struct(displaced);
        return retval;
  
@@ -28612,7 +29557,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
  out:
        if (bprm->mm)
                mmput (bprm->mm);
-@@ -1560,6 +1649,169 @@ out:
+@@ -1559,6 +1648,169 @@ out:
        return ispipe;
  }
  
@@ -28779,10 +29724,10 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
 +}
 +#endif
 +
- static int zap_process(struct task_struct *start)
+ static int zap_process(struct task_struct *start, int exit_code)
  {
        struct task_struct *t;
-@@ -1762,17 +2014,17 @@ static void wait_for_dump_helpers(struct
+@@ -1766,17 +2018,17 @@ static void wait_for_dump_helpers(struct
        pipe = file->f_path.dentry->d_inode->i_pipe;
  
        pipe_lock(pipe);
@@ -28805,7 +29750,7 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        pipe_unlock(pipe);
  
  }
-@@ -1846,6 +2098,10 @@ void do_coredump(long signr, int exit_co
+@@ -1857,6 +2109,10 @@ void do_coredump(long signr, int exit_co
         */
        clear_thread_flag(TIF_SIGPENDING);
  
@@ -28816,10 +29761,10 @@ diff -urNp linux-2.6.33.1/fs/exec.c linux-2.6.33.1/fs/exec.c
        /*
         * lock_kernel() because format_corename() is controlled by sysctl, which
         * uses lock_kernel()
-diff -urNp linux-2.6.33.1/fs/ext2/balloc.c linux-2.6.33.1/fs/ext2/balloc.c
---- linux-2.6.33.1/fs/ext2/balloc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext2/balloc.c    2010-03-20 16:58:41.476618429 -0400
-@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
+diff -urNp linux-2.6.34/fs/ext2/balloc.c linux-2.6.34/fs/ext2/balloc.c
+--- linux-2.6.34/fs/ext2/balloc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext2/balloc.c      2010-07-01 20:45:16.000000000 -0400
+@@ -1193,7 +1193,7 @@ static int ext2_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
        root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -28828,10 +29773,24 @@ diff -urNp linux-2.6.33.1/fs/ext2/balloc.c linux-2.6.33.1/fs/ext2/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-2.6.33.1/fs/ext3/balloc.c linux-2.6.33.1/fs/ext3/balloc.c
---- linux-2.6.33.1/fs/ext3/balloc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext3/balloc.c    2010-03-20 16:58:41.484909301 -0400
-@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
+diff -urNp linux-2.6.34/fs/ext2/xattr.c linux-2.6.34/fs/ext2/xattr.c
+--- linux-2.6.34/fs/ext2/xattr.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext2/xattr.c       2010-07-01 20:45:15.000000000 -0400
+@@ -86,8 +86,8 @@
+               printk("\n"); \
+       } while (0)
+ #else
+-# define ea_idebug(f...)
+-# define ea_bdebug(f...)
++# define ea_idebug(inode, f...) do {} while (0)
++# define ea_bdebug(bh, f...) do {} while (0)
+ #endif
+ 
+ static int ext2_xattr_set2(struct inode *, struct buffer_head *,
+diff -urNp linux-2.6.34/fs/ext3/balloc.c linux-2.6.34/fs/ext3/balloc.c
+--- linux-2.6.34/fs/ext3/balloc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext3/balloc.c      2010-07-01 20:45:16.000000000 -0400
+@@ -1422,7 +1422,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);
@@ -28840,9 +29799,9 @@ diff -urNp linux-2.6.33.1/fs/ext3/balloc.c linux-2.6.33.1/fs/ext3/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-2.6.33.1/fs/ext3/namei.c linux-2.6.33.1/fs/ext3/namei.c
---- linux-2.6.33.1/fs/ext3/namei.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext3/namei.c     2010-03-20 16:58:41.496970241 -0400
+diff -urNp linux-2.6.34/fs/ext3/namei.c linux-2.6.34/fs/ext3/namei.c
+--- linux-2.6.34/fs/ext3/namei.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext3/namei.c       2010-07-01 20:45:15.000000000 -0400
 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
        char *data1 = (*bh)->b_data, *data2;
        unsigned split, move, size;
@@ -28852,9 +29811,9 @@ diff -urNp linux-2.6.33.1/fs/ext3/namei.c linux-2.6.33.1/fs/ext3/namei.c
  
        bh2 = ext3_append (handle, dir, &newblock, &err);
        if (!(bh2)) {
-diff -urNp linux-2.6.33.1/fs/ext3/xattr.c linux-2.6.33.1/fs/ext3/xattr.c
---- linux-2.6.33.1/fs/ext3/xattr.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext3/xattr.c     2010-03-20 16:58:41.500911319 -0400
+diff -urNp linux-2.6.34/fs/ext3/xattr.c linux-2.6.34/fs/ext3/xattr.c
+--- linux-2.6.34/fs/ext3/xattr.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext3/xattr.c       2010-07-01 20:45:15.000000000 -0400
 @@ -89,8 +89,8 @@
                printk("\n"); \
        } while (0)
@@ -28866,10 +29825,10 @@ diff -urNp linux-2.6.33.1/fs/ext3/xattr.c linux-2.6.33.1/fs/ext3/xattr.c
  #endif
  
  static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.33.1/fs/ext4/balloc.c linux-2.6.33.1/fs/ext4/balloc.c
---- linux-2.6.33.1/fs/ext4/balloc.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext4/balloc.c    2010-03-20 16:58:41.500911319 -0400
-@@ -535,7 +535,7 @@ int ext4_has_free_blocks(struct ext4_sb_
+diff -urNp linux-2.6.34/fs/ext4/balloc.c linux-2.6.34/fs/ext4/balloc.c
+--- linux-2.6.34/fs/ext4/balloc.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext4/balloc.c      2010-07-01 20:45:16.000000000 -0400
+@@ -522,7 +522,7 @@ int ext4_has_free_blocks(struct ext4_sb_
        /* Hm, nope.  Are (enough) root reserved blocks available? */
        if (sbi->s_resuid == current_fsuid() ||
            ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
@@ -28878,10 +29837,10 @@ diff -urNp linux-2.6.33.1/fs/ext4/balloc.c linux-2.6.33.1/fs/ext4/balloc.c
                if (free_blocks >= (nblocks + dirty_blocks))
                        return 1;
        }
-diff -urNp linux-2.6.33.1/fs/ext4/ioctl.c linux-2.6.33.1/fs/ext4/ioctl.c
---- linux-2.6.33.1/fs/ext4/ioctl.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext4/ioctl.c     2010-03-20 16:58:41.500911319 -0400
-@@ -221,6 +221,9 @@ setversion_out:
+diff -urNp linux-2.6.34/fs/ext4/ioctl.c linux-2.6.34/fs/ext4/ioctl.c
+--- linux-2.6.34/fs/ext4/ioctl.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext4/ioctl.c       2010-07-01 20:45:16.000000000 -0400
+@@ -230,6 +230,9 @@ setversion_out:
                struct file *donor_filp;
                int err;
  
@@ -28891,10 +29850,10 @@ diff -urNp linux-2.6.33.1/fs/ext4/ioctl.c linux-2.6.33.1/fs/ext4/ioctl.c
                if (!(filp->f_mode & FMODE_READ) ||
                    !(filp->f_mode & FMODE_WRITE))
                        return -EBADF;
-diff -urNp linux-2.6.33.1/fs/ext4/namei.c linux-2.6.33.1/fs/ext4/namei.c
---- linux-2.6.33.1/fs/ext4/namei.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext4/namei.c     2010-03-20 16:58:41.504537056 -0400
-@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
+diff -urNp linux-2.6.34/fs/ext4/namei.c linux-2.6.34/fs/ext4/namei.c
+--- linux-2.6.34/fs/ext4/namei.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext4/namei.c       2010-07-01 20:45:15.000000000 -0400
+@@ -1197,7 +1197,7 @@ static struct ext4_dir_entry_2 *do_split
        char *data1 = (*bh)->b_data, *data2;
        unsigned split, move, size;
        struct ext4_dir_entry_2 *de = NULL, *de2;
@@ -28903,27 +29862,29 @@ diff -urNp linux-2.6.33.1/fs/ext4/namei.c linux-2.6.33.1/fs/ext4/namei.c
  
        bh2 = ext4_append (handle, dir, &newblock, &err);
        if (!(bh2)) {
-diff -urNp linux-2.6.33.1/fs/ext4/super.c linux-2.6.33.1/fs/ext4/super.c
---- linux-2.6.33.1/fs/ext4/super.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ext4/super.c     2010-03-20 16:58:41.512931908 -0400
-@@ -2292,7 +2292,7 @@ static void ext4_sb_release(struct kobje
- }
- 
+diff -urNp linux-2.6.34/fs/ext4/xattr.c linux-2.6.34/fs/ext4/xattr.c
+--- linux-2.6.34/fs/ext4/xattr.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ext4/xattr.c       2010-07-01 20:45:15.000000000 -0400
+@@ -82,8 +82,8 @@
+               printk("\n"); \
+       } while (0)
+ #else
+-# define ea_idebug(f...)
+-# define ea_bdebug(f...)
++# define ea_idebug(inode, f...) do {} while (0)
++# define ea_bdebug(bh, f...) do {} while (0)
+ #endif
  
--static struct sysfs_ops ext4_attr_ops = {
-+static const struct sysfs_ops ext4_attr_ops = {
-       .show   = ext4_attr_show,
-       .store  = ext4_attr_store,
- };
-diff -urNp linux-2.6.33.1/fs/fcntl.c linux-2.6.33.1/fs/fcntl.c
---- linux-2.6.33.1/fs/fcntl.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fcntl.c  2010-03-20 16:58:41.516920875 -0400
+ static void ext4_xattr_cache_insert(struct buffer_head *);
+diff -urNp linux-2.6.34/fs/fcntl.c linux-2.6.34/fs/fcntl.c
+--- linux-2.6.34/fs/fcntl.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fcntl.c    2010-07-01 21:14:22.000000000 -0400
 @@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
        switch (cmd) {
        case F_DUPFD:
        case F_DUPFD_CLOEXEC:
 +              gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
-               if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+               if (arg >= rlimit(RLIMIT_NOFILE))
                        break;
                err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
 @@ -500,7 +501,8 @@ static inline int sigio_perm(struct task
@@ -28936,10 +29897,10 @@ diff -urNp linux-2.6.33.1/fs/fcntl.c linux-2.6.33.1/fs/fcntl.c
        rcu_read_unlock();
        return ret;
  }
-diff -urNp linux-2.6.33.1/fs/fifo.c linux-2.6.33.1/fs/fifo.c
---- linux-2.6.33.1/fs/fifo.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fifo.c   2010-03-20 16:58:41.516920875 -0400
-@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
+diff -urNp linux-2.6.34/fs/fifo.c linux-2.6.34/fs/fifo.c
+--- linux-2.6.34/fs/fifo.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fifo.c     2010-07-01 20:45:15.000000000 -0400
+@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &read_pipefifo_fops;
                pipe->r_counter++;
@@ -28952,7 +29913,7 @@ diff -urNp linux-2.6.33.1/fs/fifo.c linux-2.6.33.1/fs/fifo.c
                        if ((filp->f_flags & O_NONBLOCK)) {
                                /* suppress POLLHUP until we have
                                 * seen a writer */
-@@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode
+@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode
         *  errno=ENXIO when there is no process reading the FIFO.
         */
                ret = -ENXIO;
@@ -28971,7 +29932,7 @@ diff -urNp linux-2.6.33.1/fs/fifo.c linux-2.6.33.1/fs/fifo.c
                        wait_for_partner(inode, &pipe->r_counter);
                        if (signal_pending(current))
                                goto err_wr;
-@@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode
+@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &rdwr_pipefifo_fops;
  
@@ -28986,7 +29947,7 @@ diff -urNp linux-2.6.33.1/fs/fifo.c linux-2.6.33.1/fs/fifo.c
                        wake_up_partner(inode);
                break;
  
-@@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode
+@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode
        return 0;
  
  err_rd:
@@ -29009,9 +29970,9 @@ diff -urNp linux-2.6.33.1/fs/fifo.c linux-2.6.33.1/fs/fifo.c
                free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.33.1/fs/file.c linux-2.6.33.1/fs/file.c
---- linux-2.6.33.1/fs/file.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/file.c   2010-03-20 16:58:41.516920875 -0400
+diff -urNp linux-2.6.34/fs/file.c linux-2.6.34/fs/file.c
+--- linux-2.6.34/fs/file.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/file.c     2010-07-01 20:51:03.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -29020,59 +29981,52 @@ diff -urNp linux-2.6.33.1/fs/file.c linux-2.6.33.1/fs/file.c
  #include <linux/fdtable.h>
  #include <linux/bitops.h>
  #include <linux/interrupt.h>
-@@ -257,6 +258,8 @@ int expand_files(struct files_struct *fi
+@@ -257,6 +258,7 @@ int expand_files(struct files_struct *fi
         * N.B. For clone tasks sharing a files structure, this test
         * will limit the total number of files that can be opened.
         */
-+
 +      gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
-       if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+       if (nr >= rlimit(RLIMIT_NOFILE))
                return -EMFILE;
  
-diff -urNp linux-2.6.33.1/fs/fs_struct.c linux-2.6.33.1/fs/fs_struct.c
---- linux-2.6.33.1/fs/fs_struct.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fs_struct.c      2010-03-20 16:58:41.516920875 -0400
-@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
-       struct task_struct *g, *p;
-       struct fs_struct *fs;
-       int count = 0;
-+      unsigned long flags;
+diff -urNp linux-2.6.34/fs/fs_struct.c linux-2.6.34/fs/fs_struct.c
+--- linux-2.6.34/fs/fs_struct.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fs_struct.c        2010-07-01 20:45:16.000000000 -0400
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/grsecurity.h>
  
-       read_lock(&tasklist_lock);
-       do_each_thread(g, p) {
-               task_lock(p);
-+              gr_fs_write_lock_irqsave(p, flags);
-               fs = p->fs;
-               if (fs) {
-                       write_lock(&fs->lock);
-@@ -66,6 +68,7 @@ void chroot_fs_refs(struct path *old_roo
+ /*
+  * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s
+       old_root = fs->root;
+       fs->root = *path;
+       path_get(path);
++      gr_set_chroot_entries(current, path);
+       write_unlock(&fs->lock);
+       if (old_root.dentry)
+               path_put(&old_root);
+@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo
+                           && fs->root.mnt == old_root->mnt) {
+                               path_get(new_root);
+                               fs->root = *new_root;
++                              gr_set_chroot_entries(p, new_root);
+                               count++;
                        }
-                       write_unlock(&fs->lock);
-               }
-+              gr_fs_write_unlock_irqrestore(p, flags);
-               task_unlock(p);
-       } while_each_thread(g, p);
-       read_unlock(&tasklist_lock);
-@@ -83,14 +86,17 @@ void free_fs_struct(struct fs_struct *fs
- void exit_fs(struct task_struct *tsk)
- {
-       struct fs_struct *fs = tsk->fs;
-+      unsigned long flags;
- 
-       if (fs) {
-               int kill;
+                       if (fs->pwd.dentry == old_root->dentry
+@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
                task_lock(tsk);
-+              gr_fs_write_lock_irqsave(tsk, flags);
                write_lock(&fs->lock);
                tsk->fs = NULL;
 -              kill = !--fs->users;
++              gr_clear_chroot_entries(tsk);
 +              kill = !atomic_dec_return(&fs->users);
                write_unlock(&fs->lock);
-+              gr_fs_write_unlock_irqrestore(tsk, flags);
                task_unlock(tsk);
                if (kill)
-                       free_fs_struct(fs);
-@@ -102,7 +108,7 @@ struct fs_struct *copy_fs_struct(struct 
+@@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct 
        struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
        /* We don't need to lock fs - think why ;-) */
        if (fs) {
@@ -29081,27 +30035,18 @@ diff -urNp linux-2.6.33.1/fs/fs_struct.c linux-2.6.33.1/fs/fs_struct.c
                fs->in_exec = 0;
                rwlock_init(&fs->lock);
                fs->umask = old->umask;
-@@ -121,15 +127,18 @@ int unshare_fs_struct(void)
-       struct fs_struct *fs = current->fs;
-       struct fs_struct *new_fs = copy_fs_struct(fs);
-       int kill;
-+      unsigned long flags;
- 
-       if (!new_fs)
-               return -ENOMEM;
+@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
  
        task_lock(current);
-+      gr_fs_write_lock_irqsave(current, flags);
        write_lock(&fs->lock);
 -      kill = !--fs->users;
 +      kill = !atomic_dec_return(&fs->users);
        current->fs = new_fs;
++      gr_set_chroot_entries(current, &new_fs->root);
        write_unlock(&fs->lock);
-+      gr_fs_write_unlock_irqrestore(current, flags);
        task_unlock(current);
  
-       if (kill)
-@@ -147,7 +156,7 @@ EXPORT_SYMBOL(current_umask);
+@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
  
  /* to be mentioned only in INIT_TASK */
  struct fs_struct init_fs = {
@@ -29110,15 +30055,7 @@ diff -urNp linux-2.6.33.1/fs/fs_struct.c linux-2.6.33.1/fs/fs_struct.c
        .lock           = __RW_LOCK_UNLOCKED(init_fs.lock),
        .umask          = 0022,
  };
-@@ -155,6 +164,7 @@ struct fs_struct init_fs = {
- void daemonize_fs_struct(void)
- {
-       struct fs_struct *fs = current->fs;
-+      unsigned long flags;
- 
-       if (fs) {
-               int kill;
-@@ -162,13 +172,15 @@ void daemonize_fs_struct(void)
+@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
                task_lock(current);
  
                write_lock(&init_fs.lock);
@@ -29126,19 +30063,17 @@ diff -urNp linux-2.6.33.1/fs/fs_struct.c linux-2.6.33.1/fs/fs_struct.c
 +              atomic_inc(&init_fs.users);
                write_unlock(&init_fs.lock);
  
-+              gr_fs_write_lock_irqsave(current, flags);
                write_lock(&fs->lock);
                current->fs = &init_fs;
 -              kill = !--fs->users;
++              gr_set_chroot_entries(current, &current->fs->root);
 +              kill = !atomic_dec_return(&fs->users);
                write_unlock(&fs->lock);
-+              gr_fs_write_unlock_irqrestore(current, flags);
  
                task_unlock(current);
-               if (kill)
-diff -urNp linux-2.6.33.1/fs/fuse/control.c linux-2.6.33.1/fs/fuse/control.c
---- linux-2.6.33.1/fs/fuse/control.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fuse/control.c   2010-03-20 16:58:41.520615009 -0400
+diff -urNp linux-2.6.34/fs/fuse/control.c linux-2.6.34/fs/fuse/control.c
+--- linux-2.6.34/fs/fuse/control.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fuse/control.c     2010-07-01 20:45:15.000000000 -0400
 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
  
  static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -29148,10 +30083,10 @@ diff -urNp linux-2.6.33.1/fs/fuse/control.c linux-2.6.33.1/fs/fuse/control.c
        struct fuse_conn *fc;
        int err;
  
-diff -urNp linux-2.6.33.1/fs/fuse/cuse.c linux-2.6.33.1/fs/fuse/cuse.c
---- linux-2.6.33.1/fs/fuse/cuse.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fuse/cuse.c      2010-03-20 16:58:41.520615009 -0400
-@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
+diff -urNp linux-2.6.34/fs/fuse/cuse.c linux-2.6.34/fs/fuse/cuse.c
+--- linux-2.6.34/fs/fuse/cuse.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fuse/cuse.c        2010-07-01 20:45:15.000000000 -0400
+@@ -529,8 +529,18 @@ static int cuse_channel_release(struct i
        return rc;
  }
  
@@ -29172,7 +30107,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/cuse.c linux-2.6.33.1/fs/fuse/cuse.c
  
  /**************************************************************************
   * Misc stuff and module initializatiion
-@@ -575,12 +585,6 @@ static int __init cuse_init(void)
+@@ -576,12 +586,6 @@ static int __init cuse_init(void)
        for (i = 0; i < CUSE_CONNTBL_LEN; i++)
                INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -29185,9 +30120,9 @@ diff -urNp linux-2.6.33.1/fs/fuse/cuse.c linux-2.6.33.1/fs/fuse/cuse.c
        cuse_class = class_create(THIS_MODULE, "cuse");
        if (IS_ERR(cuse_class))
                return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
---- linux-2.6.33.1/fs/fuse/dev.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fuse/dev.c       2010-03-20 16:58:41.524892399 -0400
+diff -urNp linux-2.6.34/fs/fuse/dev.c linux-2.6.34/fs/fuse/dev.c
+--- linux-2.6.34/fs/fuse/dev.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fuse/dev.c 2010-07-01 20:45:15.000000000 -0400
 @@ -745,7 +745,7 @@ __releases(&fc->lock)
   * request_end().  Otherwise add it to the processing list, and set
   * the 'sent' flag.
@@ -29206,50 +30141,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
  static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,
                            struct fuse_copy_state *cs)
  {
-@@ -885,7 +887,7 @@ static int fuse_notify_inval_entry(struc
- {
-       struct fuse_notify_inval_entry_out outarg;
-       int err = -EINVAL;
--      char buf[FUSE_NAME_MAX+1];
-+      char *buf = NULL;
-       struct qstr name;
- 
-       if (size < sizeof(outarg))
-@@ -899,6 +901,11 @@ static int fuse_notify_inval_entry(struc
-       if (outarg.namelen > FUSE_NAME_MAX)
-               goto err;
- 
-+      err = -ENOMEM;
-+      buf = kmalloc(FUSE_NAME_MAX+1, GFP_KERNEL);
-+      if (!buf)
-+              goto err;
-+
-       name.name = buf;
-       name.len = outarg.namelen;
-       err = fuse_copy_one(cs, buf, outarg.namelen + 1);
-@@ -910,17 +917,15 @@ static int fuse_notify_inval_entry(struc
- 
-       down_read(&fc->killsb);
-       err = -ENOENT;
--      if (!fc->sb)
--              goto err_unlock;
--
--      err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
--
--err_unlock:
-+      if (fc->sb)
-+              err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
-       up_read(&fc->killsb);
-+      kfree(buf);
-       return err;
- 
- err:
-       fuse_copy_finish(cs);
-+      kfree(buf);
-       return err;
- }
- 
-@@ -987,7 +992,7 @@ static int copy_out_args(struct fuse_cop
+@@ -987,7 +989,7 @@ static int copy_out_args(struct fuse_cop
   * it from the list and copy the rest of the buffer to the request.
   * The request is finished by calling request_end()
   */
@@ -29258,7 +30150,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
                               unsigned long nr_segs, loff_t pos)
  {
        int err;
-@@ -1084,7 +1089,9 @@ static ssize_t fuse_dev_write(struct kio
+@@ -1084,7 +1086,9 @@ static ssize_t fuse_dev_write(struct kio
        return err;
  }
  
@@ -29269,7 +30161,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
  {
        unsigned mask = POLLOUT | POLLWRNORM;
        struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1103,6 +1110,8 @@ static unsigned fuse_dev_poll(struct fil
+@@ -1103,6 +1107,8 @@ static unsigned fuse_dev_poll(struct fil
        return mask;
  }
  
@@ -29278,7 +30170,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
  /*
   * Abort all requests on the given list (pending or processing)
   *
-@@ -1210,7 +1219,7 @@ int fuse_dev_release(struct inode *inode
+@@ -1210,7 +1216,7 @@ int fuse_dev_release(struct inode *inode
  }
  EXPORT_SYMBOL_GPL(fuse_dev_release);
  
@@ -29287,7 +30179,7 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
  {
        struct fuse_conn *fc = fuse_get_conn(file);
        if (!fc)
-@@ -1220,6 +1229,8 @@ static int fuse_dev_fasync(int fd, struc
+@@ -1220,6 +1226,8 @@ static int fuse_dev_fasync(int fd, struc
        return fasync_helper(fd, file, on, &fc->fasync);
  }
  
@@ -29296,9 +30188,9 @@ diff -urNp linux-2.6.33.1/fs/fuse/dev.c linux-2.6.33.1/fs/fuse/dev.c
  const struct file_operations fuse_dev_operations = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
-diff -urNp linux-2.6.33.1/fs/fuse/dir.c linux-2.6.33.1/fs/fuse/dir.c
---- linux-2.6.33.1/fs/fuse/dir.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fuse/dir.c       2010-03-20 16:58:41.528872982 -0400
+diff -urNp linux-2.6.34/fs/fuse/dir.c linux-2.6.34/fs/fuse/dir.c
+--- linux-2.6.34/fs/fuse/dir.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fuse/dir.c 2010-07-01 20:45:15.000000000 -0400
 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
        return link;
  }
@@ -29308,9 +30200,9 @@ diff -urNp linux-2.6.33.1/fs/fuse/dir.c linux-2.6.33.1/fs/fuse/dir.c
  {
        if (!IS_ERR(link))
                free_page((unsigned long) link);
-diff -urNp linux-2.6.33.1/fs/fuse/fuse_i.h linux-2.6.33.1/fs/fuse/fuse_i.h
---- linux-2.6.33.1/fs/fuse/fuse_i.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/fuse/fuse_i.h    2010-03-20 16:58:41.532912913 -0400
+diff -urNp linux-2.6.34/fs/fuse/fuse_i.h linux-2.6.34/fs/fuse/fuse_i.h
+--- linux-2.6.34/fs/fuse/fuse_i.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/fuse/fuse_i.h      2010-07-01 20:45:15.000000000 -0400
 @@ -521,6 +521,16 @@ extern const struct file_operations fuse
  
  extern const struct dentry_operations fuse_dentry_operations;
@@ -29328,30 +30220,9 @@ diff -urNp linux-2.6.33.1/fs/fuse/fuse_i.h linux-2.6.33.1/fs/fuse/fuse_i.h
  /**
   * Inode to nodeid comparison.
   */
-diff -urNp linux-2.6.33.1/fs/gfs2/sys.c linux-2.6.33.1/fs/gfs2/sys.c
---- linux-2.6.33.1/fs/gfs2/sys.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/gfs2/sys.c       2010-03-20 16:58:41.563618654 -0400
-@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
-       return a->store ? a->store(sdp, buf, len) : len;
- }
- 
--static struct sysfs_ops gfs2_attr_ops = {
-+static const struct sysfs_ops gfs2_attr_ops = {
-       .show  = gfs2_attr_show,
-       .store = gfs2_attr_store,
- };
-@@ -576,7 +576,7 @@ static int gfs2_uevent(struct kset *kset
-       return 0;
- }
- 
--static struct kset_uevent_ops gfs2_uevent_ops = {
-+static const struct kset_uevent_ops gfs2_uevent_ops = {
-       .uevent = gfs2_uevent,
- };
- 
-diff -urNp linux-2.6.33.1/fs/hfs/inode.c linux-2.6.33.1/fs/hfs/inode.c
---- linux-2.6.33.1/fs/hfs/inode.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/hfs/inode.c      2010-03-20 16:58:41.564527258 -0400
+diff -urNp linux-2.6.34/fs/hfs/inode.c linux-2.6.34/fs/hfs/inode.c
+--- linux-2.6.34/fs/hfs/inode.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/hfs/inode.c        2010-07-01 20:45:15.000000000 -0400
 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
  
        if (S_ISDIR(main_inode->i_mode)) {
@@ -29370,9 +30241,9 @@ diff -urNp linux-2.6.33.1/fs/hfs/inode.c linux-2.6.33.1/fs/hfs/inode.c
                hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
                           sizeof(struct hfs_cat_file));
                if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.33.1/fs/hfsplus/inode.c linux-2.6.33.1/fs/hfsplus/inode.c
---- linux-2.6.33.1/fs/hfsplus/inode.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/hfsplus/inode.c  2010-03-20 16:58:41.564527258 -0400
+diff -urNp linux-2.6.34/fs/hfsplus/inode.c linux-2.6.34/fs/hfsplus/inode.c
+--- linux-2.6.34/fs/hfsplus/inode.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/hfsplus/inode.c    2010-07-01 20:45:15.000000000 -0400
 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 
                struct hfsplus_cat_folder *folder = &entry.folder;
  
@@ -29409,9 +30280,21 @@ diff -urNp linux-2.6.33.1/fs/hfsplus/inode.c linux-2.6.33.1/fs/hfsplus/inode.c
                hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
                                        sizeof(struct hfsplus_cat_file));
                hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.33.1/fs/ioctl.c linux-2.6.33.1/fs/ioctl.c
---- linux-2.6.33.1/fs/ioctl.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ioctl.c  2010-03-20 16:58:41.564527258 -0400
+diff -urNp linux-2.6.34/fs/hugetlbfs/inode.c linux-2.6.34/fs/hugetlbfs/inode.c
+--- linux-2.6.34/fs/hugetlbfs/inode.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/hugetlbfs/inode.c  2010-07-01 20:45:16.000000000 -0400
+@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
+       .kill_sb        = kill_litter_super,
+ };
+ 
+-static struct vfsmount *hugetlbfs_vfsmount;
++struct vfsmount *hugetlbfs_vfsmount;
+ 
+ static int can_do_hugetlb_shm(void)
+ {
+diff -urNp linux-2.6.34/fs/ioctl.c linux-2.6.34/fs/ioctl.c
+--- linux-2.6.34/fs/ioctl.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ioctl.c    2010-07-01 20:45:15.000000000 -0400
 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
                            u64 phys, u64 len, u32 flags)
  {
@@ -29439,9 +30322,9 @@ diff -urNp linux-2.6.33.1/fs/ioctl.c linux-2.6.33.1/fs/ioctl.c
                error = -EFAULT;
  
        return error;
-diff -urNp linux-2.6.33.1/fs/jffs2/debug.h linux-2.6.33.1/fs/jffs2/debug.h
---- linux-2.6.33.1/fs/jffs2/debug.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/jffs2/debug.h    2010-03-20 16:58:41.564527258 -0400
+diff -urNp linux-2.6.34/fs/jffs2/debug.h linux-2.6.34/fs/jffs2/debug.h
+--- linux-2.6.34/fs/jffs2/debug.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/jffs2/debug.h      2010-07-01 20:45:15.000000000 -0400
 @@ -52,13 +52,13 @@
  #if CONFIG_JFFS2_FS_DEBUG > 0
  #define D1(x) x
@@ -29543,9 +30426,9 @@ diff -urNp linux-2.6.33.1/fs/jffs2/debug.h linux-2.6.33.1/fs/jffs2/debug.h
  #endif 
  
  /* "Sanity" checks */
-diff -urNp linux-2.6.33.1/fs/jffs2/erase.c linux-2.6.33.1/fs/jffs2/erase.c
---- linux-2.6.33.1/fs/jffs2/erase.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/jffs2/erase.c    2010-03-20 16:58:41.588752321 -0400
+diff -urNp linux-2.6.34/fs/jffs2/erase.c linux-2.6.34/fs/jffs2/erase.c
+--- linux-2.6.34/fs/jffs2/erase.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/jffs2/erase.c      2010-07-01 20:45:15.000000000 -0400
 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
                struct jffs2_unknown_node marker = {
                        .magic =        cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29556,9 +30439,9 @@ diff -urNp linux-2.6.33.1/fs/jffs2/erase.c linux-2.6.33.1/fs/jffs2/erase.c
                };
  
                jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.33.1/fs/jffs2/summary.h linux-2.6.33.1/fs/jffs2/summary.h
---- linux-2.6.33.1/fs/jffs2/summary.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/jffs2/summary.h  2010-03-20 16:58:41.588752321 -0400
+diff -urNp linux-2.6.34/fs/jffs2/summary.h linux-2.6.34/fs/jffs2/summary.h
+--- linux-2.6.34/fs/jffs2/summary.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/jffs2/summary.h    2010-07-01 20:45:15.000000000 -0400
 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
  
  #define jffs2_sum_active() (0)
@@ -29587,9 +30470,9 @@ diff -urNp linux-2.6.33.1/fs/jffs2/summary.h linux-2.6.33.1/fs/jffs2/summary.h
  #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
  
  #endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.33.1/fs/jffs2/wbuf.c linux-2.6.33.1/fs/jffs2/wbuf.c
---- linux-2.6.33.1/fs/jffs2/wbuf.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/jffs2/wbuf.c     2010-03-20 16:58:41.588752321 -0400
+diff -urNp linux-2.6.34/fs/jffs2/wbuf.c linux-2.6.34/fs/jffs2/wbuf.c
+--- linux-2.6.34/fs/jffs2/wbuf.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/jffs2/wbuf.c       2010-07-01 20:45:15.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
        .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -29600,10 +30483,10 @@ diff -urNp linux-2.6.33.1/fs/jffs2/wbuf.c linux-2.6.33.1/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.33.1/fs/lockd/svc.c linux-2.6.33.1/fs/lockd/svc.c
---- linux-2.6.33.1/fs/lockd/svc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/lockd/svc.c      2010-03-20 16:58:41.588752321 -0400
-@@ -43,7 +43,7 @@
+diff -urNp linux-2.6.34/fs/lockd/svc.c linux-2.6.34/fs/lockd/svc.c
+--- linux-2.6.34/fs/lockd/svc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/lockd/svc.c        2010-07-01 20:45:15.000000000 -0400
+@@ -42,7 +42,7 @@
  
  static struct svc_program     nlmsvc_program;
  
@@ -29612,10 +30495,10 @@ diff -urNp linux-2.6.33.1/fs/lockd/svc.c linux-2.6.33.1/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.33.1/fs/locks.c linux-2.6.33.1/fs/locks.c
---- linux-2.6.33.1/fs/locks.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/locks.c  2010-03-20 16:58:41.600927747 -0400
-@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
+diff -urNp linux-2.6.34/fs/locks.c linux-2.6.34/fs/locks.c
+--- linux-2.6.34/fs/locks.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/locks.c    2010-07-01 20:45:15.000000000 -0400
+@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *fil
                return;
  
        if (filp->f_op && filp->f_op->flock) {
@@ -29636,19 +30519,19 @@ diff -urNp linux-2.6.33.1/fs/locks.c linux-2.6.33.1/fs/locks.c
        }
  
        lock_kernel();
-diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
---- linux-2.6.33.1/fs/namei.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/namei.c  2010-03-20 16:58:41.612934232 -0400
-@@ -565,7 +565,7 @@ static __always_inline int __do_follow_l
-       cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
-       error = PTR_ERR(cookie);
-       if (!IS_ERR(cookie)) {
+diff -urNp linux-2.6.34/fs/namei.c linux-2.6.34/fs/namei.c
+--- linux-2.6.34/fs/namei.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/namei.c    2010-07-02 19:42:31.000000000 -0400
+@@ -547,7 +547,7 @@ __do_follow_link(struct path *path, stru
+       *p = dentry->d_inode->i_op->follow_link(dentry, nd);
+       error = PTR_ERR(*p);
+       if (!IS_ERR(*p)) {
 -              char *s = nd_get_link(nd);
 +              const char *s = nd_get_link(nd);
                error = 0;
                if (s)
                        error = __vfs_follow_link(nd, s);
-@@ -599,6 +599,13 @@ static inline int do_follow_link(struct 
+@@ -580,6 +580,13 @@ static inline int do_follow_link(struct 
        err = security_inode_follow_link(path->dentry, nd);
        if (err)
                goto loop;
@@ -29662,11 +30545,11 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        current->link_count++;
        current->total_link_count++;
        nd->depth++;
-@@ -994,11 +1001,18 @@ return_reval:
+@@ -964,11 +971,18 @@ return_reval:
                                break;
                }
  return_base:
-+              if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++              if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
 +                      path_put(&nd->path);
 +                      return -ENOENT;
 +              }
@@ -29675,17 +30558,17 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
                path_put_conditional(&next, nd);
                break;
        }
-+      if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
++      if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
 +              err = -ENOENT;
 +
        path_put(&nd->path);
  return_err:
        return err;
-@@ -1552,12 +1566,19 @@ static int __open_namei_create(struct na
+@@ -1505,12 +1519,19 @@ static int __open_namei_create(struct na
        int error;
        struct dentry *dir = nd->path.dentry;
  
-+      if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
++      if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, open_flag, mode)) {
 +              error = -EACCES;
 +              goto out_unlock;
 +      }
@@ -29701,22 +30584,30 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  out_unlock:
        mutex_unlock(&dir->d_inode->i_mutex);
        dput(nd->path.dentry);
-@@ -1665,6 +1686,22 @@ struct file *do_filp_open(int dfd, const
-                       release_open_intent(&nd);
-               if (error)
-                       return ERR_PTR(error);
+@@ -1613,6 +1634,7 @@ static struct file *do_last(struct namei
+                           int mode, const char *pathname)
+ {
+       struct dentry *dir = nd->path.dentry;
++      int flag = open_to_namei_flags(open_flag);
+       struct file *filp;
+       int error = -EISDIR;
+ 
+@@ -1661,6 +1683,22 @@ static struct file *do_last(struct namei
+               }
+               path_to_nameidata(path, nd);
+               audit_inode(pathname, nd->path.dentry);
 +
-+              if (gr_handle_rofs_blockwrite(nd.path.dentry, nd.path.mnt, acc_mode)) {
++              if (gr_handle_rofs_blockwrite(nd->path.dentry, nd->path.mnt, acc_mode)) {
 +                      error = -EPERM;
 +                      goto exit;
 +              }
 +
-+              if (gr_handle_rawio(nd.path.dentry->d_inode)) {
++              if (gr_handle_rawio(nd->path.dentry->d_inode)) {
 +                      error = -EPERM;
 +                      goto exit;
 +              }
 +
-+              if (!gr_acl_handle_open(nd.path.dentry, nd.path.mnt, flag)) {
++              if (!gr_acl_handle_open(nd->path.dentry, nd->path.mnt, flag)) {
 +                      error = -EACCES;
 +                      goto exit;
 +              }
@@ -29724,46 +30615,32 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
                goto ok;
        }
  
-@@ -1758,6 +1795,24 @@ do_last:
+@@ -1713,6 +1751,24 @@ static struct file *do_last(struct namei
        /*
         * It already exists.
         */
 +
-+      if (gr_handle_rofs_blockwrite(path.dentry, nd.path.mnt, acc_mode)) {
++      if (gr_handle_rofs_blockwrite(path->dentry, nd->path.mnt, acc_mode)) {
 +              error = -EPERM;
 +              goto exit_mutex_unlock;
 +      }
-+      if (gr_handle_rawio(path.dentry->d_inode)) {
++      if (gr_handle_rawio(path->dentry->d_inode)) {
 +              error = -EPERM;
 +              goto exit_mutex_unlock;
 +      }
-+      if (!gr_acl_handle_open(path.dentry, nd.path.mnt, flag)) {
++      if (!gr_acl_handle_open(path->dentry, nd->path.mnt, flag)) {
 +              error = -EACCES;
 +              goto exit_mutex_unlock;
 +      }
-+      if (gr_handle_fifo(path.dentry, nd.path.mnt, dir, flag, acc_mode)) {
++      if (gr_handle_fifo(path->dentry, nd->path.mnt, dir, flag, acc_mode)) {
 +              error = -EACCES;
 +              goto exit_mutex_unlock;
 +      }
 +
        mutex_unlock(&dir->d_inode->i_mutex);
-       audit_inode(pathname, path.dentry);
+       audit_inode(pathname, path->dentry);
  
-@@ -1866,6 +1921,13 @@ do_link:
-       error = security_inode_follow_link(path.dentry, &nd);
-       if (error)
-               goto exit_dput;
-+
-+      if (gr_handle_follow_link(path.dentry->d_parent->d_inode, path.dentry->d_inode,
-+                                path.dentry, nd.path.mnt)) {
-+              error = -EACCES;
-+              goto exit_dput;
-+      }
-+
-       error = __do_follow_link(&path, &nd);
-       path_put(&path);
-       if (error) {
-@@ -2045,6 +2107,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2033,6 +2089,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        error = may_mknod(mode);
        if (error)
                goto out_dput;
@@ -29781,7 +30658,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2065,6 +2138,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2053,6 +2120,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
        }
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
@@ -29791,7 +30668,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  out_dput:
        dput(dentry);
  out_unlock:
-@@ -2118,6 +2194,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2105,6 +2175,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        if (IS_ERR(dentry))
                goto out_unlock;
  
@@ -29803,7 +30680,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        if (!IS_POSIXACL(nd.path.dentry->d_inode))
                mode &= ~current_umask();
        error = mnt_want_write(nd.path.mnt);
-@@ -2129,6 +2210,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2116,6 +2191,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
        error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
@@ -29814,7 +30691,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  out_dput:
        dput(dentry);
  out_unlock:
-@@ -2210,6 +2295,8 @@ static long do_rmdir(int dfd, const char
+@@ -2197,6 +2276,8 @@ static long do_rmdir(int dfd, const char
        char * name;
        struct dentry *dentry;
        struct nameidata nd;
@@ -29823,7 +30700,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2234,6 +2321,19 @@ static long do_rmdir(int dfd, const char
+@@ -2221,6 +2302,19 @@ static long do_rmdir(int dfd, const char
        error = PTR_ERR(dentry);
        if (IS_ERR(dentry))
                goto exit2;
@@ -29843,7 +30720,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto exit3;
-@@ -2241,6 +2341,8 @@ static long do_rmdir(int dfd, const char
+@@ -2228,6 +2322,8 @@ static long do_rmdir(int dfd, const char
        if (error)
                goto exit4;
        error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -29852,7 +30729,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  exit4:
        mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2302,6 +2404,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2290,6 +2386,8 @@ static long do_unlinkat(int dfd, const c
        struct dentry *dentry;
        struct nameidata nd;
        struct inode *inode = NULL;
@@ -29861,7 +30738,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  
        error = user_path_parent(dfd, pathname, &nd, &name);
        if (error)
-@@ -2321,8 +2425,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2309,8 +2407,19 @@ static long do_unlinkat(int dfd, const c
                if (nd.last.name[nd.last.len])
                        goto slashes;
                inode = dentry->d_inode;
@@ -29882,7 +30759,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
                error = mnt_want_write(nd.path.mnt);
                if (error)
                        goto exit2;
-@@ -2330,6 +2445,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2318,6 +2427,8 @@ static long do_unlinkat(int dfd, const c
                if (error)
                        goto exit3;
                error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -29891,7 +30768,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  exit3:
                mnt_drop_write(nd.path.mnt);
        exit2:
-@@ -2408,6 +2525,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2395,6 +2506,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
        if (IS_ERR(dentry))
                goto out_unlock;
  
@@ -29903,7 +30780,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2415,6 +2537,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2402,6 +2518,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
        if (error)
                goto out_drop_write;
        error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -29912,7 +30789,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2508,6 +2632,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2494,6 +2612,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        error = PTR_ERR(new_dentry);
        if (IS_ERR(new_dentry))
                goto out_unlock;
@@ -29933,7 +30810,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        error = mnt_want_write(nd.path.mnt);
        if (error)
                goto out_dput;
-@@ -2515,6 +2653,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2501,6 +2633,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
        if (error)
                goto out_drop_write;
        error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -29942,7 +30819,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  out_drop_write:
        mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2748,6 +2888,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2734,6 +2868,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
        if (new_dentry == trap)
                goto exit5;
  
@@ -29955,7 +30832,7 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
        error = mnt_want_write(oldnd.path.mnt);
        if (error)
                goto exit5;
-@@ -2757,6 +2903,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2743,6 +2883,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
                goto exit6;
        error = vfs_rename(old_dir->d_inode, old_dentry,
                                   new_dir->d_inode, new_dentry);
@@ -29965,10 +30842,10 @@ diff -urNp linux-2.6.33.1/fs/namei.c linux-2.6.33.1/fs/namei.c
  exit6:
        mnt_drop_write(oldnd.path.mnt);
  exit5:
-diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
---- linux-2.6.33.1/fs/namespace.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/namespace.c      2010-03-20 16:58:41.649168726 -0400
-@@ -1085,6 +1085,9 @@ static int do_umount(struct vfsmount *mn
+diff -urNp linux-2.6.34/fs/namespace.c linux-2.6.34/fs/namespace.c
+--- linux-2.6.34/fs/namespace.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/namespace.c        2010-07-01 20:45:16.000000000 -0400
+@@ -1100,6 +1100,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);
@@ -29978,7 +30855,7 @@ diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
                return retval;
        }
  
-@@ -1106,6 +1109,9 @@ static int do_umount(struct vfsmount *mn
+@@ -1121,6 +1124,9 @@ static int do_umount(struct vfsmount *mn
                security_sb_umount_busy(mnt);
        up_write(&namespace_sem);
        release_mounts(&umount_list);
@@ -29988,7 +30865,7 @@ diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
        return retval;
  }
  
-@@ -1963,6 +1969,16 @@ long do_mount(char *dev_name, char *dir_
+@@ -2000,6 +2006,16 @@ long do_mount(char *dev_name, char *dir_
                   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
                   MS_STRICTATIME);
  
@@ -30005,7 +30882,7 @@ diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
        if (flags & MS_REMOUNT)
                retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
                                    data_page);
-@@ -1977,6 +1993,9 @@ long do_mount(char *dev_name, char *dir_
+@@ -2014,6 +2030,9 @@ long do_mount(char *dev_name, char *dir_
                                      dev_name, data_page);
  dput_out:
        path_put(&path);
@@ -30015,7 +30892,7 @@ diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
        return retval;
  }
  
-@@ -2183,6 +2202,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2220,6 +2239,12 @@ SYSCALL_DEFINE2(pivot_root, const char _
                goto out1;
        }
  
@@ -30028,10 +30905,10 @@ diff -urNp linux-2.6.33.1/fs/namespace.c linux-2.6.33.1/fs/namespace.c
        read_lock(&current->fs->lock);
        root = current->fs->root;
        path_get(&current->fs->root);
-diff -urNp linux-2.6.33.1/fs/nfs/inode.c linux-2.6.33.1/fs/nfs/inode.c
---- linux-2.6.33.1/fs/nfs/inode.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nfs/inode.c      2010-03-20 16:58:41.649168726 -0400
-@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
+diff -urNp linux-2.6.34/fs/nfs/inode.c linux-2.6.34/fs/nfs/inode.c
+--- linux-2.6.34/fs/nfs/inode.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nfs/inode.c        2010-07-01 20:45:15.000000000 -0400
+@@ -897,16 +897,16 @@ static int nfs_size_need_update(const st
        return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -30051,10 +30928,10 @@ diff -urNp linux-2.6.33.1/fs/nfs/inode.c linux-2.6.33.1/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
---- linux-2.6.33.1/fs/nfs/nfs4proc.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nfs/nfs4proc.c   2010-03-20 16:58:41.652911113 -0400
-@@ -1159,7 +1159,7 @@ static int _nfs4_do_open_reclaim(struct 
+diff -urNp linux-2.6.34/fs/nfs/nfs4proc.c linux-2.6.34/fs/nfs/nfs4proc.c
+--- linux-2.6.34/fs/nfs/nfs4proc.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nfs/nfs4proc.c     2010-07-01 20:45:15.000000000 -0400
+@@ -1162,7 +1162,7 @@ static int _nfs4_do_open_reclaim(struct 
  static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -30063,7 +30940,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = _nfs4_do_open_reclaim(ctx, state);
-@@ -1201,7 +1201,7 @@ static int _nfs4_open_delegation_recall(
+@@ -1204,7 +1204,7 @@ static int _nfs4_open_delegation_recall(
  
  int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
  {
@@ -30072,7 +30949,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        struct nfs_server *server = NFS_SERVER(state->inode);
        int err;
        do {
-@@ -1572,7 +1572,7 @@ static int _nfs4_open_expired(struct nfs
+@@ -1577,7 +1577,7 @@ static int _nfs4_open_expired(struct nfs
  static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -30081,7 +30958,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -1678,7 +1678,7 @@ out_err:
+@@ -1684,7 +1684,7 @@ out_err:
  
  static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
  {
@@ -30090,7 +30967,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        struct nfs4_state *res;
        int status;
  
-@@ -1769,7 +1769,7 @@ static int nfs4_do_setattr(struct inode 
+@@ -1775,7 +1775,7 @@ static int nfs4_do_setattr(struct inode 
                           struct nfs4_state *state)
  {
        struct nfs_server *server = NFS_SERVER(inode);
@@ -30099,7 +30976,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2146,7 +2146,7 @@ static int _nfs4_server_capabilities(str
+@@ -2151,7 +2151,7 @@ static int _nfs4_server_capabilities(str
  
  int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
  {
@@ -30108,7 +30985,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2180,7 +2180,7 @@ static int _nfs4_lookup_root(struct nfs_
+@@ -2185,7 +2185,7 @@ static int _nfs4_lookup_root(struct nfs_
  static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
                struct nfs_fsinfo *info)
  {
@@ -30117,7 +30994,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2269,7 +2269,7 @@ static int _nfs4_proc_getattr(struct nfs
+@@ -2274,7 +2274,7 @@ static int _nfs4_proc_getattr(struct nfs
  
  static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -30126,7 +31003,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -2357,7 +2357,7 @@ static int nfs4_proc_lookupfh(struct nfs
+@@ -2362,7 +2362,7 @@ static int nfs4_proc_lookupfh(struct nfs
                              struct qstr *name, struct nfs_fh *fhandle,
                              struct nfs_fattr *fattr)
  {
@@ -30135,7 +31012,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
-@@ -2386,7 +2386,7 @@ static int _nfs4_proc_lookup(struct inod
+@@ -2391,7 +2391,7 @@ static int _nfs4_proc_lookup(struct inod
  
  static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
  {
@@ -30144,7 +31021,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2450,7 +2450,7 @@ static int _nfs4_proc_access(struct inod
+@@ -2455,7 +2455,7 @@ static int _nfs4_proc_access(struct inod
  
  static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
  {
@@ -30153,7 +31030,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2506,7 +2506,7 @@ static int _nfs4_proc_readlink(struct in
+@@ -2511,7 +2511,7 @@ static int _nfs4_proc_readlink(struct in
  static int nfs4_proc_readlink(struct inode *inode, struct page *page,
                unsigned int pgbase, unsigned int pglen)
  {
@@ -30162,7 +31039,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2604,7 +2604,7 @@ static int _nfs4_proc_remove(struct inod
+@@ -2609,7 +2609,7 @@ static int _nfs4_proc_remove(struct inod
  
  static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
  {
@@ -30171,7 +31048,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2677,7 +2677,7 @@ static int _nfs4_proc_rename(struct inod
+@@ -2682,7 +2682,7 @@ static int _nfs4_proc_rename(struct inod
  static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
                struct inode *new_dir, struct qstr *new_name)
  {
@@ -30180,7 +31057,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(old_dir),
-@@ -2724,7 +2724,7 @@ static int _nfs4_proc_link(struct inode 
+@@ -2729,7 +2729,7 @@ static int _nfs4_proc_link(struct inode 
  
  static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
  {
@@ -30189,7 +31066,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2816,7 +2816,7 @@ out:
+@@ -2821,7 +2821,7 @@ out:
  static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
                struct page *page, unsigned int len, struct iattr *sattr)
  {
@@ -30198,7 +31075,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2847,7 +2847,7 @@ out:
+@@ -2852,7 +2852,7 @@ out:
  static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
                struct iattr *sattr)
  {
@@ -30207,7 +31084,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2896,7 +2896,7 @@ static int _nfs4_proc_readdir(struct den
+@@ -2901,7 +2901,7 @@ static int _nfs4_proc_readdir(struct den
  static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
                    u64 cookie, struct page *page, unsigned int count, int plus)
  {
@@ -30216,7 +31093,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
-@@ -2944,7 +2944,7 @@ out:
+@@ -2949,7 +2949,7 @@ out:
  static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
                struct iattr *sattr, dev_t rdev)
  {
@@ -30225,7 +31102,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2976,7 +2976,7 @@ static int _nfs4_proc_statfs(struct nfs_
+@@ -2981,7 +2981,7 @@ static int _nfs4_proc_statfs(struct nfs_
  
  static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
  {
@@ -30234,7 +31111,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(server,
-@@ -3007,7 +3007,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
+@@ -3012,7 +3012,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
  
  static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
  {
@@ -30243,7 +31120,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -3053,7 +3053,7 @@ static int _nfs4_proc_pathconf(struct nf
+@@ -3058,7 +3058,7 @@ static int _nfs4_proc_pathconf(struct nf
  static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
                struct nfs_pathconf *pathconf)
  {
@@ -30252,7 +31129,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -3348,7 +3348,7 @@ out_free:
+@@ -3365,7 +3365,7 @@ out_free:
  
  static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
  {
@@ -30261,7 +31138,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        ssize_t ret;
        do {
                ret = __nfs4_get_acl_uncached(inode, buf, buflen);
-@@ -3404,7 +3404,7 @@ static int __nfs4_proc_set_acl(struct in
+@@ -3421,7 +3421,7 @@ static int __nfs4_proc_set_acl(struct in
  
  static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
  {
@@ -30270,7 +31147,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -3686,7 +3686,7 @@ out:
+@@ -3705,7 +3705,7 @@ out:
  int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
  {
        struct nfs_server *server = NFS_SERVER(inode);
@@ -30279,7 +31156,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
        do {
                err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
-@@ -3759,7 +3759,7 @@ out:
+@@ -3778,7 +3778,7 @@ out:
  
  static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -30288,7 +31165,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4171,7 +4171,7 @@ static int _nfs4_do_setlk(struct nfs4_st
+@@ -4190,7 +4190,7 @@ static int _nfs4_do_setlk(struct nfs4_st
  static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -30297,7 +31174,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4189,7 +4189,7 @@ static int nfs4_lock_reclaim(struct nfs4
+@@ -4208,7 +4208,7 @@ static int nfs4_lock_reclaim(struct nfs4
  static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -30306,7 +31183,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        err = nfs4_set_lock_state(state, request);
-@@ -4253,7 +4253,7 @@ out:
+@@ -4273,7 +4273,7 @@ out:
  
  static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
  {
@@ -30315,7 +31192,7 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        do {
-@@ -4313,7 +4313,7 @@ nfs4_proc_lock(struct file *filp, int cm
+@@ -4333,7 +4333,7 @@ nfs4_proc_lock(struct file *filp, int cm
  int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
  {
        struct nfs_server *server = NFS_SERVER(state->inode);
@@ -30324,9 +31201,9 @@ diff -urNp linux-2.6.33.1/fs/nfs/nfs4proc.c linux-2.6.33.1/fs/nfs/nfs4proc.c
        int err;
  
        err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.33.1/fs/nfsd/lockd.c linux-2.6.33.1/fs/nfsd/lockd.c
---- linux-2.6.33.1/fs/nfsd/lockd.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nfsd/lockd.c     2010-03-20 16:58:41.660926393 -0400
+diff -urNp linux-2.6.34/fs/nfsd/lockd.c linux-2.6.34/fs/nfsd/lockd.c
+--- linux-2.6.34/fs/nfsd/lockd.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nfsd/lockd.c       2010-07-01 20:45:15.000000000 -0400
 @@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
        fput(filp);
  }
@@ -30336,10 +31213,10 @@ diff -urNp linux-2.6.33.1/fs/nfsd/lockd.c linux-2.6.33.1/fs/nfsd/lockd.c
        .fopen          = nlm_fopen,            /* open file for locking */
        .fclose         = nlm_fclose,           /* close file */
  };
-diff -urNp linux-2.6.33.1/fs/nfsd/nfsctl.c linux-2.6.33.1/fs/nfsd/nfsctl.c
---- linux-2.6.33.1/fs/nfsd/nfsctl.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nfsd/nfsctl.c    2010-03-20 16:58:41.676914510 -0400
-@@ -159,7 +159,7 @@ static int export_features_open(struct i
+diff -urNp linux-2.6.34/fs/nfsd/nfsctl.c linux-2.6.34/fs/nfsd/nfsctl.c
+--- linux-2.6.34/fs/nfsd/nfsctl.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nfsd/nfsctl.c      2010-07-01 20:45:15.000000000 -0400
+@@ -160,7 +160,7 @@ static int export_features_open(struct i
        return single_open(file, export_features_show, NULL);
  }
  
@@ -30348,10 +31225,10 @@ diff -urNp linux-2.6.33.1/fs/nfsd/nfsctl.c linux-2.6.33.1/fs/nfsd/nfsctl.c
        .open           = export_features_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-diff -urNp linux-2.6.33.1/fs/nfsd/vfs.c linux-2.6.33.1/fs/nfsd/vfs.c
---- linux-2.6.33.1/fs/nfsd/vfs.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nfsd/vfs.c       2010-03-20 16:58:41.676914510 -0400
-@@ -945,7 +945,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
+diff -urNp linux-2.6.34/fs/nfsd/vfs.c linux-2.6.34/fs/nfsd/vfs.c
+--- linux-2.6.34/fs/nfsd/vfs.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nfsd/vfs.c 2010-07-01 20:45:15.000000000 -0400
+@@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
        } else {
                oldfs = get_fs();
                set_fs(KERNEL_DS);
@@ -30360,7 +31237,7 @@ diff -urNp linux-2.6.33.1/fs/nfsd/vfs.c linux-2.6.33.1/fs/nfsd/vfs.c
                set_fs(oldfs);
        }
  
-@@ -1068,7 +1068,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
+@@ -1056,7 +1056,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
  
        /* Write the data. */
        oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -30369,7 +31246,7 @@ diff -urNp linux-2.6.33.1/fs/nfsd/vfs.c linux-2.6.33.1/fs/nfsd/vfs.c
        set_fs(oldfs);
        if (host_err < 0)
                goto out_nfserr;
-@@ -1543,7 +1543,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1541,7 +1541,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
         */
  
        oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -30378,9 +31255,9 @@ diff -urNp linux-2.6.33.1/fs/nfsd/vfs.c linux-2.6.33.1/fs/nfsd/vfs.c
        set_fs(oldfs);
  
        if (host_err < 0)
-diff -urNp linux-2.6.33.1/fs/nls/nls_base.c linux-2.6.33.1/fs/nls/nls_base.c
---- linux-2.6.33.1/fs/nls/nls_base.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/nls/nls_base.c   2010-03-20 16:58:41.684912030 -0400
+diff -urNp linux-2.6.34/fs/nls/nls_base.c linux-2.6.34/fs/nls/nls_base.c
+--- linux-2.6.34/fs/nls/nls_base.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/nls/nls_base.c     2010-07-01 20:45:15.000000000 -0400
 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
      {0xF8,  0xF0,   3*6,    0x1FFFFF,       0x10000,   /* 4 byte sequence */},
      {0xFC,  0xF8,   4*6,    0x3FFFFFF,      0x200000,  /* 5 byte sequence */},
@@ -30390,10 +31267,10 @@ diff -urNp linux-2.6.33.1/fs/nls/nls_base.c linux-2.6.33.1/fs/nls/nls_base.c
  };
  
  #define UNICODE_MAX   0x0010ffff
-diff -urNp linux-2.6.33.1/fs/ntfs/file.c linux-2.6.33.1/fs/ntfs/file.c
---- linux-2.6.33.1/fs/ntfs/file.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ntfs/file.c      2010-03-20 16:58:41.717206210 -0400
-@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
+diff -urNp linux-2.6.34/fs/ntfs/file.c linux-2.6.34/fs/ntfs/file.c
+--- linux-2.6.34/fs/ntfs/file.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ntfs/file.c        2010-07-01 20:45:15.000000000 -0400
+@@ -2244,6 +2244,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
  
@@ -30402,22 +31279,10 @@ diff -urNp linux-2.6.33.1/fs/ntfs/file.c linux-2.6.33.1/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.33.1/fs/ocfs2/cluster/masklog.c linux-2.6.33.1/fs/ocfs2/cluster/masklog.c
---- linux-2.6.33.1/fs/ocfs2/cluster/masklog.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/cluster/masklog.c  2010-03-20 16:58:41.724925424 -0400
-@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
-       return mlog_mask_store(mlog_attr->mask, buf, count);
- }
- 
--static struct sysfs_ops mlog_attr_ops = {
-+static const struct sysfs_ops mlog_attr_ops = {
-       .show  = mlog_show,
-       .store = mlog_store,
- };
-diff -urNp linux-2.6.33.1/fs/ocfs2/localalloc.c linux-2.6.33.1/fs/ocfs2/localalloc.c
---- linux-2.6.33.1/fs/ocfs2/localalloc.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/localalloc.c       2010-03-20 16:58:41.736921327 -0400
-@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
+diff -urNp linux-2.6.34/fs/ocfs2/localalloc.c linux-2.6.34/fs/ocfs2/localalloc.c
+--- linux-2.6.34/fs/ocfs2/localalloc.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ocfs2/localalloc.c 2010-07-01 20:45:15.000000000 -0400
+@@ -1190,7 +1190,7 @@ static int ocfs2_local_alloc_slide_windo
                goto bail;
        }
  
@@ -30426,10 +31291,10 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/localalloc.c linux-2.6.33.1/fs/ocfs2/localall
  
        status = 0;
  bail:
-diff -urNp linux-2.6.33.1/fs/ocfs2/ocfs2.h linux-2.6.33.1/fs/ocfs2/ocfs2.h
---- linux-2.6.33.1/fs/ocfs2/ocfs2.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/ocfs2.h    2010-03-20 16:58:41.753416780 -0400
-@@ -221,11 +221,11 @@ enum ocfs2_vol_state
+diff -urNp linux-2.6.34/fs/ocfs2/ocfs2.h linux-2.6.34/fs/ocfs2/ocfs2.h
+--- linux-2.6.34/fs/ocfs2/ocfs2.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ocfs2/ocfs2.h      2010-07-01 20:45:15.000000000 -0400
+@@ -222,11 +222,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
  {
@@ -30446,10 +31311,10 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/ocfs2.h linux-2.6.33.1/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
---- linux-2.6.33.1/fs/ocfs2/suballoc.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/suballoc.c 2010-03-20 16:58:41.773443597 -0400
-@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
+diff -urNp linux-2.6.34/fs/ocfs2/suballoc.c linux-2.6.34/fs/ocfs2/suballoc.c
+--- linux-2.6.34/fs/ocfs2/suballoc.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ocfs2/suballoc.c   2010-07-01 20:45:15.000000000 -0400
+@@ -616,7 +616,7 @@ static int ocfs2_reserve_suballoc_bits(s
                                mlog_errno(status);
                        goto bail;
                }
@@ -30458,7 +31323,7 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
  
                /* You should never ask for this much metadata */
                BUG_ON(bits_wanted >
-@@ -1651,7 +1651,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
+@@ -1738,7 +1738,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
                mlog_errno(status);
                goto bail;
        }
@@ -30467,7 +31332,7 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
  
        *blkno_start = bg_blkno + (u64) *suballoc_bit_start;
        ac->ac_bits_given += (*num_bits);
-@@ -1725,7 +1725,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
+@@ -1812,7 +1812,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
                mlog_errno(status);
                goto bail;
        }
@@ -30476,7 +31341,7 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
  
        BUG_ON(num_bits != 1);
  
-@@ -1827,7 +1827,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -1914,7 +1914,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
                                                      cluster_start,
                                                      num_clusters);
                if (!status)
@@ -30485,7 +31350,7 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
        } else {
                if (min_clusters > (osb->bitmap_cpg - 1)) {
                        /* The only paths asking for contiguousness
-@@ -1855,7 +1855,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -1942,7 +1942,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
                                ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
                                                                 bg_blkno,
                                                                 bg_bit_off);
@@ -30494,10 +31359,10 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/suballoc.c linux-2.6.33.1/fs/ocfs2/suballoc.c
                }
        }
        if (status < 0) {
-diff -urNp linux-2.6.33.1/fs/ocfs2/super.c linux-2.6.33.1/fs/ocfs2/super.c
---- linux-2.6.33.1/fs/ocfs2/super.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/super.c    2010-03-20 16:58:41.781934851 -0400
-@@ -286,11 +286,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
+diff -urNp linux-2.6.34/fs/ocfs2/super.c linux-2.6.34/fs/ocfs2/super.c
+--- linux-2.6.34/fs/ocfs2/super.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ocfs2/super.c      2010-07-01 20:45:15.000000000 -0400
+@@ -287,11 +287,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
                        "%10s => GlobalAllocs: %d  LocalAllocs: %d  "
                        "SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
                        "Stats",
@@ -30514,9 +31379,9 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/super.c linux-2.6.33.1/fs/ocfs2/super.c
  
        out += snprintf(buf + out, len - out,
                        "%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -1999,11 +1999,11 @@ static int ocfs2_initialize_super(struct
+@@ -2003,11 +2003,11 @@ static int ocfs2_initialize_super(struct
        spin_lock_init(&osb->osb_xattr_lock);
-       ocfs2_init_inode_steal_slot(osb);
+       ocfs2_init_steal_slots(osb);
  
 -      atomic_set(&osb->alloc_stats.moves, 0);
 -      atomic_set(&osb->alloc_stats.local_data, 0);
@@ -30531,9 +31396,9 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/super.c linux-2.6.33.1/fs/ocfs2/super.c
  
        /* Copy the blockcheck stats from the superblock probe */
        osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.33.1/fs/ocfs2/symlink.c linux-2.6.33.1/fs/ocfs2/symlink.c
---- linux-2.6.33.1/fs/ocfs2/symlink.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/ocfs2/symlink.c  2010-03-20 16:58:41.809220780 -0400
+diff -urNp linux-2.6.34/fs/ocfs2/symlink.c linux-2.6.34/fs/ocfs2/symlink.c
+--- linux-2.6.34/fs/ocfs2/symlink.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/ocfs2/symlink.c    2010-07-01 20:45:15.000000000 -0400
 @@ -148,7 +148,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -30543,10 +31408,10 @@ diff -urNp linux-2.6.33.1/fs/ocfs2/symlink.c linux-2.6.33.1/fs/ocfs2/symlink.c
        if (!IS_ERR(link))
                kfree(link);
  }
-diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
---- linux-2.6.33.1/fs/open.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/open.c   2010-03-20 16:58:41.824559234 -0400
-@@ -209,6 +209,9 @@ int do_truncate(struct dentry *dentry, l
+diff -urNp linux-2.6.34/fs/open.c linux-2.6.34/fs/open.c
+--- linux-2.6.34/fs/open.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/open.c     2010-07-01 20:45:16.000000000 -0400
+@@ -208,6 +208,9 @@ int do_truncate(struct dentry *dentry, l
        if (length < 0)
                return -EINVAL;
  
@@ -30556,7 +31421,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        newattrs.ia_size = length;
        newattrs.ia_valid = ATTR_SIZE | time_attrs;
        if (filp) {
-@@ -514,6 +517,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
+@@ -511,6 +514,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
        if (__mnt_is_readonly(path.mnt))
                res = -EROFS;
  
@@ -30566,7 +31431,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
  out_path_release:
        path_put(&path);
  out:
-@@ -540,6 +546,8 @@ SYSCALL_DEFINE1(chdir, const char __user
+@@ -537,6 +543,8 @@ SYSCALL_DEFINE1(chdir, const char __user
        if (error)
                goto dput_and_out;
  
@@ -30575,7 +31440,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        set_fs_pwd(current->fs, &path);
  
  dput_and_out:
-@@ -566,6 +574,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
+@@ -563,6 +571,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
                goto out_putf;
  
        error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
@@ -30589,7 +31454,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        if (!error)
                set_fs_pwd(current->fs, &file->f_path);
  out_putf:
-@@ -594,7 +609,18 @@ SYSCALL_DEFINE1(chroot, const char __use
+@@ -591,7 +606,18 @@ SYSCALL_DEFINE1(chroot, const char __use
        if (error)
                goto dput_and_out;
  
@@ -30608,7 +31473,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        error = 0;
  dput_and_out:
        path_put(&path);
-@@ -622,6 +648,12 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -619,6 +645,12 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
        err = mnt_want_write_file(file);
        if (err)
                goto out_putf;
@@ -30621,7 +31486,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        mutex_lock(&inode->i_mutex);
        err = security_path_chmod(dentry, file->f_vfsmnt, mode);
        if (err)
-@@ -633,6 +665,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -630,6 +662,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
        err = notify_change(dentry, &newattrs);
  out_unlock:
        mutex_unlock(&inode->i_mutex);
@@ -30629,7 +31494,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        mnt_drop_write(file->f_path.mnt);
  out_putf:
        fput(file);
-@@ -655,17 +688,30 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -652,17 +685,30 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
        error = mnt_want_write(path.mnt);
        if (error)
                goto dput_and_out;
@@ -30660,7 +31525,7 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        mnt_drop_write(path.mnt);
  dput_and_out:
        path_put(&path);
-@@ -684,6 +730,9 @@ static int chown_common(struct path *pat
+@@ -681,6 +727,9 @@ static int chown_common(struct path *pat
        int error;
        struct iattr newattrs;
  
@@ -30670,9 +31535,9 @@ diff -urNp linux-2.6.33.1/fs/open.c linux-2.6.33.1/fs/open.c
        newattrs.ia_valid =  ATTR_CTIME;
        if (user != (uid_t) -1) {
                newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-2.6.33.1/fs/pipe.c linux-2.6.33.1/fs/pipe.c
---- linux-2.6.33.1/fs/pipe.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/pipe.c   2010-03-20 16:58:41.824559234 -0400
+diff -urNp linux-2.6.34/fs/pipe.c linux-2.6.34/fs/pipe.c
+--- linux-2.6.34/fs/pipe.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/pipe.c     2010-07-01 20:45:16.000000000 -0400
 @@ -401,9 +401,9 @@ redo:
                }
                if (bufs)       /* More to do? */
@@ -30796,9 +31661,9 @@ diff -urNp linux-2.6.33.1/fs/pipe.c linux-2.6.33.1/fs/pipe.c
        inode->i_fop = &rdwr_pipefifo_fops;
  
        /*
-diff -urNp linux-2.6.33.1/fs/proc/array.c linux-2.6.33.1/fs/proc/array.c
---- linux-2.6.33.1/fs/proc/array.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/array.c     2010-03-20 16:58:41.824559234 -0400
+diff -urNp linux-2.6.34/fs/proc/array.c linux-2.6.34/fs/proc/array.c
+--- linux-2.6.34/fs/proc/array.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/array.c       2010-07-01 20:45:16.000000000 -0400
 @@ -337,6 +337,21 @@ static void task_cpus_allowed(struct seq
        seq_printf(m, "\n");
  }
@@ -30869,11 +31734,11 @@ diff -urNp linux-2.6.33.1/fs/proc/array.c linux-2.6.33.1/fs/proc/array.c
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +              PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0),
 +              PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0),
-+              PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0),
++              PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
 +#else
                mm ? mm->start_code : 0,
                mm ? mm->end_code : 0,
-               (permitted && mm) ? task->stack_start : 0,
+               (permitted && mm) ? mm->start_stack : 0,
 +#endif
                esp,
                eip,
@@ -30889,10 +31754,10 @@ diff -urNp linux-2.6.33.1/fs/proc/array.c linux-2.6.33.1/fs/proc/array.c
 +      return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
---- linux-2.6.33.1/fs/proc/base.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/base.c      2010-03-20 16:58:41.824559234 -0400
-@@ -102,6 +102,22 @@ struct pid_entry {
+diff -urNp linux-2.6.34/fs/proc/base.c linux-2.6.34/fs/proc/base.c
+--- linux-2.6.34/fs/proc/base.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/base.c        2010-07-01 20:45:16.000000000 -0400
+@@ -103,6 +103,22 @@ struct pid_entry {
        union proc_op op;
  };
  
@@ -30915,7 +31780,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
  #define NOD(NAME, MODE, IOP, FOP, OP) {                       \
        .name = (NAME),                                 \
        .len  = sizeof(NAME) - 1,                       \
-@@ -213,6 +229,9 @@ static int check_mem_permission(struct t
+@@ -214,6 +230,9 @@ static int check_mem_permission(struct t
        if (task == current)
                return 0;
  
@@ -30925,7 +31790,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
        /*
         * If current is actively ptrace'ing, and would also be
         * permitted to freshly attach with ptrace now, permit it.
-@@ -260,6 +279,9 @@ static int proc_pid_cmdline(struct task_
+@@ -261,6 +280,9 @@ static int proc_pid_cmdline(struct task_
        if (!mm->arg_end)
                goto out_mm;    /* Shh! No looking before we're done */
  
@@ -30935,7 +31800,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
        len = mm->arg_end - mm->arg_start;
   
        if (len > PAGE_SIZE)
-@@ -287,12 +309,26 @@ out:
+@@ -288,12 +310,26 @@ out:
        return res;
  }
  
@@ -30962,7 +31827,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
                do {
                        nwords += 2;
                } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -328,7 +364,7 @@ static int proc_pid_wchan(struct task_st
+@@ -329,7 +365,7 @@ static int proc_pid_wchan(struct task_st
  }
  #endif /* CONFIG_KALLSYMS */
  
@@ -30971,7 +31836,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
  
  #define MAX_STACK_TRACE_DEPTH 64
  
-@@ -521,7 +557,7 @@ static int proc_pid_limits(struct task_s
+@@ -523,7 +559,7 @@ static int proc_pid_limits(struct task_s
        return count;
  }
  
@@ -30980,7 +31845,7 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
  static int proc_pid_syscall(struct task_struct *task, char *buffer)
  {
        long nr;
-@@ -935,6 +971,9 @@ static ssize_t environ_read(struct file 
+@@ -931,6 +967,9 @@ static ssize_t environ_read(struct file 
        if (!task)
                goto out_no_task;
  
@@ -31257,9 +32122,9 @@ diff -urNp linux-2.6.33.1/fs/proc/base.c linux-2.6.33.1/fs/proc/base.c
        ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.33.1/fs/proc/cmdline.c linux-2.6.33.1/fs/proc/cmdline.c
---- linux-2.6.33.1/fs/proc/cmdline.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/cmdline.c   2010-03-20 16:58:41.828775433 -0400
+diff -urNp linux-2.6.34/fs/proc/cmdline.c linux-2.6.34/fs/proc/cmdline.c
+--- linux-2.6.34/fs/proc/cmdline.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/cmdline.c     2010-07-01 20:45:16.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -31272,9 +32137,9 @@ diff -urNp linux-2.6.33.1/fs/proc/cmdline.c linux-2.6.33.1/fs/proc/cmdline.c
        return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.33.1/fs/proc/devices.c linux-2.6.33.1/fs/proc/devices.c
---- linux-2.6.33.1/fs/proc/devices.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/devices.c   2010-03-20 16:58:41.828775433 -0400
+diff -urNp linux-2.6.34/fs/proc/devices.c linux-2.6.34/fs/proc/devices.c
+--- linux-2.6.34/fs/proc/devices.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/devices.c     2010-07-01 20:45:16.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -31287,10 +32152,10 @@ diff -urNp linux-2.6.33.1/fs/proc/devices.c linux-2.6.33.1/fs/proc/devices.c
        return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.33.1/fs/proc/inode.c linux-2.6.33.1/fs/proc/inode.c
---- linux-2.6.33.1/fs/proc/inode.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/inode.c     2010-03-20 16:58:41.828775433 -0400
-@@ -434,7 +434,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-2.6.34/fs/proc/inode.c linux-2.6.34/fs/proc/inode.c
+--- linux-2.6.34/fs/proc/inode.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/inode.c       2010-07-01 20:45:16.000000000 -0400
+@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
                if (de->mode) {
                        inode->i_mode = de->mode;
                        inode->i_uid = de->uid;
@@ -31302,9 +32167,9 @@ diff -urNp linux-2.6.33.1/fs/proc/inode.c linux-2.6.33.1/fs/proc/inode.c
                }
                if (de->size)
                        inode->i_size = de->size;
-diff -urNp linux-2.6.33.1/fs/proc/internal.h linux-2.6.33.1/fs/proc/internal.h
---- linux-2.6.33.1/fs/proc/internal.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/internal.h  2010-03-20 16:58:41.828775433 -0400
+diff -urNp linux-2.6.34/fs/proc/internal.h linux-2.6.34/fs/proc/internal.h
+--- linux-2.6.34/fs/proc/internal.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/internal.h    2010-07-01 20:45:16.000000000 -0400
 @@ -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,
@@ -31315,9 +32180,9 @@ diff -urNp linux-2.6.33.1/fs/proc/internal.h linux-2.6.33.1/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.33.1/fs/proc/Kconfig linux-2.6.33.1/fs/proc/Kconfig
---- linux-2.6.33.1/fs/proc/Kconfig     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/Kconfig     2010-03-20 16:58:41.828775433 -0400
+diff -urNp linux-2.6.34/fs/proc/Kconfig linux-2.6.34/fs/proc/Kconfig
+--- linux-2.6.34/fs/proc/Kconfig       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/Kconfig       2010-07-01 20:45:16.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -31345,10 +32210,10 @@ diff -urNp linux-2.6.33.1/fs/proc/Kconfig linux-2.6.33.1/fs/proc/Kconfig
        bool "Enable /proc page monitoring" if EMBEDDED
        help
          Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.33.1/fs/proc/kcore.c linux-2.6.33.1/fs/proc/kcore.c
---- linux-2.6.33.1/fs/proc/kcore.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/kcore.c     2010-03-20 16:58:41.832562866 -0400
-@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
+diff -urNp linux-2.6.34/fs/proc/kcore.c linux-2.6.34/fs/proc/kcore.c
+--- linux-2.6.34/fs/proc/kcore.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/kcore.c       2010-07-01 20:45:16.000000000 -0400
+@@ -542,6 +542,9 @@ read_kcore(struct file *file, char __use
  
  static int open_kcore(struct inode *inode, struct file *filp)
  {
@@ -31358,9 +32223,9 @@ diff -urNp linux-2.6.33.1/fs/proc/kcore.c linux-2.6.33.1/fs/proc/kcore.c
        if (!capable(CAP_SYS_RAWIO))
                return -EPERM;
        if (kcore_need_update)
-diff -urNp linux-2.6.33.1/fs/proc/meminfo.c linux-2.6.33.1/fs/proc/meminfo.c
---- linux-2.6.33.1/fs/proc/meminfo.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/meminfo.c   2010-03-20 16:58:41.832562866 -0400
+diff -urNp linux-2.6.34/fs/proc/meminfo.c linux-2.6.34/fs/proc/meminfo.c
+--- linux-2.6.34/fs/proc/meminfo.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/meminfo.c     2010-07-01 20:45:15.000000000 -0400
 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
                vmi.used >> 10,
                vmi.largest_chunk >> 10
@@ -31370,10 +32235,10 @@ diff -urNp linux-2.6.33.1/fs/proc/meminfo.c linux-2.6.33.1/fs/proc/meminfo.c
  #endif
                );
  
-diff -urNp linux-2.6.33.1/fs/proc/nommu.c linux-2.6.33.1/fs/proc/nommu.c
---- linux-2.6.33.1/fs/proc/nommu.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/nommu.c     2010-03-20 16:58:41.832562866 -0400
-@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
+diff -urNp linux-2.6.34/fs/proc/nommu.c linux-2.6.34/fs/proc/nommu.c
+--- linux-2.6.34/fs/proc/nommu.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/nommu.c       2010-07-01 20:45:15.000000000 -0400
+@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
                if (len < 1)
                        len = 1;
                seq_printf(m, "%*c", len, ' ');
@@ -31382,10 +32247,10 @@ diff -urNp linux-2.6.33.1/fs/proc/nommu.c linux-2.6.33.1/fs/proc/nommu.c
        }
  
        seq_putc(m, '\n');
-diff -urNp linux-2.6.33.1/fs/proc/proc_net.c linux-2.6.33.1/fs/proc/proc_net.c
---- linux-2.6.33.1/fs/proc/proc_net.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/proc_net.c  2010-03-20 16:58:41.832562866 -0400
-@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
+diff -urNp linux-2.6.34/fs/proc/proc_net.c linux-2.6.34/fs/proc/proc_net.c
+--- linux-2.6.34/fs/proc/proc_net.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/proc_net.c    2010-07-01 20:45:16.000000000 -0400
+@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
        struct task_struct *task;
        struct nsproxy *ns;
        struct net *net = NULL;
@@ -31403,9 +32268,9 @@ diff -urNp linux-2.6.33.1/fs/proc/proc_net.c linux-2.6.33.1/fs/proc/proc_net.c
  
        rcu_read_lock();
        task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.33.1/fs/proc/proc_sysctl.c linux-2.6.33.1/fs/proc/proc_sysctl.c
---- linux-2.6.33.1/fs/proc/proc_sysctl.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/proc_sysctl.c       2010-03-20 16:58:41.832562866 -0400
+diff -urNp linux-2.6.34/fs/proc/proc_sysctl.c linux-2.6.34/fs/proc/proc_sysctl.c
+--- linux-2.6.34/fs/proc/proc_sysctl.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/proc_sysctl.c 2010-07-01 20:45:16.000000000 -0400
 @@ -7,6 +7,8 @@
  #include <linux/security.h>
  #include "internal.h"
@@ -31445,9 +32310,9 @@ diff -urNp linux-2.6.33.1/fs/proc/proc_sysctl.c linux-2.6.33.1/fs/proc/proc_sysc
        generic_fillattr(inode, stat);
        if (table)
                stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.33.1/fs/proc/root.c linux-2.6.33.1/fs/proc/root.c
---- linux-2.6.33.1/fs/proc/root.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/root.c      2010-03-20 16:58:41.836587389 -0400
+diff -urNp linux-2.6.34/fs/proc/root.c linux-2.6.34/fs/proc/root.c
+--- linux-2.6.34/fs/proc/root.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/root.c        2010-07-01 20:45:16.000000000 -0400
 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
        proc_device_tree_init();
@@ -31464,16 +32329,16 @@ diff -urNp linux-2.6.33.1/fs/proc/root.c linux-2.6.33.1/fs/proc/root.c
        proc_sys_init();
  }
  
-diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
---- linux-2.6.33.1/fs/proc/task_mmu.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/task_mmu.c  2010-03-20 16:58:41.836587389 -0400
-@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
-               "VmStk:\t%8lu kB\n"
+diff -urNp linux-2.6.34/fs/proc/task_mmu.c linux-2.6.34/fs/proc/task_mmu.c
+--- linux-2.6.34/fs/proc/task_mmu.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/task_mmu.c    2010-07-02 17:29:09.000000000 -0400
+@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
                "VmExe:\t%8lu kB\n"
                "VmLib:\t%8lu kB\n"
--              "VmPTE:\t%8lu kB\n",
+               "VmPTE:\t%8lu kB\n"
+-              "VmSwap:\t%8lu kB\n",
 -              hiwater_vm << (PAGE_SHIFT-10),
-+              "VmPTE:\t%8lu kB\n"
++              "VmSwap:\t%8lu kB\n"
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +              "CsBase:\t%8lx\nCsLim:\t%8lx\n"
@@ -31483,11 +32348,12 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
                (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
                mm->locked_vm << (PAGE_SHIFT-10),
                hiwater_rss << (PAGE_SHIFT-10),
-               total_rss << (PAGE_SHIFT-10),
+@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct
                data << (PAGE_SHIFT-10),
                mm->stack_vm << (PAGE_SHIFT-10), text, lib,
--              (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
-+              (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10
+               (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
+-              swap << (PAGE_SHIFT-10));
++              swap << (PAGE_SHIFT-10)
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +              , mm->context.user_cs_base, mm->context.user_cs_limit
@@ -31497,7 +32363,7 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
  }
  
  unsigned long task_vsize(struct mm_struct *mm)
-@@ -199,6 +210,12 @@ static int do_maps_open(struct inode *in
+@@ -203,6 +214,12 @@ static int do_maps_open(struct inode *in
        return ret;
  }
  
@@ -31510,7 +32376,7 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
  static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  {
        struct mm_struct *mm = vma->vm_mm;
-@@ -217,13 +234,22 @@ static void show_map_vma(struct seq_file
+@@ -221,13 +238,22 @@ static void show_map_vma(struct seq_file
        }
  
        seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
@@ -31533,7 +32399,7 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
                        MAJOR(dev), MINOR(dev), ino, &len);
  
        /*
-@@ -232,16 +258,16 @@ static void show_map_vma(struct seq_file
+@@ -236,16 +262,16 @@ static void show_map_vma(struct seq_file
         */
        if (file) {
                pad_len_spaces(m, len);
@@ -31553,29 +32419,31 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
 +                                         (vma->vm_start <= mm->start_stack &&
 +                                          vma->vm_end >= mm->start_stack)) {
                                        name = "[stack]";
-                               } else {
-                                       unsigned long stack_start;
-@@ -402,9 +428,16 @@ static int show_smap(struct seq_file *m,
+                               }
+                       } else {
+@@ -387,11 +413,16 @@ static int show_smap(struct seq_file *m,
        };
  
        memset(&mss, 0, sizeof mss);
 -      mss.vma = vma;
+-      /* mmap_sem is held in m_start */
 -      if (vma->vm_mm && !is_vm_hugetlb_page(vma))
 -              walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
-+
+-
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +      if (!PAX_RAND_FLAGS(vma->vm_mm)) {
 +#endif
 +              mss.vma = vma;
++              /* mmap_sem is held in m_start */
 +              if (vma->vm_mm && !is_vm_hugetlb_page(vma))
 +                      walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +      }
 +#endif
- 
        show_map_vma(m, vma);
  
-@@ -420,7 +453,11 @@ static int show_smap(struct seq_file *m,
+       seq_printf(m,
+@@ -406,7 +437,11 @@ static int show_smap(struct seq_file *m,
                   "Swap:           %8lu kB\n"
                   "KernelPageSize: %8lu kB\n"
                   "MMUPageSize:    %8lu kB\n",
@@ -31587,10 +32455,10 @@ diff -urNp linux-2.6.33.1/fs/proc/task_mmu.c linux-2.6.33.1/fs/proc/task_mmu.c
                   mss.resident >> 10,
                   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
                   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.33.1/fs/proc/task_nommu.c linux-2.6.33.1/fs/proc/task_nommu.c
---- linux-2.6.33.1/fs/proc/task_nommu.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/proc/task_nommu.c        2010-03-20 16:58:41.836587389 -0400
-@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
+diff -urNp linux-2.6.34/fs/proc/task_nommu.c linux-2.6.34/fs/proc/task_nommu.c
+--- linux-2.6.34/fs/proc/task_nommu.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/proc/task_nommu.c  2010-07-01 20:45:15.000000000 -0400
+@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
        else
                bytes += kobjsize(mm);
        
@@ -31599,7 +32467,7 @@ diff -urNp linux-2.6.33.1/fs/proc/task_nommu.c linux-2.6.33.1/fs/proc/task_nommu
                sbytes += kobjsize(current->fs);
        else
                bytes += kobjsize(current->fs);
-@@ -158,7 +158,7 @@ static int nommu_vma_show(struct seq_fil
+@@ -159,7 +159,7 @@ static int nommu_vma_show(struct seq_fil
                if (len < 1)
                        len = 1;
                seq_printf(m, "%*c", len, ' ');
@@ -31608,9 +32476,9 @@ diff -urNp linux-2.6.33.1/fs/proc/task_nommu.c linux-2.6.33.1/fs/proc/task_nommu
        }
  
        seq_putc(m, '\n');
-diff -urNp linux-2.6.33.1/fs/readdir.c linux-2.6.33.1/fs/readdir.c
---- linux-2.6.33.1/fs/readdir.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/readdir.c        2010-03-20 16:58:41.836587389 -0400
+diff -urNp linux-2.6.34/fs/readdir.c linux-2.6.34/fs/readdir.c
+--- linux-2.6.34/fs/readdir.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/readdir.c  2010-07-01 20:45:16.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -31700,9 +32568,9 @@ diff -urNp linux-2.6.33.1/fs/readdir.c linux-2.6.33.1/fs/readdir.c
        buf.count = count;
        buf.error = 0;
  
-diff -urNp linux-2.6.33.1/fs/reiserfs/do_balan.c linux-2.6.33.1/fs/reiserfs/do_balan.c
---- linux-2.6.33.1/fs/reiserfs/do_balan.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/reiserfs/do_balan.c      2010-03-20 16:58:41.848535760 -0400
+diff -urNp linux-2.6.34/fs/reiserfs/do_balan.c linux-2.6.34/fs/reiserfs/do_balan.c
+--- linux-2.6.34/fs/reiserfs/do_balan.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/reiserfs/do_balan.c        2010-07-01 20:45:15.000000000 -0400
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
                return;
        }
@@ -31712,9 +32580,9 @@ diff -urNp linux-2.6.33.1/fs/reiserfs/do_balan.c linux-2.6.33.1/fs/reiserfs/do_b
        do_balance_starts(tb);
  
        /* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.33.1/fs/reiserfs/item_ops.c linux-2.6.33.1/fs/reiserfs/item_ops.c
---- linux-2.6.33.1/fs/reiserfs/item_ops.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/reiserfs/item_ops.c      2010-03-20 16:58:41.848535760 -0400
+diff -urNp linux-2.6.34/fs/reiserfs/item_ops.c linux-2.6.34/fs/reiserfs/item_ops.c
+--- linux-2.6.34/fs/reiserfs/item_ops.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/reiserfs/item_ops.c        2010-07-01 20:45:15.000000000 -0400
 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
                         vi->vi_index, vi->vi_type, vi->vi_ih);
  }
@@ -31769,9 +32637,9 @@ diff -urNp linux-2.6.33.1/fs/reiserfs/item_ops.c linux-2.6.33.1/fs/reiserfs/item
        &stat_data_ops,
        &indirect_ops,
        &direct_ops,
-diff -urNp linux-2.6.33.1/fs/reiserfs/procfs.c linux-2.6.33.1/fs/reiserfs/procfs.c
---- linux-2.6.33.1/fs/reiserfs/procfs.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/reiserfs/procfs.c        2010-03-20 16:58:41.848535760 -0400
+diff -urNp linux-2.6.34/fs/reiserfs/procfs.c linux-2.6.34/fs/reiserfs/procfs.c
+--- linux-2.6.34/fs/reiserfs/procfs.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/reiserfs/procfs.c  2010-07-01 20:45:15.000000000 -0400
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
                   "SMALL_TAILS " : "NO_TAILS ",
                   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -31781,9 +32649,9 @@ diff -urNp linux-2.6.33.1/fs/reiserfs/procfs.c linux-2.6.33.1/fs/reiserfs/procfs
                   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
                   SF(s_do_balance), SF(s_unneeded_left_neighbor),
                   SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.33.1/fs/select.c linux-2.6.33.1/fs/select.c
---- linux-2.6.33.1/fs/select.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/select.c 2010-03-20 16:58:41.848535760 -0400
+diff -urNp linux-2.6.34/fs/select.c linux-2.6.34/fs/select.c
+--- linux-2.6.34/fs/select.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/select.c   2010-07-01 20:52:08.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -31792,17 +32660,17 @@ diff -urNp linux-2.6.33.1/fs/select.c linux-2.6.33.1/fs/select.c
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -821,6 +822,7 @@ int do_sys_poll(struct pollfd __user *uf
+@@ -838,6 +839,7 @@ int do_sys_poll(struct pollfd __user *uf
        struct poll_list *walk = head;
        unsigned long todo = nfds;
  
 +      gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
-       if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+       if (nfds > rlimit(RLIMIT_NOFILE))
                return -EINVAL;
  
-diff -urNp linux-2.6.33.1/fs/seq_file.c linux-2.6.33.1/fs/seq_file.c
---- linux-2.6.33.1/fs/seq_file.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/seq_file.c       2010-03-20 16:58:41.860772579 -0400
+diff -urNp linux-2.6.34/fs/seq_file.c linux-2.6.34/fs/seq_file.c
+--- linux-2.6.34/fs/seq_file.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/seq_file.c 2010-07-01 20:45:15.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
                return 0;
        }
@@ -31843,10 +32711,10 @@ diff -urNp linux-2.6.33.1/fs/seq_file.c linux-2.6.33.1/fs/seq_file.c
                if (!m->buf)
                        goto Enomem;
                m->count = 0;
-diff -urNp linux-2.6.33.1/fs/smbfs/symlink.c linux-2.6.33.1/fs/smbfs/symlink.c
---- linux-2.6.33.1/fs/smbfs/symlink.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/smbfs/symlink.c  2010-03-20 16:58:41.860772579 -0400
-@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
+diff -urNp linux-2.6.34/fs/smbfs/symlink.c linux-2.6.34/fs/smbfs/symlink.c
+--- linux-2.6.34/fs/smbfs/symlink.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/smbfs/symlink.c    2010-07-01 20:45:15.000000000 -0400
+@@ -56,7 +56,7 @@ static void *smb_follow_link(struct dent
  
  static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -31855,10 +32723,10 @@ diff -urNp linux-2.6.33.1/fs/smbfs/symlink.c linux-2.6.33.1/fs/smbfs/symlink.c
        if (!IS_ERR(s))
                __putname(s);
  }
-diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
---- linux-2.6.33.1/fs/splice.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/splice.c 2010-03-20 16:58:41.877542041 -0400
-@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
+diff -urNp linux-2.6.34/fs/splice.c linux-2.6.34/fs/splice.c
+--- linux-2.6.34/fs/splice.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/splice.c   2010-07-01 20:45:15.000000000 -0400
+@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
        pipe_lock(pipe);
  
        for (;;) {
@@ -31867,7 +32735,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        send_sig(SIGPIPE, current, 0);
                        if (!ret)
                                ret = -EPIPE;
-@@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode
+@@ -240,9 +240,9 @@ ssize_t splice_to_pipe(struct pipe_inode
                        do_wakeup = 0;
                }
  
@@ -31879,7 +32747,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
        }
  
        pipe_unlock(pipe);
-@@ -531,7 +531,7 @@ static ssize_t kernel_readv(struct file 
+@@ -532,7 +532,7 @@ static ssize_t kernel_readv(struct file 
        old_fs = get_fs();
        set_fs(get_ds());
        /* The cast to a user pointer is valid due to the set_fs() */
@@ -31888,7 +32756,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
        set_fs(old_fs);
  
        return res;
-@@ -546,7 +546,7 @@ static ssize_t kernel_write(struct file 
+@@ -547,7 +547,7 @@ static ssize_t kernel_write(struct file 
        old_fs = get_fs();
        set_fs(get_ds());
        /* The cast to a user pointer is valid due to the set_fs() */
@@ -31897,7 +32765,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
        set_fs(old_fs);
  
        return res;
-@@ -588,7 +588,7 @@ ssize_t default_file_splice_read(struct 
+@@ -589,7 +589,7 @@ ssize_t default_file_splice_read(struct 
                        goto err;
  
                this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -31906,7 +32774,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                vec[i].iov_len = this_len;
                pages[i] = page;
                spd.nr_pages++;
-@@ -810,10 +810,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -811,10 +811,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
  int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
  {
        while (!pipe->nrbufs) {
@@ -31919,7 +32787,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        return 0;
  
                if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1150,7 +1150,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1151,7 +1151,7 @@ ssize_t splice_direct_to_actor(struct fi
                 * out of the pipe right after the splice_to_pipe(). So set
                 * PIPE_READERS appropriately.
                 */
@@ -31928,7 +32796,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
  
                current->splice_pipe = pipe;
        }
-@@ -1710,9 +1710,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1711,9 +1711,9 @@ static int ipipe_prep(struct pipe_inode_
                        ret = -ERESTARTSYS;
                        break;
                }
@@ -31940,7 +32808,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        if (flags & SPLICE_F_NONBLOCK) {
                                ret = -EAGAIN;
                                break;
-@@ -1744,7 +1744,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1745,7 +1745,7 @@ static int opipe_prep(struct pipe_inode_
        pipe_lock(pipe);
  
        while (pipe->nrbufs >= PIPE_BUFFERS) {
@@ -31949,7 +32817,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        send_sig(SIGPIPE, current, 0);
                        ret = -EPIPE;
                        break;
-@@ -1757,9 +1757,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1758,9 +1758,9 @@ static int opipe_prep(struct pipe_inode_
                        ret = -ERESTARTSYS;
                        break;
                }
@@ -31961,7 +32829,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
        }
  
        pipe_unlock(pipe);
-@@ -1795,14 +1795,14 @@ retry:
+@@ -1796,14 +1796,14 @@ retry:
        pipe_double_lock(ipipe, opipe);
  
        do {
@@ -31978,7 +32846,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        break;
  
                /*
-@@ -1902,7 +1902,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1903,7 +1903,7 @@ static int link_pipe(struct pipe_inode_i
        pipe_double_lock(ipipe, opipe);
  
        do {
@@ -31987,7 +32855,7 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                        send_sig(SIGPIPE, current, 0);
                        if (!ret)
                                ret = -EPIPE;
-@@ -1947,7 +1947,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1948,7 +1948,7 @@ static int link_pipe(struct pipe_inode_i
         * return EAGAIN if we have the potential of some data in the
         * future, otherwise just return 0
         */
@@ -31996,49 +32864,10 @@ diff -urNp linux-2.6.33.1/fs/splice.c linux-2.6.33.1/fs/splice.c
                ret = -EAGAIN;
  
        pipe_unlock(ipipe);
-diff -urNp linux-2.6.33.1/fs/sysfs/file.c linux-2.6.33.1/fs/sysfs/file.c
---- linux-2.6.33.1/fs/sysfs/file.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/sysfs/file.c     2010-03-20 16:58:41.877542041 -0400
-@@ -53,7 +53,7 @@ struct sysfs_buffer {
-       size_t                  count;
-       loff_t                  pos;
-       char                    * page;
--      struct sysfs_ops        * ops;
-+      const struct sysfs_ops  * ops;
-       struct mutex            mutex;
-       int                     needs_read_fill;
-       int                     event;
-@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentr
- {
-       struct sysfs_dirent *attr_sd = dentry->d_fsdata;
-       struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
--      struct sysfs_ops * ops = buffer->ops;
-+      const struct sysfs_ops * ops = buffer->ops;
-       int ret = 0;
-       ssize_t count;
- 
-@@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentr
- {
-       struct sysfs_dirent *attr_sd = dentry->d_fsdata;
-       struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
--      struct sysfs_ops * ops = buffer->ops;
-+      const struct sysfs_ops * ops = buffer->ops;
-       int rc;
- 
-       /* need attr_sd for attr and ops, its parent for kobj */
-@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode 
-       struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
-       struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
-       struct sysfs_buffer *buffer;
--      struct sysfs_ops *ops;
-+      const struct sysfs_ops *ops;
-       int error = -EACCES;
-       char *p;
- 
-diff -urNp linux-2.6.33.1/fs/sysfs/symlink.c linux-2.6.33.1/fs/sysfs/symlink.c
---- linux-2.6.33.1/fs/sysfs/symlink.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/sysfs/symlink.c  2010-03-20 16:58:41.877542041 -0400
-@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
+diff -urNp linux-2.6.34/fs/sysfs/symlink.c linux-2.6.34/fs/sysfs/symlink.c
+--- linux-2.6.34/fs/sysfs/symlink.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/sysfs/symlink.c    2010-07-01 20:45:15.000000000 -0400
+@@ -243,7 +243,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
  {
@@ -32047,34 +32876,35 @@ diff -urNp linux-2.6.33.1/fs/sysfs/symlink.c linux-2.6.33.1/fs/sysfs/symlink.c
        if (!IS_ERR(page))
                free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.33.1/fs/udf/balloc.c linux-2.6.33.1/fs/udf/balloc.c
---- linux-2.6.33.1/fs/udf/balloc.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/udf/balloc.c     2010-03-20 16:58:41.880865953 -0400
-@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
- 
-       mutex_lock(&sbi->s_alloc_mutex);
-       partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
--      if (bloc->logicalBlockNum < 0 ||
--          (bloc->logicalBlockNum + count) >
--              partmap->s_partition_len) {
-+      if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
-               udf_debug("%d < %d || %d + %d > %d\n",
-                         bloc->logicalBlockNum, 0, bloc->logicalBlockNum,
-                         count, partmap->s_partition_len);
-@@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct
- 
-       mutex_lock(&sbi->s_alloc_mutex);
-       partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
--      if (bloc->logicalBlockNum < 0 ||
--          (bloc->logicalBlockNum + count) >
--              partmap->s_partition_len) {
-+      if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
-               udf_debug("%d < %d || %d + %d > %d\n",
-                         bloc->logicalBlockNum, 0, bloc->logicalBlockNum, count,
-                         partmap->s_partition_len);
-diff -urNp linux-2.6.33.1/fs/utimes.c linux-2.6.33.1/fs/utimes.c
---- linux-2.6.33.1/fs/utimes.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/utimes.c 2010-03-20 16:58:41.884933711 -0400
+diff -urNp linux-2.6.34/fs/udf/misc.c linux-2.6.34/fs/udf/misc.c
+--- linux-2.6.34/fs/udf/misc.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/udf/misc.c 2010-07-01 20:45:15.000000000 -0400
+@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
+               iinfo->i_lenEAttr += size;
+               return (struct genericFormat *)&ea[offset];
+       }
+-      if (loc & 0x02)
+-              ;
++      if (loc & 0x02) {
++      }
+ 
+       return NULL;
+ }
+diff -urNp linux-2.6.34/fs/udf/udfdecl.h linux-2.6.34/fs/udf/udfdecl.h
+--- linux-2.6.34/fs/udf/udfdecl.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/udf/udfdecl.h      2010-07-01 20:45:15.000000000 -0400
+@@ -26,7 +26,7 @@ do { \
+       printk(f, ##a); \
+ } while (0)
+ #else
+-#define udf_debug(f, a...) /**/
++#define udf_debug(f, a...) do {} while (0)
+ #endif
+ 
+ #define udf_info(f, a...) \
+diff -urNp linux-2.6.34/fs/utimes.c linux-2.6.34/fs/utimes.c
+--- linux-2.6.34/fs/utimes.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/utimes.c   2010-07-01 20:45:16.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -32096,10 +32926,10 @@ diff -urNp linux-2.6.33.1/fs/utimes.c linux-2.6.33.1/fs/utimes.c
        mutex_lock(&inode->i_mutex);
        error = notify_change(path->dentry, &newattrs);
        mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.33.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.33.1/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.33.1/fs/xfs/linux-2.6/xfs_ioctl.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/xfs/linux-2.6/xfs_ioctl.c        2010-03-20 16:58:41.884933711 -0400
-@@ -135,7 +135,7 @@ xfs_find_handle(
+diff -urNp linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/xfs/linux-2.6/xfs_ioctl.c  2010-07-01 20:45:16.000000000 -0400
+@@ -136,7 +136,7 @@ xfs_find_handle(
        }
  
        error = -EFAULT;
@@ -32108,10 +32938,10 @@ diff -urNp linux-2.6.33.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.33.1/fs/xfs/lin
            copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
                goto out_put;
  
-diff -urNp linux-2.6.33.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.33.1/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.33.1/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/xfs/linux-2.6/xfs_iops.c 2010-03-20 16:58:41.884933711 -0400
-@@ -469,7 +469,7 @@ xfs_vn_put_link(
+diff -urNp linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/xfs/linux-2.6/xfs_iops.c   2010-07-01 20:45:15.000000000 -0400
+@@ -480,7 +480,7 @@ xfs_vn_put_link(
        struct nameidata *nd,
        void            *p)
  {
@@ -32120,9 +32950,9 @@ diff -urNp linux-2.6.33.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.33.1/fs/xfs/linu
  
        if (!IS_ERR(s))
                kfree(s);
-diff -urNp linux-2.6.33.1/fs/xfs/xfs_bmap.c linux-2.6.33.1/fs/xfs/xfs_bmap.c
---- linux-2.6.33.1/fs/xfs/xfs_bmap.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/fs/xfs/xfs_bmap.c   2010-03-20 16:58:41.888938450 -0400
+diff -urNp linux-2.6.34/fs/xfs/xfs_bmap.c linux-2.6.34/fs/xfs/xfs_bmap.c
+--- linux-2.6.34/fs/xfs/xfs_bmap.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/fs/xfs/xfs_bmap.c     2010-07-01 20:45:15.000000000 -0400
 @@ -296,7 +296,7 @@ xfs_bmap_validate_ret(
        int                     nmap,
        int                     ret_nmap);
@@ -32132,9 +32962,9 @@ diff -urNp linux-2.6.33.1/fs/xfs/xfs_bmap.c linux-2.6.33.1/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-2.6.33.1/grsecurity/gracl_alloc.c linux-2.6.33.1/grsecurity/gracl_alloc.c
---- linux-2.6.33.1/grsecurity/gracl_alloc.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_alloc.c    2010-03-20 16:58:41.888938450 -0400
+diff -urNp linux-2.6.34/grsecurity/gracl_alloc.c linux-2.6.34/grsecurity/gracl_alloc.c
+--- linux-2.6.34/grsecurity/gracl_alloc.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_alloc.c      2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -32241,10 +33071,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_alloc.c linux-2.6.33.1/grsecurity/gra
 +      else
 +              return 1;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
---- linux-2.6.33.1/grsecurity/gracl.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl.c  2010-03-20 17:00:48.140865901 -0400
-@@ -0,0 +1,3917 @@
+diff -urNp linux-2.6.34/grsecurity/gracl.c linux-2.6.34/grsecurity/gracl.c
+--- linux-2.6.34/grsecurity/gracl.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl.c    2010-07-02 18:12:24.000000000 -0400
+@@ -0,0 +1,3899 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -32323,6 +33153,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +extern struct vfsmount *sock_mnt;
 +extern struct vfsmount *pipe_mnt;
 +extern struct vfsmount *shm_mnt;
++#ifdef CONFIG_HUGETLBFS
++extern struct vfsmount *hugetlbfs_vfsmount;
++#endif
++
 +static struct acl_object_label *fakefs_obj;
 +
 +extern int gr_init_uidset(void);
@@ -32330,6 +33164,8 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +extern void gr_remove_uid(uid_t uid);
 +extern int gr_find_uid(uid_t uid);
 +
++extern spinlock_t vfsmount_lock;
++
 +__inline__ int
 +gr_acl_is_enabled(void)
 +{
@@ -32380,37 +33216,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +static int
 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
 +{
-+      int i;
-+      unsigned long *l1;
-+      unsigned long *l2;
-+      unsigned char *c1;
-+      unsigned char *c2;
-+      int num_longs;
-+
 +      if (likely(lena != lenb))
 +              return 0;
 +
-+      l1 = (unsigned long *)a;
-+      l2 = (unsigned long *)b;
-+
-+      num_longs = lena / sizeof(unsigned long);
-+
-+      for (i = num_longs; i--; l1++, l2++) {
-+              if (unlikely(*l1 != *l2))
-+                      return 0;
-+      }
-+
-+      c1 = (unsigned char *) l1;
-+      c2 = (unsigned char *) l2;
-+
-+      i = lena - (num_longs * sizeof(unsigned long)); 
-+
-+      for (; i--; c1++, c2++) {
-+              if (unlikely(*c1 != *c2))
-+                      return 0;
-+      }
-+
-+      return 1;
++      return !memcmp(a, b, lena);
 +}
 +
 +static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
@@ -32421,6 +33230,7 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +      char * retval;
 +      int namelen;
 +
++      spin_lock(&vfsmount_lock);
 +      *--end = '\0';
 +      buflen--;
 +
@@ -32437,14 +33247,11 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +                      break;
 +              if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
 +                      /* Global root? */
-+                      spin_lock(&vfsmount_lock);
 +                      if (vfsmnt->mnt_parent == vfsmnt) {
-+                              spin_unlock(&vfsmount_lock);
 +                              goto global_root;
 +                      }
 +                      dentry = vfsmnt->mnt_mountpoint;
 +                      vfsmnt = vfsmnt->mnt_parent;
-+                      spin_unlock(&vfsmount_lock);
 +                      continue;
 +              }
 +              parent = dentry->d_parent;
@@ -32460,6 +33267,8 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +              dentry = parent;
 +      }
 +
++out:
++      spin_unlock(&vfsmount_lock);
 +      return retval;
 +
 +global_root:
@@ -32469,9 +33278,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +              goto Elong;
 +      retval -= namelen-1;    /* hit the slash */
 +      memcpy(retval, dentry->d_name.name, namelen);
-+      return retval;
++      goto out;
 +Elong:
-+      return ERR_PTR(-ENAMETOOLONG);
++      retval = ERR_PTR(-ENAMETOOLONG);
++      goto out;
 +}
 +
 +static char *
@@ -34038,6 +34848,9 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +      spin_lock(&dcache_lock);
 +
 +      if (unlikely(mnt == shm_mnt || mnt == pipe_mnt || mnt == sock_mnt ||
++#ifdef CONFIG_HUGETLBFS
++          mnt == hugetlbfs_vfsmount ||
++#endif
 +              /* ignore Eric Biederman */
 +          IS_PRIVATE(l_dentry->d_inode))) {
 +              retval = fakefs_obj;
@@ -36052,10 +36865,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +         who have the 'view' subject flag if the RBAC system is enabled
 +      */
 +
++      rcu_read_lock();
 +      read_lock(&tasklist_lock);
 +      task = find_task_by_vpid(pid);
 +      if (task) {
-+              gr_fs_read_lock(task);
 +#ifdef CONFIG_GRKERNSEC_CHROOT
 +              if (proc_is_chrooted(task))
 +                      ret = -EACCES;
@@ -36074,12 +36887,11 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +                      if (!(task->acl->mode & GR_VIEW))
 +                              ret = -EACCES;
 +              }
-+              
-+              gr_fs_read_unlock(task);
 +      } else
 +              ret = -ENOENT;
 +
 +      read_unlock(&tasklist_lock);
++      rcu_read_unlock();
 +
 +      return ret;
 +}
@@ -36162,10 +36974,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl.c linux-2.6.33.1/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl_cap.c
---- linux-2.6.33.1/grsecurity/gracl_cap.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_cap.c      2010-03-20 16:58:41.888938450 -0400
-@@ -0,0 +1,131 @@
+diff -urNp linux-2.6.34/grsecurity/gracl_cap.c linux-2.6.34/grsecurity/gracl_cap.c
+--- linux-2.6.34/grsecurity/gracl_cap.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_cap.c        2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,138 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -36220,6 +37032,7 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl
 +      const struct cred *cred = current_cred();
 +      struct acl_subject_label *curracl;
 +      kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
++      kernel_cap_t cap_audit = __cap_empty_set;
 +
 +      if (!gr_acl_is_enabled())
 +              return 1;
@@ -36228,6 +37041,7 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl
 +
 +      cap_drop = curracl->cap_lower;
 +      cap_mask = curracl->cap_mask;
++      cap_audit = curracl->cap_invert_audit;
 +
 +      while ((curracl = curracl->parent_subject)) {
 +              /* if the cap isn't specified in the current computed mask but is specified in the
@@ -36239,11 +37053,16 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl
 +                      cap_raise(cap_mask, cap);
 +                      if (cap_raised(curracl->cap_lower, cap))
 +                              cap_raise(cap_drop, cap);
++                      if (cap_raised(curracl->cap_invert_audit, cap))
++                              cap_raise(cap_audit, cap);
 +              }
 +      }
 +
-+      if (!cap_raised(cap_drop, cap))
++      if (!cap_raised(cap_drop, cap)) {
++              if (cap_raised(cap_audit, cap))
++                      gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
 +              return 1;
++      }
 +
 +      curracl = task->acl;
 +
@@ -36259,7 +37078,7 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl
 +              return 1;
 +      }
 +
-+      if ((cap >= 0) && (cap < (sizeof(captab_log)/sizeof(captab_log[0]))) && cap_raised(cred->cap_effective, cap))
++      if ((cap >= 0) && (cap < (sizeof(captab_log)/sizeof(captab_log[0]))) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
 +              gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
 +      return 0;
 +}
@@ -36297,9 +37116,9 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_cap.c linux-2.6.33.1/grsecurity/gracl
 +      return 0;
 +}
 +
-diff -urNp linux-2.6.33.1/grsecurity/gracl_fs.c linux-2.6.33.1/grsecurity/gracl_fs.c
---- linux-2.6.33.1/grsecurity/gracl_fs.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_fs.c       2010-03-20 16:58:41.888938450 -0400
+diff -urNp linux-2.6.34/grsecurity/gracl_fs.c linux-2.6.34/grsecurity/gracl_fs.c
+--- linux-2.6.34/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_fs.c 2010-07-02 19:46:12.000000000 -0400
 @@ -0,0 +1,424 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -36725,9 +37544,9 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_fs.c linux-2.6.33.1/grsecurity/gracl_
 +
 +      return 0;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/gracl_ip.c linux-2.6.33.1/grsecurity/gracl_ip.c
---- linux-2.6.33.1/grsecurity/gracl_ip.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_ip.c       2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/gracl_ip.c linux-2.6.34/grsecurity/gracl_ip.c
+--- linux-2.6.34/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_ip.c 2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,339 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -37068,9 +37887,9 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_ip.c linux-2.6.33.1/grsecurity/gracl_
 +
 +      return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.33.1/grsecurity/gracl_learn.c linux-2.6.33.1/grsecurity/gracl_learn.c
---- linux-2.6.33.1/grsecurity/gracl_learn.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_learn.c    2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/gracl_learn.c linux-2.6.34/grsecurity/gracl_learn.c
+--- linux-2.6.34/grsecurity/gracl_learn.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_learn.c      2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -37283,10 +38102,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_learn.c linux-2.6.33.1/grsecurity/gra
 +      .release        = close_learn,
 +      .poll           = poll_learn,
 +};
-diff -urNp linux-2.6.33.1/grsecurity/gracl_res.c linux-2.6.33.1/grsecurity/gracl_res.c
---- linux-2.6.33.1/grsecurity/gracl_res.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_res.c      2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,65 @@
+diff -urNp linux-2.6.34/grsecurity/gracl_res.c linux-2.6.34/grsecurity/gracl_res.c
+--- linux-2.6.34/grsecurity/gracl_res.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_res.c        2010-07-03 08:50:00.000000000 -0400
+@@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/gracl.h>
@@ -37317,12 +38136,21 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_res.c linux-2.6.33.1/grsecurity/gracl
 +              const int res, const unsigned long wanted, const int gt)
 +{
 +      const struct cred *cred;
++      unsigned long rlim;
 +
 +      if (!gr_acl_is_enabled() && !grsec_resource_logging)
 +              return;
 +
 +      // not yet supported resource
-+      if (!restab_log[res])
++      if (unlikely(!restab_log[res]))
++              return;
++
++      if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
++              rlim = task_rlimit_max(task, res);
++      else
++              rlim = task_rlimit(task, res);
++
++      if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
 +              return;
 +
 +      rcu_read_lock();
@@ -37339,22 +38167,16 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_res.c linux-2.6.33.1/grsecurity/gracl
 +              goto out_rcu_unlock;
 +      rcu_read_unlock();
 +
-+      preempt_disable();
-+
-+      if (unlikely(((gt && wanted > task->signal->rlim[res].rlim_cur) ||
-+                    (!gt && wanted >= task->signal->rlim[res].rlim_cur)) &&
-+                   task->signal->rlim[res].rlim_cur != RLIM_INFINITY))
-+              gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], task->signal->rlim[res].rlim_cur);
-+      preempt_enable_no_resched();
++      gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
 +
 +      return;
 +out_rcu_unlock:
 +      rcu_read_unlock();
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/gracl_segv.c linux-2.6.33.1/grsecurity/gracl_segv.c
---- linux-2.6.33.1/grsecurity/gracl_segv.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_segv.c     2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/gracl_segv.c linux-2.6.34/grsecurity/gracl_segv.c
+--- linux-2.6.34/grsecurity/gracl_segv.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_segv.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -37666,10 +38488,10 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_segv.c linux-2.6.33.1/grsecurity/grac
 +
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/gracl_shm.c linux-2.6.33.1/grsecurity/gracl_shm.c
---- linux-2.6.33.1/grsecurity/gracl_shm.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/gracl_shm.c      2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,37 @@
+diff -urNp linux-2.6.34/grsecurity/gracl_shm.c linux-2.6.34/grsecurity/gracl_shm.c
+--- linux-2.6.34/grsecurity/gracl_shm.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/gracl_shm.c        2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
 +#include <linux/sched.h>
@@ -37688,6 +38510,7 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_shm.c linux-2.6.33.1/grsecurity/gracl
 +      if (!gr_acl_is_enabled())
 +              return 1;
 +
++      rcu_read_lock();
 +      read_lock(&tasklist_lock);
 +
 +      task = find_task_by_vpid(shm_cprid);
@@ -37700,16 +38523,18 @@ diff -urNp linux-2.6.33.1/grsecurity/gracl_shm.c linux-2.6.33.1/grsecurity/gracl
 +                   (task->acl->mode & GR_PROTSHM) &&
 +                   (task->acl != current->acl))) {
 +              read_unlock(&tasklist_lock);
++              rcu_read_unlock();
 +              gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
 +              return 0;
 +      }
 +      read_unlock(&tasklist_lock);
++      rcu_read_unlock();
 +
 +      return 1;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_chdir.c linux-2.6.33.1/grsecurity/grsec_chdir.c
---- linux-2.6.33.1/grsecurity/grsec_chdir.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_chdir.c    2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_chdir.c linux-2.6.34/grsecurity/grsec_chdir.c
+--- linux-2.6.34/grsecurity/grsec_chdir.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_chdir.c      2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -37730,10 +38555,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chdir.c linux-2.6.33.1/grsecurity/grs
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/grsec_chroot.c
---- linux-2.6.33.1/grsecurity/grsec_chroot.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_chroot.c   2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,348 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_chroot.c linux-2.6.34/grsecurity/grsec_chroot.c
+--- linux-2.6.34/grsecurity/grsec_chroot.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_chroot.c     2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,366 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -37745,6 +38570,29 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/gr
 +#include <linux/grsecurity.h>
 +#include <linux/grinternal.h>
 +
++void gr_set_chroot_entries(struct task_struct *task, struct path *path)
++{
++#ifdef CONFIG_GRKERNSEC
++      if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
++                           path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
++              task->gr_is_chrooted = 1;
++      else
++              task->gr_is_chrooted = 0;
++
++      task->gr_chroot_dentry = path->dentry;
++#endif
++      return;
++}
++
++void gr_clear_chroot_entries(struct task_struct *task)
++{
++#ifdef CONFIG_GRKERNSEC
++      task->gr_is_chrooted = 0;
++      task->gr_chroot_dentry = NULL;
++#endif
++      return;
++}     
++
 +int
 +gr_handle_chroot_unix(const pid_t pid)
 +{
@@ -37757,22 +38605,22 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/gr
 +      if (likely(!proc_is_chrooted(current)))
 +              return 1;
 +
++      rcu_read_lock();
 +      read_lock(&tasklist_lock);
 +
 +      spid = find_vpid(pid);
 +      if (spid) {
 +              struct task_struct *p;
 +              p = pid_task(spid, PIDTYPE_PID);
-+              gr_fs_read_lock(p);
 +              if (unlikely(!have_same_root(current, p))) {
-+                      gr_fs_read_unlock(p);
 +                      read_unlock(&tasklist_lock);
++                      rcu_read_unlock();
 +                      gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
 +                      return 0;
 +              }
-+              gr_fs_read_unlock(p);
 +      }
 +      read_unlock(&tasklist_lock);
++      rcu_read_unlock();
 +#endif
 +      return 1;
 +}
@@ -37820,13 +38668,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/gr
 +      if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
 +              return 0;
 +
-+      gr_fs_read_lock(p);
 +      if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
 +          !have_same_root(current, p)) {
-+              gr_fs_read_unlock(p);
 +              return 1;
 +      }
-+      gr_fs_read_unlock(p);
 +#endif
 +      return 0;
 +}
@@ -37915,39 +38760,37 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/gr
 +      if (likely(!proc_is_chrooted(current)))
 +              return 1;
 +
++      rcu_read_lock();
 +      read_lock(&tasklist_lock);
 +
 +      pid = find_vpid(shm_cprid);
 +      if (pid) {
 +              struct task_struct *p;
 +              p = pid_task(pid, PIDTYPE_PID);
-+              gr_fs_read_lock(p);
 +              starttime = p->start_time.tv_sec;
 +              if (unlikely(!have_same_root(current, p) &&
 +                           time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) {
-+                      gr_fs_read_unlock(p);
 +                      read_unlock(&tasklist_lock);
++                      rcu_read_unlock();
 +                      gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
 +                      return 0;
 +              }
-+              gr_fs_read_unlock(p);
 +      } else {
 +              pid = find_vpid(shm_lapid);
 +              if (pid) {
 +                      struct task_struct *p;
 +                      p = pid_task(pid, PIDTYPE_PID);
-+                      gr_fs_read_lock(p);
 +                      if (unlikely(!have_same_root(current, p))) {
-+                              gr_fs_read_unlock(p);
 +                              read_unlock(&tasklist_lock);
++                              rcu_read_unlock();
 +                              gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
 +                              return 0;
 +                      }
-+                      gr_fs_read_unlock(p);
 +              }
 +      }
 +
 +      read_unlock(&tasklist_lock);
++      rcu_read_unlock();
 +#endif
 +      return 1;
 +}
@@ -38082,10 +38925,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_chroot.c linux-2.6.33.1/grsecurity/gr
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.33.1/grsecurity/grsec_disabled.c linux-2.6.33.1/grsecurity/grsec_disabled.c
---- linux-2.6.33.1/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_disabled.c 2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,426 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_disabled.c linux-2.6.34/grsecurity/grsec_disabled.c
+--- linux-2.6.34/grsecurity/grsec_disabled.c   1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_disabled.c   2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,425 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -38503,7 +39346,6 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_disabled.c linux-2.6.33.1/grsecurity/
 +      return 0;
 +}
 +
-+
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
 +EXPORT_SYMBOL(gr_learn_resource);
@@ -38512,10 +39354,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_disabled.c linux-2.6.33.1/grsecurity/
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.33.1/grsecurity/grsec_exec.c linux-2.6.33.1/grsecurity/grsec_exec.c
---- linux-2.6.33.1/grsecurity/grsec_exec.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_exec.c     2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,89 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_exec.c linux-2.6.34/grsecurity/grsec_exec.c
+--- linux-2.6.34/grsecurity/grsec_exec.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_exec.c       2010-07-01 20:54:40.000000000 -0400
+@@ -0,0 +1,88 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -38540,8 +39382,7 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_exec.c linux-2.6.33.1/grsecurity/grse
 +#ifdef CONFIG_GRKERNSEC_EXECVE
 +      const struct cred *cred = current_cred();
 +      if (grsec_enable_execve && cred->user &&
-+          (atomic_read(&cred->user->processes) >
-+           current->signal->rlim[RLIMIT_NPROC].rlim_cur) &&
++          (atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) &&
 +          !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE)) {
 +              gr_log_noargs(GR_DONT_AUDIT, GR_NPROC_MSG);
 +              return -EAGAIN;
@@ -38605,9 +39446,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_exec.c linux-2.6.33.1/grsecurity/grse
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_fifo.c linux-2.6.33.1/grsecurity/grsec_fifo.c
---- linux-2.6.33.1/grsecurity/grsec_fifo.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_fifo.c     2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_fifo.c linux-2.6.34/grsecurity/grsec_fifo.c
+--- linux-2.6.34/grsecurity/grsec_fifo.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_fifo.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -38633,9 +39474,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_fifo.c linux-2.6.33.1/grsecurity/grse
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_fork.c linux-2.6.33.1/grsecurity/grsec_fork.c
---- linux-2.6.33.1/grsecurity/grsec_fork.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_fork.c     2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_fork.c linux-2.6.34/grsecurity/grsec_fork.c
+--- linux-2.6.34/grsecurity/grsec_fork.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_fork.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,15 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -38652,10 +39493,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_fork.c linux-2.6.33.1/grsecurity/grse
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grsec_init.c
---- linux-2.6.33.1/grsecurity/grsec_init.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_init.c     2010-03-20 17:00:48.140865901 -0400
-@@ -0,0 +1,241 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_init.c linux-2.6.34/grsecurity/grsec_init.c
+--- linux-2.6.34/grsecurity/grsec_init.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_init.c       2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,258 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/mm.h>
@@ -38664,6 +39505,7 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grse
 +#include <linux/slab.h>
 +#include <linux/vmalloc.h>
 +#include <linux/percpu.h>
++#include <linux/module.h>
 +
 +int grsec_enable_link;
 +int grsec_enable_dmesg;
@@ -38698,6 +39540,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grse
 +int grsec_enable_tpe;
 +int grsec_tpe_gid;
 +int grsec_enable_blackhole;
++#ifdef CONFIG_IPV6_MODULE
++EXPORT_SYMBOL(grsec_enable_blackhole);
++#endif
 +int grsec_lastack_retries;
 +int grsec_enable_tpe_all;
 +int grsec_enable_socket_all;
@@ -38707,6 +39552,7 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grse
 +int grsec_enable_socket_server;
 +int grsec_socket_server_gid;
 +int grsec_resource_logging;
++int grsec_disable_privio;
 +int grsec_lock;
 +
 +DEFINE_SPINLOCK(grsec_alert_lock);
@@ -38778,10 +39624,22 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grse
 +              return;
 +      }
 +
++
++#ifdef CONFIG_GRKERNSEC_IO
++#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
++      grsec_disable_privio = 1;
++#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
++      grsec_disable_privio = 1;
++#else
++      grsec_disable_privio = 0;
++#endif
++#endif
++
 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
 +#ifndef CONFIG_GRKERNSEC_SYSCTL
 +      grsec_lock = 1;
 +#endif
++
 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
 +      grsec_enable_audit_textrel = 1;
 +#endif
@@ -38897,9 +39755,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_init.c linux-2.6.33.1/grsecurity/grse
 +
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_link.c linux-2.6.33.1/grsecurity/grsec_link.c
---- linux-2.6.33.1/grsecurity/grsec_link.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_link.c     2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_link.c linux-2.6.34/grsecurity/grsec_link.c
+--- linux-2.6.34/grsecurity/grsec_link.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_link.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -38944,10 +39802,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_link.c linux-2.6.33.1/grsecurity/grse
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_log.c linux-2.6.33.1/grsecurity/grsec_log.c
---- linux-2.6.33.1/grsecurity/grsec_log.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_log.c      2010-03-20 16:58:41.892922620 -0400
-@@ -0,0 +1,296 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_log.c linux-2.6.34/grsecurity/grsec_log.c
+--- linux-2.6.34/grsecurity/grsec_log.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_log.c        2010-07-02 15:53:14.000000000 -0400
+@@ -0,0 +1,306 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -38955,7 +39813,16 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_log.c linux-2.6.33.1/grsecurity/grsec
 +#include <linux/fs.h>
 +#include <linux/grinternal.h>
 +
++#ifdef CONFIG_TREE_PREEMPT_RCU
++#define DISABLE_PREEMPT() preempt_disable()
++#define ENABLE_PREEMPT() preempt_enable()
++#else
++#define DISABLE_PREEMPT()
++#define ENABLE_PREEMPT()
++#endif
++
 +#define BEGIN_LOCKS(x) \
++      DISABLE_PREEMPT(); \
 +      rcu_read_lock(); \
 +      read_lock(&tasklist_lock); \
 +      read_lock(&grsec_exec_file_lock); \
@@ -38972,6 +39839,7 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_log.c linux-2.6.33.1/grsecurity/grsec
 +      read_unlock(&grsec_exec_file_lock); \
 +      read_unlock(&tasklist_lock); \
 +      rcu_read_unlock(); \
++      ENABLE_PREEMPT(); \
 +      if (x == GR_DONT_AUDIT) \
 +              gr_handle_alertkill(current)
 +
@@ -39244,9 +40112,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_log.c linux-2.6.33.1/grsecurity/grsec
 +      gr_log_end(audit);
 +      END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_mem.c linux-2.6.33.1/grsecurity/grsec_mem.c
---- linux-2.6.33.1/grsecurity/grsec_mem.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_mem.c      2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_mem.c linux-2.6.34/grsecurity/grsec_mem.c
+--- linux-2.6.34/grsecurity/grsec_mem.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_mem.c        2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39333,9 +40201,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_mem.c linux-2.6.33.1/grsecurity/grsec
 +      gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_mount.c linux-2.6.33.1/grsecurity/grsec_mount.c
---- linux-2.6.33.1/grsecurity/grsec_mount.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_mount.c    2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_mount.c linux-2.6.34/grsecurity/grsec_mount.c
+--- linux-2.6.34/grsecurity/grsec_mount.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_mount.c      2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39399,9 +40267,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_mount.c linux-2.6.33.1/grsecurity/grs
 +#endif
 +      return 0;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_ptrace.c linux-2.6.33.1/grsecurity/grsec_ptrace.c
---- linux-2.6.33.1/grsecurity/grsec_ptrace.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_ptrace.c   2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_ptrace.c linux-2.6.34/grsecurity/grsec_ptrace.c
+--- linux-2.6.34/grsecurity/grsec_ptrace.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_ptrace.c     2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39417,9 +40285,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_ptrace.c linux-2.6.33.1/grsecurity/gr
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_sig.c linux-2.6.33.1/grsecurity/grsec_sig.c
---- linux-2.6.33.1/grsecurity/grsec_sig.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_sig.c      2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_sig.c linux-2.6.34/grsecurity/grsec_sig.c
+--- linux-2.6.34/grsecurity/grsec_sig.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_sig.c        2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,65 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -39486,9 +40354,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_sig.c linux-2.6.33.1/grsecurity/grsec
 +      return;
 +}
 +
-diff -urNp linux-2.6.33.1/grsecurity/grsec_sock.c linux-2.6.33.1/grsecurity/grsec_sock.c
---- linux-2.6.33.1/grsecurity/grsec_sock.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_sock.c     2010-03-20 16:58:41.892922620 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_sock.c linux-2.6.34/grsecurity/grsec_sock.c
+--- linux-2.6.34/grsecurity/grsec_sock.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_sock.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,271 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -39761,10 +40629,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_sock.c linux-2.6.33.1/grsecurity/grse
 +      return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_sysctl.c linux-2.6.33.1/grsecurity/grsec_sysctl.c
---- linux-2.6.33.1/grsecurity/grsec_sysctl.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_sysctl.c   2010-03-20 17:08:11.436987044 -0400
-@@ -0,0 +1,404 @@
+diff -urNp linux-2.6.34/grsecurity/grsec_sysctl.c linux-2.6.34/grsecurity/grsec_sysctl.c
+--- linux-2.6.34/grsecurity/grsec_sysctl.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_sysctl.c     2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,415 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -39790,6 +40658,17 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_sysctl.c linux-2.6.33.1/grsecurity/gr
 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
 +ctl_table grsecurity_table[] = {
 +#ifdef CONFIG_GRKERNSEC_SYSCTL
++#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
++#ifdef CONFIG_GRKERNSEC_IO
++      {
++              .procname       = "disable_priv_io",
++              .data           = &grsec_disable_privio,
++              .maxlen         = sizeof(int),
++              .mode           = 0600,
++              .proc_handler   = &proc_dointvec,
++      },
++#endif
++#endif
 +#ifdef CONFIG_GRKERNSEC_LINK
 +      {
 +              .procname       = "linking_restrictions",
@@ -40169,9 +41048,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_sysctl.c linux-2.6.33.1/grsecurity/gr
 +      { }
 +};
 +#endif
-diff -urNp linux-2.6.33.1/grsecurity/grsec_textrel.c linux-2.6.33.1/grsecurity/grsec_textrel.c
---- linux-2.6.33.1/grsecurity/grsec_textrel.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_textrel.c  2010-03-20 16:58:41.900965882 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_textrel.c linux-2.6.34/grsecurity/grsec_textrel.c
+--- linux-2.6.34/grsecurity/grsec_textrel.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_textrel.c    2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40189,9 +41068,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_textrel.c linux-2.6.33.1/grsecurity/g
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_time.c linux-2.6.33.1/grsecurity/grsec_time.c
---- linux-2.6.33.1/grsecurity/grsec_time.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_time.c     2010-03-20 16:58:41.900965882 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_time.c linux-2.6.34/grsecurity/grsec_time.c
+--- linux-2.6.34/grsecurity/grsec_time.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_time.c       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,13 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40206,9 +41085,9 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_time.c linux-2.6.33.1/grsecurity/grse
 +#endif
 +      return;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsec_tpe.c linux-2.6.33.1/grsecurity/grsec_tpe.c
---- linux-2.6.33.1/grsecurity/grsec_tpe.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsec_tpe.c      2010-03-20 16:58:41.900965882 -0400
+diff -urNp linux-2.6.34/grsecurity/grsec_tpe.c linux-2.6.34/grsecurity/grsec_tpe.c
+--- linux-2.6.34/grsecurity/grsec_tpe.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsec_tpe.c        2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,38 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40248,10 +41127,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsec_tpe.c linux-2.6.33.1/grsecurity/grsec
 +#endif
 +      return 1;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/grsum.c linux-2.6.33.1/grsecurity/grsum.c
---- linux-2.6.33.1/grsecurity/grsum.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/grsum.c  2010-03-20 16:58:41.900965882 -0400
-@@ -0,0 +1,59 @@
+diff -urNp linux-2.6.34/grsecurity/grsum.c linux-2.6.34/grsecurity/grsum.c
+--- linux-2.6.34/grsecurity/grsum.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/grsum.c    2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40277,6 +41156,8 @@ diff -urNp linux-2.6.33.1/grsecurity/grsum.c linux-2.6.33.1/grsecurity/grsum.c
 +      volatile int dummy = 0;
 +      unsigned int i;
 +
++      sg_init_table(&sg, 1);
++
 +      tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
 +      if (IS_ERR(tfm)) {
 +              /* should never happen, since sha256 should be built in */
@@ -40311,10 +41192,10 @@ diff -urNp linux-2.6.33.1/grsecurity/grsum.c linux-2.6.33.1/grsecurity/grsum.c
 +
 +      return retval;
 +}
-diff -urNp linux-2.6.33.1/grsecurity/Kconfig linux-2.6.33.1/grsecurity/Kconfig
---- linux-2.6.33.1/grsecurity/Kconfig  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/Kconfig  2010-03-20 17:00:48.140865901 -0400
-@@ -0,0 +1,965 @@
+diff -urNp linux-2.6.34/grsecurity/Kconfig linux-2.6.34/grsecurity/Kconfig
+--- linux-2.6.34/grsecurity/Kconfig    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/Kconfig    2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,981 @@
 +#
 +# grecurity configuration
 +#
@@ -41130,14 +42011,14 @@ diff -urNp linux-2.6.33.1/grsecurity/Kconfig linux-2.6.33.1/grsecurity/Kconfig
 +      help
 +        If you say Y here, neither TCP resets nor ICMP
 +        destination-unreachable packets will be sent in response to packets
-+        send to ports for which no associated listening process exists.
++        sent to ports for which no associated listening process exists.
 +        This feature supports both IPV4 and IPV6 and exempts the 
 +        loopback interface from blackholing.  Enabling this feature 
 +        makes a host more resilient to DoS attacks and reduces network
 +        visibility against scanners.
 +
 +        The blackhole feature as-implemented is equivalent to the FreeBSD
-+        blackhole feature, as prevents RST responses to all packets, not
++        blackhole feature, as it prevents RST responses to all packets, not
 +        just SYNs.  Under most application behavior this causes no
 +        problems, but applications (like haproxy) may not close certain
 +        connections in a way that cleanly terminates them on the remote
@@ -41149,7 +42030,7 @@ diff -urNp linux-2.6.33.1/grsecurity/Kconfig linux-2.6.33.1/grsecurity/Kconfig
 +        all servers it connects to have this option enabled, consider
 +        disabling this feature on the haproxy host.
 +
-+        If this option is enabled, two sysctl options with names
++        If the sysctl option is enabled, two sysctl options with names
 +        "ip_blackhole" and "lastack_retries" will be created.
 +        While "ip_blackhole" takes the standard zero/non-zero on/off
 +        toggle, "lastack_retries" uses the same kinds of values as
@@ -41241,6 +42122,22 @@ diff -urNp linux-2.6.33.1/grsecurity/Kconfig linux-2.6.33.1/grsecurity/Kconfig
 +        be set to a non-zero value after all the options are set.
 +        *THIS IS EXTREMELY IMPORTANT*
 +
++config GRKERNSEC_SYSCTL_DISTRO
++      bool "Extra sysctl support for distro makers (READ HELP)"
++      depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
++      help
++        If you say Y here, additional sysctl options will be created
++        for features that affect processes running as root.  Therefore,
++        it is critical when using this option that the grsec_lock entry be
++        enabled after boot.  Only distros with prebuilt kernel packages
++        with this option enabled that can ensure grsec_lock is enabled
++        after boot should use this option.
++        *Failure to set grsec_lock after boot makes all grsec features
++        this option covers useless*
++
++        Currently this option creates the following sysctl entries:
++        "Disable Privileged I/O": "disable_priv_io"   
++
 +config GRKERNSEC_SYSCTL_ON
 +      bool "Turn on features by default"
 +      depends on GRKERNSEC_SYSCTL
@@ -41280,9 +42177,9 @@ diff -urNp linux-2.6.33.1/grsecurity/Kconfig linux-2.6.33.1/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.33.1/grsecurity/Makefile linux-2.6.33.1/grsecurity/Makefile
---- linux-2.6.33.1/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/grsecurity/Makefile 2010-03-20 16:58:41.900965882 -0400
+diff -urNp linux-2.6.34/grsecurity/Makefile linux-2.6.34/grsecurity/Makefile
+--- linux-2.6.34/grsecurity/Makefile   1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/grsecurity/Makefile   2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,29 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -41313,10 +42210,24 @@ diff -urNp linux-2.6.33.1/grsecurity/Makefile linux-2.6.33.1/grsecurity/Makefile
 +      @-chmod -f 700 .
 +      @echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.33.1/include/acpi/acpi_drivers.h linux-2.6.33.1/include/acpi/acpi_drivers.h
---- linux-2.6.33.1/include/acpi/acpi_drivers.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/acpi/acpi_drivers.h 2010-03-20 16:58:41.900965882 -0400
-@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
+diff -urNp linux-2.6.34/include/acpi/acoutput.h linux-2.6.34/include/acpi/acoutput.h
+--- linux-2.6.34/include/acpi/acoutput.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/acpi/acoutput.h       2010-07-01 20:45:15.000000000 -0400
+@@ -266,8 +266,8 @@
+  * leaving no executable debug code!
+  */
+ #define ACPI_FUNCTION_NAME(a)
+-#define ACPI_DEBUG_PRINT(pl)
+-#define ACPI_DEBUG_PRINT_RAW(pl)
++#define ACPI_DEBUG_PRINT(pl) do {} while (0)
++#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0)
+ 
+ #endif                                /* ACPI_DEBUG_OUTPUT */
+ 
+diff -urNp linux-2.6.34/include/acpi/acpi_drivers.h linux-2.6.34/include/acpi/acpi_drivers.h
+--- linux-2.6.34/include/acpi/acpi_drivers.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/acpi/acpi_drivers.h   2010-07-01 20:45:15.000000000 -0400
+@@ -122,8 +122,8 @@ int acpi_processor_set_thermal_limit(acp
                                    Dock Station
    -------------------------------------------------------------------------- */
  struct acpi_dock_ops {
@@ -41327,7 +42238,7 @@ diff -urNp linux-2.6.33.1/include/acpi/acpi_drivers.h linux-2.6.33.1/include/acp
  };
  
  #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
-@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
+@@ -131,7 +131,7 @@ extern int is_dock_device(acpi_handle ha
  extern int register_dock_notifier(struct notifier_block *nb);
  extern void unregister_dock_notifier(struct notifier_block *nb);
  extern int register_hotplug_dock_device(acpi_handle handle,
@@ -41336,7 +42247,7 @@ diff -urNp linux-2.6.33.1/include/acpi/acpi_drivers.h linux-2.6.33.1/include/acp
                                        void *context);
  extern void unregister_hotplug_dock_device(acpi_handle handle);
  #else
-@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
+@@ -147,7 +147,7 @@ static inline void unregister_dock_notif
  {
  }
  static inline int register_hotplug_dock_device(acpi_handle handle,
@@ -41345,9 +42256,9 @@ diff -urNp linux-2.6.33.1/include/acpi/acpi_drivers.h linux-2.6.33.1/include/acp
                                               void *context)
  {
        return -ENODEV;
-diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/include/asm-generic/atomic-long.h
---- linux-2.6.33.1/include/asm-generic/atomic-long.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/atomic-long.h   2010-03-20 16:58:41.900965882 -0400
+diff -urNp linux-2.6.34/include/asm-generic/atomic-long.h linux-2.6.34/include/asm-generic/atomic-long.h
+--- linux-2.6.34/include/asm-generic/atomic-long.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/atomic-long.h     2010-07-01 20:45:15.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -41409,7 +42320,23 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_dec(atomic_long_t *l)
  {
        atomic64_t *v = (atomic64_t *)l;
-@@ -59,6 +92,15 @@ static inline void atomic_long_add(long 
+@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi
+       atomic64_dec(v);
+ }
+ 
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
++{
++      atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
++
++      atomic64_dec_unchecked(v);
++}
++#endif
++
+ static inline void atomic_long_add(long i, atomic_long_t *l)
+ {
+       atomic64_t *v = (atomic64_t *)l;
+@@ -59,6 +101,15 @@ static inline void atomic_long_add(long 
        atomic64_add(i, v);
  }
  
@@ -41425,7 +42352,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
        atomic64_t *v = (atomic64_t *)l;
-@@ -115,6 +157,15 @@ static inline long atomic_long_inc_retur
+@@ -115,6 +166,15 @@ static inline long atomic_long_inc_retur
        return (long)atomic64_inc_return(v);
  }
  
@@ -41441,7 +42368,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
        atomic64_t *v = (atomic64_t *)l;
-@@ -140,6 +191,12 @@ static inline long atomic_long_add_unles
+@@ -140,6 +200,12 @@ static inline long atomic_long_add_unles
  
  typedef atomic_t atomic_long_t;
  
@@ -41454,7 +42381,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  #define ATOMIC_LONG_INIT(i)   ATOMIC_INIT(i)
  static inline long atomic_long_read(atomic_long_t *l)
  {
-@@ -148,6 +205,15 @@ static inline long atomic_long_read(atom
+@@ -148,6 +214,15 @@ static inline long atomic_long_read(atom
        return (long)atomic_read(v);
  }
  
@@ -41470,7 +42397,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_set(atomic_long_t *l, long i)
  {
        atomic_t *v = (atomic_t *)l;
-@@ -155,6 +221,15 @@ static inline void atomic_long_set(atomi
+@@ -155,6 +230,15 @@ static inline void atomic_long_set(atomi
        atomic_set(v, i);
  }
  
@@ -41486,7 +42413,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_inc(atomic_long_t *l)
  {
        atomic_t *v = (atomic_t *)l;
-@@ -162,6 +237,15 @@ static inline void atomic_long_inc(atomi
+@@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomi
        atomic_inc(v);
  }
  
@@ -41502,7 +42429,23 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_dec(atomic_long_t *l)
  {
        atomic_t *v = (atomic_t *)l;
-@@ -176,6 +260,15 @@ static inline void atomic_long_add(long 
+@@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomi
+       atomic_dec(v);
+ }
+ 
++#ifdef CONFIG_PAX_REFCOUNT
++static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
++{
++      atomic_unchecked_t *v = (atomic_unchecked_t *)l;
++
++      atomic_dec_unchecked(v);
++}
++#endif
++
+ static inline void atomic_long_add(long i, atomic_long_t *l)
+ {
+       atomic_t *v = (atomic_t *)l;
+@@ -176,6 +278,15 @@ static inline void atomic_long_add(long 
        atomic_add(i, v);
  }
  
@@ -41518,7 +42461,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
        atomic_t *v = (atomic_t *)l;
-@@ -232,6 +325,15 @@ static inline long atomic_long_inc_retur
+@@ -232,6 +343,15 @@ static inline long atomic_long_inc_retur
        return (long)atomic_inc_return(v);
  }
  
@@ -41534,7 +42477,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
        atomic_t *v = (atomic_t *)l;
-@@ -255,4 +357,33 @@ static inline long atomic_long_add_unles
+@@ -255,4 +375,35 @@ static inline long atomic_long_add_unles
  
  #endif  /*  BITS_PER_LONG == 64  */
  
@@ -41552,6 +42495,7 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
 +      atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
 +      atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
 +      atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
++      atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
 +}
 +#else
 +#define atomic_read_unchecked(v) atomic_read(v)
@@ -41565,12 +42509,13 @@ diff -urNp linux-2.6.33.1/include/asm-generic/atomic-long.h linux-2.6.33.1/inclu
 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
++#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.33.1/include/asm-generic/dma-mapping-common.h linux-2.6.33.1/include/asm-generic/dma-mapping-common.h
---- linux-2.6.33.1/include/asm-generic/dma-mapping-common.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/dma-mapping-common.h    2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/dma-mapping-common.h linux-2.6.34/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.34/include/asm-generic/dma-mapping-common.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/dma-mapping-common.h      2010-07-01 20:45:15.000000000 -0400
 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
                                              enum dma_data_direction dir,
                                              struct dma_attrs *attrs)
@@ -41679,9 +42624,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/dma-mapping-common.h linux-2.6.33.
  
        BUG_ON(!valid_dma_direction(dir));
        if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.33.1/include/asm-generic/futex.h linux-2.6.33.1/include/asm-generic/futex.h
---- linux-2.6.33.1/include/asm-generic/futex.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/futex.h 2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/futex.h linux-2.6.34/include/asm-generic/futex.h
+--- linux-2.6.34/include/asm-generic/futex.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/futex.h   2010-07-01 20:45:15.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -41700,9 +42645,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/futex.h linux-2.6.33.1/include/asm
  {
        return -ENOSYS;
  }
-diff -urNp linux-2.6.33.1/include/asm-generic/int-l64.h linux-2.6.33.1/include/asm-generic/int-l64.h
---- linux-2.6.33.1/include/asm-generic/int-l64.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/int-l64.h       2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/int-l64.h linux-2.6.34/include/asm-generic/int-l64.h
+--- linux-2.6.34/include/asm-generic/int-l64.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/int-l64.h 2010-07-01 20:45:15.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -41712,9 +42657,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/int-l64.h linux-2.6.33.1/include/a
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.33.1/include/asm-generic/int-ll64.h linux-2.6.33.1/include/asm-generic/int-ll64.h
---- linux-2.6.33.1/include/asm-generic/int-ll64.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/int-ll64.h      2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/int-ll64.h linux-2.6.34/include/asm-generic/int-ll64.h
+--- linux-2.6.34/include/asm-generic/int-ll64.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/int-ll64.h        2010-07-01 20:45:15.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -41724,9 +42669,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/int-ll64.h linux-2.6.33.1/include/
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.33.1/include/asm-generic/kmap_types.h linux-2.6.33.1/include/asm-generic/kmap_types.h
---- linux-2.6.33.1/include/asm-generic/kmap_types.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/kmap_types.h    2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/kmap_types.h linux-2.6.34/include/asm-generic/kmap_types.h
+--- linux-2.6.34/include/asm-generic/kmap_types.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/kmap_types.h      2010-07-01 20:45:15.000000000 -0400
 @@ -28,7 +28,8 @@ KMAP_D(15)   KM_UML_USERCOPY,
  KMAP_D(16)    KM_IRQ_PTE,
  KMAP_D(17)    KM_NMI,
@@ -41737,9 +42682,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/kmap_types.h linux-2.6.33.1/includ
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.33.1/include/asm-generic/pgtable.h linux-2.6.33.1/include/asm-generic/pgtable.h
---- linux-2.6.33.1/include/asm-generic/pgtable.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/pgtable.h       2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/pgtable.h linux-2.6.34/include/asm-generic/pgtable.h
+--- linux-2.6.34/include/asm-generic/pgtable.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/pgtable.h 2010-07-01 20:45:15.000000000 -0400
 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
                                unsigned long size);
  #endif
@@ -41755,9 +42700,9 @@ diff -urNp linux-2.6.33.1/include/asm-generic/pgtable.h linux-2.6.33.1/include/a
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.33.1/include/asm-generic/vmlinux.lds.h linux-2.6.33.1/include/asm-generic/vmlinux.lds.h
---- linux-2.6.33.1/include/asm-generic/vmlinux.lds.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/asm-generic/vmlinux.lds.h   2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/asm-generic/vmlinux.lds.h linux-2.6.34/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.34/include/asm-generic/vmlinux.lds.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/asm-generic/vmlinux.lds.h     2010-07-01 20:45:15.000000000 -0400
 @@ -203,6 +203,7 @@
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                VMLINUX_SYMBOL(__start_rodata) = .;                     \
@@ -41796,19 +42741,19 @@ diff -urNp linux-2.6.33.1/include/asm-generic/vmlinux.lds.h linux-2.6.33.1/inclu
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/drm_pciids.h
---- linux-2.6.33.1/include/drm/drm_pciids.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/drm/drm_pciids.h    2010-03-20 16:58:41.904583344 -0400
-@@ -375,7 +375,7 @@
-       {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+diff -urNp linux-2.6.34/include/drm/drm_pciids.h linux-2.6.34/include/drm/drm_pciids.h
+--- linux-2.6.34/include/drm/drm_pciids.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/drm/drm_pciids.h      2010-07-01 20:45:16.000000000 -0400
+@@ -412,7 +412,7 @@
        {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
        {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+       {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 -      {0, 0, 0}
 +      {0, 0, 0, 0, 0, 0}
  
  #define r128_PCI_IDS \
        {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -415,14 +415,14 @@
+@@ -452,14 +452,14 @@
        {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -41825,7 +42770,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define mach64_PCI_IDS \
        {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -445,7 +445,7 @@
+@@ -482,7 +482,7 @@
        {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -41834,7 +42779,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define sisdrv_PCI_IDS \
        {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -456,7 +456,7 @@
+@@ -493,7 +493,7 @@
        {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
        {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
@@ -41843,7 +42788,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define tdfx_PCI_IDS \
        {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -465,7 +465,7 @@
+@@ -502,7 +502,7 @@
        {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -41852,7 +42797,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define viadrv_PCI_IDS \
        {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -477,14 +477,14 @@
+@@ -514,14 +514,14 @@
        {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
        {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
@@ -41869,7 +42814,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define i830_PCI_IDS \
        {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -492,11 +492,11 @@
+@@ -529,11 +529,11 @@
        {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -41883,7 +42828,7 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define savage_PCI_IDS \
        {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
-@@ -522,10 +522,10 @@
+@@ -559,10 +559,10 @@
        {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
        {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
        {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
@@ -41896,16 +42841,16 @@ diff -urNp linux-2.6.33.1/include/drm/drm_pciids.h linux-2.6.33.1/include/drm/dr
  
  #define i915_PCI_IDS \
        {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-@@ -558,4 +558,4 @@
-       {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+@@ -596,4 +596,4 @@
        {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
        {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+       {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
 -      {0, 0, 0}
 +      {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.33.1/include/drm/drmP.h linux-2.6.33.1/include/drm/drmP.h
---- linux-2.6.33.1/include/drm/drmP.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/drm/drmP.h  2010-03-20 16:58:41.904583344 -0400
-@@ -806,7 +806,7 @@ struct drm_driver {
+diff -urNp linux-2.6.34/include/drm/drmP.h linux-2.6.34/include/drm/drmP.h
+--- linux-2.6.34/include/drm/drmP.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/drm/drmP.h    2010-07-01 20:45:16.000000000 -0400
+@@ -808,7 +808,7 @@ struct drm_driver {
        void (*vgaarb_irq)(struct drm_device *dev, bool state);
  
        /* Driver private ops for this object */
@@ -41914,7 +42859,7 @@ diff -urNp linux-2.6.33.1/include/drm/drmP.h linux-2.6.33.1/include/drm/drmP.h
  
        int major;
        int minor;
-@@ -915,7 +915,7 @@ struct drm_device {
+@@ -917,7 +917,7 @@ struct drm_device {
  
        /** \name Usage Counters */
        /*@{ */
@@ -41923,7 +42868,7 @@ diff -urNp linux-2.6.33.1/include/drm/drmP.h linux-2.6.33.1/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 */
-@@ -926,7 +926,7 @@ struct drm_device {
+@@ -928,7 +928,7 @@ struct drm_device {
        /*@{ */
        unsigned long counters;
        enum drm_stat_type types[15];
@@ -41932,9 +42877,9 @@ diff -urNp linux-2.6.33.1/include/drm/drmP.h linux-2.6.33.1/include/drm/drmP.h
        /*@} */
  
        struct list_head filelist;
-diff -urNp linux-2.6.33.1/include/linux/a.out.h linux-2.6.33.1/include/linux/a.out.h
---- linux-2.6.33.1/include/linux/a.out.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/a.out.h       2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/linux/a.out.h linux-2.6.34/include/linux/a.out.h
+--- linux-2.6.34/include/linux/a.out.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/a.out.h 2010-07-01 20:45:16.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152               /* MIPS R6000/R4000 binary */
  };
@@ -41950,9 +42895,9 @@ diff -urNp linux-2.6.33.1/include/linux/a.out.h linux-2.6.33.1/include/linux/a.o
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.33.1/include/linux/atmdev.h linux-2.6.33.1/include/linux/atmdev.h
---- linux-2.6.33.1/include/linux/atmdev.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/atmdev.h      2010-03-20 16:58:41.904583344 -0400
+diff -urNp linux-2.6.34/include/linux/atmdev.h linux-2.6.34/include/linux/atmdev.h
+--- linux-2.6.34/include/linux/atmdev.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/atmdev.h        2010-07-01 20:45:16.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -41962,10 +42907,10 @@ diff -urNp linux-2.6.33.1/include/linux/atmdev.h linux-2.6.33.1/include/linux/at
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.33.1/include/linux/binfmts.h linux-2.6.33.1/include/linux/binfmts.h
---- linux-2.6.33.1/include/linux/binfmts.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/binfmts.h     2010-03-20 16:58:41.904583344 -0400
-@@ -86,6 +86,7 @@ struct linux_binfmt {
+diff -urNp linux-2.6.34/include/linux/binfmts.h linux-2.6.34/include/linux/binfmts.h
+--- linux-2.6.34/include/linux/binfmts.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/binfmts.h       2010-07-01 20:45:16.000000000 -0400
+@@ -87,6 +87,7 @@ struct linux_binfmt {
        int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
        int (*load_shlib)(struct file *);
        int (*core_dump)(struct coredump_params *cprm);
@@ -41973,10 +42918,10 @@ diff -urNp linux-2.6.33.1/include/linux/binfmts.h linux-2.6.33.1/include/linux/b
        unsigned long min_coredump;     /* minimal dump size */
        int hasvdso;
  };
-diff -urNp linux-2.6.33.1/include/linux/blkdev.h linux-2.6.33.1/include/linux/blkdev.h
---- linux-2.6.33.1/include/linux/blkdev.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/blkdev.h      2010-03-20 16:58:41.908542968 -0400
-@@ -1287,19 +1287,19 @@ static inline int blk_integrity_rq(struc
+diff -urNp linux-2.6.34/include/linux/blkdev.h linux-2.6.34/include/linux/blkdev.h
+--- linux-2.6.34/include/linux/blkdev.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/blkdev.h        2010-07-01 20:45:16.000000000 -0400
+@@ -1275,19 +1275,19 @@ static inline int blk_integrity_rq(struc
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  
  struct block_device_operations {
@@ -42007,9 +42952,9 @@ diff -urNp linux-2.6.33.1/include/linux/blkdev.h linux-2.6.33.1/include/linux/bl
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.33.1/include/linux/cache.h linux-2.6.33.1/include/linux/cache.h
---- linux-2.6.33.1/include/linux/cache.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/cache.h       2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/cache.h linux-2.6.34/include/linux/cache.h
+--- linux-2.6.34/include/linux/cache.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/cache.h 2010-07-01 20:45:16.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -42021,9 +42966,9 @@ diff -urNp linux-2.6.33.1/include/linux/cache.h linux-2.6.33.1/include/linux/cac
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.33.1/include/linux/capability.h linux-2.6.33.1/include/linux/capability.h
---- linux-2.6.33.1/include/linux/capability.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/capability.h  2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/capability.h linux-2.6.34/include/linux/capability.h
+--- linux-2.6.34/include/linux/capability.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/capability.h    2010-07-01 20:45:16.000000000 -0400
 @@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
        (security_real_capable_noaudit((t), (cap)) == 0)
  
@@ -42032,9 +42977,9 @@ diff -urNp linux-2.6.33.1/include/linux/capability.h linux-2.6.33.1/include/linu
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.33.1/include/linux/compiler-gcc4.h linux-2.6.33.1/include/linux/compiler-gcc4.h
---- linux-2.6.33.1/include/linux/compiler-gcc4.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/compiler-gcc4.h       2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/compiler-gcc4.h linux-2.6.34/include/linux/compiler-gcc4.h
+--- linux-2.6.34/include/linux/compiler-gcc4.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/compiler-gcc4.h 2010-07-01 20:45:16.000000000 -0400
 @@ -50,6 +50,10 @@
  #define unreachable() __builtin_unreachable()
  #endif
@@ -42046,9 +42991,9 @@ diff -urNp linux-2.6.33.1/include/linux/compiler-gcc4.h linux-2.6.33.1/include/l
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.33.1/include/linux/compiler.h linux-2.6.33.1/include/linux/compiler.h
---- linux-2.6.33.1/include/linux/compiler.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/compiler.h    2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/compiler.h linux-2.6.34/include/linux/compiler.h
+--- linux-2.6.34/include/linux/compiler.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/compiler.h      2010-07-01 20:45:16.000000000 -0400
 @@ -267,6 +267,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
@@ -42072,10 +43017,10 @@ diff -urNp linux-2.6.33.1/include/linux/compiler.h linux-2.6.33.1/include/linux/
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.33.1/include/linux/decompress/mm.h linux-2.6.33.1/include/linux/decompress/mm.h
---- linux-2.6.33.1/include/linux/decompress/mm.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/decompress/mm.h       2010-03-20 16:58:41.908542968 -0400
-@@ -68,7 +68,7 @@ static void free(void *where)
+diff -urNp linux-2.6.34/include/linux/decompress/mm.h linux-2.6.34/include/linux/decompress/mm.h
+--- linux-2.6.34/include/linux/decompress/mm.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/decompress/mm.h 2010-07-01 20:45:16.000000000 -0400
+@@ -78,7 +78,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
  
@@ -42084,9 +43029,9 @@ diff -urNp linux-2.6.33.1/include/linux/decompress/mm.h linux-2.6.33.1/include/l
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.33.1/include/linux/dma-mapping.h linux-2.6.33.1/include/linux/dma-mapping.h
---- linux-2.6.33.1/include/linux/dma-mapping.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/dma-mapping.h 2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/dma-mapping.h linux-2.6.34/include/linux/dma-mapping.h
+--- linux-2.6.34/include/linux/dma-mapping.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/dma-mapping.h   2010-07-01 20:45:16.000000000 -0400
 @@ -16,50 +16,50 @@ enum dma_data_direction {
  };
  
@@ -42154,9 +43099,9 @@ diff -urNp linux-2.6.33.1/include/linux/dma-mapping.h linux-2.6.33.1/include/lin
  };
  
  #define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.33.1/include/linux/elf.h linux-2.6.33.1/include/linux/elf.h
---- linux-2.6.33.1/include/linux/elf.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/elf.h 2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/elf.h linux-2.6.34/include/linux/elf.h
+--- linux-2.6.34/include/linux/elf.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/elf.h   2010-07-01 20:45:16.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64       Elf64_Sxword;
  #define PT_GNU_EH_FRAME               0x6474e550
  
@@ -42173,9 +43118,9 @@ diff -urNp linux-2.6.33.1/include/linux/elf.h linux-2.6.33.1/include/linux/elf.h
 +/*#define EF_PAX_RANDEXEC             16*/    /* Randomize ET_EXEC base */
 +#define EF_PAX_SEGMEXEC               32      /* Segmentation based non-executable pages */
  
- /* These constants define the different elf file types */
- #define ET_NONE   0
-@@ -84,6 +95,8 @@ typedef __s64        Elf64_Sxword;
+ /*
+  * Extended Numbering
+@@ -106,6 +117,8 @@ typedef __s64      Elf64_Sxword;
  #define DT_DEBUG      21
  #define DT_TEXTREL    22
  #define DT_JMPREL     23
@@ -42184,7 +43129,7 @@ diff -urNp linux-2.6.33.1/include/linux/elf.h linux-2.6.33.1/include/linux/elf.h
  #define DT_ENCODING   32
  #define OLD_DT_LOOS   0x60000000
  #define DT_LOOS               0x6000000d
-@@ -230,6 +243,19 @@ typedef struct elf64_hdr {
+@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
  #define PF_W          0x2
  #define PF_X          0x1
  
@@ -42204,7 +43149,7 @@ diff -urNp linux-2.6.33.1/include/linux/elf.h linux-2.6.33.1/include/linux/elf.h
  typedef struct elf32_phdr{
    Elf32_Word  p_type;
    Elf32_Off   p_offset;
-@@ -322,6 +348,8 @@ typedef struct elf64_shdr {
+@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
  #define       EI_OSABI        7
  #define       EI_PAD          8
  
@@ -42213,33 +43158,33 @@ diff -urNp linux-2.6.33.1/include/linux/elf.h linux-2.6.33.1/include/linux/elf.h
  #define       ELFMAG0         0x7f            /* EI_MAG */
  #define       ELFMAG1         'E'
  #define       ELFMAG2         'L'
-@@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC [];
- #define elf_phdr      elf32_phdr
+@@ -420,6 +448,7 @@ extern Elf32_Dyn _DYNAMIC [];
  #define elf_note      elf32_note
  #define elf_addr_t    Elf32_Off
+ #define Elf_Half      Elf32_Half
 +#define elf_dyn               Elf32_Dyn
  
  #else
  
-@@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC [];
- #define elf_phdr      elf64_phdr
+@@ -430,6 +459,7 @@ extern Elf64_Dyn _DYNAMIC [];
  #define elf_note      elf64_note
  #define elf_addr_t    Elf64_Off
+ #define Elf_Half      Elf64_Half
 +#define elf_dyn               Elf64_Dyn
  
  #endif
  
-diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
---- linux-2.6.33.1/include/linux/fs.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/fs.h  2010-03-20 16:59:37.096727099 -0400
+diff -urNp linux-2.6.34/include/linux/fs.h linux-2.6.34/include/linux/fs.h
+--- linux-2.6.34/include/linux/fs.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/fs.h    2010-07-02 17:23:24.000000000 -0400
 @@ -90,6 +90,11 @@ struct inodes_stat_t {
  /* Expect random access pattern */
- #define FMODE_RANDOM          ((__force fmode_t)4096)
+ #define FMODE_RANDOM          ((__force fmode_t)0x1000)
  
 +/* Hack for grsec so as not to require read permission simply to execute
 + * a binary
 + */
-+#define FMODE_GREXEC          ((__force fmode_t)8192)
++#define FMODE_GREXEC          ((__force fmode_t)0x2000)
 +
  /*
   * The below are the various read and write types that we support. Some of
@@ -42333,7 +43278,7 @@ diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
  };
  
  struct lock_manager {
-@@ -1437,7 +1442,7 @@ struct fiemap_extent_info {
+@@ -1439,7 +1444,7 @@ struct fiemap_extent_info {
        unsigned int fi_flags;          /* Flags as passed from user */
        unsigned int fi_extents_mapped; /* Number of mapped extents */
        unsigned int fi_extents_max;    /* Size of fiemap_extent array */
@@ -42342,7 +43287,7 @@ diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
                                                 * array */
  };
  int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
-@@ -1554,30 +1559,30 @@ extern ssize_t vfs_writev(struct file *,
+@@ -1556,30 +1561,30 @@ extern ssize_t vfs_writev(struct file *,
                unsigned long, loff_t *);
  
  struct super_operations {
@@ -42352,7 +43297,7 @@ diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
 +      void (* const destroy_inode)(struct inode *);
  
 -      void (*dirty_inode) (struct inode *);
--      int (*write_inode) (struct inode *, int);
+-      int (*write_inode) (struct inode *, struct writeback_control *wbc);
 -      void (*drop_inode) (struct inode *);
 -      void (*delete_inode) (struct inode *);
 -      void (*put_super) (struct super_block *);
@@ -42365,7 +43310,7 @@ diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
 -      void (*clear_inode) (struct inode *);
 -      void (*umount_begin) (struct super_block *);
 +      void (* const dirty_inode) (struct inode *);
-+      int (* const write_inode) (struct inode *, int);
++      int (* const write_inode) (struct inode *, struct writeback_control *wbc);
 +      void (* const drop_inode) (struct inode *);
 +      void (* const delete_inode) (struct inode *);
 +      void (* const put_super) (struct super_block *);
@@ -42393,9 +43338,9 @@ diff -urNp linux-2.6.33.1/include/linux/fs.h linux-2.6.33.1/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.33.1/include/linux/fs_struct.h linux-2.6.33.1/include/linux/fs_struct.h
---- linux-2.6.33.1/include/linux/fs_struct.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/fs_struct.h   2010-03-20 16:58:41.908542968 -0400
+diff -urNp linux-2.6.34/include/linux/fs_struct.h linux-2.6.34/include/linux/fs_struct.h
+--- linux-2.6.34/include/linux/fs_struct.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/fs_struct.h     2010-07-01 20:45:16.000000000 -0400
 @@ -4,7 +4,7 @@
  #include <linux/path.h>
  
@@ -42405,9 +43350,9 @@ diff -urNp linux-2.6.33.1/include/linux/fs_struct.h linux-2.6.33.1/include/linux
        rwlock_t lock;
        int umask;
        int in_exec;
-diff -urNp linux-2.6.33.1/include/linux/genhd.h linux-2.6.33.1/include/linux/genhd.h
---- linux-2.6.33.1/include/linux/genhd.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/genhd.h       2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/genhd.h linux-2.6.34/include/linux/genhd.h
+--- linux-2.6.34/include/linux/genhd.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/genhd.h 2010-07-01 20:45:16.000000000 -0400
 @@ -162,7 +162,7 @@ struct gendisk {
  
        struct timer_rand_state *random;
@@ -42417,10 +43362,10 @@ diff -urNp linux-2.6.33.1/include/linux/genhd.h linux-2.6.33.1/include/linux/gen
        struct work_struct async_notify;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
        struct blk_integrity *integrity;
-diff -urNp linux-2.6.33.1/include/linux/gracl.h linux-2.6.33.1/include/linux/gracl.h
---- linux-2.6.33.1/include/linux/gracl.h       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/gracl.h       2010-03-20 16:58:41.912517036 -0400
-@@ -0,0 +1,309 @@
+diff -urNp linux-2.6.34/include/linux/gracl.h linux-2.6.34/include/linux/gracl.h
+--- linux-2.6.34/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/gracl.h 2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,310 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
 +
@@ -42432,8 +43377,8 @@ diff -urNp linux-2.6.33.1/include/linux/gracl.h linux-2.6.33.1/include/linux/gra
 +
 +/* Major status information */
 +
-+#define GR_VERSION  "grsecurity 2.1.14"
-+#define GRSECURITY_VERSION 0x2114
++#define GR_VERSION  "grsecurity 2.2.0"
++#define GRSECURITY_VERSION 0x2200
 +
 +enum {
 +      GR_SHUTDOWN = 0,
@@ -42524,6 +43469,7 @@ diff -urNp linux-2.6.33.1/include/linux/gracl.h linux-2.6.33.1/include/linux/gra
 +      __u32 mode;
 +      kernel_cap_t cap_mask;
 +      kernel_cap_t cap_lower;
++      kernel_cap_t cap_invert_audit;
 +
 +      struct rlimit res[GR_NLIMITS];
 +      __u32 resmask;
@@ -42730,9 +43676,9 @@ diff -urNp linux-2.6.33.1/include/linux/gracl.h linux-2.6.33.1/include/linux/gra
 +
 +#endif
 +
-diff -urNp linux-2.6.33.1/include/linux/gralloc.h linux-2.6.33.1/include/linux/gralloc.h
---- linux-2.6.33.1/include/linux/gralloc.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/gralloc.h     2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/gralloc.h linux-2.6.34/include/linux/gralloc.h
+--- linux-2.6.34/include/linux/gralloc.h       1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/gralloc.h       2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -42743,9 +43689,9 @@ diff -urNp linux-2.6.33.1/include/linux/gralloc.h linux-2.6.33.1/include/linux/g
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.33.1/include/linux/grdefs.h linux-2.6.33.1/include/linux/grdefs.h
---- linux-2.6.33.1/include/linux/grdefs.h      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/grdefs.h      2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/grdefs.h linux-2.6.34/include/linux/grdefs.h
+--- linux-2.6.34/include/linux/grdefs.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/grdefs.h        2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1,136 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -42883,10 +43829,10 @@ diff -urNp linux-2.6.33.1/include/linux/grdefs.h linux-2.6.33.1/include/linux/gr
 +};
 +
 +#endif
-diff -urNp linux-2.6.33.1/include/linux/grinternal.h linux-2.6.33.1/include/linux/grinternal.h
---- linux-2.6.33.1/include/linux/grinternal.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/grinternal.h  2010-03-20 17:34:52.485855710 -0400
-@@ -0,0 +1,215 @@
+diff -urNp linux-2.6.34/include/linux/grinternal.h linux-2.6.34/include/linux/grinternal.h
+--- linux-2.6.34/include/linux/grinternal.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/grinternal.h    2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,211 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
 +
@@ -42992,13 +43938,9 @@ diff -urNp linux-2.6.33.1/include/linux/grinternal.h linux-2.6.33.1/include/linu
 +                      gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \
 +                      tsk->parent->exec_file->f_vfsmnt) : "/")
 +
-+#define proc_is_chrooted(tsk_a)  ((tsk_a->pid > 1) && (tsk_a->fs != NULL) && \
-+                        ((init_task.fs->root.dentry != tsk_a->fs->root.dentry) && \
-+                         (tsk_a->nsproxy->mnt_ns->root->mnt_root != \
-+                          tsk_a->fs->root.dentry)))
++#define proc_is_chrooted(tsk_a)  (tsk_a->gr_is_chrooted)
 +
-+#define have_same_root(tsk_a,tsk_b) ((tsk_a->fs != NULL) && (tsk_b->fs != NULL) && \
-+                        (tsk_a->fs->root.dentry == tsk_b->fs->root.dentry))
++#define have_same_root(tsk_a,tsk_b) (tsk_a->gr_chroot_dentry == tsk_b->gr_chroot_dentry)
 +
 +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \
 +                     task->pid, cred->uid, \
@@ -43102,10 +44044,10 @@ diff -urNp linux-2.6.33.1/include/linux/grinternal.h linux-2.6.33.1/include/linu
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.33.1/include/linux/grmsg.h linux-2.6.33.1/include/linux/grmsg.h
---- linux-2.6.33.1/include/linux/grmsg.h       1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/grmsg.h       2010-03-20 17:00:48.140865901 -0400
-@@ -0,0 +1,107 @@
+diff -urNp linux-2.6.34/include/linux/grmsg.h linux-2.6.34/include/linux/grmsg.h
+--- linux-2.6.34/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/grmsg.h 2010-07-01 20:45:16.000000000 -0400
+@@ -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"
 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -43201,6 +44143,7 @@ diff -urNp linux-2.6.33.1/include/linux/grmsg.h linux-2.6.33.1/include/linux/grm
 +#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
 +#define GR_CAP_ACL_MSG "use of %s denied for "
++#define GR_CAP_ACL_MSG2 "use of %s permitted for "
 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
@@ -43213,10 +44156,10 @@ diff -urNp linux-2.6.33.1/include/linux/grmsg.h linux-2.6.33.1/include/linux/grm
 +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.33.1/include/linux/grsecurity.h linux-2.6.33.1/include/linux/grsecurity.h
---- linux-2.6.33.1/include/linux/grsecurity.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/grsecurity.h  2010-03-20 17:00:48.140865901 -0400
-@@ -0,0 +1,199 @@
+diff -urNp linux-2.6.34/include/linux/grsecurity.h linux-2.6.34/include/linux/grsecurity.h
+--- linux-2.6.34/include/linux/grsecurity.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/grsecurity.h    2010-07-01 20:45:16.000000000 -0400
+@@ -0,0 +1,201 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -43279,7 +44222,8 @@ diff -urNp linux-2.6.33.1/include/linux/grsecurity.h linux-2.6.33.1/include/linu
 +
 +int gr_tpe_allow(const struct file *file);
 +
-+int gr_random_pid(void);
++void gr_set_chroot_entries(struct task_struct *task, struct path *path);
++void gr_clear_chroot_entries(struct task_struct *task);
 +
 +void gr_log_forkfail(const int retval);
 +void gr_log_timechange(void);
@@ -43413,12 +44357,13 @@ diff -urNp linux-2.6.33.1/include/linux/grsecurity.h linux-2.6.33.1/include/linu
 +                            struct vm_area_struct *vma);
 +
 +extern int grsec_enable_dmesg;
++extern int grsec_disable_privio;
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.33.1/include/linux/grsock.h linux-2.6.33.1/include/linux/grsock.h
---- linux-2.6.33.1/include/linux/grsock.h      1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/include/linux/grsock.h      2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/grsock.h linux-2.6.34/include/linux/grsock.h
+--- linux-2.6.34/include/linux/grsock.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/include/linux/grsock.h        2010-07-03 19:09:03.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -43427,7 +44372,7 @@ diff -urNp linux-2.6.33.1/include/linux/grsock.h linux-2.6.33.1/include/linux/gr
 +extern int gr_handle_sock_all(const int family, const int type,
 +                            const int protocol);
 +extern int gr_handle_sock_server(const struct sockaddr *sck);
-+extern int gr_handle_sock_server_other(const struct socket *sck);
++extern int gr_handle_sock_server_other(const struct sock *sck);
 +extern int gr_handle_sock_client(const struct sockaddr *sck);
 +extern int gr_search_connect(struct socket * sock,
 +                           struct sockaddr_in * addr);
@@ -43439,9 +44384,9 @@ diff -urNp linux-2.6.33.1/include/linux/grsock.h linux-2.6.33.1/include/linux/gr
 +                          const int protocol);
 +
 +#endif
-diff -urNp linux-2.6.33.1/include/linux/hdpu_features.h linux-2.6.33.1/include/linux/hdpu_features.h
---- linux-2.6.33.1/include/linux/hdpu_features.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/hdpu_features.h       2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/hdpu_features.h linux-2.6.34/include/linux/hdpu_features.h
+--- linux-2.6.34/include/linux/hdpu_features.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/hdpu_features.h 2010-07-01 20:45:16.000000000 -0400
 @@ -3,7 +3,7 @@
  struct cpustate_t {
        spinlock_t lock;
@@ -43451,10 +44396,10 @@ diff -urNp linux-2.6.33.1/include/linux/hdpu_features.h linux-2.6.33.1/include/l
        unsigned char cached_val;
        int inited;
        unsigned long *set_addr;
-diff -urNp linux-2.6.33.1/include/linux/highmem.h linux-2.6.33.1/include/linux/highmem.h
---- linux-2.6.33.1/include/linux/highmem.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/highmem.h     2010-03-20 16:58:41.912517036 -0400
-@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
+diff -urNp linux-2.6.34/include/linux/highmem.h linux-2.6.34/include/linux/highmem.h
+--- linux-2.6.34/include/linux/highmem.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/highmem.h       2010-07-01 20:45:16.000000000 -0400
+@@ -143,6 +143,18 @@ static inline void clear_highpage(struct
        kunmap_atomic(kaddr, KM_USER0);
  }
  
@@ -43473,34 +44418,9 @@ diff -urNp linux-2.6.33.1/include/linux/highmem.h linux-2.6.33.1/include/linux/h
  static inline void zero_user_segments(struct page *page,
        unsigned start1, unsigned end1,
        unsigned start2, unsigned end2)
-diff -urNp linux-2.6.33.1/include/linux/init_task.h linux-2.6.33.1/include/linux/init_task.h
---- linux-2.6.33.1/include/linux/init_task.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/init_task.h   2010-03-20 16:58:41.912517036 -0400
-@@ -111,6 +111,13 @@ extern struct cred init_cred;
- # define INIT_PERF_EVENTS(tsk)
- #endif
- 
-+#ifdef CONFIG_GRKERNSEC
-+# define INIT_GR_FS_LOCK                                      \
-+      .gr_fs_lock = __RW_LOCK_UNLOCKED(gr_fs_lock),
-+#else
-+# define INIT_GR_FS_LOCK
-+#endif
-+
- /*
-  *  INIT_TASK is used to set up the first task table, touch at
-  * your own risk!. Base=0, limit=0x1fffff (=2MB)
-@@ -180,6 +187,7 @@ extern struct cred init_cred;
-       INIT_FTRACE_GRAPH                                               \
-       INIT_TRACE_RECURSION                                            \
-       INIT_TASK_RCU_PREEMPT(tsk)                                      \
-+      INIT_GR_FS_LOCK                                                 \
- }
- 
- 
-diff -urNp linux-2.6.33.1/include/linux/interrupt.h linux-2.6.33.1/include/linux/interrupt.h
---- linux-2.6.33.1/include/linux/interrupt.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/interrupt.h   2010-03-20 16:58:41.912517036 -0400
+diff -urNp linux-2.6.34/include/linux/interrupt.h linux-2.6.34/include/linux/interrupt.h
+--- linux-2.6.34/include/linux/interrupt.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/interrupt.h     2010-07-01 20:45:16.000000000 -0400
 @@ -357,7 +357,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -43525,10 +44445,10 @@ diff -urNp linux-2.6.33.1/include/linux/interrupt.h linux-2.6.33.1/include/linux
  extern void softirq_init(void);
  #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
  extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.33.1/include/linux/jbd2.h linux-2.6.33.1/include/linux/jbd2.h
---- linux-2.6.33.1/include/linux/jbd2.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/jbd2.h        2010-03-20 16:58:41.912517036 -0400
-@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
+diff -urNp linux-2.6.34/include/linux/jbd2.h linux-2.6.34/include/linux/jbd2.h
+--- linux-2.6.34/include/linux/jbd2.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/jbd2.h  2010-07-01 20:45:16.000000000 -0400
+@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
                }                                                       \
        } while (0)
  #else
@@ -43536,11 +44456,11 @@ diff -urNp linux-2.6.33.1/include/linux/jbd2.h linux-2.6.33.1/include/linux/jbd2
 +#define jbd_debug(f, a...)    do {} while (0)
  #endif
  
- static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.33.1/include/linux/jbd.h linux-2.6.33.1/include/linux/jbd.h
---- linux-2.6.33.1/include/linux/jbd.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/jbd.h 2010-03-20 16:58:41.916544293 -0400
-@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
+ extern void *jbd2_alloc(size_t size, gfp_t flags);
+diff -urNp linux-2.6.34/include/linux/jbd.h linux-2.6.34/include/linux/jbd.h
+--- linux-2.6.34/include/linux/jbd.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/jbd.h   2010-07-01 20:45:16.000000000 -0400
+@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
                }                                                       \
        } while (0)
  #else
@@ -43549,9 +44469,9 @@ diff -urNp linux-2.6.33.1/include/linux/jbd.h linux-2.6.33.1/include/linux/jbd.h
  #endif
  
  static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.33.1/include/linux/kallsyms.h linux-2.6.33.1/include/linux/kallsyms.h
---- linux-2.6.33.1/include/linux/kallsyms.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/kallsyms.h    2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/kallsyms.h linux-2.6.34/include/linux/kallsyms.h
+--- linux-2.6.34/include/linux/kallsyms.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/kallsyms.h      2010-07-01 20:45:16.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -43572,9 +44492,9 @@ diff -urNp linux-2.6.33.1/include/linux/kallsyms.h linux-2.6.33.1/include/linux/
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.33.1/include/linux/kgdb.h linux-2.6.33.1/include/linux/kgdb.h
---- linux-2.6.33.1/include/linux/kgdb.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/kgdb.h        2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/kgdb.h linux-2.6.34/include/linux/kgdb.h
+--- linux-2.6.34/include/linux/kgdb.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/kgdb.h  2010-07-01 20:45:16.000000000 -0400
 @@ -250,20 +250,20 @@ struct kgdb_arch {
   */
  struct kgdb_io {
@@ -43605,61 +44525,10 @@ diff -urNp linux-2.6.33.1/include/linux/kgdb.h linux-2.6.33.1/include/linux/kgdb
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.33.1/include/linux/kobject.h linux-2.6.33.1/include/linux/kobject.h
---- linux-2.6.33.1/include/linux/kobject.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/kobject.h     2010-03-20 16:58:41.916544293 -0400
-@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
- 
- struct kobj_type {
-       void (*release)(struct kobject *kobj);
--      struct sysfs_ops *sysfs_ops;
-+      const struct sysfs_ops *sysfs_ops;
-       struct attribute **default_attrs;
- };
- 
-@@ -118,9 +118,9 @@ struct kobj_uevent_env {
- };
- 
- struct kset_uevent_ops {
--      int (*filter)(struct kset *kset, struct kobject *kobj);
--      const char *(*name)(struct kset *kset, struct kobject *kobj);
--      int (*uevent)(struct kset *kset, struct kobject *kobj,
-+      int (* const filter)(struct kset *kset, struct kobject *kobj);
-+      const char *(* const name)(struct kset *kset, struct kobject *kobj);
-+      int (* const uevent)(struct kset *kset, struct kobject *kobj,
-                     struct kobj_uevent_env *env);
- };
- 
-@@ -132,7 +132,7 @@ struct kobj_attribute {
-                        const char *buf, size_t count);
- };
- 
--extern struct sysfs_ops kobj_sysfs_ops;
-+extern const struct sysfs_ops kobj_sysfs_ops;
- 
- /**
-  * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
-@@ -155,14 +155,14 @@ struct kset {
-       struct list_head list;
-       spinlock_t list_lock;
-       struct kobject kobj;
--      struct kset_uevent_ops *uevent_ops;
-+      const struct kset_uevent_ops *uevent_ops;
- };
- 
- extern void kset_init(struct kset *kset);
- extern int __must_check kset_register(struct kset *kset);
- extern void kset_unregister(struct kset *kset);
- extern struct kset * __must_check kset_create_and_add(const char *name,
--                                              struct kset_uevent_ops *u,
-+                                              const struct kset_uevent_ops *u,
-                                               struct kobject *parent_kobj);
- 
- static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.33.1/include/linux/kvm_host.h linux-2.6.33.1/include/linux/kvm_host.h
---- linux-2.6.33.1/include/linux/kvm_host.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/kvm_host.h    2010-03-20 16:58:41.916544293 -0400
-@@ -225,7 +225,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-2.6.34/include/linux/kvm_host.h linux-2.6.34/include/linux/kvm_host.h
+--- linux-2.6.34/include/linux/kvm_host.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/kvm_host.h      2010-07-01 20:45:16.000000000 -0400
+@@ -237,7 +237,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
@@ -43668,7 +44537,7 @@ diff -urNp linux-2.6.33.1/include/linux/kvm_host.h linux-2.6.33.1/include/linux/
                  struct module *module);
  void kvm_exit(void);
  
-@@ -332,7 +332,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -355,7 +355,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);
  
@@ -43677,9 +44546,9 @@ diff -urNp linux-2.6.33.1/include/linux/kvm_host.h linux-2.6.33.1/include/linux/
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/libata.h
---- linux-2.6.33.1/include/linux/libata.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/libata.h      2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/libata.h linux-2.6.34/include/linux/libata.h
+--- linux-2.6.34/include/linux/libata.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/libata.h        2010-07-01 20:45:16.000000000 -0400
 @@ -64,11 +64,11 @@
  #ifdef ATA_VERBOSE_DEBUG
  #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -43695,7 +44564,7 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
  #endif        /* ATA_DEBUG */
  
  #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
-@@ -524,11 +524,11 @@ struct ata_ioports {
+@@ -525,11 +525,11 @@ struct ata_ioports {
  
  struct ata_host {
        spinlock_t              lock;
@@ -43709,7 +44578,7 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
        unsigned long           flags;
  #ifdef CONFIG_ATA_ACPI
        acpi_handle             acpi_handle;
-@@ -710,7 +710,7 @@ struct ata_link {
+@@ -711,7 +711,7 @@ struct ata_link {
  
  struct ata_port {
        struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
@@ -43718,7 +44587,7 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
        spinlock_t              *lock;
        /* Flags owned by the EH context. Only EH should touch these once the
           port is active */
-@@ -892,7 +892,7 @@ struct ata_port_info {
+@@ -894,7 +894,7 @@ struct ata_port_info {
        unsigned long           pio_mask;
        unsigned long           mwdma_mask;
        unsigned long           udma_mask;
@@ -43727,7 +44596,7 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
        void                    *private_data;
  };
  
-@@ -916,7 +916,7 @@ extern const unsigned long sata_deb_timi
+@@ -918,7 +918,7 @@ extern const unsigned long sata_deb_timi
  extern const unsigned long sata_deb_timing_hotplug[];
  extern const unsigned long sata_deb_timing_long[];
  
@@ -43736,7 +44605,7 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
  extern const struct ata_port_info ata_dummy_port_info;
  
  static inline const unsigned long *
-@@ -962,7 +962,7 @@ extern int ata_host_activate(struct ata_
+@@ -964,7 +964,7 @@ extern int ata_host_activate(struct ata_
                             struct scsi_host_template *sht);
  extern void ata_host_detach(struct ata_host *host);
  extern void ata_host_init(struct ata_host *, struct device *,
@@ -43745,9 +44614,9 @@ diff -urNp linux-2.6.33.1/include/linux/libata.h linux-2.6.33.1/include/linux/li
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
  extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.33.1/include/linux/lockd/bind.h linux-2.6.33.1/include/linux/lockd/bind.h
---- linux-2.6.33.1/include/linux/lockd/bind.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/lockd/bind.h  2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/lockd/bind.h linux-2.6.34/include/linux/lockd/bind.h
+--- linux-2.6.34/include/linux/lockd/bind.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/lockd/bind.h    2010-07-01 20:45:16.000000000 -0400
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -43765,21 +44634,25 @@ diff -urNp linux-2.6.33.1/include/linux/lockd/bind.h linux-2.6.33.1/include/linu
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/include/linux/mm.h
---- linux-2.6.33.1/include/linux/mm.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/mm.h  2010-03-20 16:58:41.916544293 -0400
-@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 
- #define VM_PFN_AT_MMAP        0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
- #define VM_MERGEABLE  0x80000000      /* KSM may merge identical pages */
+diff -urNp linux-2.6.34/include/linux/mm.h linux-2.6.34/include/linux/mm.h
+--- linux-2.6.34/include/linux/mm.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/mm.h    2010-07-01 20:45:16.000000000 -0400
+@@ -103,7 +103,14 @@ extern unsigned int kobjsize(const void 
  
-+#ifdef CONFIG_PAX_PAGEEXEC
-+#define VM_PAGEEXEC   0x80000000      /* vma->vm_page_prot needs special handling */
+ #define VM_CAN_NONLINEAR 0x08000000   /* Has ->fault & does nonlinear pages */
+ #define VM_MIXEDMAP   0x10000000      /* Can contain "struct page" and pure PFN pages */
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
++#define VM_SAO                0x00000000      /* Strong Access Ordering (powerpc) */
++#define VM_PAGEEXEC   0x20000000      /* vma->vm_page_prot needs special handling */
++#else
+ #define VM_SAO                0x20000000      /* Strong Access Ordering (powerpc) */
 +#endif
 +
- #ifndef VM_STACK_DEFAULT_FLAGS                /* arch can override this */
- #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
- #endif
-@@ -895,6 +899,8 @@ struct shrinker {
+ #define VM_PFN_AT_MMAP        0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
+ #define VM_MERGEABLE  0x80000000      /* KSM may merge identical pages */
+ 
+@@ -1006,6 +1013,8 @@ struct shrinker {
  extern void register_shrinker(struct shrinker *);
  extern void unregister_shrinker(struct shrinker *);
  
@@ -43788,7 +44661,7 @@ diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/include/linux/mm.h
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
-@@ -1171,6 +1177,7 @@ out:
+@@ -1282,6 +1291,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -43796,18 +44669,18 @@ diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1225,6 +1232,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1336,6 +1346,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);
  
 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
-+extern void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
++extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
 +
  /* 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)
-@@ -1241,7 +1252,6 @@ static inline unsigned long vma_pages(st
+@@ -1352,7 +1366,6 @@ static inline unsigned long vma_pages(st
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -43815,7 +44688,7 @@ diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/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);
-@@ -1344,8 +1354,14 @@ extern int unpoison_memory(unsigned long
+@@ -1462,10 +1475,16 @@ 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);
@@ -43823,6 +44696,8 @@ diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/include/linux/mm.h
 +extern atomic_long_unchecked_t mce_bad_pages;
  extern int soft_offline_page(struct page *page, int flags);
  
+ extern void dump_page(struct page *page);
+ 
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
 +#else
@@ -43831,10 +44706,10 @@ diff -urNp linux-2.6.33.1/include/linux/mm.h linux-2.6.33.1/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.33.1/include/linux/mm_types.h linux-2.6.33.1/include/linux/mm_types.h
---- linux-2.6.33.1/include/linux/mm_types.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/mm_types.h    2010-03-20 16:58:41.916544293 -0400
-@@ -188,6 +188,8 @@ struct vm_area_struct {
+diff -urNp linux-2.6.34/include/linux/mm_types.h linux-2.6.34/include/linux/mm_types.h
+--- linux-2.6.34/include/linux/mm_types.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/mm_types.h      2010-07-01 20:45:16.000000000 -0400
+@@ -183,6 +183,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
        struct mempolicy *vm_policy;    /* NUMA policy for the VMA */
  #endif
@@ -43843,7 +44718,7 @@ diff -urNp linux-2.6.33.1/include/linux/mm_types.h linux-2.6.33.1/include/linux/
  };
  
  struct core_thread {
-@@ -291,6 +293,24 @@ struct mm_struct {
+@@ -310,6 +312,24 @@ struct mm_struct {
  #ifdef CONFIG_MMU_NOTIFIER
        struct mmu_notifier_mm *mmu_notifier_mm;
  #endif
@@ -43868,9 +44743,9 @@ diff -urNp linux-2.6.33.1/include/linux/mm_types.h linux-2.6.33.1/include/linux/
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.33.1/include/linux/mmu_notifier.h linux-2.6.33.1/include/linux/mmu_notifier.h
---- linux-2.6.33.1/include/linux/mmu_notifier.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/mmu_notifier.h        2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/mmu_notifier.h linux-2.6.34/include/linux/mmu_notifier.h
+--- linux-2.6.34/include/linux/mmu_notifier.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/mmu_notifier.h  2010-07-01 20:45:16.000000000 -0400
 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)             \
@@ -43887,9 +44762,9 @@ diff -urNp linux-2.6.33.1/include/linux/mmu_notifier.h linux-2.6.33.1/include/li
  })
  
  #define ptep_clear_flush_young_notify(__vma, __address, __ptep)               \
-diff -urNp linux-2.6.33.1/include/linux/mod_devicetable.h linux-2.6.33.1/include/linux/mod_devicetable.h
---- linux-2.6.33.1/include/linux/mod_devicetable.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/mod_devicetable.h     2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/mod_devicetable.h linux-2.6.34/include/linux/mod_devicetable.h
+--- linux-2.6.34/include/linux/mod_devicetable.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/mod_devicetable.h       2010-07-01 20:45:16.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -43908,10 +44783,10 @@ diff -urNp linux-2.6.33.1/include/linux/mod_devicetable.h linux-2.6.33.1/include
  
  struct hid_device_id {
        __u16 bus;
-diff -urNp linux-2.6.33.1/include/linux/module.h linux-2.6.33.1/include/linux/module.h
---- linux-2.6.33.1/include/linux/module.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/module.h      2010-03-20 16:58:41.916544293 -0400
-@@ -289,16 +289,16 @@ struct module
+diff -urNp linux-2.6.34/include/linux/module.h linux-2.6.34/include/linux/module.h
+--- linux-2.6.34/include/linux/module.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/module.h        2010-07-01 20:45:16.000000000 -0400
+@@ -290,16 +290,16 @@ struct module
        int (*init)(void);
  
        /* If this is non-NULL, vfree after init() returns */
@@ -43932,8 +44807,8 @@ diff -urNp linux-2.6.33.1/include/linux/module.h linux-2.6.33.1/include/linux/mo
  
        /* Arch-specific module values */
        struct mod_arch_specific arch;
-@@ -395,16 +395,46 @@ struct module *__module_address(unsigned
- bool is_module_address(unsigned long addr);
+@@ -399,16 +399,46 @@ bool is_module_address(unsigned long add
+ bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
@@ -43983,9 +44858,9 @@ diff -urNp linux-2.6.33.1/include/linux/module.h linux-2.6.33.1/include/linux/mo
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.33.1/include/linux/moduleloader.h linux-2.6.33.1/include/linux/moduleloader.h
---- linux-2.6.33.1/include/linux/moduleloader.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/moduleloader.h        2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/moduleloader.h linux-2.6.34/include/linux/moduleloader.h
+--- linux-2.6.34/include/linux/moduleloader.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/moduleloader.h  2010-07-01 20:45:16.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -44008,9 +44883,9 @@ diff -urNp linux-2.6.33.1/include/linux/moduleloader.h linux-2.6.33.1/include/li
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.33.1/include/linux/namei.h linux-2.6.33.1/include/linux/namei.h
---- linux-2.6.33.1/include/linux/namei.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/namei.h       2010-03-20 16:58:41.916544293 -0400
+diff -urNp linux-2.6.34/include/linux/namei.h linux-2.6.34/include/linux/namei.h
+--- linux-2.6.34/include/linux/namei.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/namei.h 2010-07-01 20:45:16.000000000 -0400
 @@ -22,7 +22,7 @@ struct nameidata {
        unsigned int    flags;
        int             last_type;
@@ -44035,28 +44910,9 @@ diff -urNp linux-2.6.33.1/include/linux/namei.h linux-2.6.33.1/include/linux/nam
  {
        return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.33.1/include/linux/nodemask.h linux-2.6.33.1/include/linux/nodemask.h
---- linux-2.6.33.1/include/linux/nodemask.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/nodemask.h    2010-03-20 16:58:41.916544293 -0400
-@@ -469,11 +469,11 @@ static inline int num_node_state(enum no
- 
- #define any_online_node(mask)                 \
- ({                                            \
--      int node;                               \
--      for_each_node_mask(node, (mask))        \
--              if (node_online(node))          \
-+      int __node;                             \
-+      for_each_node_mask(__node, (mask))      \
-+              if (node_online(__node))        \
-                       break;                  \
--      node;                                   \
-+      __node;                                 \
- })
- 
- #define num_online_nodes()    num_node_state(N_ONLINE)
-diff -urNp linux-2.6.33.1/include/linux/oprofile.h linux-2.6.33.1/include/linux/oprofile.h
---- linux-2.6.33.1/include/linux/oprofile.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/oprofile.h    2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/oprofile.h linux-2.6.34/include/linux/oprofile.h
+--- linux-2.6.34/include/linux/oprofile.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/oprofile.h      2010-07-01 20:45:16.000000000 -0400
 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
        char const * name, ulong * val);
@@ -44069,9 +44925,9 @@ diff -urNp linux-2.6.33.1/include/linux/oprofile.h linux-2.6.33.1/include/linux/
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.33.1/include/linux/pipe_fs_i.h linux-2.6.33.1/include/linux/pipe_fs_i.h
---- linux-2.6.33.1/include/linux/pipe_fs_i.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/pipe_fs_i.h   2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/pipe_fs_i.h linux-2.6.34/include/linux/pipe_fs_i.h
+--- linux-2.6.34/include/linux/pipe_fs_i.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/pipe_fs_i.h     2010-07-01 20:45:16.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_inode_info {
        wait_queue_head_t wait;
        unsigned int nrbufs, curbuf;
@@ -44085,9 +44941,9 @@ diff -urNp linux-2.6.33.1/include/linux/pipe_fs_i.h linux-2.6.33.1/include/linux
        unsigned int r_counter;
        unsigned int w_counter;
        struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.33.1/include/linux/poison.h linux-2.6.33.1/include/linux/poison.h
---- linux-2.6.33.1/include/linux/poison.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/poison.h      2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/poison.h linux-2.6.34/include/linux/poison.h
+--- linux-2.6.34/include/linux/poison.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/poison.h        2010-07-01 20:45:16.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -44099,9 +44955,9 @@ diff -urNp linux-2.6.33.1/include/linux/poison.h linux-2.6.33.1/include/linux/po
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.33.1/include/linux/proc_fs.h linux-2.6.33.1/include/linux/proc_fs.h
---- linux-2.6.33.1/include/linux/proc_fs.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/proc_fs.h     2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/proc_fs.h linux-2.6.34/include/linux/proc_fs.h
+--- linux-2.6.34/include/linux/proc_fs.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/proc_fs.h       2010-07-01 20:45:16.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
        return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -44122,9 +44978,9 @@ diff -urNp linux-2.6.33.1/include/linux/proc_fs.h linux-2.6.33.1/include/linux/p
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
        mode_t mode, struct proc_dir_entry *base, 
        read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.33.1/include/linux/random.h linux-2.6.33.1/include/linux/random.h
---- linux-2.6.33.1/include/linux/random.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/random.h      2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/random.h linux-2.6.34/include/linux/random.h
+--- linux-2.6.34/include/linux/random.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/random.h        2010-07-01 20:45:16.000000000 -0400
 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
  u32 random32(void);
  void srandom32(u32 seed);
@@ -44137,9 +44993,9 @@ diff -urNp linux-2.6.33.1/include/linux/random.h linux-2.6.33.1/include/linux/ra
  #endif /* __KERNEL___ */
  
  #endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.33.1/include/linux/reiserfs_fs.h linux-2.6.33.1/include/linux/reiserfs_fs.h
---- linux-2.6.33.1/include/linux/reiserfs_fs.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/reiserfs_fs.h 2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/reiserfs_fs.h linux-2.6.34/include/linux/reiserfs_fs.h
+--- linux-2.6.34/include/linux/reiserfs_fs.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/reiserfs_fs.h   2010-07-01 20:45:16.000000000 -0400
 @@ -1404,7 +1404,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM             1       /* reiserfs user memory mode            */
  
@@ -44186,9 +45042,9 @@ diff -urNp linux-2.6.33.1/include/linux/reiserfs_fs.h linux-2.6.33.1/include/lin
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.33.1/include/linux/reiserfs_fs_sb.h linux-2.6.33.1/include/linux/reiserfs_fs_sb.h
---- linux-2.6.33.1/include/linux/reiserfs_fs_sb.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/reiserfs_fs_sb.h      2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/reiserfs_fs_sb.h linux-2.6.34/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.34/include/linux/reiserfs_fs_sb.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/reiserfs_fs_sb.h        2010-07-01 20:45:16.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
        /* Comment? -Hans */
        wait_queue_head_t s_wait;
@@ -44198,10 +45054,10 @@ diff -urNp linux-2.6.33.1/include/linux/reiserfs_fs_sb.h linux-2.6.33.1/include/
        // tree gets re-balanced
        unsigned long s_properties;     /* File system properties. Currently holds
                                           on-disk FS format */
-diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sched.h
---- linux-2.6.33.1/include/linux/sched.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/sched.h       2010-03-20 16:58:41.920592896 -0400
-@@ -101,6 +101,7 @@ struct bio;
+diff -urNp linux-2.6.34/include/linux/sched.h linux-2.6.34/include/linux/sched.h
+--- linux-2.6.34/include/linux/sched.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/sched.h 2010-07-02 17:25:21.000000000 -0400
+@@ -101,6 +101,7 @@ struct bio_list;
  struct fs_struct;
  struct bts_context;
  struct perf_event_context;
@@ -44209,7 +45065,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  
  /*
   * List of flags we want to share for kernel threads,
-@@ -678,6 +679,15 @@ struct signal_struct {
+@@ -628,6 +629,15 @@ struct signal_struct {
        struct tty_audit_buf *tty_audit_buf;
  #endif
  
@@ -44225,7 +45081,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
        int oom_adj;    /* OOM kill score adjustment (bit shift) */
  };
  
-@@ -1234,7 +1244,7 @@ struct rcu_node;
+@@ -1169,7 +1179,7 @@ struct rcu_node;
  
  struct task_struct {
        volatile long state;    /* -1 unrunnable, 0 runnable, >0 stopped */
@@ -44234,7 +45090,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
        atomic_t usage;
        unsigned int flags;     /* per process flags, defined below */
        unsigned int ptrace;
-@@ -1346,8 +1356,8 @@ struct task_struct {
+@@ -1283,8 +1293,8 @@ struct task_struct {
        struct list_head thread_group;
  
        struct completion *vfork_done;          /* for vfork() */
@@ -44245,7 +45101,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  
        cputime_t utime, stime, utimescaled, stimescaled;
        cputime_t gtime;
-@@ -1363,16 +1373,6 @@ struct task_struct {
+@@ -1300,16 +1310,6 @@ struct task_struct {
        struct task_cputime cputime_expires;
        struct list_head cpu_timers[3];
  
@@ -44262,7 +45118,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
        char comm[TASK_COMM_LEN]; /* executable name excluding path
                                     - access with [gs]et_task_comm (which lock
                                       it with task_lock())
-@@ -1456,6 +1456,15 @@ struct task_struct {
+@@ -1393,6 +1393,15 @@ struct task_struct {
        int softirqs_enabled;
        int softirq_context;
  #endif
@@ -44278,7 +45134,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  #ifdef CONFIG_LOCKDEP
  # define MAX_LOCK_DEPTH 48UL
        u64 curr_chain_key;
-@@ -1476,6 +1485,9 @@ struct task_struct {
+@@ -1413,6 +1422,9 @@ struct task_struct {
  
        struct backing_dev_info *backing_dev_info;
  
@@ -44288,14 +45144,14 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
        struct io_context *io_context;
  
        unsigned long ptrace_message;
-@@ -1539,6 +1551,19 @@ struct task_struct {
+@@ -1476,6 +1488,20 @@ struct task_struct {
        unsigned long default_timer_slack_ns;
  
        struct list_head        *scm_work_list;
 +
 +#ifdef CONFIG_GRKERNSEC
 +      /* grsecurity */
-+      rwlock_t gr_fs_lock;
++      struct dentry *gr_chroot_dentry;
 +      struct acl_subject_label *acl;
 +      struct acl_role_label *role;
 +      struct file *exec_file;
@@ -44303,12 +45159,13 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
 +      u8 acl_sp_role;
 +      u8 is_writable;
 +      u8 brute;
++      u8 gr_is_chrooted;
 +#endif
 +
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-       /* Index of current stored adress in ret_stack */
+       /* Index of current stored address in ret_stack */
        int curr_ret_stack;
-@@ -1571,6 +1596,52 @@ struct task_struct {
+@@ -1507,6 +1533,52 @@ struct task_struct {
  #endif
  };
  
@@ -44361,7 +45218,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2172,7 +2243,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2108,7 +2180,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -44370,41 +45227,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2274,6 +2345,33 @@ static inline void task_unlock(struct ta
-       spin_unlock(&p->alloc_lock);
- }
- 
-+/* grsec: protects only ->fs as task_lock is overkill and we can't
-+   be using a spin_lock in interrupt context
-+*/
-+#ifdef CONFIG_GRKERNSEC
-+#define gr_fs_write_lock_irqsave(x, y)                                \
-+      write_lock_irqsave(&x->gr_fs_lock, y)
-+#define gr_fs_write_unlock_irqrestore(x, y)                   \
-+      write_unlock_irqrestore(&x->gr_fs_lock, y)
-+#else
-+#define gr_fs_write_lock_irqsave(x, y)
-+#define gr_fs_write_unlock_irqrestore(x, y)
-+#endif
-+
-+static inline void gr_fs_read_lock(struct task_struct *p)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+      read_lock(&p->gr_fs_lock);
-+#endif
-+}
-+
-+static inline void gr_fs_read_unlock(struct task_struct *p)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+      read_unlock(&p->gr_fs_lock);
-+#endif
-+}
-+
- extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk,
-                                                       unsigned long *flags);
- 
-@@ -2285,8 +2383,8 @@ static inline void unlock_task_sighand(s
+@@ -2221,8 +2293,8 @@ static inline void unlock_task_sighand(s
  
  #ifndef __HAVE_THREAD_FUNCTIONS
  
@@ -44415,7 +45238,7 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  
  static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
  {
-@@ -2301,13 +2399,31 @@ static inline unsigned long *end_of_stac
+@@ -2237,13 +2309,31 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -44449,9 +45272,9 @@ diff -urNp linux-2.6.33.1/include/linux/sched.h linux-2.6.33.1/include/linux/sch
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.33.1/include/linux/screen_info.h linux-2.6.33.1/include/linux/screen_info.h
---- linux-2.6.33.1/include/linux/screen_info.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/screen_info.h 2010-03-20 16:58:41.920592896 -0400
+diff -urNp linux-2.6.34/include/linux/screen_info.h linux-2.6.34/include/linux/screen_info.h
+--- linux-2.6.34/include/linux/screen_info.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/screen_info.h   2010-07-01 20:45:16.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
        __u16 pages;            /* 0x32 */
        __u16 vesa_attributes;  /* 0x34 */
@@ -44462,20 +45285,20 @@ diff -urNp linux-2.6.33.1/include/linux/screen_info.h linux-2.6.33.1/include/lin
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA                0x10    /* Monochrome Text Display      */
-diff -urNp linux-2.6.33.1/include/linux/security.h linux-2.6.33.1/include/linux/security.h
---- linux-2.6.33.1/include/linux/security.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/security.h    2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/security.h linux-2.6.34/include/linux/security.h
+--- linux-2.6.34/include/linux/security.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/security.h      2010-07-02 17:23:53.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
- #include <linux/gfp.h>
+ #include <linux/slab.h>
 +#include <linux/grsecurity.h>
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.33.1/include/linux/shm.h linux-2.6.33.1/include/linux/shm.h
---- linux-2.6.33.1/include/linux/shm.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/shm.h 2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/shm.h linux-2.6.34/include/linux/shm.h
+--- linux-2.6.34/include/linux/shm.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/shm.h   2010-07-01 20:45:16.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
        pid_t                   shm_cprid;
        pid_t                   shm_lprid;
@@ -44487,9 +45310,9 @@ diff -urNp linux-2.6.33.1/include/linux/shm.h linux-2.6.33.1/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.33.1/include/linux/slab.h linux-2.6.33.1/include/linux/slab.h
---- linux-2.6.33.1/include/linux/slab.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/slab.h        2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/slab.h linux-2.6.34/include/linux/slab.h
+--- linux-2.6.34/include/linux/slab.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/slab.h  2010-07-01 20:45:16.000000000 -0400
 @@ -11,6 +11,7 @@
  
  #include <linux/gfp.h>
@@ -44498,7 +45321,7 @@ diff -urNp linux-2.6.33.1/include/linux/slab.h linux-2.6.33.1/include/linux/slab
  
  /*
   * Flags to pass to kmem_cache_create().
-@@ -82,10 +83,13 @@
+@@ -87,10 +88,13 @@
   * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
   * Both make kfree a no-op.
   */
@@ -44511,11 +45334,11 @@ diff -urNp linux-2.6.33.1/include/linux/slab.h linux-2.6.33.1/include/linux/slab
  
 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
 -                              (unsigned long)ZERO_SIZE_PTR)
-+#define ZERO_OR_NULL_PTR(x) (!(x) || (x) == ZERO_SIZE_PTR)
++#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
  
  /*
   * struct kmem_cache related prototypes
-@@ -138,6 +142,7 @@ void * __must_check krealloc(const void 
+@@ -144,6 +148,7 @@ void * __must_check krealloc(const void 
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -44523,7 +45346,7 @@ diff -urNp linux-2.6.33.1/include/linux/slab.h linux-2.6.33.1/include/linux/slab
  
  /*
   * Allocator specific definitions. These are mainly used to establish optimized
-@@ -328,4 +333,37 @@ static inline void *kzalloc_node(size_t 
+@@ -334,4 +339,37 @@ static inline void *kzalloc_node(size_t 
  
  void __init kmem_cache_init_late(void);
  
@@ -44561,10 +45384,10 @@ diff -urNp linux-2.6.33.1/include/linux/slab.h linux-2.6.33.1/include/linux/slab
 +})
 +
  #endif        /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.33.1/include/linux/slub_def.h linux-2.6.33.1/include/linux/slub_def.h
---- linux-2.6.33.1/include/linux/slub_def.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/slub_def.h    2010-03-20 16:58:41.924637706 -0400
-@@ -86,7 +86,7 @@ struct kmem_cache {
+diff -urNp linux-2.6.34/include/linux/slub_def.h linux-2.6.34/include/linux/slub_def.h
+--- linux-2.6.34/include/linux/slub_def.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/slub_def.h      2010-07-01 20:45:16.000000000 -0400
+@@ -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 */
@@ -44573,9 +45396,9 @@ diff -urNp linux-2.6.33.1/include/linux/slub_def.h linux-2.6.33.1/include/linux/
        void (*ctor)(void *);
        int inuse;              /* Offset to metadata */
        int align;              /* Alignment */
-diff -urNp linux-2.6.33.1/include/linux/sonet.h linux-2.6.33.1/include/linux/sonet.h
---- linux-2.6.33.1/include/linux/sonet.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/sonet.h       2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/sonet.h linux-2.6.34/include/linux/sonet.h
+--- linux-2.6.34/include/linux/sonet.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/sonet.h 2010-07-01 20:45:16.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -44585,9 +45408,9 @@ diff -urNp linux-2.6.33.1/include/linux/sonet.h linux-2.6.33.1/include/linux/son
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.33.1/include/linux/suspend.h linux-2.6.33.1/include/linux/suspend.h
---- linux-2.6.33.1/include/linux/suspend.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/suspend.h     2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/suspend.h linux-2.6.34/include/linux/suspend.h
+--- linux-2.6.34/include/linux/suspend.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/suspend.h       2010-07-01 20:45:16.000000000 -0400
 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
   *    which require special recovery actions in that situation.
   */
@@ -44676,9 +45499,9 @@ diff -urNp linux-2.6.33.1/include/linux/suspend.h linux-2.6.33.1/include/linux/s
  static inline int hibernate(void) { return -ENOSYS; }
  static inline bool system_entering_hibernation(void) { return false; }
  #endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.33.1/include/linux/sysctl.h linux-2.6.33.1/include/linux/sysctl.h
---- linux-2.6.33.1/include/linux/sysctl.h      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/sysctl.h      2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/sysctl.h linux-2.6.34/include/linux/sysctl.h
+--- linux-2.6.34/include/linux/sysctl.h        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/sysctl.h        2010-07-01 20:45:16.000000000 -0400
 @@ -155,7 +155,11 @@ enum
        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -44692,11 +45515,11 @@ diff -urNp linux-2.6.33.1/include/linux/sysctl.h linux-2.6.33.1/include/linux/sy
  
  /* CTL_VM names: */
  enum
-diff -urNp linux-2.6.33.1/include/linux/sysfs.h linux-2.6.33.1/include/linux/sysfs.h
---- linux-2.6.33.1/include/linux/sysfs.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/sysfs.h       2010-03-20 16:58:41.924637706 -0400
-@@ -75,8 +75,8 @@ struct bin_attribute {
- };
+diff -urNp linux-2.6.34/include/linux/sysfs.h linux-2.6.34/include/linux/sysfs.h
+--- linux-2.6.34/include/linux/sysfs.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/sysfs.h 2010-07-01 20:45:16.000000000 -0400
+@@ -113,8 +113,8 @@ struct bin_attribute {
+ #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
  
  struct sysfs_ops {
 -      ssize_t (*show)(struct kobject *, struct attribute *,char *);
@@ -44706,9 +45529,9 @@ diff -urNp linux-2.6.33.1/include/linux/sysfs.h linux-2.6.33.1/include/linux/sys
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.33.1/include/linux/thread_info.h linux-2.6.33.1/include/linux/thread_info.h
---- linux-2.6.33.1/include/linux/thread_info.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/thread_info.h 2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/thread_info.h linux-2.6.34/include/linux/thread_info.h
+--- linux-2.6.34/include/linux/thread_info.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/thread_info.h   2010-07-01 20:45:16.000000000 -0400
 @@ -23,7 +23,7 @@ struct restart_block {
                };
                /* For futex_wait and futex_wait_requeue_pi */
@@ -44718,9 +45541,9 @@ diff -urNp linux-2.6.33.1/include/linux/thread_info.h linux-2.6.33.1/include/lin
                        u32 val;
                        u32 flags;
                        u32 bitset;
-diff -urNp linux-2.6.33.1/include/linux/tty.h linux-2.6.33.1/include/linux/tty.h
---- linux-2.6.33.1/include/linux/tty.h 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/tty.h 2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/tty.h linux-2.6.34/include/linux/tty.h
+--- linux-2.6.34/include/linux/tty.h   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/tty.h   2010-07-01 20:45:16.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_ldisc.h>
@@ -44729,7 +45552,7 @@ diff -urNp linux-2.6.33.1/include/linux/tty.h linux-2.6.33.1/include/linux/tty.h
  
  #include <asm/system.h>
  
-@@ -440,7 +441,6 @@ extern int tty_perform_flush(struct tty_
+@@ -452,7 +453,6 @@ extern int tty_perform_flush(struct tty_
  extern dev_t tty_devnum(struct tty_struct *tty);
  extern void proc_clear_tty(struct task_struct *p);
  extern struct tty_struct *get_current_tty(void);
@@ -44737,7 +45560,7 @@ diff -urNp linux-2.6.33.1/include/linux/tty.h linux-2.6.33.1/include/linux/tty.h
  extern struct tty_struct *alloc_tty_struct(void);
  extern void free_tty_struct(struct tty_struct *tty);
  extern void initialize_tty_struct(struct tty_struct *tty,
-@@ -501,6 +501,18 @@ extern void tty_ldisc_begin(void);
+@@ -513,6 +513,18 @@ extern void tty_ldisc_begin(void);
  /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
  extern void tty_ldisc_enable(struct tty_struct *tty);
  
@@ -44756,10 +45579,10 @@ diff -urNp linux-2.6.33.1/include/linux/tty.h linux-2.6.33.1/include/linux/tty.h
  
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.33.1/include/linux/tty_ldisc.h linux-2.6.33.1/include/linux/tty_ldisc.h
---- linux-2.6.33.1/include/linux/tty_ldisc.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/tty_ldisc.h   2010-03-20 16:58:41.924637706 -0400
-@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
+diff -urNp linux-2.6.34/include/linux/tty_ldisc.h linux-2.6.34/include/linux/tty_ldisc.h
+--- linux-2.6.34/include/linux/tty_ldisc.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/tty_ldisc.h     2010-07-01 20:45:16.000000000 -0400
+@@ -147,7 +147,7 @@ struct tty_ldisc_ops {
  
        struct  module *owner;
        
@@ -44768,9 +45591,9 @@ diff -urNp linux-2.6.33.1/include/linux/tty_ldisc.h linux-2.6.33.1/include/linux
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.33.1/include/linux/types.h linux-2.6.33.1/include/linux/types.h
---- linux-2.6.33.1/include/linux/types.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/types.h       2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/types.h linux-2.6.34/include/linux/types.h
+--- linux-2.6.34/include/linux/types.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/types.h 2010-07-01 20:45:16.000000000 -0400
 @@ -191,10 +191,26 @@ typedef struct {
        volatile int counter;
  } atomic_t;
@@ -44798,9 +45621,9 @@ diff -urNp linux-2.6.33.1/include/linux/types.h linux-2.6.33.1/include/linux/typ
  #endif
  
  struct ustat {
-diff -urNp linux-2.6.33.1/include/linux/uaccess.h linux-2.6.33.1/include/linux/uaccess.h
---- linux-2.6.33.1/include/linux/uaccess.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/uaccess.h     2010-03-20 16:58:41.924637706 -0400
+diff -urNp linux-2.6.34/include/linux/uaccess.h linux-2.6.34/include/linux/uaccess.h
+--- linux-2.6.34/include/linux/uaccess.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/uaccess.h       2010-07-01 20:45:16.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
                long ret;                               \
                mm_segment_t old_fs = get_fs();         \
@@ -44836,15 +45659,15 @@ diff -urNp linux-2.6.33.1/include/linux/uaccess.h linux-2.6.33.1/include/linux/u
 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif                /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.33.1/include/linux/vmalloc.h linux-2.6.33.1/include/linux/vmalloc.h
---- linux-2.6.33.1/include/linux/vmalloc.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/linux/vmalloc.h     2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/linux/vmalloc.h linux-2.6.34/include/linux/vmalloc.h
+--- linux-2.6.34/include/linux/vmalloc.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/linux/vmalloc.h       2010-07-01 20:45:16.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;              /* vma defining 
  #define VM_MAP                0x00000004      /* vmap()ed pages */
  #define VM_USERMAP    0x00000008      /* suitable for remap_vmalloc_range */
  #define VM_VPAGES     0x00000010      /* buffer for pages was vmalloc'ed */
 +
-+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +#define VM_KERNEXEC   0x00000020      /* allocate from executable kernel memory range */
 +#endif
 +
@@ -44933,9 +45756,9 @@ diff -urNp linux-2.6.33.1/include/linux/vmalloc.h linux-2.6.33.1/include/linux/v
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.33.1/include/net/irda/ircomm_tty.h linux-2.6.33.1/include/net/irda/ircomm_tty.h
---- linux-2.6.33.1/include/net/irda/ircomm_tty.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/net/irda/ircomm_tty.h       2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/net/irda/ircomm_tty.h linux-2.6.34/include/net/irda/ircomm_tty.h
+--- linux-2.6.34/include/net/irda/ircomm_tty.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/net/irda/ircomm_tty.h 2010-07-01 20:45:16.000000000 -0400
 @@ -105,8 +105,8 @@ struct ircomm_tty_cb {
          unsigned short    close_delay;
          unsigned short    closing_wait; /* time to wait before closing */
@@ -44947,9 +45770,9 @@ diff -urNp linux-2.6.33.1/include/net/irda/ircomm_tty.h linux-2.6.33.1/include/n
  
        /* Protect concurent access to :
         *      o self->open_count
-diff -urNp linux-2.6.33.1/include/net/neighbour.h linux-2.6.33.1/include/net/neighbour.h
---- linux-2.6.33.1/include/net/neighbour.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/net/neighbour.h     2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/net/neighbour.h linux-2.6.34/include/net/neighbour.h
+--- linux-2.6.34/include/net/neighbour.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/net/neighbour.h       2010-07-01 20:45:16.000000000 -0400
 @@ -116,12 +116,12 @@ struct neighbour {
  
  struct neigh_ops {
@@ -44969,10 +45792,10 @@ diff -urNp linux-2.6.33.1/include/net/neighbour.h linux-2.6.33.1/include/net/nei
  };
  
  struct pneigh_entry {
-diff -urNp linux-2.6.33.1/include/net/sctp/sctp.h linux-2.6.33.1/include/net/sctp/sctp.h
---- linux-2.6.33.1/include/net/sctp/sctp.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/net/sctp/sctp.h     2010-03-20 16:58:41.928524770 -0400
-@@ -304,8 +304,8 @@ extern int sctp_debug_flag;
+diff -urNp linux-2.6.34/include/net/sctp/sctp.h linux-2.6.34/include/net/sctp/sctp.h
+--- linux-2.6.34/include/net/sctp/sctp.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/net/sctp/sctp.h       2010-07-01 20:45:16.000000000 -0400
+@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
  
  #else /* SCTP_DEBUG */
  
@@ -44983,10 +45806,10 @@ diff -urNp linux-2.6.33.1/include/net/sctp/sctp.h linux-2.6.33.1/include/net/sct
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.33.1/include/net/tcp.h linux-2.6.33.1/include/net/tcp.h
---- linux-2.6.33.1/include/net/tcp.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/net/tcp.h   2010-03-20 16:58:41.928524770 -0400
-@@ -1392,6 +1392,7 @@ enum tcp_seq_states {
+diff -urNp linux-2.6.34/include/net/tcp.h linux-2.6.34/include/net/tcp.h
+--- linux-2.6.34/include/net/tcp.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/net/tcp.h     2010-07-01 20:45:16.000000000 -0400
+@@ -1395,6 +1395,7 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -44994,9 +45817,9 @@ diff -urNp linux-2.6.33.1/include/net/tcp.h linux-2.6.33.1/include/net/tcp.h
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
  };
-diff -urNp linux-2.6.33.1/include/net/udp.h linux-2.6.33.1/include/net/udp.h
---- linux-2.6.33.1/include/net/udp.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/net/udp.h   2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/net/udp.h linux-2.6.34/include/net/udp.h
+--- linux-2.6.34/include/net/udp.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/net/udp.h     2010-07-01 20:45:16.000000000 -0400
 @@ -221,6 +221,7 @@ struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -45005,9 +45828,9 @@ diff -urNp linux-2.6.33.1/include/net/udp.h linux-2.6.33.1/include/net/udp.h
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
  };
-diff -urNp linux-2.6.33.1/include/sound/ac97_codec.h linux-2.6.33.1/include/sound/ac97_codec.h
---- linux-2.6.33.1/include/sound/ac97_codec.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/sound/ac97_codec.h  2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/sound/ac97_codec.h linux-2.6.34/include/sound/ac97_codec.h
+--- linux-2.6.34/include/sound/ac97_codec.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/sound/ac97_codec.h    2010-07-01 20:45:16.000000000 -0400
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -45040,9 +45863,9 @@ diff -urNp linux-2.6.33.1/include/sound/ac97_codec.h linux-2.6.33.1/include/soun
        void *private_data;
        void (*private_free) (struct snd_ac97 *ac97);
        /* --- */
-diff -urNp linux-2.6.33.1/include/trace/events/irq.h linux-2.6.33.1/include/trace/events/irq.h
---- linux-2.6.33.1/include/trace/events/irq.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/trace/events/irq.h  2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/trace/events/irq.h linux-2.6.34/include/trace/events/irq.h
+--- linux-2.6.34/include/trace/events/irq.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/trace/events/irq.h    2010-07-01 20:45:16.000000000 -0400
 @@ -34,7 +34,7 @@
   */
  TRACE_EVENT(irq_handler_entry,
@@ -45088,9 +45911,9 @@ diff -urNp linux-2.6.33.1/include/trace/events/irq.h linux-2.6.33.1/include/trac
  
        TP_ARGS(h, vec)
  );
-diff -urNp linux-2.6.33.1/include/video/uvesafb.h linux-2.6.33.1/include/video/uvesafb.h
---- linux-2.6.33.1/include/video/uvesafb.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/include/video/uvesafb.h     2010-03-20 16:58:41.928524770 -0400
+diff -urNp linux-2.6.34/include/video/uvesafb.h linux-2.6.34/include/video/uvesafb.h
+--- linux-2.6.34/include/video/uvesafb.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/include/video/uvesafb.h       2010-07-01 20:45:16.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
        u8 ypan;                        /* 0 - nothing, 1 - ypan, 2 - ywrap */
        u8 pmi_setpal;                  /* PMI for palette changes */
@@ -45099,10 +45922,10 @@ diff -urNp linux-2.6.33.1/include/video/uvesafb.h linux-2.6.33.1/include/video/u
        void *pmi_start;
        void *pmi_pal;
        u8 *vbe_state_orig;             /*
-diff -urNp linux-2.6.33.1/init/do_mounts.c linux-2.6.33.1/init/do_mounts.c
---- linux-2.6.33.1/init/do_mounts.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/do_mounts.c    2010-03-20 16:58:41.936928392 -0400
-@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
+diff -urNp linux-2.6.34/init/do_mounts.c linux-2.6.34/init/do_mounts.c
+--- linux-2.6.34/init/do_mounts.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/do_mounts.c      2010-07-01 20:45:16.000000000 -0400
+@@ -217,11 +217,11 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
@@ -45116,7 +45939,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts.c linux-2.6.33.1/init/do_mounts.c
        ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
        printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
               current->fs->pwd.mnt->mnt_sb->s_type->name,
-@@ -311,18 +311,18 @@ void __init change_floppy(char *fmt, ...
+@@ -312,18 +312,18 @@ void __init change_floppy(char *fmt, ...
        va_start(args, fmt);
        vsprintf(buf, fmt, args);
        va_end(args);
@@ -45128,7 +45951,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts.c linux-2.6.33.1/init/do_mounts.c
        }
        printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
 -      fd = sys_open("/dev/console", O_RDWR, 0);
-+      fd = sys_open((char __user *)"/dev/console", O_RDWR, 0);
++      fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
        if (fd >= 0) {
                sys_ioctl(fd, TCGETS, (long)&termios);
                termios.c_lflag &= ~ICANON;
@@ -45138,7 +45961,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts.c linux-2.6.33.1/init/do_mounts.c
                termios.c_lflag |= ICANON;
                sys_ioctl(fd, TCSETSF, (long)&termios);
                sys_close(fd);
-@@ -416,6 +416,6 @@ void __init prepare_namespace(void)
+@@ -417,6 +417,6 @@ void __init prepare_namespace(void)
        mount_root();
  out:
        devtmpfs_mount("dev");
@@ -45147,9 +45970,9 @@ diff -urNp linux-2.6.33.1/init/do_mounts.c linux-2.6.33.1/init/do_mounts.c
 +      sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
 +      sys_chroot((__force char __user *)".");
  }
-diff -urNp linux-2.6.33.1/init/do_mounts.h linux-2.6.33.1/init/do_mounts.h
---- linux-2.6.33.1/init/do_mounts.h    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/do_mounts.h    2010-03-20 16:58:41.973158089 -0400
+diff -urNp linux-2.6.34/init/do_mounts.h linux-2.6.34/init/do_mounts.h
+--- linux-2.6.34/init/do_mounts.h      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/do_mounts.h      2010-07-01 20:45:16.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -45169,19 +45992,10 @@ diff -urNp linux-2.6.33.1/init/do_mounts.h linux-2.6.33.1/init/do_mounts.h
                return 0;
        if (!S_ISBLK(stat.st_mode))
                return 0;
-diff -urNp linux-2.6.33.1/init/do_mounts_initrd.c linux-2.6.33.1/init/do_mounts_initrd.c
---- linux-2.6.33.1/init/do_mounts_initrd.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/do_mounts_initrd.c     2010-03-20 16:58:41.973158089 -0400
-@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
-       sys_close(old_fd);sys_close(root_fd);
-       sys_close(0);sys_close(1);sys_close(2);
-       sys_setsid();
--      (void) sys_open("/dev/console",O_RDWR,0);
-+      (void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
-       (void) sys_dup(0);
-       (void) sys_dup(0);
-       return kernel_execve(shell, argv, envp_init);
-@@ -47,13 +47,13 @@ static void __init handle_initrd(void)
+diff -urNp linux-2.6.34/init/do_mounts_initrd.c linux-2.6.34/init/do_mounts_initrd.c
+--- linux-2.6.34/init/do_mounts_initrd.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/do_mounts_initrd.c       2010-07-01 20:45:16.000000000 -0400
+@@ -43,13 +43,13 @@ static void __init handle_initrd(void)
        create_dev("/dev/root.old", Root_RAM0);
        /* mount initrd on rootfs' /root */
        mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
@@ -45201,7 +46015,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts_initrd.c linux-2.6.33.1/init/do_mounts_
  
        /*
         * In case that a resume from disk is carried out by linuxrc or one of
-@@ -70,15 +70,15 @@ static void __init handle_initrd(void)
+@@ -66,15 +66,15 @@ static void __init handle_initrd(void)
  
        /* move initrd to rootfs' /old */
        sys_fchdir(old_fd);
@@ -45220,7 +46034,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts_initrd.c linux-2.6.33.1/init/do_mounts_
                return;
        }
  
-@@ -86,17 +86,17 @@ static void __init handle_initrd(void)
+@@ -82,17 +82,17 @@ static void __init handle_initrd(void)
        mount_root();
  
        printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
@@ -45241,7 +46055,7 @@ diff -urNp linux-2.6.33.1/init/do_mounts_initrd.c linux-2.6.33.1/init/do_mounts_
                printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
                if (fd < 0) {
                        error = fd;
-@@ -119,11 +119,11 @@ int __init initrd_load(void)
+@@ -115,11 +115,11 @@ int __init initrd_load(void)
                 * mounted in the normal path.
                 */
                if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
@@ -45255,9 +46069,9 @@ diff -urNp linux-2.6.33.1/init/do_mounts_initrd.c linux-2.6.33.1/init/do_mounts_
 +      sys_unlink((__force const char __user *)"/initrd.image");
        return 0;
  }
-diff -urNp linux-2.6.33.1/init/do_mounts_md.c linux-2.6.33.1/init/do_mounts_md.c
---- linux-2.6.33.1/init/do_mounts_md.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/do_mounts_md.c 2010-03-20 16:58:41.973158089 -0400
+diff -urNp linux-2.6.34/init/do_mounts_md.c linux-2.6.34/init/do_mounts_md.c
+--- linux-2.6.34/init/do_mounts_md.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/do_mounts_md.c   2010-07-01 20:45:16.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
                        partitioned ? "_d" : "", minor,
                        md_setup_args[ent].device_names);
@@ -45285,9 +46099,9 @@ diff -urNp linux-2.6.33.1/init/do_mounts_md.c linux-2.6.33.1/init/do_mounts_md.c
        if (fd >= 0) {
                sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
                sys_close(fd);
-diff -urNp linux-2.6.33.1/init/initramfs.c linux-2.6.33.1/init/initramfs.c
---- linux-2.6.33.1/init/initramfs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/initramfs.c    2010-03-20 16:58:41.973158089 -0400
+diff -urNp linux-2.6.34/init/initramfs.c linux-2.6.34/init/initramfs.c
+--- linux-2.6.34/init/initramfs.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/initramfs.c      2010-07-01 20:45:16.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
        }
  }
@@ -45396,10 +46210,10 @@ diff -urNp linux-2.6.33.1/init/initramfs.c linux-2.6.33.1/init/initramfs.c
        state = SkipIt;
        next_state = Reset;
        return 0;
-diff -urNp linux-2.6.33.1/init/Kconfig linux-2.6.33.1/init/Kconfig
---- linux-2.6.33.1/init/Kconfig        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/Kconfig        2010-03-20 16:58:41.973158089 -0400
-@@ -1046,7 +1046,7 @@ config SLUB_DEBUG
+diff -urNp linux-2.6.34/init/Kconfig linux-2.6.34/init/Kconfig
+--- linux-2.6.34/init/Kconfig  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/Kconfig  2010-07-01 20:45:16.000000000 -0400
+@@ -1029,7 +1029,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
        bool "Disable heap randomization"
@@ -45408,21 +46222,9 @@ diff -urNp linux-2.6.33.1/init/Kconfig linux-2.6.33.1/init/Kconfig
        help
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
-@@ -1158,9 +1158,9 @@ config HAVE_GENERIC_DMA_COHERENT
- 
- config SLABINFO
-       bool
--      depends on PROC_FS
-+      depends on PROC_FS && !GRKERNSEC_PROC_ADD
-       depends on SLAB || SLUB_DEBUG
--      default y
-+      default n
- 
- config RT_MUTEXES
-       boolean
-diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
---- linux-2.6.33.1/init/main.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/main.c 2010-03-20 16:58:41.976562026 -0400
+diff -urNp linux-2.6.34/init/main.c linux-2.6.34/init/main.c
+--- linux-2.6.34/init/main.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/main.c   2010-07-01 20:45:16.000000000 -0400
 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 
  #ifdef CONFIG_TC
  extern void tc_init(void);
@@ -45431,13 +46233,20 @@ diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
  
  enum system_states system_state __read_mostly;
  EXPORT_SYMBOL(system_state);
-@@ -183,6 +184,35 @@ static int __init set_reset_devices(char
+@@ -197,6 +198,50 @@ static int __init set_reset_devices(char
  
  __setup("reset_devices", set_reset_devices);
  
-+#if defined(CONFIG_PAX_MEMORY_UDEREF) && defined(CONFIG_X86_32)
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++extern void pax_enter_kernel_user(void);
++extern void pax_exit_kernel_user(void);
++extern pgdval_t clone_pgd_mask;
++#endif
++
++#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +static int __init setup_pax_nouderef(char *str)
 +{
++#ifdef CONFIG_X86_32
 +      unsigned int cpu;
 +
 +      for (cpu = 0; cpu < NR_CPUS; cpu++) {
@@ -45447,6 +46256,14 @@ diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
 +      asm("mov %0, %%ds" : : "r" (__KERNEL_DS) : "memory");
 +      asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory");
 +      asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
++#else
++      char *p;
++      p = (char *)pax_enter_kernel_user;
++      *p = 0xc3;
++      p = (char *)pax_exit_kernel_user;
++      *p = 0xc3;
++      clone_pgd_mask = ~(pgdval_t)0UL;
++#endif
 +
 +      return 0;
 +}
@@ -45467,7 +46284,7 @@ diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
  static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -697,52 +727,53 @@ int initcall_debug;
+@@ -713,52 +758,53 @@ int initcall_debug;
  core_param(initcall_debug, initcall_debug, bool, 0644);
  
  static char msgbuf[64];
@@ -45537,7 +46354,16 @@ diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
  }
  
  
-@@ -881,11 +912,13 @@ static int __init kernel_init(void * unu
+@@ -886,7 +932,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)
+               printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ 
+       (void) sys_dup(0);
+@@ -899,11 +945,13 @@ static int __init kernel_init(void * unu
        if (!ramdisk_execute_command)
                ramdisk_execute_command = "/init";
  
@@ -45552,10 +46378,10 @@ diff -urNp linux-2.6.33.1/init/main.c linux-2.6.33.1/init/main.c
        /*
         * Ok, we have completed the initial bootup, and
         * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.33.1/init/noinitramfs.c linux-2.6.33.1/init/noinitramfs.c
---- linux-2.6.33.1/init/noinitramfs.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/init/noinitramfs.c  2010-03-20 16:58:41.976562026 -0400
-@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
+diff -urNp linux-2.6.34/init/noinitramfs.c linux-2.6.34/init/noinitramfs.c
+--- linux-2.6.34/init/noinitramfs.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/init/noinitramfs.c    2010-07-01 20:45:16.000000000 -0400
+@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
  {
        int err;
  
@@ -45564,7 +46390,10 @@ diff -urNp linux-2.6.33.1/init/noinitramfs.c linux-2.6.33.1/init/noinitramfs.c
        if (err < 0)
                goto out;
  
-@@ -39,7 +39,7 @@ static int __init default_rootfs(void)
+-      err = sys_mknod((const char __user *) "/dev/console",
++      err = sys_mknod((__force const char __user *) "/dev/console",
+                       S_IFCHR | S_IRUSR | S_IWUSR,
+                       new_encode_dev(MKDEV(5, 1)));
        if (err < 0)
                goto out;
  
@@ -45573,10 +46402,10 @@ diff -urNp linux-2.6.33.1/init/noinitramfs.c linux-2.6.33.1/init/noinitramfs.c
        if (err < 0)
                goto out;
  
-diff -urNp linux-2.6.33.1/ipc/mqueue.c linux-2.6.33.1/ipc/mqueue.c
---- linux-2.6.33.1/ipc/mqueue.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/ipc/mqueue.c        2010-03-20 16:58:41.976562026 -0400
-@@ -149,6 +149,7 @@ static struct inode *mqueue_get_inode(st
+diff -urNp linux-2.6.34/ipc/mqueue.c linux-2.6.34/ipc/mqueue.c
+--- linux-2.6.34/ipc/mqueue.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/ipc/mqueue.c  2010-07-01 20:45:16.000000000 -0400
+@@ -153,6 +153,7 @@ static struct inode *mqueue_get_inode(st
                        mq_bytes = (mq_msg_tblsz +
                                (info->attr.mq_maxmsg * info->attr.mq_msgsize));
  
@@ -45584,9 +46413,9 @@ diff -urNp linux-2.6.33.1/ipc/mqueue.c linux-2.6.33.1/ipc/mqueue.c
                        spin_lock(&mq_lock);
                        if (u->mq_bytes + mq_bytes < u->mq_bytes ||
                            u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.33.1/ipc/shm.c linux-2.6.33.1/ipc/shm.c
---- linux-2.6.33.1/ipc/shm.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/ipc/shm.c   2010-03-20 16:58:41.997340945 -0400
+diff -urNp linux-2.6.34/ipc/shm.c linux-2.6.34/ipc/shm.c
+--- linux-2.6.34/ipc/shm.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/ipc/shm.c     2010-07-01 20:45:16.000000000 -0400
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -45617,7 +46446,7 @@ diff -urNp linux-2.6.33.1/ipc/shm.c linux-2.6.33.1/ipc/shm.c
        shp->shm_segsz = size;
        shp->shm_nattch = 0;
        shp->shm_file = file;
-@@ -881,9 +897,21 @@ long do_shmat(int shmid, char __user *sh
+@@ -880,9 +896,21 @@ long do_shmat(int shmid, char __user *sh
        if (err)
                goto out_unlock;
  
@@ -45639,10 +46468,10 @@ diff -urNp linux-2.6.33.1/ipc/shm.c linux-2.6.33.1/ipc/shm.c
        size = i_size_read(path.dentry->d_inode);
        shm_unlock(shp);
  
-diff -urNp linux-2.6.33.1/kernel/acct.c linux-2.6.33.1/kernel/acct.c
---- linux-2.6.33.1/kernel/acct.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/acct.c       2010-03-20 16:58:42.008931878 -0400
-@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
+diff -urNp linux-2.6.34/kernel/acct.c linux-2.6.34/kernel/acct.c
+--- linux-2.6.34/kernel/acct.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/acct.c 2010-07-01 20:45:16.000000000 -0400
+@@ -580,7 +580,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;
@@ -45651,9 +46480,9 @@ diff -urNp linux-2.6.33.1/kernel/acct.c linux-2.6.33.1/kernel/acct.c
                               sizeof(acct_t), &file->f_pos);
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
        set_fs(fs);
-diff -urNp linux-2.6.33.1/kernel/capability.c linux-2.6.33.1/kernel/capability.c
---- linux-2.6.33.1/kernel/capability.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/capability.c 2010-03-20 16:58:42.008931878 -0400
+diff -urNp linux-2.6.34/kernel/capability.c linux-2.6.34/kernel/capability.c
+--- linux-2.6.34/kernel/capability.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/capability.c   2010-07-01 20:45:16.000000000 -0400
 @@ -206,6 +206,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
                 * before modification is attempted and the application
                 * fails.
@@ -45687,9 +46516,9 @@ diff -urNp linux-2.6.33.1/kernel/capability.c linux-2.6.33.1/kernel/capability.c
 +
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.33.1/kernel/configs.c linux-2.6.33.1/kernel/configs.c
---- linux-2.6.33.1/kernel/configs.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/configs.c    2010-03-20 16:58:42.020953047 -0400
+diff -urNp linux-2.6.34/kernel/configs.c linux-2.6.34/kernel/configs.c
+--- linux-2.6.34/kernel/configs.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/configs.c      2010-07-01 20:45:16.000000000 -0400
 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
        struct proc_dir_entry *entry;
  
@@ -45710,10 +46539,10 @@ diff -urNp linux-2.6.33.1/kernel/configs.c linux-2.6.33.1/kernel/configs.c
        if (!entry)
                return -ENOMEM;
  
-diff -urNp linux-2.6.33.1/kernel/cpu.c linux-2.6.33.1/kernel/cpu.c
---- linux-2.6.33.1/kernel/cpu.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/cpu.c        2010-03-20 16:58:42.028929112 -0400
-@@ -19,7 +19,7 @@
+diff -urNp linux-2.6.34/kernel/cpu.c linux-2.6.34/kernel/cpu.c
+--- linux-2.6.34/kernel/cpu.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/cpu.c  2010-07-01 20:45:16.000000000 -0400
+@@ -20,7 +20,7 @@
  /* Serializes the updates to cpu_online_mask, cpu_present_mask */
  static DEFINE_MUTEX(cpu_add_remove_lock);
  
@@ -45722,10 +46551,10 @@ diff -urNp linux-2.6.33.1/kernel/cpu.c linux-2.6.33.1/kernel/cpu.c
  
  /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
   * Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.33.1/kernel/cred.c linux-2.6.33.1/kernel/cred.c
---- linux-2.6.33.1/kernel/cred.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/cred.c       2010-03-20 16:58:42.028929112 -0400
-@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
+diff -urNp linux-2.6.34/kernel/cred.c linux-2.6.34/kernel/cred.c
+--- linux-2.6.34/kernel/cred.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/cred.c 2010-07-01 20:45:16.000000000 -0400
+@@ -527,6 +527,8 @@ int commit_creds(struct cred *new)
  
        get_cred(new); /* we will require a ref for the subj creds too */
  
@@ -45734,9 +46563,9 @@ diff -urNp linux-2.6.33.1/kernel/cred.c linux-2.6.33.1/kernel/cred.c
        /* dumpability changes */
        if (old->euid != new->euid ||
            old->egid != new->egid ||
-diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
---- linux-2.6.33.1/kernel/exit.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/exit.c       2010-03-20 16:58:42.032663961 -0400
+diff -urNp linux-2.6.34/kernel/exit.c linux-2.6.34/kernel/exit.c
+--- linux-2.6.34/kernel/exit.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/exit.c 2010-07-02 17:17:11.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/mmu_context.h>
  #include "cred-internals.h"
@@ -45748,7 +46577,7 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
  static void exit_mm(struct task_struct * tsk);
  
  static void __unhash_process(struct task_struct *p)
-@@ -168,6 +172,8 @@ void release_task(struct task_struct * p
+@@ -170,6 +174,8 @@ void release_task(struct task_struct * p
        struct task_struct *leader;
        int zap_leader;
  repeat:
@@ -45756,8 +46585,8 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
 +
        tracehook_prepare_release_task(p);
        /* don't need to get the RCU readlock here - the process is dead and
-        * can't be modifying its own credentials */
-@@ -335,11 +341,22 @@ static void reparent_to_kthreadd(void)
+        * can't be modifying its own credentials. But shut RCU-lockdep up */
+@@ -339,11 +345,22 @@ static void reparent_to_kthreadd(void)
  {
        write_lock_irq(&tasklist_lock);
  
@@ -45780,7 +46609,7 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
        /* Set the exit signal to SIGCHLD so we signal init on exit */
        current->exit_signal = SIGCHLD;
  
-@@ -391,7 +408,7 @@ int allow_signal(int sig)
+@@ -395,7 +412,7 @@ int allow_signal(int sig)
         * know it'll be handled, so that they don't get converted to
         * SIGKILL or just silently dropped.
         */
@@ -45789,7 +46618,7 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
        return 0;
-@@ -427,6 +444,17 @@ void daemonize(const char *name, ...)
+@@ -431,6 +448,17 @@ void daemonize(const char *name, ...)
        vsnprintf(current->comm, sizeof(current->comm), name, args);
        va_end(args);
  
@@ -45807,7 +46636,7 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/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
-@@ -961,6 +989,9 @@ NORET_TYPE void do_exit(long code)
+@@ -971,6 +999,9 @@ NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        taskstats_exit(tsk, group_dead);
  
@@ -45817,19 +46646,10 @@ diff -urNp linux-2.6.33.1/kernel/exit.c linux-2.6.33.1/kernel/exit.c
        exit_mm(tsk);
  
        if (group_dead)
-@@ -1180,7 +1211,7 @@ static int wait_task_zombie(struct wait_
- 
-       if (unlikely(wo->wo_flags & WNOWAIT)) {
-               int exit_code = p->exit_code;
--              int why, status;
-+              int why;
- 
-               get_task_struct(p);
-               read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
---- linux-2.6.33.1/kernel/fork.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/fork.c       2010-03-20 16:58:42.032663961 -0400
-@@ -255,7 +255,7 @@ static struct task_struct *dup_task_stru
+diff -urNp linux-2.6.34/kernel/fork.c linux-2.6.34/kernel/fork.c
+--- linux-2.6.34/kernel/fork.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/fork.c 2010-07-02 17:19:04.000000000 -0400
+@@ -263,7 +263,7 @@ static struct task_struct *dup_task_stru
        *stackend = STACK_END_MAGIC;    /* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -45838,7 +46658,7 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
  #endif
  
        /* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -295,8 +295,8 @@ static int dup_mmap(struct mm_struct *mm
+@@ -303,8 +303,8 @@ static int dup_mmap(struct mm_struct *mm
        mm->locked_vm = 0;
        mm->mmap = NULL;
        mm->mmap_cache = NULL;
@@ -45849,15 +46669,15 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
        mm->map_count = 0;
        cpumask_clear(mm_cpumask(mm));
        mm->mm_rb = RB_ROOT;
-@@ -336,6 +336,7 @@ static int dup_mmap(struct mm_struct *mm
+@@ -347,6 +347,7 @@ static int dup_mmap(struct mm_struct *mm
                tmp->vm_flags &= ~VM_LOCKED;
                tmp->vm_mm = mm;
                tmp->vm_next = NULL;
 +              tmp->vm_mirror = NULL;
-               anon_vma_link(tmp);
                file = tmp->vm_file;
                if (file) {
-@@ -383,6 +384,31 @@ static int dup_mmap(struct mm_struct *mm
+                       struct inode *inode = file->f_path.dentry->d_inode;
+@@ -393,6 +394,31 @@ static int dup_mmap(struct mm_struct *mm
                if (retval)
                        goto out;
        }
@@ -45889,7 +46709,7 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
        /* a new mm has just been created */
        arch_dup_mmap(oldmm, mm);
        retval = 0;
-@@ -733,7 +759,7 @@ static int copy_fs(unsigned long clone_f
+@@ -744,13 +770,14 @@ static int copy_fs(unsigned long clone_f
                        write_unlock(&fs->lock);
                        return -EAGAIN;
                }
@@ -45898,7 +46718,14 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
                write_unlock(&fs->lock);
                return 0;
        }
-@@ -1032,10 +1058,13 @@ static struct task_struct *copy_process(
+       tsk->fs = copy_fs_struct(fs);
+       if (!tsk->fs)
+               return -ENOMEM;
++      gr_set_chroot_entries(tsk, &tsk->fs->root);
+       return 0;
+ }
+ 
+@@ -1009,10 +1036,13 @@ static struct task_struct *copy_process(
        DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
        retval = -EAGAIN;
@@ -45906,26 +46733,15 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
 +      gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
 +
        if (atomic_read(&p->real_cred->user->processes) >=
-                       p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
+                       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_RESOURCE) && !capable(CAP_SYS_ADMIN))
++                  !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE))
                        goto bad_fork_free;
        }
  
-@@ -1064,6 +1093,10 @@ static struct task_struct *copy_process(
-       p->vfork_done = NULL;
-       spin_lock_init(&p->alloc_lock);
- 
-+#ifdef CONFIG_GRKERNSEC
-+      rwlock_init(&p->gr_fs_lock);
-+#endif
-+
-       init_sigpending(&p->pending);
- 
-       p->utime = cputime_zero;
-@@ -1190,6 +1223,8 @@ static struct task_struct *copy_process(
+@@ -1168,6 +1198,8 @@ static struct task_struct *copy_process(
                        goto bad_fork_free_pid;
        }
  
@@ -45934,7 +46750,7 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
        p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
        /*
         * Clear TID on mm_release()?
-@@ -1342,6 +1377,8 @@ bad_fork_cleanup_count:
+@@ -1320,6 +1352,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
        free_task(p);
  fork_out:
@@ -45943,7 +46759,7 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
        return ERR_PTR(retval);
  }
  
-@@ -1435,6 +1472,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1413,6 +1447,8 @@ long do_fork(unsigned long clone_flags,
                if (clone_flags & CLONE_PARENT_SETTID)
                        put_user(nr, parent_tidptr);
  
@@ -45952,7 +46768,7 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
                if (clone_flags & CLONE_VFORK) {
                        p->vfork_done = &vfork;
                        init_completion(&vfork);
-@@ -1567,7 +1606,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1545,7 +1581,7 @@ static int unshare_fs(unsigned long unsh
                return 0;
  
        /* don't need lock here; in the worst case we'll do useless copy */
@@ -45961,29 +46777,19 @@ diff -urNp linux-2.6.33.1/kernel/fork.c linux-2.6.33.1/kernel/fork.c
                return 0;
  
        *new_fsp = copy_fs_struct(fs);
-@@ -1687,14 +1726,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
-               task_lock(current);
- 
-               if (new_fs) {
-+                      unsigned long flags;
-+
-+                      gr_fs_write_lock_irqsave(current, flags);
+@@ -1668,7 +1704,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
                        fs = current->fs;
                        write_lock(&fs->lock);
                        current->fs = new_fs;
 -                      if (--fs->users)
++                      gr_set_chroot_entries(current, &current->fs->root);
 +                      if (atomic_dec_return(&fs->users))
                                new_fs = NULL;
                        else
                                new_fs = fs;
-                       write_unlock(&fs->lock);
-+                      gr_fs_write_unlock_irqrestore(current, flags);
-               }
- 
-               if (new_mm) {
-diff -urNp linux-2.6.33.1/kernel/futex.c linux-2.6.33.1/kernel/futex.c
---- linux-2.6.33.1/kernel/futex.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/futex.c      2010-03-20 16:58:42.048537218 -0400
+diff -urNp linux-2.6.34/kernel/futex.c linux-2.6.34/kernel/futex.c
+--- linux-2.6.34/kernel/futex.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/futex.c        2010-07-01 20:45:16.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -46051,9 +46857,9 @@ diff -urNp linux-2.6.33.1/kernel/futex.c linux-2.6.33.1/kernel/futex.c
  {
        unsigned long uentry;
  
-diff -urNp linux-2.6.33.1/kernel/futex_compat.c linux-2.6.33.1/kernel/futex_compat.c
---- linux-2.6.33.1/kernel/futex_compat.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/futex_compat.c       2010-03-20 16:58:42.048537218 -0400
+diff -urNp linux-2.6.34/kernel/futex_compat.c linux-2.6.34/kernel/futex_compat.c
+--- linux-2.6.34/kernel/futex_compat.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/futex_compat.c 2010-07-02 15:48:05.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -46089,11 +46895,11 @@ diff -urNp linux-2.6.33.1/kernel/futex_compat.c linux-2.6.33.1/kernel/futex_comp
                        goto err_unlock;
 +#endif
                head = p->compat_robust_list;
-               read_unlock(&tasklist_lock);
+               rcu_read_unlock();
        }
-diff -urNp linux-2.6.33.1/kernel/gcov/base.c linux-2.6.33.1/kernel/gcov/base.c
---- linux-2.6.33.1/kernel/gcov/base.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/gcov/base.c  2010-03-20 16:58:42.048537218 -0400
+diff -urNp linux-2.6.34/kernel/gcov/base.c linux-2.6.34/kernel/gcov/base.c
+--- linux-2.6.34/kernel/gcov/base.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/gcov/base.c    2010-07-01 20:45:16.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -46115,9 +46921,9 @@ diff -urNp linux-2.6.33.1/kernel/gcov/base.c linux-2.6.33.1/kernel/gcov/base.c
                        if (prev)
                                prev->next = info->next;
                        else
-diff -urNp linux-2.6.33.1/kernel/hrtimer.c linux-2.6.33.1/kernel/hrtimer.c
---- linux-2.6.33.1/kernel/hrtimer.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/hrtimer.c    2010-03-20 16:58:42.048537218 -0400
+diff -urNp linux-2.6.34/kernel/hrtimer.c linux-2.6.34/kernel/hrtimer.c
+--- linux-2.6.34/kernel/hrtimer.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/hrtimer.c      2010-07-01 20:45:16.000000000 -0400
 @@ -1398,7 +1398,7 @@ void hrtimer_peek_ahead_timers(void)
        local_irq_restore(flags);
  }
@@ -46127,9 +46933,9 @@ diff -urNp linux-2.6.33.1/kernel/hrtimer.c linux-2.6.33.1/kernel/hrtimer.c
  {
        hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
---- linux-2.6.33.1/kernel/kallsyms.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/kallsyms.c   2010-03-20 16:58:42.064920323 -0400
+diff -urNp linux-2.6.34/kernel/kallsyms.c linux-2.6.34/kernel/kallsyms.c
+--- linux-2.6.34/kernel/kallsyms.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/kallsyms.c     2010-07-01 20:45:16.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -46140,7 +46946,7 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
  #include <linux/kallsyms.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -51,6 +54,9 @@ extern const unsigned long kallsyms_mark
+@@ -52,6 +55,9 @@ extern const unsigned long kallsyms_mark
  
  static inline int is_kernel_inittext(unsigned long addr)
  {
@@ -46150,7 +46956,7 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
        if (addr >= (unsigned long)_sinittext
            && addr <= (unsigned long)_einittext)
                return 1;
-@@ -67,6 +73,24 @@ static inline int is_kernel_text(unsigne
+@@ -68,6 +74,26 @@ static inline int is_kernel_text(unsigne
  
  static inline int is_kernel(unsigned long addr)
  {
@@ -46158,8 +46964,10 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
 +              return 1;
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++#ifdef CONFIG_MODULES
 +      if ((unsigned long)MODULES_EXEC_VADDR <= ktla_ktva(addr) && ktla_ktva(addr) <= (unsigned long)MODULES_EXEC_END)
 +              return 0;
++#endif
 +
 +      if (is_kernel_text(addr))
 +              return 1;
@@ -46175,7 +46983,7 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
        if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
                return 1;
        return in_gate_area_no_task(addr);
-@@ -414,7 +438,6 @@ static unsigned long get_ksymbol_core(st
+@@ -415,7 +441,6 @@ static unsigned long get_ksymbol_core(st
  
  static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
  {
@@ -46183,7 +46991,7 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
        iter->nameoff = get_symbol_offset(new_pos);
        iter->pos = new_pos;
  }
-@@ -462,6 +485,11 @@ static int s_show(struct seq_file *m, vo
+@@ -463,6 +488,11 @@ static int s_show(struct seq_file *m, vo
  {
        struct kallsym_iter *iter = m->private;
  
@@ -46195,7 +47003,7 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
        /* Some debugging symbols have no name.  Ignore them. */
        if (!iter->name[0])
                return 0;
-@@ -502,7 +530,7 @@ static int kallsyms_open(struct inode *i
+@@ -503,7 +533,7 @@ static int kallsyms_open(struct inode *i
        struct kallsym_iter *iter;
        int ret;
  
@@ -46204,10 +47012,10 @@ diff -urNp linux-2.6.33.1/kernel/kallsyms.c linux-2.6.33.1/kernel/kallsyms.c
        if (!iter)
                return -ENOMEM;
        reset_iter(iter, 0);
-diff -urNp linux-2.6.33.1/kernel/kgdb.c linux-2.6.33.1/kernel/kgdb.c
---- linux-2.6.33.1/kernel/kgdb.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/kgdb.c       2010-03-20 16:58:42.068659558 -0400
-@@ -86,7 +86,7 @@ static int                   kgdb_io_module_registered;
+diff -urNp linux-2.6.34/kernel/kgdb.c linux-2.6.34/kernel/kgdb.c
+--- linux-2.6.34/kernel/kgdb.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/kgdb.c 2010-07-01 20:45:16.000000000 -0400
+@@ -93,7 +93,7 @@ static int                   kgdb_io_module_registered;
  /* Guard for recursive entry */
  static int                    exception_level;
  
@@ -46216,7 +47024,7 @@ diff -urNp linux-2.6.33.1/kernel/kgdb.c linux-2.6.33.1/kernel/kgdb.c
  static DEFINE_SPINLOCK(kgdb_registration_lock);
  
  /* kgdb console driver is loaded */
-@@ -1664,7 +1664,7 @@ static void kgdb_initial_breakpoint(void
+@@ -1665,7 +1665,7 @@ static void kgdb_initial_breakpoint(void
   *
   *    Register it with the KGDB core.
   */
@@ -46225,7 +47033,7 @@ diff -urNp linux-2.6.33.1/kernel/kgdb.c linux-2.6.33.1/kernel/kgdb.c
  {
        int err;
  
-@@ -1709,7 +1709,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
+@@ -1710,7 +1710,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_modul
   *
   *    Unregister it with the KGDB core.
   */
@@ -46234,9 +47042,9 @@ diff -urNp linux-2.6.33.1/kernel/kgdb.c linux-2.6.33.1/kernel/kgdb.c
  {
        BUG_ON(kgdb_connected);
  
-diff -urNp linux-2.6.33.1/kernel/kmod.c linux-2.6.33.1/kernel/kmod.c
---- linux-2.6.33.1/kernel/kmod.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/kmod.c       2010-03-20 16:58:42.068659558 -0400
+diff -urNp linux-2.6.34/kernel/kmod.c linux-2.6.34/kernel/kmod.c
+--- linux-2.6.34/kernel/kmod.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/kmod.c 2010-07-01 20:45:16.000000000 -0400
 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
        if (ret)
                return ret;
@@ -46256,10 +47064,10 @@ diff -urNp linux-2.6.33.1/kernel/kmod.c linux-2.6.33.1/kernel/kmod.c
        /* If modprobe needs a service that is in a module, we get a recursive
         * loop.  Limit the number of running kmod threads to max_threads/2 or
         * MAX_KMOD_CONCURRENT, whichever is the smaller.  A cleaner method
-diff -urNp linux-2.6.33.1/kernel/kprobes.c linux-2.6.33.1/kernel/kprobes.c
---- linux-2.6.33.1/kernel/kprobes.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/kprobes.c    2010-03-20 16:58:42.068659558 -0400
-@@ -186,7 +186,7 @@ static kprobe_opcode_t __kprobes *__get_
+diff -urNp linux-2.6.34/kernel/kprobes.c linux-2.6.34/kernel/kprobes.c
+--- linux-2.6.34/kernel/kprobes.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/kprobes.c      2010-07-01 20:45:16.000000000 -0400
+@@ -183,7 +183,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.
         */
@@ -46270,19 +47078,37 @@ diff -urNp linux-2.6.33.1/kernel/kprobes.c linux-2.6.33.1/kernel/kprobes.c
                return NULL;
 @@ -223,7 +223,7 @@ static int __kprobes collect_one_slot(st
                 */
-               if (!list_is_singular(&kprobe_insn_pages)) {
+               if (!list_is_singular(&kip->list)) {
                        list_del(&kip->list);
 -                      module_free(NULL, kip->insns);
 +                      module_free_exec(NULL, kip->insns);
                        kfree(kip);
                }
                return 1;
-diff -urNp linux-2.6.33.1/kernel/lockdep.c linux-2.6.33.1/kernel/lockdep.c
---- linux-2.6.33.1/kernel/lockdep.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/lockdep.c    2010-03-20 16:58:42.072946288 -0400
-@@ -586,6 +586,10 @@ static int static_obj(void *obj)
-       int i;
- #endif
+@@ -1643,7 +1643,7 @@ static int __init init_kprobes(void)
+ {
+       int i, err = 0;
+       unsigned long offset = 0, size = 0;
+-      char *modname, namebuf[128];
++      char *modname, namebuf[KSYM_NAME_LEN];
+       const char *symbol_name;
+       void *addr;
+       struct kprobe_blackpoint *kb;
+@@ -1769,7 +1769,7 @@ static int __kprobes show_kprobe_addr(st
+       const char *sym = NULL;
+       unsigned int i = *(loff_t *) v;
+       unsigned long offset = 0;
+-      char *modname, namebuf[128];
++      char *modname, namebuf[KSYM_NAME_LEN];
+ 
+       head = &kprobe_table[i];
+       preempt_disable();
+diff -urNp linux-2.6.34/kernel/lockdep.c linux-2.6.34/kernel/lockdep.c
+--- linux-2.6.34/kernel/lockdep.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/lockdep.c      2010-07-01 20:45:16.000000000 -0400
+@@ -584,6 +584,10 @@ static int static_obj(void *obj)
+                     end   = (unsigned long) &_end,
+                     addr  = (unsigned long) obj;
  
 +#ifdef CONFIG_PAX_KERNEXEC
 +      start = ktla_ktva(start);
@@ -46291,17 +47117,7 @@ diff -urNp linux-2.6.33.1/kernel/lockdep.c linux-2.6.33.1/kernel/lockdep.c
        /*
         * static variable?
         */
-@@ -601,8 +605,7 @@ static int static_obj(void *obj)
-        */
-       for_each_possible_cpu(i) {
-               start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
--              end   = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
--                                      + per_cpu_offset(i);
-+              end   = start + PERCPU_ENOUGH_ROOM;
- 
-               if ((addr >= start) && (addr < end))
-                       return 1;
-@@ -719,6 +722,7 @@ register_lock_class(struct lockdep_map *
+@@ -709,6 +713,7 @@ register_lock_class(struct lockdep_map *
        if (!static_obj(lock->key)) {
                debug_locks_off();
                printk("INFO: trying to register non-static key.\n");
@@ -46309,9 +47125,21 @@ diff -urNp linux-2.6.33.1/kernel/lockdep.c linux-2.6.33.1/kernel/lockdep.c
                printk("the code is fine but needs lockdep annotation.\n");
                printk("turning off the locking correctness validator.\n");
                dump_stack();
-diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
---- linux-2.6.33.1/kernel/module.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/module.c     2010-03-20 16:58:42.072946288 -0400
+diff -urNp linux-2.6.34/kernel/lockdep_proc.c linux-2.6.34/kernel/lockdep_proc.c
+--- linux-2.6.34/kernel/lockdep_proc.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/lockdep_proc.c 2010-07-01 20:45:16.000000000 -0400
+@@ -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)
+ {
+-      char str[128];
++      char str[KSYM_NAME_LEN];
+       const char *name = class->name;
+ 
+       if (!name) {
+diff -urNp linux-2.6.34/kernel/module.c linux-2.6.34/kernel/module.c
+--- linux-2.6.34/kernel/module.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/module.c       2010-07-01 20:45:16.000000000 -0400
 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
  static BLOCKING_NOTIFIER_HEAD(module_notify_list);
  
@@ -46340,16 +47168,16 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                        return true;
        }
        return false;
-@@ -375,7 +376,7 @@ static void *percpu_modalloc(unsigned lo
+@@ -378,7 +379,7 @@ static inline void __percpu *mod_percpu(
+ static int percpu_modalloc(struct module *mod,
+                          unsigned long size, unsigned long align)
  {
-       void *ptr;
- 
 -      if (align > PAGE_SIZE) {
 +      if (align-1 >= PAGE_SIZE) {
                printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
-                      name, align, PAGE_SIZE);
+                      mod->name, align, PAGE_SIZE);
                align = PAGE_SIZE;
-@@ -1393,7 +1394,8 @@ static void free_module(struct module *m
+@@ -1465,7 +1466,8 @@ static void free_module(struct module *m
        destroy_params(mod->kp, mod->num_kp);
  
        /* This may be NULL, but that's OK */
@@ -46357,10 +47185,10 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
 +      module_free(mod, mod->module_init_rw);
 +      module_free_exec(mod, mod->module_init_rx);
        kfree(mod->args);
-       if (mod->percpu)
-               percpu_modfree(mod->percpu);
-@@ -1402,10 +1404,12 @@ static void free_module(struct module *m
-               percpu_modfree(mod->refptr);
+       percpu_modfree(mod);
+ #if defined(CONFIG_MODULE_UNLOAD)
+@@ -1473,10 +1475,12 @@ static void free_module(struct module *m
+               free_percpu(mod->refptr);
  #endif
        /* Free lock-classes: */
 -      lockdep_free_key_range(mod->module_core, mod->core_size);
@@ -46374,7 +47202,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
  #ifdef CONFIG_MPU
        update_protections(current->mm);
-@@ -1499,7 +1503,9 @@ static int simplify_symbols(Elf_Shdr *se
+@@ -1570,7 +1574,9 @@ static int simplify_symbols(Elf_Shdr *se
                                              strtab + sym[i].st_name, mod);
                        /* Ok if resolved.  */
                        if (ksym) {
@@ -46384,8 +47212,8 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                                break;
                        }
  
-@@ -1518,7 +1524,9 @@ static int simplify_symbols(Elf_Shdr *se
-                               secbase = (unsigned long)mod->percpu;
+@@ -1589,7 +1595,9 @@ static int simplify_symbols(Elf_Shdr *se
+                               secbase = (unsigned long)mod_percpu(mod);
                        else
                                secbase = sechdrs[sym[i].st_shndx].sh_addr;
 +                      pax_open_kernel();
@@ -46394,7 +47222,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                        break;
                }
        }
-@@ -1579,11 +1587,12 @@ static void layout_sections(struct modul
+@@ -1650,11 +1658,12 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || strstarts(secstrings + s->sh_name, ".init"))
                                continue;
@@ -46410,7 +47238,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        }
  
        DEBUGP("Init section allocation order:\n");
-@@ -1596,12 +1605,13 @@ static void layout_sections(struct modul
+@@ -1667,12 +1676,13 @@ static void layout_sections(struct modul
                            || s->sh_entsize != ~0UL
                            || !strstarts(secstrings + s->sh_name, ".init"))
                                continue;
@@ -46428,7 +47256,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        }
  }
  
-@@ -1705,9 +1715,8 @@ static int is_exported(const char *name,
+@@ -1776,9 +1786,8 @@ static int is_exported(const char *name,
  
  /* As per nm */
  static char elf_type(const Elf_Sym *sym,
@@ -46440,7 +47268,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  {
        if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
                if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
-@@ -1782,7 +1791,7 @@ static unsigned long layout_symtab(struc
+@@ -1853,7 +1862,7 @@ static unsigned long layout_symtab(struc
  
        /* Put symbol section at end of init part of module. */
        symsect->sh_flags |= SHF_ALLOC;
@@ -46449,7 +47277,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                                         symindex) | INIT_OFFSET_MASK;
        DEBUGP("\t%s\n", secstrings + symsect->sh_name);
  
-@@ -1799,19 +1808,19 @@ static unsigned long layout_symtab(struc
+@@ -1870,19 +1879,19 @@ static unsigned long layout_symtab(struc
                }
  
        /* Append room for core symbols at end of core part. */
@@ -46474,7 +47302,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
        return symoffs;
  }
-@@ -1835,12 +1844,14 @@ static void add_kallsyms(struct module *
+@@ -1906,12 +1915,14 @@ static void add_kallsyms(struct module *
        mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
        mod->strtab = (void *)sechdrs[strindex].sh_addr;
  
@@ -46491,7 +47319,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        src = mod->symtab;
        *dst = *src;
        for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -1852,10 +1863,12 @@ static void add_kallsyms(struct module *
+@@ -1923,10 +1934,12 @@ static void add_kallsyms(struct module *
        }
        mod->core_num_syms = ndst;
  
@@ -46505,7 +47333,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  }
  #else
  static inline unsigned long layout_symtab(struct module *mod,
-@@ -1892,16 +1905,30 @@ static void dynamic_debug_setup(struct _
+@@ -1963,16 +1976,30 @@ static void dynamic_debug_setup(struct _
  #endif
  }
  
@@ -46541,7 +47369,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        }
        return ret;
  }
-@@ -2108,7 +2135,7 @@ static noinline struct module *load_modu
+@@ -2175,7 +2202,7 @@ static noinline struct module *load_modu
                                secstrings, &stroffs, strmap);
  
        /* Do the allocs. */
@@ -46550,7 +47378,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/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
-@@ -2119,23 +2146,47 @@ static noinline struct module *load_modu
+@@ -2186,23 +2213,47 @@ static noinline struct module *load_modu
                err = -ENOMEM;
                goto free_percpu;
        }
@@ -46606,7 +47434,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
        /* Transfer each section which specifies SHF_ALLOC */
        DEBUGP("final section addresses:\n");
-@@ -2145,17 +2196,41 @@ static noinline struct module *load_modu
+@@ -2212,17 +2263,41 @@ static noinline struct module *load_modu
                if (!(sechdrs[i].sh_flags & SHF_ALLOC))
                        continue;
  
@@ -46657,8 +47485,8 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
        }
        /* Module has been moved. */
-@@ -2167,7 +2242,7 @@ static noinline struct module *load_modu
-                                     mod->name);
+@@ -2233,7 +2308,7 @@ static noinline struct module *load_modu
+       mod->refptr = alloc_percpu(struct module_ref);
        if (!mod->refptr) {
                err = -ENOMEM;
 -              goto free_init;
@@ -46666,7 +47494,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        }
  #endif
        /* Now we've moved module, initialize linked lists, etc. */
-@@ -2282,8 +2357,8 @@ static noinline struct module *load_modu
+@@ -2348,8 +2423,8 @@ static noinline struct module *load_modu
  
        /* Now do relocations. */
        for (i = 1; i < hdr->e_shnum; i++) {
@@ -46676,7 +47504,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
                /* Not a valid relocation section? */
                if (info >= hdr->e_shnum)
-@@ -2344,12 +2419,12 @@ static noinline struct module *load_modu
+@@ -2410,12 +2485,12 @@ static noinline struct module *load_modu
         * Do it before processing of module parameters, so the module
         * can provide parameter accessor functions of its own.
         */
@@ -46695,12 +47523,12 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
        set_fs(old_fs);
  
-@@ -2397,12 +2472,16 @@ static noinline struct module *load_modu
+@@ -2463,12 +2538,16 @@ static noinline struct module *load_modu
   free_unload:
        module_unload_free(mod);
- #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
+ #if defined(CONFIG_MODULE_UNLOAD)
 + free_init_rx:
-       percpu_modfree(mod->refptr);
+       free_percpu(mod->refptr);
 - free_init:
  #endif
 -      module_free(mod, mod->module_init);
@@ -46715,8 +47543,8 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
 +      module_free(mod, mod->module_core_rw);
        /* mod will be freed with core. Don't access it beyond this line! */
   free_percpu:
-       if (percpu)
-@@ -2504,10 +2583,12 @@ SYSCALL_DEFINE3(init_module, void __user
+       percpu_modfree(mod);
+@@ -2569,10 +2648,12 @@ SYSCALL_DEFINE3(init_module, void __user
        mod->symtab = mod->core_symtab;
        mod->strtab = mod->core_strtab;
  #endif
@@ -46733,7 +47561,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        mutex_unlock(&module_mutex);
  
        return 0;
-@@ -2538,10 +2619,16 @@ static const char *get_ksymbol(struct mo
+@@ -2603,10 +2684,16 @@ static const char *get_ksymbol(struct mo
        unsigned long nextval;
  
        /* At worse, next value is at end of module */
@@ -46753,7 +47581,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
        /* Scan for closest preceeding symbol, and next symbol. (ELF
           starts real symbols at 1). */
-@@ -2787,7 +2874,7 @@ static int m_show(struct seq_file *m, vo
+@@ -2852,7 +2939,7 @@ static int m_show(struct seq_file *m, vo
        char buf[8];
  
        seq_printf(m, "%s %u",
@@ -46762,7 +47590,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        print_unload_info(m, mod);
  
        /* Informative for users. */
-@@ -2796,7 +2883,7 @@ static int m_show(struct seq_file *m, vo
+@@ -2861,7 +2948,7 @@ static int m_show(struct seq_file *m, vo
                   mod->state == MODULE_STATE_COMING ? "Loading":
                   "Live");
        /* Used by oprofile and other similar tools. */
@@ -46771,7 +47599,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
  
        /* Taints info */
        if (mod->taints)
-@@ -2832,7 +2919,17 @@ static const struct file_operations proc
+@@ -2897,7 +2984,17 @@ static const struct file_operations proc
  
  static int __init proc_modules_init(void)
  {
@@ -46789,7 +47617,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
        return 0;
  }
  module_init(proc_modules_init);
-@@ -2891,12 +2988,12 @@ struct module *__module_address(unsigned
+@@ -2956,12 +3053,12 @@ struct module *__module_address(unsigned
  {
        struct module *mod;
  
@@ -46805,7 +47633,7 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                        return mod;
        return NULL;
  }
-@@ -2930,11 +3027,20 @@ bool is_module_text_address(unsigned lon
+@@ -2995,11 +3092,20 @@ bool is_module_text_address(unsigned lon
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -46829,10 +47657,10 @@ diff -urNp linux-2.6.33.1/kernel/module.c linux-2.6.33.1/kernel/module.c
                        mod = NULL;
        }
        return mod;
-diff -urNp linux-2.6.33.1/kernel/panic.c linux-2.6.33.1/kernel/panic.c
---- linux-2.6.33.1/kernel/panic.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/panic.c      2010-03-20 16:58:42.076969908 -0400
-@@ -396,7 +396,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+diff -urNp linux-2.6.34/kernel/panic.c linux-2.6.34/kernel/panic.c
+--- linux-2.6.34/kernel/panic.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/panic.c        2010-07-01 20:45:16.000000000 -0400
+@@ -410,7 +410,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
@@ -46842,30 +47670,9 @@ diff -urNp linux-2.6.33.1/kernel/panic.c linux-2.6.33.1/kernel/panic.c
                __builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.33.1/kernel/params.c linux-2.6.33.1/kernel/params.c
---- linux-2.6.33.1/kernel/params.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/params.c     2010-03-20 16:58:42.088938657 -0400
-@@ -723,7 +723,7 @@ static ssize_t module_attr_store(struct 
-       return ret;
- }
- 
--static struct sysfs_ops module_sysfs_ops = {
-+static const struct sysfs_ops module_sysfs_ops = {
-       .show = module_attr_show,
-       .store = module_attr_store,
- };
-@@ -737,7 +737,7 @@ static int uevent_filter(struct kset *ks
-       return 0;
- }
- 
--static struct kset_uevent_ops module_uevent_ops = {
-+static const struct kset_uevent_ops module_uevent_ops = {
-       .filter = uevent_filter,
- };
- 
-diff -urNp linux-2.6.33.1/kernel/pid.c linux-2.6.33.1/kernel/pid.c
---- linux-2.6.33.1/kernel/pid.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/pid.c        2010-03-20 16:58:42.092540045 -0400
+diff -urNp linux-2.6.34/kernel/pid.c linux-2.6.34/kernel/pid.c
+--- linux-2.6.34/kernel/pid.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/pid.c  2010-07-01 20:45:16.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -46883,7 +47690,7 @@ diff -urNp linux-2.6.33.1/kernel/pid.c linux-2.6.33.1/kernel/pid.c
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -380,7 +381,14 @@ EXPORT_SYMBOL(pid_task);
+@@ -382,7 +383,14 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
@@ -46899,9 +47706,9 @@ diff -urNp linux-2.6.33.1/kernel/pid.c linux-2.6.33.1/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.33.1/kernel/posix-cpu-timers.c linux-2.6.33.1/kernel/posix-cpu-timers.c
---- linux-2.6.33.1/kernel/posix-cpu-timers.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/posix-cpu-timers.c   2010-03-20 16:58:42.092540045 -0400
+diff -urNp linux-2.6.34/kernel/posix-cpu-timers.c linux-2.6.34/kernel/posix-cpu-timers.c
+--- linux-2.6.34/kernel/posix-cpu-timers.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/posix-cpu-timers.c     2010-07-03 08:51:50.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -46910,26 +47717,26 @@ diff -urNp linux-2.6.33.1/kernel/posix-cpu-timers.c linux-2.6.33.1/kernel/posix-
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -1043,6 +1044,7 @@ static void check_thread_timers(struct t
-                       __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
-                       return;
-               }
-+              gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout, 1);
-               if (tsk->rt.timeout > DIV_ROUND_UP(*soft, USEC_PER_SEC/HZ)) {
+@@ -1036,6 +1037,7 @@ static void check_thread_timers(struct t
+               unsigned long hard =
+                       ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
+ 
++              gr_learn_resource(tsk, RLIMIT_RTTIME, tsk->rt.timeout * (USEC_PER_SEC/HZ), 1);
+               if (hard != RLIM_INFINITY &&
+                   tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
                        /*
-                        * At the soft limit, send a SIGXCPU every second.
 @@ -1205,6 +1207,7 @@ static void check_process_timers(struct 
-                       __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
-                       return;
-               }
+               unsigned long hard =
+                       ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_max);
+               cputime_t x;
 +              gr_learn_resource(tsk, RLIMIT_CPU, psecs, 0);
-               if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
+               if (psecs >= hard) {
                        /*
-                        * At the soft limit, send a SIGXCPU every second.
-diff -urNp linux-2.6.33.1/kernel/power/hibernate.c linux-2.6.33.1/kernel/power/hibernate.c
---- linux-2.6.33.1/kernel/power/hibernate.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/power/hibernate.c    2010-03-20 16:58:42.092540045 -0400
-@@ -49,14 +49,14 @@ enum {
+                        * At the hard limit, we just die.
+diff -urNp linux-2.6.34/kernel/power/hibernate.c linux-2.6.34/kernel/power/hibernate.c
+--- linux-2.6.34/kernel/power/hibernate.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/power/hibernate.c      2010-07-01 20:45:16.000000000 -0400
+@@ -50,14 +50,14 @@ enum {
  
  static int hibernation_mode = HIBERNATION_SHUTDOWN;
  
@@ -46946,9 +47753,9 @@ diff -urNp linux-2.6.33.1/kernel/power/hibernate.c linux-2.6.33.1/kernel/power/h
  {
        if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
            && ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.33.1/kernel/power/poweroff.c linux-2.6.33.1/kernel/power/poweroff.c
---- linux-2.6.33.1/kernel/power/poweroff.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/power/poweroff.c     2010-03-20 16:58:42.096640751 -0400
+diff -urNp linux-2.6.34/kernel/power/poweroff.c linux-2.6.34/kernel/power/poweroff.c
+--- linux-2.6.34/kernel/power/poweroff.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/power/poweroff.c       2010-07-01 20:45:16.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op   sysrq_powerof
        .enable_mask    = SYSRQ_ENABLE_BOOT,
  };
@@ -46958,9 +47765,9 @@ diff -urNp linux-2.6.33.1/kernel/power/poweroff.c linux-2.6.33.1/kernel/power/po
  {
        register_sysrq_key('o', &sysrq_poweroff_op);
        return 0;
-diff -urNp linux-2.6.33.1/kernel/power/process.c linux-2.6.33.1/kernel/power/process.c
---- linux-2.6.33.1/kernel/power/process.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/power/process.c      2010-03-20 16:58:42.096640751 -0400
+diff -urNp linux-2.6.34/kernel/power/process.c linux-2.6.34/kernel/power/process.c
+--- linux-2.6.34/kernel/power/process.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/power/process.c        2010-07-01 20:45:16.000000000 -0400
 @@ -38,12 +38,15 @@ static int try_to_freeze_tasks(bool sig_
        struct timeval start, end;
        u64 elapsed_csecs64;
@@ -46997,10 +47804,10 @@ diff -urNp linux-2.6.33.1/kernel/power/process.c linux-2.6.33.1/kernel/power/pro
                        break;
  
                /*
-diff -urNp linux-2.6.33.1/kernel/power/suspend.c linux-2.6.33.1/kernel/power/suspend.c
---- linux-2.6.33.1/kernel/power/suspend.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/power/suspend.c      2010-03-20 16:58:42.096640751 -0400
-@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
+diff -urNp linux-2.6.34/kernel/power/suspend.c linux-2.6.34/kernel/power/suspend.c
+--- linux-2.6.34/kernel/power/suspend.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/power/suspend.c        2010-07-01 20:45:16.000000000 -0400
+@@ -24,13 +24,13 @@ const char *const pm_states[PM_SUSPEND_M
        [PM_SUSPEND_MEM]        = "mem",
  };
  
@@ -47016,10 +47823,10 @@ diff -urNp linux-2.6.33.1/kernel/power/suspend.c linux-2.6.33.1/kernel/power/sus
  {
        mutex_lock(&pm_mutex);
        suspend_ops = ops;
-diff -urNp linux-2.6.33.1/kernel/printk.c linux-2.6.33.1/kernel/printk.c
---- linux-2.6.33.1/kernel/printk.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/printk.c     2010-03-20 16:58:42.096640751 -0400
-@@ -280,6 +280,11 @@ int do_syslog(int type, char __user *buf
+diff -urNp linux-2.6.34/kernel/printk.c linux-2.6.34/kernel/printk.c
+--- linux-2.6.34/kernel/printk.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/printk.c       2010-07-02 16:55:07.000000000 -0400
+@@ -265,6 +265,11 @@ int do_syslog(int type, char __user *buf
        char c;
        int error = 0;
  
@@ -47028,13 +47835,13 @@ diff -urNp linux-2.6.33.1/kernel/printk.c linux-2.6.33.1/kernel/printk.c
 +              return -EPERM;
 +#endif
 +
-       error = security_syslog(type);
+       error = security_syslog(type, from_file);
        if (error)
                return error;
-diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
---- linux-2.6.33.1/kernel/ptrace.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/ptrace.c     2010-03-20 16:58:42.104944311 -0400
-@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
+diff -urNp linux-2.6.34/kernel/ptrace.c linux-2.6.34/kernel/ptrace.c
+--- linux-2.6.34/kernel/ptrace.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/ptrace.c       2010-07-01 20:45:16.000000000 -0400
+@@ -142,7 +142,7 @@ int __ptrace_may_access(struct task_stru
             cred->gid != tcred->egid ||
             cred->gid != tcred->sgid ||
             cred->gid != tcred->gid) &&
@@ -47043,7 +47850,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                rcu_read_unlock();
                return -EPERM;
        }
-@@ -149,7 +149,7 @@ int __ptrace_may_access(struct task_stru
+@@ -150,7 +150,7 @@ int __ptrace_may_access(struct task_stru
        smp_rmb();
        if (task->mm)
                dumpable = get_dumpable(task->mm);
@@ -47052,7 +47859,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                return -EPERM;
  
        return security_ptrace_access_check(task, mode);
-@@ -199,7 +199,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -200,7 +200,7 @@ int ptrace_attach(struct task_struct *ta
                goto unlock_tasklist;
  
        task->ptrace = PT_PTRACED;
@@ -47061,7 +47868,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                task->ptrace |= PT_PTRACE_CAP;
  
        __ptrace_link(task, current);
-@@ -362,7 +362,7 @@ int ptrace_readdata(struct task_struct *
+@@ -363,7 +363,7 @@ int ptrace_readdata(struct task_struct *
                                break;
                        return -EIO;
                }
@@ -47070,7 +47877,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                        return -EFAULT;
                copied += retval;
                src += retval;
-@@ -532,18 +532,18 @@ int ptrace_request(struct task_struct *c
+@@ -574,18 +574,18 @@ int ptrace_request(struct task_struct *c
                ret = ptrace_setoptions(child, data);
                break;
        case PTRACE_GETEVENTMSG:
@@ -47092,7 +47899,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                                   sizeof siginfo))
                        ret = -EFAULT;
                else
-@@ -621,14 +621,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
+@@ -683,14 +683,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
                goto out;
        }
  
@@ -47115,7 +47922,7 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
                goto out_put_task_struct;
        }
  
-@@ -653,7 +660,7 @@ int generic_ptrace_peekdata(struct task_
+@@ -715,7 +722,7 @@ int generic_ptrace_peekdata(struct task_
        copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
        if (copied != sizeof(tmp))
                return -EIO;
@@ -47124,10 +47931,10 @@ diff -urNp linux-2.6.33.1/kernel/ptrace.c linux-2.6.33.1/kernel/ptrace.c
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-diff -urNp linux-2.6.33.1/kernel/rcutree.c linux-2.6.33.1/kernel/rcutree.c
---- linux-2.6.33.1/kernel/rcutree.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/rcutree.c    2010-03-20 16:58:42.108722969 -0400
-@@ -1315,7 +1315,7 @@ __rcu_process_callbacks(struct rcu_state
+diff -urNp linux-2.6.34/kernel/rcutree.c linux-2.6.34/kernel/rcutree.c
+--- linux-2.6.34/kernel/rcutree.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/rcutree.c      2010-07-01 20:45:16.000000000 -0400
+@@ -1321,7 +1321,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
   */
@@ -47136,10 +47943,10 @@ diff -urNp linux-2.6.33.1/kernel/rcutree.c linux-2.6.33.1/kernel/rcutree.c
  {
        /*
         * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.33.1/kernel/relay.c linux-2.6.33.1/kernel/relay.c
---- linux-2.6.33.1/kernel/relay.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/relay.c      2010-03-20 16:58:42.108722969 -0400
-@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
+diff -urNp linux-2.6.34/kernel/relay.c linux-2.6.34/kernel/relay.c
+--- linux-2.6.34/kernel/relay.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/relay.c        2010-07-01 20:45:16.000000000 -0400
+@@ -1293,7 +1293,7 @@ static ssize_t subbuf_splice_actor(struc
                return 0;
  
        ret = *nonpad_ret = splice_to_pipe(pipe, &spd);
@@ -47148,9 +47955,9 @@ diff -urNp linux-2.6.33.1/kernel/relay.c linux-2.6.33.1/kernel/relay.c
                return ret;
  
          if (read_start + ret == nonpad_end)
-diff -urNp linux-2.6.33.1/kernel/resource.c linux-2.6.33.1/kernel/resource.c
---- linux-2.6.33.1/kernel/resource.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/resource.c   2010-03-20 16:58:42.108722969 -0400
+diff -urNp linux-2.6.34/kernel/resource.c linux-2.6.34/kernel/resource.c
+--- linux-2.6.34/kernel/resource.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/resource.c     2010-07-01 20:45:16.000000000 -0400
 @@ -132,8 +132,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -47170,28 +47977,19 @@ diff -urNp linux-2.6.33.1/kernel/resource.c linux-2.6.33.1/kernel/resource.c
        return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.33.1/kernel/sched.c linux-2.6.33.1/kernel/sched.c
---- linux-2.6.33.1/kernel/sched.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/sched.c      2010-03-20 16:58:42.116976245 -0400
-@@ -4855,7 +4855,7 @@ out:
-  * In CONFIG_NO_HZ case, the idle load balance owner will do the
-  * rebalancing for all the cpus for whom scheduler ticks are stopped.
-  */
--static void run_rebalance_domains(struct softirq_action *h)
-+static void run_rebalance_domains(void)
- {
-       int this_cpu = smp_processor_id();
-       struct rq *this_rq = cpu_rq(this_cpu);
-@@ -6158,6 +6158,8 @@ int can_nice(const struct task_struct *p
+diff -urNp linux-2.6.34/kernel/sched.c linux-2.6.34/kernel/sched.c
+--- linux-2.6.34/kernel/sched.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/sched.c        2010-07-02 17:10:55.000000000 -0400
+@@ -4364,6 +4364,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;
  
 +      gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
 +
-       return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
+       return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
-@@ -6191,7 +6193,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4397,7 +4399,8 @@ SYSCALL_DEFINE1(nice, int, increment)
        if (nice > 19)
                nice = 19;
  
@@ -47201,19 +47999,54 @@ diff -urNp linux-2.6.33.1/kernel/sched.c linux-2.6.33.1/kernel/sched.c
                return -EPERM;
  
        retval = security_task_setnice(current, nice);
-@@ -6333,6 +6336,8 @@ recheck:
-               if (rt_policy(policy)) {
-                       unsigned long rlim_rtprio;
+@@ -4544,6 +4547,7 @@ recheck:
+                       rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO);
+                       unlock_task_sighand(p, &flags);
  
 +                      gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
-+
-                       if (!lock_task_sighand(p, &flags))
-                               return -ESRCH;
-                       rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
---- linux-2.6.33.1/kernel/signal.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/signal.c     2010-03-20 16:58:42.116976245 -0400
-@@ -226,6 +226,9 @@ __sigqueue_alloc(int sig, struct task_st
+                       /* can't set/change the rt policy */
+                       if (policy != p->policy && !rlim_rtprio)
+                               return -EPERM;
+diff -urNp linux-2.6.34/kernel/sched_fair.c linux-2.6.34/kernel/sched_fair.c
+--- linux-2.6.34/kernel/sched_fair.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/sched_fair.c   2010-07-01 20:45:16.000000000 -0400
+@@ -3432,7 +3432,7 @@ out:
+  * In CONFIG_NO_HZ case, the idle load balance owner will do the
+  * rebalancing for all the cpus for whom scheduler ticks are stopped.
+  */
+-static void run_rebalance_domains(struct softirq_action *h)
++static void run_rebalance_domains(void)
+ {
+       int this_cpu = smp_processor_id();
+       struct rq *this_rq = cpu_rq(this_cpu);
+diff -urNp linux-2.6.34/kernel/signal.c linux-2.6.34/kernel/signal.c
+--- linux-2.6.34/kernel/signal.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/signal.c       2010-07-02 17:20:05.000000000 -0400
+@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
+ 
+ int print_fatal_signals __read_mostly;
+ 
+-static void __user *sig_handler(struct task_struct *t, int sig)
++static __sighandler_t sig_handler(struct task_struct *t, int sig)
+ {
+       return t->sighand->action[sig - 1].sa.sa_handler;
+ }
+ 
+-static int sig_handler_ignored(void __user *handler, int sig)
++static int sig_handler_ignored(__sighandler_t handler, int sig)
+ {
+       /* Is it explicitly or implicitly ignored? */
+       return handler == SIG_IGN ||
+@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __us
+ static int sig_task_ignored(struct task_struct *t, int sig,
+               int from_ancestor_ns)
+ {
+-      void __user *handler;
++      __sighandler_t handler;
+ 
+       handler = sig_handler(t, sig);
+ 
+@@ -243,6 +243,9 @@ __sigqueue_alloc(int sig, struct task_st
        atomic_inc(&user->sigpending);
        rcu_read_unlock();
  
@@ -47222,8 +48055,17 @@ diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
 +
        if (override_rlimit ||
            atomic_read(&user->sigpending) <=
-                       t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur) {
-@@ -659,6 +662,9 @@ static int check_kill_permission(int sig
+                       task_rlimit(t, RLIMIT_SIGPENDING)) {
+@@ -367,7 +370,7 @@ flush_signal_handlers(struct task_struct
+ 
+ int unhandled_signal(struct task_struct *tsk, int sig)
+ {
+-      void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
++      __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
+       if (is_global_init(tsk))
+               return 1;
+       if (handler != SIG_IGN && handler != SIG_DFL)
+@@ -676,6 +679,9 @@ static int check_kill_permission(int sig
                }
        }
  
@@ -47233,7 +48075,7 @@ diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
        return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1006,7 +1012,7 @@ __group_send_sig_info(int sig, struct si
+@@ -1023,7 +1029,7 @@ __group_send_sig_info(int sig, struct si
        return send_signal(sig, info, p, 1);
  }
  
@@ -47242,7 +48084,7 @@ diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
        return send_signal(sig, info, t, 0);
-@@ -1060,6 +1066,9 @@ force_sig_info(int sig, struct siginfo *
+@@ -1077,6 +1083,9 @@ force_sig_info(int sig, struct siginfo *
        ret = specific_send_sig_info(sig, info, t);
        spin_unlock_irqrestore(&t->sighand->siglock, flags);
  
@@ -47252,7 +48094,7 @@ diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
        return ret;
  }
  
-@@ -1113,8 +1122,11 @@ int group_send_sig_info(int sig, struct 
+@@ -1130,8 +1139,11 @@ int group_send_sig_info(int sig, struct 
  {
        int ret = check_kill_permission(sig, info, p);
  
@@ -47265,10 +48107,10 @@ diff -urNp linux-2.6.33.1/kernel/signal.c linux-2.6.33.1/kernel/signal.c
  
        return ret;
  }
-diff -urNp linux-2.6.33.1/kernel/smp.c linux-2.6.33.1/kernel/smp.c
---- linux-2.6.33.1/kernel/smp.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/smp.c        2010-03-20 16:58:42.120938497 -0400
-@@ -498,22 +498,22 @@ int smp_call_function(void (*func)(void 
+diff -urNp linux-2.6.34/kernel/smp.c linux-2.6.34/kernel/smp.c
+--- linux-2.6.34/kernel/smp.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/smp.c  2010-07-01 20:45:16.000000000 -0400
+@@ -499,22 +499,22 @@ int smp_call_function(void (*func)(void 
  }
  EXPORT_SYMBOL(smp_call_function);
  
@@ -47295,9 +48137,9 @@ diff -urNp linux-2.6.33.1/kernel/smp.c linux-2.6.33.1/kernel/smp.c
  {
        raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.33.1/kernel/softirq.c linux-2.6.33.1/kernel/softirq.c
---- linux-2.6.33.1/kernel/softirq.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/softirq.c    2010-03-20 16:58:42.120938497 -0400
+diff -urNp linux-2.6.34/kernel/softirq.c linux-2.6.34/kernel/softirq.c
+--- linux-2.6.34/kernel/softirq.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/softirq.c      2010-07-01 20:45:16.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -47352,10 +48194,10 @@ diff -urNp linux-2.6.33.1/kernel/softirq.c linux-2.6.33.1/kernel/softirq.c
  {
        struct tasklet_struct *list;
  
-diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
---- linux-2.6.33.1/kernel/sys.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/sys.c        2010-03-20 16:58:42.128666983 -0400
-@@ -132,6 +132,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-2.6.34/kernel/sys.c linux-2.6.34/kernel/sys.c
+--- linux-2.6.34/kernel/sys.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/sys.c  2010-07-01 20:45:16.000000000 -0400
+@@ -134,6 +134,12 @@ static int set_one_prio(struct task_stru
                error = -EACCES;
                goto out;
        }
@@ -47368,7 +48210,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        no_nice = security_task_setnice(p, niceval);
        if (no_nice) {
                error = no_nice;
-@@ -513,6 +519,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -515,6 +521,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
                        goto error;
        }
  
@@ -47378,7 +48220,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (rgid != (gid_t) -1 ||
            (egid != (gid_t) -1 && egid != old->gid))
                new->sgid = new->egid;
-@@ -546,6 +555,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -548,6 +557,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
                goto error;
  
        retval = -EPERM;
@@ -47389,7 +48231,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (capable(CAP_SETGID))
                new->gid = new->egid = new->sgid = new->fsgid = gid;
        else if (gid == old->gid || gid == old->sgid)
-@@ -636,6 +649,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -632,6 +645,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
                        goto error;
        }
  
@@ -47399,7 +48241,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (new->uid != old->uid) {
                retval = set_user(new);
                if (retval < 0)
-@@ -684,6 +700,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -680,6 +696,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
                goto error;
  
        retval = -EPERM;
@@ -47412,7 +48254,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (capable(CAP_SETUID)) {
                new->suid = new->uid = uid;
                if (uid != old->uid) {
-@@ -741,6 +763,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -737,6 +759,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
                        goto error;
        }
  
@@ -47422,7 +48264,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (ruid != (uid_t) -1) {
                new->uid = ruid;
                if (ruid != old->uid) {
-@@ -809,6 +834,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -805,6 +830,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
                        goto error;
        }
  
@@ -47432,7 +48274,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (rgid != (gid_t) -1)
                new->gid = rgid;
        if (egid != (gid_t) -1)
-@@ -858,6 +886,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
        if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
                goto error;
  
@@ -47442,7 +48284,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
        if (uid == old->uid  || uid == old->euid  ||
            uid == old->suid || uid == old->fsuid ||
            capable(CAP_SETUID)) {
-@@ -898,6 +929,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -894,6 +925,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
        if (gid == old->gid  || gid == old->egid  ||
            gid == old->sgid || gid == old->fsgid ||
            capable(CAP_SETGID)) {
@@ -47452,7 +48294,7 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
                if (gid != old_fsgid) {
                        new->fsgid = gid;
                        goto change_okay;
-@@ -1460,7 +1494,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1522,7 +1556,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
                        error = get_dumpable(me->mm);
                        break;
                case PR_SET_DUMPABLE:
@@ -47461,10 +48303,10 @@ diff -urNp linux-2.6.33.1/kernel/sys.c linux-2.6.33.1/kernel/sys.c
                                error = -EINVAL;
                                break;
                        }
-diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
---- linux-2.6.33.1/kernel/sysctl.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/sysctl.c     2010-03-20 16:58:42.186495404 -0400
-@@ -62,6 +62,13 @@
+diff -urNp linux-2.6.34/kernel/sysctl.c linux-2.6.34/kernel/sysctl.c
+--- linux-2.6.34/kernel/sysctl.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/sysctl.c       2010-07-02 17:21:11.000000000 -0400
+@@ -76,6 +76,13 @@
  
  
  #if defined(CONFIG_SYSCTL)
@@ -47477,8 +48319,8 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
 +extern int gr_handle_chroot_sysctl(const int op);
  
  /* External variables not in a header file. */
- extern int C_A_D;
-@@ -169,6 +176,7 @@ static int proc_do_cad_pid(struct ctl_ta
+ extern int sysctl_overcommit_memory;
+@@ -162,6 +169,7 @@ static int proc_do_cad_pid(struct ctl_ta
  static int proc_taint(struct ctl_table *table, int write,
                               void __user *buffer, size_t *lenp, loff_t *ppos);
  #endif
@@ -47486,7 +48328,7 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
  
  static struct ctl_table root_table[];
  static struct ctl_table_root sysctl_table_root;
-@@ -201,6 +209,20 @@ extern struct ctl_table epoll_table[];
+@@ -194,6 +202,20 @@ extern struct ctl_table epoll_table[];
  int sysctl_legacy_va_layout;
  #endif
  
@@ -47504,10 +48346,10 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
 +};
 +#endif
 +
- extern int prove_locking;
- extern int lock_stat;
+ /* The default sysctl tables: */
  
-@@ -251,6 +273,22 @@ static int max_sched_shares_ratelimit = 
+ static struct ctl_table root_table[] = {
+@@ -241,6 +263,22 @@ static int max_sched_shares_ratelimit = 
  #endif
  
  static struct ctl_table kern_table[] = {
@@ -47530,7 +48372,7 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
        {
                .procname       = "sched_child_runs_first",
                .data           = &sysctl_sched_child_runs_first,
-@@ -1629,6 +1667,16 @@ int sysctl_perm(struct ctl_table_root *r
+@@ -1630,6 +1668,16 @@ int sysctl_perm(struct ctl_table_root *r
        int error;
        int mode;
  
@@ -47547,7 +48389,7 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
        error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
        if (error)
                return error;
-@@ -2137,6 +2185,8 @@ static int __do_proc_dointvec(void *tbl_
+@@ -2138,6 +2186,8 @@ static int __do_proc_dointvec(void *tbl_
                        len = strlen(buf);
                        if (len > left)
                                len = left;
@@ -47556,7 +48398,7 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
                        if(copy_to_user(s, buf, len))
                                return -EFAULT;
                        left -= len;
-@@ -2362,6 +2412,8 @@ static int __do_proc_doulongvec_minmax(v
+@@ -2363,6 +2413,8 @@ static int __do_proc_doulongvec_minmax(v
                        len = strlen(buf);
                        if (len > left)
                                len = left;
@@ -47565,10 +48407,10 @@ diff -urNp linux-2.6.33.1/kernel/sysctl.c linux-2.6.33.1/kernel/sysctl.c
                        if(copy_to_user(s, buf, len))
                                return -EFAULT;
                        left -= len;
-diff -urNp linux-2.6.33.1/kernel/taskstats.c linux-2.6.33.1/kernel/taskstats.c
---- linux-2.6.33.1/kernel/taskstats.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/taskstats.c  2010-03-20 16:58:42.186495404 -0400
-@@ -26,9 +26,12 @@
+diff -urNp linux-2.6.34/kernel/taskstats.c linux-2.6.34/kernel/taskstats.c
+--- linux-2.6.34/kernel/taskstats.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/taskstats.c    2010-07-01 20:45:16.000000000 -0400
+@@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
  #include <linux/file.h>
@@ -47581,7 +48423,7 @@ diff -urNp linux-2.6.33.1/kernel/taskstats.c linux-2.6.33.1/kernel/taskstats.c
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -433,6 +436,9 @@ static int taskstats_user_cmd(struct sk_
+@@ -432,6 +435,9 @@ static int taskstats_user_cmd(struct sk_
        size_t size;
        cpumask_var_t mask;
  
@@ -47591,9 +48433,9 @@ diff -urNp linux-2.6.33.1/kernel/taskstats.c linux-2.6.33.1/kernel/taskstats.c
        if (!alloc_cpumask_var(&mask, GFP_KERNEL))
                return -ENOMEM;
  
-diff -urNp linux-2.6.33.1/kernel/time/tick-broadcast.c linux-2.6.33.1/kernel/time/tick-broadcast.c
---- linux-2.6.33.1/kernel/time/tick-broadcast.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/time/tick-broadcast.c        2010-03-20 16:58:42.200972419 -0400
+diff -urNp linux-2.6.34/kernel/time/tick-broadcast.c linux-2.6.34/kernel/time/tick-broadcast.c
+--- linux-2.6.34/kernel/time/tick-broadcast.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/time/tick-broadcast.c  2010-07-01 20:45:16.000000000 -0400
 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
                 * then clear the broadcast bit.
                 */
@@ -47603,10 +48445,10 @@ diff -urNp linux-2.6.33.1/kernel/time/tick-broadcast.c linux-2.6.33.1/kernel/tim
  
                        cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
                        tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.33.1/kernel/time.c linux-2.6.33.1/kernel/time.c
---- linux-2.6.33.1/kernel/time.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/time.c       2010-03-20 16:58:42.200972419 -0400
-@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
+diff -urNp linux-2.6.34/kernel/time.c linux-2.6.34/kernel/time.c
+--- linux-2.6.34/kernel/time.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/time.c 2010-07-01 20:45:16.000000000 -0400
+@@ -93,6 +93,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
                return err;
  
        do_settimeofday(&tv);
@@ -47616,7 +48458,7 @@ diff -urNp linux-2.6.33.1/kernel/time.c linux-2.6.33.1/kernel/time.c
        return 0;
  }
  
-@@ -202,6 +205,8 @@ SYSCALL_DEFINE2(settimeofday, struct tim
+@@ -201,6 +204,8 @@ SYSCALL_DEFINE2(settimeofday, struct tim
                        return -EFAULT;
        }
  
@@ -47625,7 +48467,7 @@ diff -urNp linux-2.6.33.1/kernel/time.c linux-2.6.33.1/kernel/time.c
        return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
  }
  
-@@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
+@@ -239,7 +244,7 @@ EXPORT_SYMBOL(current_fs_time);
   * Avoid unnecessary multiplications/divisions in the
   * two most common HZ cases:
   */
@@ -47634,7 +48476,7 @@ diff -urNp linux-2.6.33.1/kernel/time.c linux-2.6.33.1/kernel/time.c
  {
  #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
        return (MSEC_PER_SEC / HZ) * j;
-@@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(con
+@@ -255,7 +260,7 @@ unsigned int inline jiffies_to_msecs(con
  }
  EXPORT_SYMBOL(jiffies_to_msecs);
  
@@ -47643,10 +48485,10 @@ diff -urNp linux-2.6.33.1/kernel/time.c linux-2.6.33.1/kernel/time.c
  {
  #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
        return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.33.1/kernel/timer.c linux-2.6.33.1/kernel/timer.c
---- linux-2.6.33.1/kernel/timer.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/timer.c      2010-03-20 16:58:42.212949807 -0400
-@@ -1206,7 +1206,7 @@ void update_process_times(int user_tick)
+diff -urNp linux-2.6.34/kernel/timer.c linux-2.6.34/kernel/timer.c
+--- linux-2.6.34/kernel/timer.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/timer.c        2010-07-01 20:45:16.000000000 -0400
+@@ -1208,7 +1208,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
   */
@@ -47655,10 +48497,10 @@ diff -urNp linux-2.6.33.1/kernel/timer.c linux-2.6.33.1/kernel/timer.c
  {
        struct tvec_base *base = __get_cpu_var(tvec_bases);
  
-diff -urNp linux-2.6.33.1/kernel/trace/ftrace.c linux-2.6.33.1/kernel/trace/ftrace.c
---- linux-2.6.33.1/kernel/trace/ftrace.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/trace/ftrace.c       2010-03-20 16:58:42.212949807 -0400
-@@ -1102,13 +1102,18 @@ ftrace_code_disable(struct module *mod, 
+diff -urNp linux-2.6.34/kernel/trace/ftrace.c linux-2.6.34/kernel/trace/ftrace.c
+--- linux-2.6.34/kernel/trace/ftrace.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/ftrace.c 2010-07-01 20:45:16.000000000 -0400
+@@ -1079,13 +1079,18 @@ ftrace_code_disable(struct module *mod, 
  
        ip = rec->ip;
  
@@ -47679,9 +48521,9 @@ diff -urNp linux-2.6.33.1/kernel/trace/ftrace.c linux-2.6.33.1/kernel/trace/ftra
  }
  
  /*
-diff -urNp linux-2.6.33.1/kernel/trace/Kconfig linux-2.6.33.1/kernel/trace/Kconfig
---- linux-2.6.33.1/kernel/trace/Kconfig        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/trace/Kconfig        2010-03-20 16:58:42.212949807 -0400
+diff -urNp linux-2.6.34/kernel/trace/Kconfig linux-2.6.34/kernel/trace/Kconfig
+--- linux-2.6.34/kernel/trace/Kconfig  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/Kconfig  2010-07-01 20:45:16.000000000 -0400
 @@ -124,6 +124,7 @@ if FTRACE
  config FUNCTION_TRACER
        bool "Kernel Function Tracer"
@@ -47690,7 +48532,7 @@ diff -urNp linux-2.6.33.1/kernel/trace/Kconfig linux-2.6.33.1/kernel/trace/Kconf
        select FRAME_POINTER
        select KALLSYMS
        select GENERIC_TRACER
-@@ -362,6 +363,7 @@ config PROFILE_KSYM_TRACER
+@@ -353,6 +354,7 @@ config PROFILE_KSYM_TRACER
  config STACK_TRACER
        bool "Trace max stack"
        depends on HAVE_FUNCTION_TRACER
@@ -47698,10 +48540,22 @@ diff -urNp linux-2.6.33.1/kernel/trace/Kconfig linux-2.6.33.1/kernel/trace/Kconf
        select FUNCTION_TRACER
        select STACKTRACE
        select KALLSYMS
-diff -urNp linux-2.6.33.1/kernel/trace/trace.c linux-2.6.33.1/kernel/trace/trace.c
---- linux-2.6.33.1/kernel/trace/trace.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/trace/trace.c        2010-03-20 16:58:42.217937104 -0400
-@@ -3820,10 +3820,9 @@ static const struct file_operations trac
+diff -urNp linux-2.6.34/kernel/trace/ring_buffer.c linux-2.6.34/kernel/trace/ring_buffer.c
+--- linux-2.6.34/kernel/trace/ring_buffer.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/ring_buffer.c    2010-07-01 20:45:16.000000000 -0400
+@@ -621,7 +621,7 @@ static struct list_head *rb_list_head(st
+  * the reader page). But if the next page is a header page,
+  * its flags will be non zero.
+  */
+-static int inline
++static inline int
+ rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+               struct buffer_page *page, struct list_head *list)
+ {
+diff -urNp linux-2.6.34/kernel/trace/trace.c linux-2.6.34/kernel/trace/trace.c
+--- linux-2.6.34/kernel/trace/trace.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/trace.c  2010-07-01 20:45:16.000000000 -0400
+@@ -3918,10 +3918,9 @@ static const struct file_operations trac
  };
  #endif
  
@@ -47713,7 +48567,7 @@ diff -urNp linux-2.6.33.1/kernel/trace/trace.c linux-2.6.33.1/kernel/trace/trace
        static int once;
  
        if (d_tracer)
-@@ -3843,10 +3842,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -3941,10 +3940,9 @@ struct dentry *tracing_init_dentry(void)
        return d_tracer;
  }
  
@@ -47725,9 +48579,9 @@ diff -urNp linux-2.6.33.1/kernel/trace/trace.c linux-2.6.33.1/kernel/trace/trace
        static int once;
        struct dentry *d_tracer;
  
-diff -urNp linux-2.6.33.1/kernel/trace/trace_output.c linux-2.6.33.1/kernel/trace/trace_output.c
---- linux-2.6.33.1/kernel/trace/trace_output.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/trace/trace_output.c 2010-03-20 16:58:42.220764190 -0400
+diff -urNp linux-2.6.34/kernel/trace/trace_output.c linux-2.6.34/kernel/trace/trace_output.c
+--- linux-2.6.34/kernel/trace/trace_output.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/trace_output.c   2010-07-01 20:45:16.000000000 -0400
 @@ -280,7 +280,7 @@ int trace_seq_path(struct trace_seq *s, 
  
        p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -47737,9 +48591,9 @@ diff -urNp linux-2.6.33.1/kernel/trace/trace_output.c linux-2.6.33.1/kernel/trac
                if (p) {
                        s->len = p - s->buffer;
                        return 1;
-diff -urNp linux-2.6.33.1/kernel/trace/trace_stack.c linux-2.6.33.1/kernel/trace/trace_stack.c
---- linux-2.6.33.1/kernel/trace/trace_stack.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/kernel/trace/trace_stack.c  2010-03-20 16:58:42.220764190 -0400
+diff -urNp linux-2.6.34/kernel/trace/trace_stack.c linux-2.6.34/kernel/trace/trace_stack.c
+--- linux-2.6.34/kernel/trace/trace_stack.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/kernel/trace/trace_stack.c    2010-07-01 20:45:16.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
                return;
  
@@ -47749,9 +48603,9 @@ diff -urNp linux-2.6.33.1/kernel/trace/trace_stack.c linux-2.6.33.1/kernel/trace
                return;
  
        local_irq_save(flags);
-diff -urNp linux-2.6.33.1/lib/bug.c linux-2.6.33.1/lib/bug.c
---- linux-2.6.33.1/lib/bug.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/bug.c   2010-03-20 16:58:42.225948146 -0400
+diff -urNp linux-2.6.34/lib/bug.c linux-2.6.34/lib/bug.c
+--- linux-2.6.34/lib/bug.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/bug.c     2010-07-01 20:45:16.000000000 -0400
 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
                return BUG_TRAP_TYPE_NONE;
  
@@ -47761,10 +48615,10 @@ diff -urNp linux-2.6.33.1/lib/bug.c linux-2.6.33.1/lib/bug.c
  
        printk(KERN_EMERG "------------[ cut here ]------------\n");
  
-diff -urNp linux-2.6.33.1/lib/debugobjects.c linux-2.6.33.1/lib/debugobjects.c
---- linux-2.6.33.1/lib/debugobjects.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/debugobjects.c  2010-03-20 16:58:42.225948146 -0400
-@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
+diff -urNp linux-2.6.34/lib/debugobjects.c linux-2.6.34/lib/debugobjects.c
+--- linux-2.6.34/lib/debugobjects.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/debugobjects.c    2010-07-01 20:45:16.000000000 -0400
+@@ -278,7 +278,7 @@ static void debug_object_is_on_stack(voi
        if (limit > 4)
                return;
  
@@ -47773,9 +48627,9 @@ diff -urNp linux-2.6.33.1/lib/debugobjects.c linux-2.6.33.1/lib/debugobjects.c
        if (is_on_stack == onstack)
                return;
  
-diff -urNp linux-2.6.33.1/lib/dma-debug.c linux-2.6.33.1/lib/dma-debug.c
---- linux-2.6.33.1/lib/dma-debug.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/dma-debug.c     2010-03-20 16:58:42.240954646 -0400
+diff -urNp linux-2.6.34/lib/dma-debug.c linux-2.6.34/lib/dma-debug.c
+--- linux-2.6.34/lib/dma-debug.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/dma-debug.c       2010-07-01 20:45:16.000000000 -0400
 @@ -861,7 +861,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -47785,10 +48639,10 @@ diff -urNp linux-2.6.33.1/lib/dma-debug.c linux-2.6.33.1/lib/dma-debug.c
                err_printk(dev, NULL, "DMA-API: device driver maps memory from"
                                "stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.33.1/lib/inflate.c linux-2.6.33.1/lib/inflate.c
---- linux-2.6.33.1/lib/inflate.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/inflate.c       2010-03-20 16:58:42.240954646 -0400
-@@ -266,7 +266,7 @@ static void free(void *where)
+diff -urNp linux-2.6.34/lib/inflate.c linux-2.6.34/lib/inflate.c
+--- linux-2.6.34/lib/inflate.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/inflate.c 2010-07-01 20:45:16.000000000 -0400
+@@ -267,7 +267,7 @@ static void free(void *where)
                malloc_ptr = free_mem_ptr;
  }
  #else
@@ -47797,10 +48651,10 @@ diff -urNp linux-2.6.33.1/lib/inflate.c linux-2.6.33.1/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.33.1/lib/Kconfig.debug linux-2.6.33.1/lib/Kconfig.debug
---- linux-2.6.33.1/lib/Kconfig.debug   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/Kconfig.debug   2010-03-20 16:58:42.244515655 -0400
-@@ -914,7 +914,7 @@ config LATENCYTOP
+diff -urNp linux-2.6.34/lib/Kconfig.debug linux-2.6.34/lib/Kconfig.debug
+--- linux-2.6.34/lib/Kconfig.debug     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/Kconfig.debug     2010-07-01 20:45:16.000000000 -0400
+@@ -946,7 +946,7 @@ config LATENCYTOP
        select STACKTRACE
        select SCHEDSTATS
        select SCHED_DEBUG
@@ -47809,51 +48663,9 @@ diff -urNp linux-2.6.33.1/lib/Kconfig.debug linux-2.6.33.1/lib/Kconfig.debug
        help
          Enable this option if you want to use the LatencyTOP tool
          to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.33.1/lib/kobject.c linux-2.6.33.1/lib/kobject.c
---- linux-2.6.33.1/lib/kobject.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/kobject.c       2010-03-20 16:58:42.244515655 -0400
-@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
-       return ret;
- }
- 
--struct sysfs_ops kobj_sysfs_ops = {
-+const struct sysfs_ops kobj_sysfs_ops = {
-       .show   = kobj_attr_show,
-       .store  = kobj_attr_store,
- };
-@@ -789,7 +789,7 @@ static struct kobj_type kset_ktype = {
-  * If the kset was not able to be created, NULL will be returned.
-  */
- static struct kset *kset_create(const char *name,
--                              struct kset_uevent_ops *uevent_ops,
-+                              const struct kset_uevent_ops *uevent_ops,
-                               struct kobject *parent_kobj)
- {
-       struct kset *kset;
-@@ -832,7 +832,7 @@ static struct kset *kset_create(const ch
-  * If the kset was not able to be created, NULL will be returned.
-  */
- struct kset *kset_create_and_add(const char *name,
--                               struct kset_uevent_ops *uevent_ops,
-+                               const struct kset_uevent_ops *uevent_ops,
-                                struct kobject *parent_kobj)
- {
-       struct kset *kset;
-diff -urNp linux-2.6.33.1/lib/kobject_uevent.c linux-2.6.33.1/lib/kobject_uevent.c
---- linux-2.6.33.1/lib/kobject_uevent.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/kobject_uevent.c        2010-03-20 16:58:42.244515655 -0400
-@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
-       const char *subsystem;
-       struct kobject *top_kobj;
-       struct kset *kset;
--      struct kset_uevent_ops *uevent_ops;
-+      const struct kset_uevent_ops *uevent_ops;
-       u64 seq;
-       int i = 0;
-       int retval = 0;
-diff -urNp linux-2.6.33.1/lib/parser.c linux-2.6.33.1/lib/parser.c
---- linux-2.6.33.1/lib/parser.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/parser.c        2010-03-20 16:58:42.244515655 -0400
+diff -urNp linux-2.6.34/lib/parser.c linux-2.6.34/lib/parser.c
+--- linux-2.6.34/lib/parser.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/parser.c  2010-07-01 20:45:16.000000000 -0400
 @@ -129,7 +129,7 @@ static int match_number(substring_t *s, 
        char *buf;
        int ret;
@@ -47863,10 +48675,10 @@ diff -urNp linux-2.6.33.1/lib/parser.c linux-2.6.33.1/lib/parser.c
        if (!buf)
                return -ENOMEM;
        memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.33.1/lib/radix-tree.c linux-2.6.33.1/lib/radix-tree.c
---- linux-2.6.33.1/lib/radix-tree.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/radix-tree.c    2010-03-20 16:58:42.253002352 -0400
-@@ -81,7 +81,7 @@ struct radix_tree_preload {
+diff -urNp linux-2.6.34/lib/radix-tree.c linux-2.6.34/lib/radix-tree.c
+--- linux-2.6.34/lib/radix-tree.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/radix-tree.c      2010-07-01 20:45:16.000000000 -0400
+@@ -80,7 +80,7 @@ struct radix_tree_preload {
        int nr;
        struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
  };
@@ -47875,9 +48687,9 @@ diff -urNp linux-2.6.33.1/lib/radix-tree.c linux-2.6.33.1/lib/radix-tree.c
  
  static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
  {
-diff -urNp linux-2.6.33.1/lib/random32.c linux-2.6.33.1/lib/random32.c
---- linux-2.6.33.1/lib/random32.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/lib/random32.c      2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/lib/random32.c linux-2.6.34/lib/random32.c
+--- linux-2.6.34/lib/random32.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/lib/random32.c        2010-07-01 20:45:16.000000000 -0400
 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
   */
  static inline u32 __seed(u32 x, u32 m)
@@ -47887,14 +48699,14 @@ diff -urNp linux-2.6.33.1/lib/random32.c linux-2.6.33.1/lib/random32.c
  }
  
  /**
-diff -urNp linux-2.6.33.1/localversion-grsec linux-2.6.33.1/localversion-grsec
---- linux-2.6.33.1/localversion-grsec  1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.33.1/localversion-grsec  2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/localversion-grsec linux-2.6.34/localversion-grsec
+--- linux-2.6.34/localversion-grsec    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.34/localversion-grsec    2010-07-01 20:45:16.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.33.1/Makefile linux-2.6.33.1/Makefile
---- linux-2.6.33.1/Makefile    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/Makefile    2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/Makefile linux-2.6.34/Makefile
+--- linux-2.6.34/Makefile      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/Makefile      2010-07-01 20:45:16.000000000 -0400
 @@ -227,8 +227,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -47915,9 +48727,9 @@ diff -urNp linux-2.6.33.1/Makefile linux-2.6.33.1/Makefile
  
  vmlinux-dirs  := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
                     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.33.1/mm/filemap.c linux-2.6.33.1/mm/filemap.c
---- linux-2.6.33.1/mm/filemap.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/filemap.c        2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/mm/filemap.c linux-2.6.34/mm/filemap.c
+--- linux-2.6.34/mm/filemap.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/filemap.c  2010-07-01 20:45:16.000000000 -0400
 @@ -1601,7 +1601,7 @@ int generic_file_mmap(struct file * file
        struct address_space *mapping = file->f_mapping;
  
@@ -47935,9 +48747,9 @@ diff -urNp linux-2.6.33.1/mm/filemap.c linux-2.6.33.1/mm/filemap.c
                        if (*pos >= limit) {
                                send_sig(SIGXFSZ, current, 0);
                                return -EFBIG;
-diff -urNp linux-2.6.33.1/mm/fremap.c linux-2.6.33.1/mm/fremap.c
---- linux-2.6.33.1/mm/fremap.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/fremap.c 2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/mm/fremap.c linux-2.6.34/mm/fremap.c
+--- linux-2.6.34/mm/fremap.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/fremap.c   2010-07-01 20:45:16.000000000 -0400
 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
        vma = find_vma(mm, start);
@@ -47950,9 +48762,9 @@ diff -urNp linux-2.6.33.1/mm/fremap.c linux-2.6.33.1/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-2.6.33.1/mm/highmem.c linux-2.6.33.1/mm/highmem.c
---- linux-2.6.33.1/mm/highmem.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/highmem.c        2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/mm/highmem.c linux-2.6.34/mm/highmem.c
+--- linux-2.6.34/mm/highmem.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/highmem.c  2010-07-01 20:45:16.000000000 -0400
 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
                 * So no dangers, even with speculative execution.
                 */
@@ -47978,10 +48790,10 @@ diff -urNp linux-2.6.33.1/mm/highmem.c linux-2.6.33.1/mm/highmem.c
        pkmap_count[last_pkmap_nr] = 1;
        set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.33.1/mm/hugetlb.c linux-2.6.33.1/mm/hugetlb.c
---- linux-2.6.33.1/mm/hugetlb.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/hugetlb.c        2010-03-20 16:58:42.256945498 -0400
-@@ -2267,6 +2267,26 @@ static int unmap_ref_private(struct mm_s
+diff -urNp linux-2.6.34/mm/hugetlb.c linux-2.6.34/mm/hugetlb.c
+--- linux-2.6.34/mm/hugetlb.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/hugetlb.c  2010-07-01 20:45:16.000000000 -0400
+@@ -2268,6 +2268,26 @@ static int unmap_ref_private(struct mm_s
        return 1;
  }
  
@@ -48008,7 +48820,7 @@ diff -urNp linux-2.6.33.1/mm/hugetlb.c linux-2.6.33.1/mm/hugetlb.c
  static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
                        unsigned long address, pte_t *ptep, pte_t pte,
                        struct page *pagecache_page)
-@@ -2347,6 +2367,11 @@ retry_avoidcopy:
+@@ -2348,6 +2368,11 @@ retry_avoidcopy:
                huge_ptep_clear_flush(vma, address, ptep);
                set_huge_pte_at(mm, address, ptep,
                                make_huge_pte(vma, new_page, 1));
@@ -48020,7 +48832,7 @@ diff -urNp linux-2.6.33.1/mm/hugetlb.c linux-2.6.33.1/mm/hugetlb.c
                /* Make the old page be freed below */
                new_page = old_page;
        }
-@@ -2476,6 +2501,10 @@ retry:
+@@ -2479,6 +2504,10 @@ retry:
                                && (vma->vm_flags & VM_SHARED)));
        set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -48031,7 +48843,7 @@ diff -urNp linux-2.6.33.1/mm/hugetlb.c linux-2.6.33.1/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);
-@@ -2504,6 +2533,28 @@ int hugetlb_fault(struct mm_struct *mm, 
+@@ -2507,6 +2536,28 @@ int hugetlb_fault(struct mm_struct *mm, 
        static DEFINE_MUTEX(hugetlb_instantiation_mutex);
        struct hstate *h = hstate_vma(vma);
  
@@ -48060,10 +48872,10 @@ diff -urNp linux-2.6.33.1/mm/hugetlb.c linux-2.6.33.1/mm/hugetlb.c
        ptep = huge_pte_alloc(mm, address, huge_page_size(h));
        if (!ptep)
                return VM_FAULT_OOM;
-diff -urNp linux-2.6.33.1/mm/Kconfig linux-2.6.33.1/mm/Kconfig
---- linux-2.6.33.1/mm/Kconfig  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/Kconfig  2010-03-20 16:58:42.256945498 -0400
-@@ -222,7 +222,7 @@ config KSM
+diff -urNp linux-2.6.34/mm/Kconfig linux-2.6.34/mm/Kconfig
+--- linux-2.6.34/mm/Kconfig    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/Kconfig    2010-07-01 20:45:16.000000000 -0400
+@@ -226,7 +226,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
        depends on MMU
@@ -48072,9 +48884,9 @@ diff -urNp linux-2.6.33.1/mm/Kconfig linux-2.6.33.1/mm/Kconfig
          help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.33.1/mm/maccess.c linux-2.6.33.1/mm/maccess.c
---- linux-2.6.33.1/mm/maccess.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/maccess.c        2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/mm/maccess.c linux-2.6.34/mm/maccess.c
+--- linux-2.6.34/mm/maccess.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/maccess.c  2010-07-01 20:45:16.000000000 -0400
 @@ -15,10 +15,10 @@
   * happens, handle that and return -EFAULT.
   */
@@ -48101,9 +48913,9 @@ diff -urNp linux-2.6.33.1/mm/maccess.c linux-2.6.33.1/mm/maccess.c
  {
        long ret;
        mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.33.1/mm/madvise.c linux-2.6.33.1/mm/madvise.c
---- linux-2.6.33.1/mm/madvise.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/madvise.c        2010-03-20 16:58:42.256945498 -0400
+diff -urNp linux-2.6.34/mm/madvise.c linux-2.6.34/mm/madvise.c
+--- linux-2.6.34/mm/madvise.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/madvise.c  2010-07-01 20:45:16.000000000 -0400
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
        pgoff_t pgoff;
        unsigned long new_flags = vma->vm_flags;
@@ -48180,9 +48992,9 @@ diff -urNp linux-2.6.33.1/mm/madvise.c linux-2.6.33.1/mm/madvise.c
        error = 0;
        if (end == start)
                goto out;
-diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
---- linux-2.6.33.1/mm/memory.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/memory.c 2010-03-20 16:58:42.260726041 -0400
+diff -urNp linux-2.6.34/mm/memory.c linux-2.6.34/mm/memory.c
+--- linux-2.6.34/mm/memory.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/memory.c   2010-07-01 20:45:16.000000000 -0400
 @@ -48,6 +48,7 @@
  #include <linux/ksm.h>
  #include <linux/rmap.h>
@@ -48191,7 +49003,33 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
  #include <linux/delayacct.h>
  #include <linux/init.h>
  #include <linux/writeback.h>
-@@ -1266,10 +1267,10 @@ int __get_user_pages(struct task_struct 
+@@ -259,8 +260,12 @@ static inline void free_pmd_range(struct
+               return;
+ 
+       pmd = pmd_offset(pud, start);
++
++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
+       pud_clear(pud);
+       pmd_free_tlb(tlb, pmd, start);
++#endif
++
+ }
+ 
+ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -292,8 +297,12 @@ static inline void free_pud_range(struct
+               return;
+ 
+       pud = pud_offset(pgd, start);
++
++#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
+       pgd_clear(pgd);
+       pud_free_tlb(tlb, pud, start);
++#endif
++
+ }
+ 
+ /*
+@@ -1354,10 +1363,10 @@ int __get_user_pages(struct task_struct 
                        (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
        i = 0;
  
@@ -48204,7 +49042,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
                if (!vma && in_gate_area(tsk, start)) {
                        unsigned long pg = start & PAGE_MASK;
                        struct vm_area_struct *gate_vma = get_gate_vma(tsk);
-@@ -1311,7 +1312,7 @@ int __get_user_pages(struct task_struct 
+@@ -1399,7 +1408,7 @@ int __get_user_pages(struct task_struct 
                        continue;
                }
  
@@ -48213,7 +49051,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
                    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
                    !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;
-@@ -1386,7 +1387,7 @@ int __get_user_pages(struct task_struct 
+@@ -1474,7 +1483,7 @@ int __get_user_pages(struct task_struct 
                        start += PAGE_SIZE;
                        nr_pages--;
                } while (nr_pages && start < vma->vm_end);
@@ -48222,7 +49060,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        return i;
  }
  
-@@ -1982,6 +1983,186 @@ static inline void cow_user_page(struct 
+@@ -2070,6 +2079,186 @@ static inline void cow_user_page(struct 
                copy_user_highpage(dst, src, va, vma);
  }
  
@@ -48251,9 +49089,9 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
 +              if (page) {
 +                      update_hiwater_rss(mm);
 +                      if (PageAnon(page))
-+                              dec_mm_counter(mm, anon_rss);
++                              dec_mm_counter_fast(mm, MM_ANONPAGES);
 +                      else
-+                              dec_mm_counter(mm, file_rss);
++                              dec_mm_counter_fast(mm, MM_FILEPAGES);
 +                      page_remove_rmap(page);
 +                      page_cache_release(page);
 +              }
@@ -48296,7 +49134,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
 +      entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
 +      page_cache_get(page_m);
 +      page_add_anon_rmap(page_m, vma_m, address_m);
-+      inc_mm_counter(mm, anon_rss);
++      inc_mm_counter_fast(mm, MM_ANONPAGES);
 +      set_pte_at(mm, address_m, pte_m, entry_m);
 +      update_mmu_cache(vma_m, address_m, entry_m);
 +out:
@@ -48335,7 +49173,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
 +      entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
 +      page_cache_get(page_m);
 +      page_add_file_rmap(page_m);
-+      inc_mm_counter(mm, file_rss);
++      inc_mm_counter_fast(mm, MM_FILEPAGES);
 +      set_pte_at(mm, address_m, pte_m, entry_m);
 +      update_mmu_cache(vma_m, address_m, entry_m);
 +out:
@@ -48409,7 +49247,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/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
-@@ -2161,6 +2342,12 @@ gotten:
+@@ -2256,6 +2445,12 @@ gotten:
         */
        page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
        if (likely(pte_same(*page_table, orig_pte))) {
@@ -48421,8 +49259,8 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
 +
                if (old_page) {
                        if (!PageAnon(old_page)) {
-                               dec_mm_counter(mm, file_rss);
-@@ -2212,6 +2399,10 @@ gotten:
+                               dec_mm_counter_fast(mm, MM_FILEPAGES);
+@@ -2307,6 +2502,10 @@ gotten:
                        page_remove_rmap(old_page);
                }
  
@@ -48433,7 +49271,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
                /* Free the old page.. */
                new_page = old_page;
                ret |= VM_FAULT_WRITE;
-@@ -2619,6 +2810,11 @@ static int do_swap_page(struct mm_struct
+@@ -2715,6 +2914,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);
@@ -48445,10 +49283,10 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        unlock_page(page);
  
        if (flags & FAULT_FLAG_WRITE) {
-@@ -2630,6 +2826,11 @@ static int do_swap_page(struct mm_struct
+@@ -2726,6 +2930,11 @@ static int do_swap_page(struct mm_struct
  
        /* No need to invalidate - it was non-present before */
-       update_mmu_cache(vma, address, pte);
+       update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      pax_mirror_anon_pte(vma, address, page, ptl);
@@ -48457,7 +49295,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2653,7 +2854,7 @@ static int do_anonymous_page(struct mm_s
+@@ -2749,7 +2958,7 @@ static int do_anonymous_page(struct mm_s
                unsigned long address, pte_t *page_table, pmd_t *pmd,
                unsigned int flags)
  {
@@ -48466,7 +49304,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        spinlock_t *ptl;
        pte_t entry;
  
-@@ -2688,6 +2889,11 @@ static int do_anonymous_page(struct mm_s
+@@ -2784,6 +2993,11 @@ static int do_anonymous_page(struct mm_s
        if (!pte_none(*page_table))
                goto release;
  
@@ -48475,13 +49313,13 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
 +              BUG_ON(!trylock_page(page));
 +#endif
 +
-       inc_mm_counter(mm, anon_rss);
+       inc_mm_counter_fast(mm, MM_ANONPAGES);
        page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -2695,6 +2901,12 @@ setpte:
+@@ -2791,6 +3005,12 @@ setpte:
  
        /* No need to invalidate - it was non-present before */
-       update_mmu_cache(vma, address, entry);
+       update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (page)
@@ -48491,7 +49329,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
  unlock:
        pte_unmap_unlock(page_table, ptl);
        return 0;
-@@ -2837,6 +3049,12 @@ static int __do_fault(struct mm_struct *
+@@ -2933,6 +3153,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))) {
@@ -48504,10 +49342,10 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
                flush_icache_page(vma, page);
                entry = mk_pte(page, vma->vm_page_prot);
                if (flags & FAULT_FLAG_WRITE)
-@@ -2856,6 +3074,14 @@ static int __do_fault(struct mm_struct *
+@@ -2952,6 +3178,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, entry);
+               update_mmu_cache(vma, address, page_table);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +              if (anon)
@@ -48519,7 +49357,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        } else {
                if (charged)
                        mem_cgroup_uncharge_page(page);
-@@ -3003,6 +3229,12 @@ static inline int handle_pte_fault(struc
+@@ -3099,6 +3333,12 @@ static inline int handle_pte_fault(struc
                if (flags & FAULT_FLAG_WRITE)
                        flush_tlb_page(vma, address);
        }
@@ -48532,7 +49370,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
  unlock:
        pte_unmap_unlock(pte, ptl);
        return 0;
-@@ -3019,6 +3251,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3115,6 +3355,10 @@ int handle_mm_fault(struct mm_struct *mm
        pmd_t *pmd;
        pte_t *pte;
  
@@ -48543,7 +49381,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        __set_current_state(TASK_RUNNING);
  
        count_vm_event(PGFAULT);
-@@ -3026,6 +3262,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3125,6 +3369,34 @@ int handle_mm_fault(struct mm_struct *mm
        if (unlikely(is_vm_hugetlb_page(vma)))
                return hugetlb_fault(mm, vma, address, flags);
  
@@ -48578,7 +49416,7 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        pgd = pgd_offset(mm, address);
        pud = pud_alloc(mm, pgd, address);
        if (!pud)
-@@ -3123,7 +3387,7 @@ static int __init gate_vma_init(void)
+@@ -3222,7 +3494,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;
@@ -48587,10 +49425,10 @@ diff -urNp linux-2.6.33.1/mm/memory.c linux-2.6.33.1/mm/memory.c
        /*
         * Make sure the vDSO gets into every core dump.
         * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.33.1/mm/memory-failure.c linux-2.6.33.1/mm/memory-failure.c
---- linux-2.6.33.1/mm/memory-failure.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/memory-failure.c 2010-03-20 16:58:42.260726041 -0400
-@@ -50,7 +50,7 @@ int sysctl_memory_failure_early_kill __r
+diff -urNp linux-2.6.34/mm/memory-failure.c linux-2.6.34/mm/memory-failure.c
+--- linux-2.6.34/mm/memory-failure.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/memory-failure.c   2010-07-01 20:45:16.000000000 -0400
+@@ -51,7 +51,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
  
@@ -48599,7 +49437,7 @@ diff -urNp linux-2.6.33.1/mm/memory-failure.c linux-2.6.33.1/mm/memory-failure.c
  
  #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
  
-@@ -935,7 +935,7 @@ int __memory_failure(unsigned long pfn, 
+@@ -939,7 +939,7 @@ int __memory_failure(unsigned long pfn, 
                return 0;
        }
  
@@ -48608,38 +49446,74 @@ diff -urNp linux-2.6.33.1/mm/memory-failure.c linux-2.6.33.1/mm/memory-failure.c
  
        /*
         * We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.33.1/mm/mempolicy.c linux-2.6.33.1/mm/mempolicy.c
---- linux-2.6.33.1/mm/mempolicy.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/mempolicy.c      2010-03-20 16:58:42.260726041 -0400
-@@ -569,6 +569,10 @@ static int mbind_range(struct vm_area_st
-       struct vm_area_struct *next;
-       int err;
+@@ -1003,7 +1003,7 @@ int __memory_failure(unsigned long pfn, 
+       }
+       if (hwpoison_filter(p)) {
+               if (TestClearPageHWPoison(p))
+-                      atomic_long_dec(&mce_bad_pages);
++                      atomic_long_dec_unchecked(&mce_bad_pages);
+               unlock_page(p);
+               put_page(p);
+               return 0;
+@@ -1096,7 +1096,7 @@ int unpoison_memory(unsigned long pfn)
+ 
+       if (!get_page_unless_zero(page)) {
+               if (TestClearPageHWPoison(p))
+-                      atomic_long_dec(&mce_bad_pages);
++                      atomic_long_dec_unchecked(&mce_bad_pages);
+               pr_debug("MCE: Software-unpoisoned free page %#lx\n", pfn);
+               return 0;
+       }
+@@ -1110,7 +1110,7 @@ int unpoison_memory(unsigned long pfn)
+        */
+       if (TestClearPageHWPoison(p)) {
+               pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn);
+-              atomic_long_dec(&mce_bad_pages);
++              atomic_long_dec_unchecked(&mce_bad_pages);
+               freeit = 1;
+       }
+       unlock_page(page);
+@@ -1291,7 +1291,7 @@ int soft_offline_page(struct page *page,
+               return ret;
+ 
+ done:
+-      atomic_long_add(1, &mce_bad_pages);
++      atomic_long_add_unchecked(1, &mce_bad_pages);
+       SetPageHWPoison(page);
+       /* keep elevated page count for bad page */
+       return ret;
+diff -urNp linux-2.6.34/mm/mempolicy.c linux-2.6.34/mm/mempolicy.c
+--- linux-2.6.34/mm/mempolicy.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/mempolicy.c        2010-07-01 20:45:16.000000000 -0400
+@@ -573,6 +573,10 @@ static int mbind_range(struct mm_struct 
+       unsigned long vmstart;
+       unsigned long vmend;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      struct vm_area_struct *vma_m;
 +#endif
 +
-       err = 0;
-       for (; vma && vma->vm_start < end; vma = next) {
-               next = vma->vm_next;
-@@ -580,6 +584,16 @@ static int mbind_range(struct vm_area_st
-                       err = policy_vma(vma, new);
+       vma = find_vma_prev(mm, start, &prev);
+       if (!vma || vma->vm_start > start)
+               return -EFAULT;
+@@ -603,6 +607,16 @@ static int mbind_range(struct mm_struct 
+               err = policy_vma(vma, new_pol);
                if (err)
-                       break;
+                       goto out;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +              vma_m = pax_find_mirror_vma(vma);
 +              if (vma_m) {
-+                      err = policy_vma(vma_m, new);
++                      err = policy_vma(vma_m, new_pol);
 +                      if (err)
-+                              break;
++                              goto out;
 +              }
 +#endif
 +
        }
-       return err;
- }
-@@ -1000,6 +1014,17 @@ static long do_mbind(unsigned long start
+ 
+  out:
+@@ -1029,6 +1043,17 @@ static long do_mbind(unsigned long start
  
        if (end < start)
                return -EINVAL;
@@ -48657,7 +49531,7 @@ diff -urNp linux-2.6.33.1/mm/mempolicy.c linux-2.6.33.1/mm/mempolicy.c
        if (end == start)
                return 0;
  
-@@ -1205,6 +1230,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1234,6 +1259,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
        if (!mm)
                return -EINVAL;
  
@@ -48672,7 +49546,7 @@ diff -urNp linux-2.6.33.1/mm/mempolicy.c linux-2.6.33.1/mm/mempolicy.c
        /*
         * Check if this process has the right to modify the specified
         * process. The right exists if the process has administrative
-@@ -1214,8 +1247,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
+@@ -1243,8 +1276,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
        rcu_read_lock();
        tcred = __task_cred(task);
        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -48682,7 +49556,7 @@ diff -urNp linux-2.6.33.1/mm/mempolicy.c linux-2.6.33.1/mm/mempolicy.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-@@ -2431,7 +2463,7 @@ int show_numa_map(struct seq_file *m, vo
+@@ -2472,7 +2504,7 @@ int show_numa_map(struct seq_file *m, vo
  
        if (file) {
                seq_printf(m, " file=");
@@ -48691,10 +49565,10 @@ diff -urNp linux-2.6.33.1/mm/mempolicy.c linux-2.6.33.1/mm/mempolicy.c
        } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
                seq_printf(m, " heap");
        } else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.33.1/mm/migrate.c linux-2.6.33.1/mm/migrate.c
---- linux-2.6.33.1/mm/migrate.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/migrate.c        2010-03-20 16:58:42.260726041 -0400
-@@ -1059,6 +1059,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+diff -urNp linux-2.6.34/mm/migrate.c linux-2.6.34/mm/migrate.c
+--- linux-2.6.34/mm/migrate.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/migrate.c  2010-07-01 20:45:16.000000000 -0400
+@@ -1056,6 +1056,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
        if (!mm)
                return -EINVAL;
  
@@ -48709,7 +49583,7 @@ diff -urNp linux-2.6.33.1/mm/migrate.c linux-2.6.33.1/mm/migrate.c
        /*
         * Check if this process has the right to modify the specified
         * process. The right exists if the process has administrative
-@@ -1068,8 +1076,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
+@@ -1065,8 +1073,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
        rcu_read_lock();
        tcred = __task_cred(task);
        if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -48719,9 +49593,9 @@ diff -urNp linux-2.6.33.1/mm/migrate.c linux-2.6.33.1/mm/migrate.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-2.6.33.1/mm/mlock.c linux-2.6.33.1/mm/mlock.c
---- linux-2.6.33.1/mm/mlock.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/mlock.c  2010-03-20 16:58:42.264564412 -0400
+diff -urNp linux-2.6.34/mm/mlock.c linux-2.6.34/mm/mlock.c
+--- linux-2.6.34/mm/mlock.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/mlock.c    2010-07-01 20:45:16.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -48790,9 +49664,9 @@ diff -urNp linux-2.6.33.1/mm/mlock.c linux-2.6.33.1/mm/mlock.c
        if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
            capable(CAP_IPC_LOCK))
                ret = do_mlockall(flags);
-diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
---- linux-2.6.33.1/mm/mmap.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/mmap.c   2010-03-20 16:58:42.264564412 -0400
+diff -urNp linux-2.6.34/mm/mmap.c linux-2.6.34/mm/mmap.c
+--- linux-2.6.34/mm/mmap.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/mmap.c     2010-07-01 21:22:01.000000000 -0400
 @@ -44,6 +44,16 @@
  #define arch_rebalance_pgtables(addr, len)            (addr)
  #endif
@@ -48849,12 +49723,12 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 @@ -266,6 +286,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
         * not page aligned -Ram Gupta
         */
-       rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+       rlim = rlimit(RLIMIT_DATA);
 +      gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
        if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
                        (mm->end_data - mm->start_data) > rlim)
                goto out;
-@@ -693,6 +714,12 @@ static int
+@@ -685,6 +706,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)
  {
@@ -48867,7 +49741,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
                if (vma->vm_pgoff == vm_pgoff)
-@@ -712,6 +739,12 @@ static int
+@@ -704,6 +731,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)
  {
@@ -48880,7 +49754,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (is_mergeable_vma(vma, file, vm_flags) &&
            is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
                pgoff_t vm_pglen;
-@@ -754,12 +787,19 @@ can_vma_merge_after(struct vm_area_struc
+@@ -746,13 +779,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,
@@ -48890,6 +49764,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  {
        pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
        struct vm_area_struct *area, *next;
+       int err;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
@@ -48901,7 +49776,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /*
         * We later require that vma->vm_flags == vm_flags,
         * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -775,6 +815,15 @@ struct vm_area_struct *vma_merge(struct 
+@@ -768,6 +808,15 @@ struct vm_area_struct *vma_merge(struct 
        if (next && next->vm_end == end)                /* cases 6, 7, 8 */
                next = next->vm_next;
  
@@ -48917,63 +49792,63 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /*
         * Can it merge with the predecessor?
         */
-@@ -794,9 +843,24 @@ struct vm_area_struct *vma_merge(struct 
+@@ -787,9 +836,24 @@ struct vm_area_struct *vma_merge(struct 
                                                        /* cases 1, 6 */
-                       vma_adjust(prev, prev->vm_start,
+                       err = vma_adjust(prev, prev->vm_start,
                                next->vm_end, prev->vm_pgoff, NULL);
 -              } else                                  /* cases 2, 5, 7 */
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+                      if (prev_m)
-+                              vma_adjust(prev_m, prev_m->vm_start,
++                      if (!err && prev_m)
++                              err = vma_adjust(prev_m, prev_m->vm_start,
 +                                      next_m->vm_end, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +              } else {                                /* cases 2, 5, 7 */
-                       vma_adjust(prev, prev->vm_start,
+                       err = vma_adjust(prev, prev->vm_start,
                                end, prev->vm_pgoff, NULL);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+                      if (prev_m)
-+                              vma_adjust(prev_m, prev_m->vm_start,
-+                                      end_m, prev_m->vm_pgoff, NULL);
++                      if (!err && prev_m)
++                              err = vma_adjust(prev_m, prev_m->vm_start,
++                                              end_m, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +              }
+               if (err)
+                       return NULL;
                return prev;
-       }
- 
-@@ -807,12 +871,27 @@ struct vm_area_struct *vma_merge(struct 
+@@ -802,12 +866,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)) {
 -              if (prev && addr < prev->vm_end)        /* case 4 */
 +              if (prev && addr < prev->vm_end) {      /* case 4 */
-                       vma_adjust(prev, prev->vm_start,
+                       err = vma_adjust(prev, prev->vm_start,
                                addr, prev->vm_pgoff, NULL);
 -              else                                    /* cases 3, 8 */
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+                      if (prev_m)
-+                              vma_adjust(prev_m, prev_m->vm_start,
-+                                      addr_m, prev_m->vm_pgoff, NULL);
++                      if (!err && prev_m)
++                              err = vma_adjust(prev_m, prev_m->vm_start,
++                                              addr_m, prev_m->vm_pgoff, NULL);
 +#endif
 +
 +              } else {                                /* cases 3, 8 */
-                       vma_adjust(area, addr, next->vm_end,
+                       err = vma_adjust(area, addr, next->vm_end,
                                next->vm_pgoff - pglen, NULL);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+                      if (area_m)
-+                              vma_adjust(area_m, addr_m, next_m->vm_end,
-+                                      next_m->vm_pgoff - pglen, NULL);
++                      if (!err && area_m)
++                              err = vma_adjust(area_m, addr_m, next_m->vm_end,
++                                              next_m->vm_pgoff - pglen, NULL);
 +#endif
 +
 +              }
+               if (err)
+                       return NULL;
                return area;
-       }
- 
-@@ -887,14 +966,11 @@ none:
+@@ -922,14 +1001,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
                                                struct file *file, long pages)
  {
@@ -48989,7 +49864,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                mm->stack_vm += pages;
        if (flags & (VM_RESERVED|VM_IO))
                mm->reserved_vm += pages;
-@@ -921,7 +997,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -956,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.)
         */
@@ -48998,7 +49873,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
                        prot |= PROT_EXEC;
  
-@@ -947,7 +1023,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -982,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.
         */
@@ -49007,7 +49882,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (addr & ~PAGE_MASK)
                return addr;
  
-@@ -958,6 +1034,26 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -993,6 +1069,26 @@ 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;
  
@@ -49034,15 +49909,15 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (flags & MAP_LOCKED)
                if (!can_do_mlock())
                        return -EPERM;
-@@ -969,6 +1065,7 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1004,6 +1100,7 @@ unsigned long do_mmap_pgoff(struct file 
                locked += mm->locked_vm;
-               lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+               lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
 +              gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
                        return -EAGAIN;
        }
-@@ -1039,6 +1136,9 @@ unsigned long do_mmap_pgoff(struct file 
+@@ -1074,6 +1171,9 @@ unsigned long do_mmap_pgoff(struct file 
        if (error)
                return error;
  
@@ -49052,7 +49927,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1091,10 +1191,10 @@ out:
+@@ -1150,10 +1250,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_ar
   */
  int vma_wants_writenotify(struct vm_area_struct *vma)
  {
@@ -49065,7 +49940,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                return 0;
  
        /* The backer wishes to know when pages are first written to? */
-@@ -1143,14 +1243,24 @@ unsigned long mmap_region(struct file *f
+@@ -1202,14 +1302,24 @@ unsigned long mmap_region(struct file *f
        unsigned long charged = 0;
        struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -49092,7 +49967,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        }
  
        /* Check against address space limit. */
-@@ -1199,6 +1309,16 @@ munmap_back:
+@@ -1258,6 +1368,16 @@ munmap_back:
                goto unacct_error;
        }
  
@@ -49109,7 +49984,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        vma->vm_mm = mm;
        vma->vm_start = addr;
        vma->vm_end = addr + len;
-@@ -1221,6 +1341,19 @@ munmap_back:
+@@ -1281,6 +1401,19 @@ munmap_back:
                error = file->f_op->mmap(file, vma);
                if (error)
                        goto unmap_and_free_vma;
@@ -49129,27 +50004,27 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                if (vm_flags & VM_EXECUTABLE)
                        added_exe_file_vma(mm);
  
-@@ -1256,6 +1389,11 @@ munmap_back:
+@@ -1316,6 +1449,11 @@ munmap_back:
        vma_link(mm, vma, prev, rb_link, rb_parent);
        file = vma->vm_file;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (vma_m)
-+              pax_mirror_vma(vma_m, vma);
++              BUG_ON(pax_mirror_vma(vma_m, vma));
 +#endif
 +
        /* Once vma denies write, undo our temporary denial count */
        if (correct_wcount)
                atomic_inc(&inode->i_writecount);
-@@ -1264,6 +1402,7 @@ out:
+@@ -1324,6 +1462,7 @@ out:
  
        mm->total_vm += len >> PAGE_SHIFT;
        vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
 +      track_exec_limit(mm, addr, addr + len, vm_flags);
        if (vm_flags & VM_LOCKED) {
-               /*
-                * makes pages present; downgrades, drops, reacquires mmap_sem
-@@ -1286,6 +1425,12 @@ unmap_and_free_vma:
+               if (!mlock_vma_pages_range(vma, addr, addr + len))
+                       mm->locked_vm += (len >> PAGE_SHIFT);
+@@ -1341,6 +1480,12 @@ unmap_and_free_vma:
        unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
        charged = 0;
  free_vma:
@@ -49162,7 +50037,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
        if (charged)
-@@ -1319,6 +1464,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1374,6 +1519,10 @@ arch_get_unmapped_area(struct file *filp
        if (flags & MAP_FIXED)
                return addr;
  
@@ -49173,7 +50048,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (addr) {
                addr = PAGE_ALIGN(addr);
                vma = find_vma(mm, addr);
-@@ -1327,10 +1476,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -1382,10 +1531,10 @@ arch_get_unmapped_area(struct file *filp
                        return addr;
        }
        if (len > mm->cached_hole_size) {
@@ -49187,7 +50062,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        }
  
  full_search:
-@@ -1341,9 +1490,8 @@ full_search:
+@@ -1396,9 +1545,8 @@ full_search:
                         * Start a new search - just in case we missed
                         * some holes.
                         */
@@ -49199,7 +50074,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                                mm->cached_hole_size = 0;
                                goto full_search;
                        }
-@@ -1365,10 +1513,16 @@ full_search:
+@@ -1420,10 +1568,16 @@ full_search:
  
  void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
  {
@@ -49217,7 +50092,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                mm->free_area_cache = addr;
                mm->cached_hole_size = ~0UL;
        }
-@@ -1386,7 +1540,7 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1441,7 +1595,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
        struct vm_area_struct *vma;
        struct mm_struct *mm = current->mm;
@@ -49226,7 +50101,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  
        /* requested length too big for entire address space */
        if (len > TASK_SIZE)
-@@ -1395,6 +1549,10 @@ arch_get_unmapped_area_topdown(struct fi
+@@ -1450,6 +1604,10 @@ arch_get_unmapped_area_topdown(struct fi
        if (flags & MAP_FIXED)
                return addr;
  
@@ -49237,7 +50112,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /* requesting a specific address */
        if (addr) {
                addr = PAGE_ALIGN(addr);
-@@ -1452,13 +1610,21 @@ bottomup:
+@@ -1507,13 +1665,21 @@ bottomup:
         * can happen with large stack limits and large mmap()
         * allocations.
         */
@@ -49261,7 +50136,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        mm->cached_hole_size = ~0UL;
  
        return addr;
-@@ -1467,6 +1633,12 @@ bottomup:
+@@ -1522,6 +1688,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -49274,7 +50149,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /*
         * Is this a new hole at the highest possible address?
         */
-@@ -1474,8 +1646,10 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1529,8 +1701,10 @@ void arch_unmap_area_topdown(struct mm_s
                mm->free_area_cache = addr;
  
        /* dont allow allocations above current base */
@@ -49286,7 +50161,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  }
  
  unsigned long
-@@ -1583,6 +1757,27 @@ out:
+@@ -1638,6 +1812,27 @@ out:
        return prev ? prev->vm_next : vma;
  }
  
@@ -49314,23 +50189,23 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1599,6 +1794,7 @@ static int acct_stack_growth(struct vm_a
+@@ -1654,6 +1849,7 @@ static int acct_stack_growth(struct vm_a
                return -ENOMEM;
  
        /* Stack limit test */
 +      gr_learn_resource(current, RLIMIT_STACK, size, 1);
-       if (size > rlim[RLIMIT_STACK].rlim_cur)
+       if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
                return -ENOMEM;
  
-@@ -1608,6 +1804,7 @@ static int acct_stack_growth(struct vm_a
-               unsigned long limit;
+@@ -1664,6 +1860,7 @@ static int acct_stack_growth(struct vm_a
                locked = mm->locked_vm + grow;
-               limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+               limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
+               limit >>= PAGE_SHIFT;
 +              gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
                if (locked > limit && !capable(CAP_IPC_LOCK))
                        return -ENOMEM;
        }
-@@ -1643,35 +1840,40 @@ static
+@@ -1699,35 +1896,40 @@ static
  #endif
  int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  {
@@ -49381,7 +50256,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                unsigned long size, grow;
  
                size = address - vma->vm_start;
-@@ -1681,6 +1883,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1737,6 +1939,8 @@ int expand_upwards(struct vm_area_struct
                if (!error)
                        vma->vm_end = address;
        }
@@ -49390,7 +50265,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        anon_vma_unlock(vma);
        return error;
  }
-@@ -1692,7 +1896,8 @@ int expand_upwards(struct vm_area_struct
+@@ -1748,7 +1952,8 @@ int expand_upwards(struct vm_area_struct
  static int expand_downwards(struct vm_area_struct *vma,
                                   unsigned long address)
  {
@@ -49400,7 +50275,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  
        /*
         * We must make sure the anon_vma is allocated
-@@ -1706,6 +1911,15 @@ static int expand_downwards(struct vm_ar
+@@ -1762,6 +1967,15 @@ static int expand_downwards(struct vm_ar
        if (error)
                return error;
  
@@ -49416,7 +50291,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        anon_vma_lock(vma);
  
        /*
-@@ -1715,9 +1929,15 @@ static int expand_downwards(struct vm_ar
+@@ -1771,9 +1985,15 @@ static int expand_downwards(struct vm_ar
         */
  
        /* Somebody else might have raced and expanded it already */
@@ -49433,7 +50308,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                size = vma->vm_end - address;
                grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1725,9 +1945,20 @@ static int expand_downwards(struct vm_ar
+@@ -1781,9 +2001,20 @@ static int expand_downwards(struct vm_ar
                if (!error) {
                        vma->vm_start = address;
                        vma->vm_pgoff -= grow;
@@ -49454,7 +50329,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        return error;
  }
  
-@@ -1803,6 +2034,13 @@ static void remove_vma_list(struct mm_st
+@@ -1857,6 +2088,13 @@ static void remove_vma_list(struct mm_st
        do {
                long nrpages = vma_pages(vma);
  
@@ -49468,7 +50343,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                mm->total_vm -= nrpages;
                vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
                vma = remove_vma(vma);
-@@ -1847,6 +2085,16 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1901,6 +2139,16 @@ detach_vmas_to_be_unmapped(struct mm_str
  
        insertion_point = (prev ? &prev->vm_next : &mm->mmap);
        do {
@@ -49485,9 +50360,9 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                rb_erase(&vma->vm_rb, &mm->mm_rb);
                mm->map_count--;
                tail_vma = vma;
-@@ -1872,14 +2120,33 @@ static int __split_vma(struct mm_struct 
-       struct mempolicy *pol;
+@@ -1927,14 +2175,33 @@ static int __split_vma(struct mm_struct 
        struct vm_area_struct *new;
+       int err = -ENOMEM;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      struct vm_area_struct *vma_m, *new_m = NULL;
@@ -49504,14 +50379,14 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +
        new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
        if (!new)
-               return -ENOMEM;
+               goto out_err;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (vma_m) {
 +              new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
 +              if (!new_m) {
 +                      kmem_cache_free(vm_area_cachep, new);
-+                      return -ENOMEM;
++                      goto out_err;
 +              }
 +      }
 +#endif
@@ -49519,13 +50394,14 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /* most fields are the same, copy all, and then fixup */
        *new = *vma;
  
-@@ -1890,8 +2157,29 @@ static int __split_vma(struct mm_struct 
+@@ -1947,6 +2214,22 @@ static int __split_vma(struct mm_struct 
                new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
        }
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (vma_m) {
 +              *new_m = *vma_m;
++              INIT_LIST_HEAD(&new_m->anon_vma_chain);
 +              new_m->vm_mirror = new;
 +              new->vm_mirror = new_m;
 +
@@ -49540,21 +50416,16 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +
        pol = mpol_dup(vma_policy(vma));
        if (IS_ERR(pol)) {
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+              if (new_m)
-+                      kmem_cache_free(vm_area_cachep, new_m);
-+#endif
-+
-               kmem_cache_free(vm_area_cachep, new);
-               return PTR_ERR(pol);
-       }
-@@ -1912,6 +2200,28 @@ static int __split_vma(struct mm_struct 
+               err = PTR_ERR(pol);
+@@ -1972,6 +2255,42 @@ static int __split_vma(struct mm_struct 
        else
-               vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
+               err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
 +#ifdef CONFIG_PAX_SEGMEXEC
-+      if (vma_m) {
++      if (!err && vma_m) {
++              if (anon_vma_clone(new_m, vma_m))
++                      goto out_free_mpol;
++
 +              mpol_get(pol);
 +              vma_set_policy(new_m, pol);
 +
@@ -49568,17 +50439,44 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +                      new_m->vm_ops->open(new_m);
 +
 +              if (new_below)
-+                      vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
++                      err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
 +                              ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
 +              else
-+                      vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
++                      err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
++
++              if (err) {
++                      if (new_m->vm_ops && new_m->vm_ops->close)
++                              new_m->vm_ops->close(new_m);
++                      if (new_m->vm_file) {
++                              if (vma_m->vm_flags & VM_EXECUTABLE)
++                                      removed_exe_file_vma(mm);
++                              fput(new_m->vm_file);
++                      }
++                      mpol_put(pol);
++              }
 +      }
 +#endif
 +
-       return 0;
- }
- 
-@@ -1922,6 +2232,15 @@ static int __split_vma(struct mm_struct 
+       /* Success. */
+       if (!err)
+               return 0;
+@@ -1987,6 +2306,15 @@ static int __split_vma(struct mm_struct 
+  out_free_mpol:
+       mpol_put(pol);
+  out_free_vma:
++
++#ifdef CONFIG_PAX_SEGMEXEC
++      if (new_m) {
++              unlink_anon_vmas(new_m);
++              kmem_cache_free(vm_area_cachep, new_m);
++      }
++#endif
++
++      unlink_anon_vmas(new);
+       kmem_cache_free(vm_area_cachep, new);
+  out_err:
+       return err;
+@@ -1999,6 +2327,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)
  {
@@ -49594,7 +50492,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if (mm->map_count >= sysctl_max_map_count)
                return -ENOMEM;
  
-@@ -1933,11 +2252,30 @@ int split_vma(struct mm_struct *mm, stru
+@@ -2010,11 +2347,30 @@ int split_vma(struct mm_struct *mm, stru
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -49625,7 +50523,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
                return -EINVAL;
  
-@@ -2011,6 +2349,8 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -2088,6 +2444,8 @@ int do_munmap(struct mm_struct *mm, unsi
        /* Fix up all other VM information */
        remove_vma_list(mm, vma);
  
@@ -49634,7 +50532,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        return 0;
  }
  
-@@ -2023,22 +2363,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
+@@ -2100,22 +2458,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
  
        profile_munmap(addr);
  
@@ -49663,19 +50561,15 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2052,6 +2388,11 @@ unsigned long do_brk(unsigned long addr,
+@@ -2129,6 +2483,7 @@ unsigned long do_brk(unsigned long addr,
        struct rb_node ** rb_link, * rb_parent;
        pgoff_t pgoff = addr >> PAGE_SHIFT;
        int error;
 +      unsigned long charged;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+      struct vm_area_struct *vma_m = NULL;
-+#endif
  
        len = PAGE_ALIGN(len);
        if (!len)
-@@ -2063,16 +2404,30 @@ unsigned long do_brk(unsigned long addr,
+@@ -2140,16 +2495,30 @@ unsigned long do_brk(unsigned long addr,
  
        flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -49705,9 +50599,9 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 -              locked = len >> PAGE_SHIFT;
 +              locked = charged;
                locked += mm->locked_vm;
-               lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+               lock_limit = rlimit(RLIMIT_MEMLOCK);
                lock_limit >>= PAGE_SHIFT;
-@@ -2089,22 +2444,22 @@ unsigned long do_brk(unsigned long addr,
+@@ -2166,22 +2535,22 @@ unsigned long do_brk(unsigned long addr,
        /*
         * Clear old maps.  this also does some error checking for us
         */
@@ -49734,7 +50628,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                return -ENOMEM;
  
        /* Can we just expand an old private anonymous mapping? */
-@@ -2118,10 +2473,21 @@ unsigned long do_brk(unsigned long addr,
+@@ -2195,7 +2564,7 @@ unsigned long do_brk(unsigned long addr,
         */
        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
        if (!vma) {
@@ -49743,21 +50637,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
                return -ENOMEM;
        }
  
-+#ifdef CONFIG_PAX_SEGMEXEC
-+      if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (flags & VM_EXEC)) {
-+              vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
-+              if (!vma_m) {
-+                      kmem_cache_free(vm_area_cachep, vma);
-+                      vm_unacct_memory(charged);
-+                      return -ENOMEM;
-+              }
-+      }
-+#endif
-+
-       vma->vm_mm = mm;
-       vma->vm_start = addr;
-       vma->vm_end = addr + len;
-@@ -2130,11 +2496,12 @@ unsigned long do_brk(unsigned long addr,
+@@ -2208,11 +2577,12 @@ unsigned long do_brk(unsigned long addr,
        vma->vm_page_prot = vm_get_page_prot(flags);
        vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
@@ -49772,7 +50652,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        return addr;
  }
  
-@@ -2181,8 +2548,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2259,8 +2629,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.
         */
@@ -49784,7 +50664,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
  
        BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2196,6 +2565,10 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2274,6 +2646,10 @@ int insert_vm_struct(struct mm_struct * 
        struct vm_area_struct * __vma, * prev;
        struct rb_node ** rb_link, * rb_parent;
  
@@ -49795,7 +50675,7 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/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
-@@ -2218,7 +2591,22 @@ int insert_vm_struct(struct mm_struct * 
+@@ -2296,7 +2672,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;
@@ -49812,13 +50692,13 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +      if (vma_m)
-+              pax_mirror_vma(vma_m, vma);
++              BUG_ON(pax_mirror_vma(vma_m, vma));
 +#endif
 +
        return 0;
  }
  
-@@ -2236,6 +2624,8 @@ struct vm_area_struct *copy_vma(struct v
+@@ -2314,6 +2705,8 @@ struct vm_area_struct *copy_vma(struct v
        struct rb_node **rb_link, *rb_parent;
        struct mempolicy *pol;
  
@@ -49827,12 +50707,13 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        /*
         * If anonymous vma has not yet been faulted, update new pgoff
         * to match new location, to increase its chance of merging.
-@@ -2279,6 +2669,35 @@ struct vm_area_struct *copy_vma(struct v
-       return new_vma;
+@@ -2363,6 +2756,39 @@ struct vm_area_struct *copy_vma(struct v
+       kmem_cache_free(vm_area_cachep, new_vma);
+       return NULL;
  }
- 
++ 
 +#ifdef CONFIG_PAX_SEGMEXEC
-+void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
++long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
 +{
 +      struct vm_area_struct *prev_m;
 +      struct rb_node **rb_link_m, *rb_parent_m;
@@ -49842,6 +50723,9 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +      BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
 +      BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
 +      *vma_m = *vma;
++      INIT_LIST_HEAD(&vma_m->anon_vma_chain);
++      if (anon_vma_clone(vma_m, vma))
++              return -ENOMEM;
 +      pol_m = vma_policy(vma_m);
 +      mpol_get(pol_m);
 +      vma_set_policy(vma_m, pol_m);
@@ -49857,22 +50741,22 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
 +      vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
 +      vma_m->vm_mirror = vma;
 +      vma->vm_mirror = vma_m;
++      return 0;
 +}
 +#endif
-+
+ 
  /*
   * Return true if the calling process may expand its vm space by the passed
-  * number of pages
-@@ -2289,7 +2708,7 @@ int may_expand_vm(struct mm_struct *mm, 
+@@ -2374,7 +2800,7 @@ int may_expand_vm(struct mm_struct *mm, 
        unsigned long lim;
  
-       lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
+       lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
 -
 +      gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
        if (cur + npages > lim)
                return 0;
        return 1;
-@@ -2358,6 +2777,15 @@ int install_special_mapping(struct mm_st
+@@ -2444,6 +2870,15 @@ int install_special_mapping(struct mm_st
        vma->vm_start = addr;
        vma->vm_end = addr + len;
  
@@ -49888,10 +50772,10 @@ diff -urNp linux-2.6.33.1/mm/mmap.c linux-2.6.33.1/mm/mmap.c
        vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
---- linux-2.6.33.1/mm/mprotect.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/mprotect.c       2010-03-20 16:58:42.264564412 -0400
-@@ -24,10 +24,16 @@
+diff -urNp linux-2.6.34/mm/mprotect.c linux-2.6.34/mm/mprotect.c
+--- linux-2.6.34/mm/mprotect.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/mprotect.c 2010-07-01 20:45:16.000000000 -0400
+@@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
  #include <linux/perf_event.h>
@@ -49908,7 +50792,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -132,6 +138,48 @@ static void change_protection(struct vm_
+@@ -131,6 +137,48 @@ static void change_protection(struct vm_
        flush_tlb_range(vma, start, end);
  }
  
@@ -49957,7 +50841,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
  int
  mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
        unsigned long start, unsigned long end, unsigned long newflags)
-@@ -144,6 +192,14 @@ mprotect_fixup(struct vm_area_struct *vm
+@@ -143,6 +191,14 @@ mprotect_fixup(struct vm_area_struct *vm
        int error;
        int dirty_accountable = 0;
  
@@ -49972,7 +50856,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
        if (newflags == oldflags) {
                *pprev = vma;
                return 0;
-@@ -165,6 +221,38 @@ mprotect_fixup(struct vm_area_struct *vm
+@@ -164,6 +220,42 @@ mprotect_fixup(struct vm_area_struct *vm
                }
        }
  
@@ -50003,7 +50887,11 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
 +                              goto fail;
 +                      }
 +                      vma->vm_flags = newflags;
-+                      pax_mirror_vma(vma_m, vma);
++                      error = pax_mirror_vma(vma_m, vma);
++                      if (error) {
++                              vma->vm_flags = oldflags;
++                              goto fail;
++                      }
 +              }
 +      }
 +#endif
@@ -50011,9 +50899,16 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
        /*
         * First try to merge with previous and/or next vma.
         */
-@@ -196,8 +284,14 @@ success:
+@@ -194,9 +286,21 @@ success:
+        * vm_flags and vm_page_prot are protected by the mmap_sem
         * held in write mode.
         */
++
++#ifdef CONFIG_PAX_SEGMEXEC
++      if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
++              pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
++#endif
++
        vma->vm_flags = newflags;
 +
 +#ifdef CONFIG_PAX_MPROTECT
@@ -50027,7 +50922,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
  
        if (vma_wants_writenotify(vma)) {
                vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -238,6 +332,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -237,6 +341,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        end = start + len;
        if (end <= start)
                return -ENOMEM;
@@ -50045,7 +50940,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
        if (!arch_validate_prot(prot))
                return -EINVAL;
  
-@@ -245,7 +350,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -244,7 +359,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        /*
         * Does the application expect PROT_READ to imply PROT_EXEC:
         */
@@ -50054,7 +50949,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
                prot |= PROT_EXEC;
  
        vm_flags = calc_vm_prot_bits(prot);
-@@ -277,6 +382,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -276,6 +391,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
        if (start > vma->vm_start)
                prev = vma;
  
@@ -50071,7 +50966,7 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
        for (nstart = start ; ; ) {
                unsigned long newflags;
  
-@@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
+@@ -300,6 +425,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
                if (error)
                        goto out;
                perf_event_mmap(vma);
@@ -50081,10 +50976,10 @@ diff -urNp linux-2.6.33.1/mm/mprotect.c linux-2.6.33.1/mm/mprotect.c
                nstart = tmp;
  
                if (nstart < prev->vm_end)
-diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
---- linux-2.6.33.1/mm/mremap.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/mremap.c 2010-03-20 16:58:42.264564412 -0400
-@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
+diff -urNp linux-2.6.34/mm/mremap.c linux-2.6.34/mm/mremap.c
+--- linux-2.6.34/mm/mremap.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/mremap.c   2010-07-01 20:45:16.000000000 -0400
+@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
                        continue;
                pte = ptep_clear_flush(vma, old_addr, old_pte);
                pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
@@ -50097,7 +50992,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
                set_pte_at(mm, new_addr, new_pte, pte);
        }
  
-@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_res
+@@ -272,6 +278,11 @@ static struct vm_area_struct *vma_to_res
        if (is_vm_hugetlb_page(vma))
                goto Einval;
  
@@ -50109,7 +51004,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
        /* We can't remap across vm area boundaries */
        if (old_len > vma->vm_end - addr)
                goto Efault;
-@@ -322,20 +333,23 @@ static unsigned long mremap_to(unsigned 
+@@ -321,20 +332,23 @@ static unsigned long mremap_to(unsigned 
        unsigned long ret = -EINVAL;
        unsigned long charged = 0;
        unsigned long map_flags;
@@ -50138,7 +51033,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
                goto out;
  
        ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
-@@ -407,6 +421,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -406,6 +420,7 @@ unsigned long do_mremap(unsigned long ad
        struct vm_area_struct *vma;
        unsigned long ret = -EINVAL;
        unsigned long charged = 0;
@@ -50146,7 +51041,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
  
        if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
                goto out;
-@@ -425,6 +440,15 @@ unsigned long do_mremap(unsigned long ad
+@@ -424,6 +439,15 @@ unsigned long do_mremap(unsigned long ad
        if (!new_len)
                goto out;
  
@@ -50162,7 +51057,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
        if (flags & MREMAP_FIXED) {
                if (flags & MREMAP_MAYMOVE)
                        ret = mremap_to(addr, old_len, new_addr, new_len);
-@@ -471,6 +495,7 @@ unsigned long do_mremap(unsigned long ad
+@@ -473,6 +497,7 @@ unsigned long do_mremap(unsigned long ad
                                                   addr + new_len);
                        }
                        ret = addr;
@@ -50170,7 +51065,7 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
                        goto out;
                }
        }
-@@ -497,7 +522,13 @@ unsigned long do_mremap(unsigned long ad
+@@ -499,7 +524,13 @@ unsigned long do_mremap(unsigned long ad
                ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
                if (ret)
                        goto out;
@@ -50184,9 +51079,9 @@ diff -urNp linux-2.6.33.1/mm/mremap.c linux-2.6.33.1/mm/mremap.c
        }
  out:
        if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.33.1/mm/nommu.c linux-2.6.33.1/mm/nommu.c
---- linux-2.6.33.1/mm/nommu.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/nommu.c  2010-03-20 16:58:42.268525965 -0400
+diff -urNp linux-2.6.34/mm/nommu.c linux-2.6.34/mm/nommu.c
+--- linux-2.6.34/mm/nommu.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/nommu.c    2010-07-01 20:45:16.000000000 -0400
 @@ -759,15 +759,6 @@ struct vm_area_struct *find_vma(struct m
  EXPORT_SYMBOL(find_vma);
  
@@ -50203,10 +51098,18 @@ diff -urNp linux-2.6.33.1/mm/nommu.c linux-2.6.33.1/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-diff -urNp linux-2.6.33.1/mm/page_alloc.c linux-2.6.33.1/mm/page_alloc.c
---- linux-2.6.33.1/mm/page_alloc.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/page_alloc.c     2010-03-20 16:58:42.272540377 -0400
-@@ -583,6 +583,10 @@ static void __free_pages_ok(struct page 
+@@ -1484,6 +1475,7 @@ int split_vma(struct mm_struct *mm, stru
+ 
+       /* most fields are the same, copy all, and then fixup */
+       *new = *vma;
++      INIT_LIST_HEAD(&new->anon_vma_chain);
+       *region = *vma->vm_region;
+       new->vm_region = region;
+ 
+diff -urNp linux-2.6.34/mm/page_alloc.c linux-2.6.34/mm/page_alloc.c
+--- linux-2.6.34/mm/page_alloc.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/page_alloc.c       2010-07-01 20:45:16.000000000 -0400
+@@ -606,6 +606,10 @@ static void __free_pages_ok(struct page 
        int bad = 0;
        int wasMlocked = __TestClearPageMlocked(page);
  
@@ -50214,10 +51117,10 @@ diff -urNp linux-2.6.33.1/mm/page_alloc.c linux-2.6.33.1/mm/page_alloc.c
 +      unsigned long index = 1UL << order;
 +#endif
 +
+       trace_mm_page_free_direct(page, order);
        kmemcheck_free_shadow(page, order);
  
-       for (i = 0 ; i < (1 << order) ; ++i)
-@@ -595,6 +599,12 @@ static void __free_pages_ok(struct page 
+@@ -619,6 +623,12 @@ static void __free_pages_ok(struct page 
                debug_check_no_obj_freed(page_address(page),
                                           PAGE_SIZE << order);
        }
@@ -50230,7 +51133,7 @@ diff -urNp linux-2.6.33.1/mm/page_alloc.c linux-2.6.33.1/mm/page_alloc.c
        arch_free_page(page, order);
        kernel_map_pages(page, 1 << order, 0);
  
-@@ -698,8 +708,10 @@ static int prep_new_page(struct page *pa
+@@ -722,8 +732,10 @@ static int prep_new_page(struct page *pa
        arch_alloc_page(page, order);
        kernel_map_pages(page, 1 << order, 1);
  
@@ -50241,7 +51144,7 @@ diff -urNp linux-2.6.33.1/mm/page_alloc.c linux-2.6.33.1/mm/page_alloc.c
  
        if (order && (gfp_flags & __GFP_COMP))
                prep_compound_page(page, order);
-@@ -1093,6 +1105,11 @@ static void free_hot_cold_page(struct pa
+@@ -1119,6 +1131,11 @@ void free_hot_cold_page(struct page *pag
                debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
                debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
        }
@@ -50253,10 +51156,19 @@ diff -urNp linux-2.6.33.1/mm/page_alloc.c linux-2.6.33.1/mm/page_alloc.c
        arch_free_page(page, 0);
        kernel_map_pages(page, 1, 0);
  
-diff -urNp linux-2.6.33.1/mm/percpu.c linux-2.6.33.1/mm/percpu.c
---- linux-2.6.33.1/mm/percpu.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/percpu.c 2010-03-20 16:58:42.272540377 -0400
-@@ -114,7 +114,7 @@ static unsigned int pcpu_first_unit_cpu 
+@@ -3746,7 +3763,7 @@ static void __init setup_usemap(struct p
+               zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
+ }
+ #else
+-static void inline setup_usemap(struct pglist_data *pgdat,
++static inline void setup_usemap(struct pglist_data *pgdat,
+                               struct zone *zone, unsigned long zonesize) {}
+ #endif /* CONFIG_SPARSEMEM */
+ 
+diff -urNp linux-2.6.34/mm/percpu.c linux-2.6.34/mm/percpu.c
+--- linux-2.6.34/mm/percpu.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/percpu.c   2010-07-01 20:45:16.000000000 -0400
+@@ -116,7 +116,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
  /* the address of the first chunk which starts with the kernel static area */
@@ -50265,39 +51177,88 @@ diff -urNp linux-2.6.33.1/mm/percpu.c linux-2.6.33.1/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;                /* cpu -> unit */
-diff -urNp linux-2.6.33.1/mm/rmap.c linux-2.6.33.1/mm/rmap.c
---- linux-2.6.33.1/mm/rmap.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/rmap.c   2010-03-20 16:58:42.272540377 -0400
-@@ -109,6 +109,10 @@ int anon_vma_prepare(struct vm_area_stru
+diff -urNp linux-2.6.34/mm/rmap.c linux-2.6.34/mm/rmap.c
+--- linux-2.6.34/mm/rmap.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/rmap.c     2010-07-01 20:45:16.000000000 -0400
+@@ -116,15 +116,29 @@ int anon_vma_prepare(struct vm_area_stru
+       struct anon_vma *anon_vma = vma->anon_vma;
+       struct anon_vma_chain *avc;
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++      struct anon_vma_chain *avc_m = NULL;
++#endif
++
+       might_sleep();
+       if (unlikely(!anon_vma)) {
                struct mm_struct *mm = vma->vm_mm;
                struct anon_vma *allocated;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +              struct vm_area_struct *vma_m;
 +#endif
++
+               avc = anon_vma_chain_alloc();
+               if (!avc)
+                       goto out_enomem;
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++              avc_m = anon_vma_chain_alloc();
++              if (!avc_m)
++                      goto out_enomem_free_avc;
++#endif
 +
                anon_vma = find_mergeable_anon_vma(vma);
                allocated = NULL;
                if (!anon_vma) {
-@@ -122,6 +126,15 @@ 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)) {
+@@ -143,6 +157,20 @@ int anon_vma_prepare(struct vm_area_stru
+                       avc->vma = vma;
+                       list_add(&avc->same_vma, &vma->anon_vma_chain);
+                       list_add(&avc->same_anon_vma, &anon_vma->head);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +                      vma_m = pax_find_mirror_vma(vma);
 +                      if (vma_m) {
++                              BUG_ON(vma_m->anon_vma);
 +                              vma_m->anon_vma = anon_vma;
-+                              __anon_vma_link(vma_m);
++                              avc_m->anon_vma = anon_vma;
++                              avc_m->vma = vma;
++                              list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
++                              list_add(&avc_m->same_anon_vma, &anon_vma->head);
++                              avc_m = NULL;
 +                      }
 +#endif
 +
-                       vma->anon_vma = anon_vma;
-                       list_add_tail(&vma->anon_vma_node, &anon_vma->head);
                        allocated = NULL;
-diff -urNp linux-2.6.33.1/mm/shmem.c linux-2.6.33.1/mm/shmem.c
---- linux-2.6.33.1/mm/shmem.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/shmem.c  2010-03-20 16:58:42.272540377 -0400
+                       avc = NULL;
+               }
+@@ -151,12 +179,24 @@ int anon_vma_prepare(struct vm_area_stru
+ 
+               if (unlikely(allocated))
+                       anon_vma_free(allocated);
++
++#ifdef CONFIG_PAX_SEGMEXEC
++              if (unlikely(avc_m))
++                      anon_vma_chain_free(avc_m);
++#endif
++
+               if (unlikely(avc))
+                       anon_vma_chain_free(avc);
+       }
+       return 0;
+ 
+  out_enomem_free_avc:
++
++#ifdef CONFIG_PAX_SEGMEXEC
++      if (avc_m)
++              anon_vma_chain_free(avc_m);
++#endif
++
+       anon_vma_chain_free(avc);
+  out_enomem:
+       return -ENOMEM;
+diff -urNp linux-2.6.34/mm/shmem.c linux-2.6.34/mm/shmem.c
+--- linux-2.6.34/mm/shmem.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/shmem.c    2010-07-01 20:45:16.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <linux/module.h>
  #include <linux/swap.h>
@@ -50307,9 +51268,9 @@ diff -urNp linux-2.6.33.1/mm/shmem.c linux-2.6.33.1/mm/shmem.c
  
  #ifdef CONFIG_SHMEM
  /*
-diff -urNp linux-2.6.33.1/mm/slab.c linux-2.6.33.1/mm/slab.c
---- linux-2.6.33.1/mm/slab.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/slab.c   2010-03-20 16:58:42.276578221 -0400
+diff -urNp linux-2.6.34/mm/slab.c linux-2.6.34/mm/slab.c
+--- linux-2.6.34/mm/slab.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/slab.c     2010-07-01 20:45:16.000000000 -0400
 @@ -308,7 +308,7 @@ struct kmem_list3 {
   * Need this for bootstrapping a per node allocator.
   */
@@ -50346,16 +51307,24 @@ diff -urNp linux-2.6.33.1/mm/slab.c linux-2.6.33.1/mm/slab.c
  
  /* internal cache of cache description objs */
  static struct kmem_cache cache_cache = {
-@@ -4104,7 +4104,7 @@ out:
-       schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC));
- }
+@@ -4483,15 +4483,66 @@ static const struct file_operations proc
  
--#ifdef CONFIG_SLABINFO
-+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
- 
- static void print_slabinfo_header(struct seq_file *m)
+ static int __init slab_proc_init(void)
  {
-@@ -4502,6 +4502,51 @@ static int __init slab_proc_init(void)
+-      proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
++      mode_t gr_mode = S_IRUGO;
++
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++      gr_mode = S_IRUSR;
++#endif
++
++      proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations);
+ #ifdef CONFIG_DEBUG_SLAB_LEAK
+-      proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
++      proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations);
+ #endif
+       return 0;
+ }
  module_init(slab_proc_init);
  #endif
  
@@ -50407,9 +51376,9 @@ diff -urNp linux-2.6.33.1/mm/slab.c linux-2.6.33.1/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.33.1/mm/slob.c linux-2.6.33.1/mm/slob.c
---- linux-2.6.33.1/mm/slob.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/slob.c   2010-03-20 16:58:42.276578221 -0400
+diff -urNp linux-2.6.34/mm/slob.c linux-2.6.34/mm/slob.c
+--- linux-2.6.34/mm/slob.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/slob.c     2010-07-01 20:45:16.000000000 -0400
 @@ -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
@@ -50730,10 +51699,10 @@ diff -urNp linux-2.6.33.1/mm/slob.c linux-2.6.33.1/mm/slob.c
        }
  
        trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
---- linux-2.6.33.1/mm/slub.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/slub.c   2010-03-20 16:58:42.280534479 -0400
-@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
+diff -urNp linux-2.6.34/mm/slub.c linux-2.6.34/mm/slub.c
+--- linux-2.6.34/mm/slub.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/slub.c     2010-07-01 20:45:16.000000000 -0400
+@@ -1877,6 +1877,8 @@ void kmem_cache_free(struct kmem_cache *
  
        page = virt_to_head_page(x);
  
@@ -50742,7 +51711,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
        slab_free(s, page, x, _RET_IP_);
  
        trace_kmem_cache_free(_RET_IP_, x);
-@@ -1937,7 +1939,7 @@ static int slub_min_objects;
+@@ -1921,7 +1923,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.)
   */
@@ -50751,7 +51720,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_c
+@@ -2359,7 +2361,7 @@ static int kmem_cache_open(struct kmem_c
         * list to avoid pounding the page allocator excessively.
         */
        set_min_partial(s, ilog2(s->size));
@@ -50760,7 +51729,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
  #ifdef CONFIG_NUMA
        s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struc
+@@ -2499,8 +2501,7 @@ static inline int kmem_cache_close(struc
  void kmem_cache_destroy(struct kmem_cache *s)
  {
        down_write(&slub_lock);
@@ -50770,7 +51739,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
                list_del(&s->list);
                up_write(&slub_lock);
                if (kmem_cache_close(s)) {
-@@ -2915,6 +2916,46 @@ void *__kmalloc_node(size_t size, gfp_t 
+@@ -2792,6 +2793,46 @@ void *__kmalloc_node(size_t size, gfp_t 
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -50817,7 +51786,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
  size_t ksize(const void *object)
  {
        struct page *page;
-@@ -3186,7 +3227,7 @@ void __init kmem_cache_init(void)
+@@ -3061,7 +3102,7 @@ void __init kmem_cache_init(void)
         */
        create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
                sizeof(struct kmem_cache_node), GFP_NOWAIT);
@@ -50826,7 +51795,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
        caches++;
  
        hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
-@@ -3293,7 +3334,7 @@ static int slab_unmergeable(struct kmem_
+@@ -3170,7 +3211,7 @@ static int slab_unmergeable(struct kmem_
        /*
         * We may have set a slab to be unmergeable during bootstrap.
         */
@@ -50835,16 +51804,16 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
                return 1;
  
        return 0;
-@@ -3353,7 +3394,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3228,7 +3269,7 @@ struct kmem_cache *kmem_cache_create(con
+       down_write(&slub_lock);
+       s = find_mergeable(size, align, flags, name, ctor);
        if (s) {
-               int cpu;
- 
 -              s->refcount++;
 +              atomic_inc(&s->refcount);
                /*
                 * Adjust the object sizes so that we clear
                 * the complete object on kzalloc.
-@@ -3372,7 +3413,7 @@ struct kmem_cache *kmem_cache_create(con
+@@ -3239,7 +3280,7 @@ struct kmem_cache *kmem_cache_create(con
  
                if (sysfs_slab_alias(s, name)) {
                        down_write(&slub_lock);
@@ -50853,7 +51822,7 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
                        up_write(&slub_lock);
                        goto err;
                }
-@@ -4101,7 +4142,7 @@ SLAB_ATTR_RO(ctor);
+@@ -3954,7 +3995,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -50862,37 +51831,25 @@ diff -urNp linux-2.6.33.1/mm/slub.c linux-2.6.33.1/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4519,7 +4560,7 @@ static void kmem_cache_release(struct ko
-       kfree(s);
- }
+@@ -4675,7 +4716,13 @@ static const struct file_operations proc
  
--static struct sysfs_ops slab_sysfs_ops = {
-+static const struct sysfs_ops slab_sysfs_ops = {
-       .show = slab_attr_show,
-       .store = slab_attr_store,
- };
-@@ -4538,7 +4579,7 @@ static int uevent_filter(struct kset *ks
+ static int __init slab_proc_init(void)
+ {
+-      proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations);
++      mode_t gr_mode = S_IRUGO;
++
++#ifdef CONFIG_GRKERNSEC_PROC_ADD
++      gr_mode = S_IRUSR;
++#endif
++
++      proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations);
        return 0;
  }
- 
--static struct kset_uevent_ops slab_uevent_ops = {
-+static const struct kset_uevent_ops slab_uevent_ops = {
-       .filter = uevent_filter,
- };
- 
-@@ -4712,7 +4753,7 @@ __initcall(slab_sysfs_init);
- /*
-  * The /proc/slabinfo ABI
-  */
--#ifdef CONFIG_SLABINFO
-+#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
- static void print_slabinfo_header(struct seq_file *m)
- {
-       seq_puts(m, "slabinfo - version: 2.1\n");
-diff -urNp linux-2.6.33.1/mm/util.c linux-2.6.33.1/mm/util.c
---- linux-2.6.33.1/mm/util.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/util.c   2010-03-20 16:58:42.280534479 -0400
-@@ -224,6 +224,12 @@ EXPORT_SYMBOL(strndup_user);
+ module_init(slab_proc_init);
+diff -urNp linux-2.6.34/mm/util.c linux-2.6.34/mm/util.c
+--- linux-2.6.34/mm/util.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/util.c     2010-07-01 20:45:16.000000000 -0400
+@@ -245,6 +245,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
        mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -50905,9 +51862,9 @@ diff -urNp linux-2.6.33.1/mm/util.c linux-2.6.33.1/mm/util.c
        mm->get_unmapped_area = arch_get_unmapped_area;
        mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
---- linux-2.6.33.1/mm/vmalloc.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/mm/vmalloc.c        2010-03-20 16:58:42.280534479 -0400
+diff -urNp linux-2.6.34/mm/vmalloc.c linux-2.6.34/mm/vmalloc.c
+--- linux-2.6.34/mm/vmalloc.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/mm/vmalloc.c  2010-07-01 20:45:16.000000000 -0400
 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
        pte = pte_offset_kernel(pmd, addr);
@@ -50938,7 +51895,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  
        /*
         * nr is a running index into the array which helps higher level
-@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, un
        pte = pte_alloc_kernel(pmd, addr);
        if (!pte)
                return -ENOMEM;
@@ -50952,7 +51909,9 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
 -              if (WARN_ON(!page))
 -                      return -ENOMEM;
 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+              if (pgprot_val(prot) & _PAGE_NX)
++              if (!(pgprot_val(prot) & _PAGE_NX))
++                      BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT);
++              else
 +#endif
 +
 +              if (WARN_ON(!pte_none(*pte))) {
@@ -50974,7 +51933,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  }
  
  static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void
+@@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void
         * and fall back on vmalloc() if that fails. Others
         * just put it in the vmalloc space.
         */
@@ -50996,7 +51955,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
        return is_vmalloc_addr(x);
  }
  
-@@ -292,13 +326,13 @@ static void __insert_vmap_area(struct vm
+@@ -292,13 +328,13 @@ static void __insert_vmap_area(struct vm
        struct rb_node *tmp;
  
        while (*p) {
@@ -51014,28 +51973,28 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
                        p = &(*p)->rb_right;
                else
                        BUG();
-@@ -1224,6 +1258,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1224,6 +1260,16 @@ static struct vm_struct *__get_vm_area_n
        struct vm_struct *area;
  
        BUG_ON(in_interrupt());
 +
-+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +      if (flags & VM_KERNEXEC) {
 +              if (start != VMALLOC_START || end != VMALLOC_END)
 +                      return NULL;
-+              start = (unsigned long)&MODULES_EXEC_VADDR;
-+              end = (unsigned long)&MODULES_EXEC_END;
++              start = (unsigned long)MODULES_EXEC_VADDR;
++              end = (unsigned long)MODULES_EXEC_END;
 +      }
 +#endif
 +
        if (flags & VM_IOREMAP) {
                int bit = fls(size);
  
-@@ -1449,6 +1493,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1449,6 +1495,11 @@ void *vmap(struct page **pages, unsigned
        if (count > totalram_pages)
                return NULL;
  
-+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +      if (!(pgprot_val(prot) & _PAGE_NX))
 +              flags |= VM_KERNEXEC;
 +#endif
@@ -51043,11 +52002,11 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
                                        __builtin_return_address(0));
        if (!area)
-@@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon
+@@ -1558,6 +1609,13 @@ static void *__vmalloc_node(unsigned lon
        if (!size || (size >> PAGE_SHIFT) > totalram_pages)
                return NULL;
  
-+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++#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);
@@ -51057,7 +52016,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
        area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
                                  VMALLOC_END, node, gfp_mask, caller);
  
-@@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1576,6 +1634,7 @@ static void *__vmalloc_node(unsigned lon
        return addr;
  }
  
@@ -51065,7 +52024,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
        return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1592,6 +1651,7 @@ EXPORT_SYMBOL(__vmalloc);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -51073,7 +52032,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *vmalloc(unsigned long size)
  {
        return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1606,6 +1666,7 @@ EXPORT_SYMBOL(vmalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -51081,7 +52040,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
        struct vm_struct *area;
-@@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1633,6 +1694,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -51089,7 +52048,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
        return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1655,10 +1717,10 @@ EXPORT_SYMBOL(vmalloc_node);
   *    For tight control over page level allocator and protection flags
   *    use __vmalloc() instead.
   */
@@ -51102,7 +52061,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
                              -1, __builtin_return_address(0));
  }
  
-@@ -1677,6 +1737,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1677,6 +1739,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.
   */
@@ -51110,7 +52069,7 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
        return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1691,6 +1754,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -51118,65 +52077,78 @@ diff -urNp linux-2.6.33.1/mm/vmalloc.c linux-2.6.33.1/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
        struct vm_struct *area;
-diff -urNp linux-2.6.33.1/net/atm/atm_misc.c linux-2.6.33.1/net/atm/atm_misc.c
---- linux-2.6.33.1/net/atm/atm_misc.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/atm/atm_misc.c  2010-03-20 16:58:42.280534479 -0400
-@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
+diff -urNp linux-2.6.34/net/8021q/vlan.c linux-2.6.34/net/8021q/vlan.c
+--- linux-2.6.34/net/8021q/vlan.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/8021q/vlan.c      2010-07-01 20:45:16.000000000 -0400
+@@ -614,8 +614,7 @@ static int vlan_ioctl_handler(struct net
+               err = -EPERM;
+               if (!capable(CAP_NET_ADMIN))
+                       break;
+-              if ((args.u.name_type >= 0) &&
+-                  (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
++              if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
+                       struct vlan_net *vn;
+ 
+                       vn = net_generic(net, vlan_net_id);
+diff -urNp linux-2.6.34/net/atm/atm_misc.c linux-2.6.34/net/atm/atm_misc.c
+--- linux-2.6.34/net/atm/atm_misc.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/atm/atm_misc.c    2010-07-01 20:45:16.000000000 -0400
+@@ -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;
-       atm_return(vcc,truesize);
+       atm_return(vcc, truesize);
 -      atomic_inc(&vcc->stats->rx_drop);
 +      atomic_inc_unchecked(&vcc->stats->rx_drop);
        return 0;
  }
- 
-@@ -41,7 +41,7 @@ struct sk_buff *atm_alloc_charge(struct 
+ EXPORT_SYMBOL(atm_charge);
+@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct 
                }
        }
-       atm_return(vcc,guess);
+       atm_return(vcc, guess);
 -      atomic_inc(&vcc->stats->rx_drop);
 +      atomic_inc_unchecked(&vcc->stats->rx_drop);
        return NULL;
  }
+ EXPORT_SYMBOL(atm_alloc_charge);
+@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
  
-@@ -88,7 +88,7 @@ int atm_pcr_goal(const struct atm_trafpr
- 
- void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
+ void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
  {
 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -96,7 +96,7 @@ void sonet_copy_stats(struct k_sonet_sta
+@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
  
- void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
+ void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
  {
--#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
+-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.33.1/net/atm/proc.c linux-2.6.33.1/net/atm/proc.c
---- linux-2.6.33.1/net/atm/proc.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/atm/proc.c      2010-03-20 16:58:42.280534479 -0400
-@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
+diff -urNp linux-2.6.34/net/atm/proc.c linux-2.6.34/net/atm/proc.c
+--- linux-2.6.34/net/atm/proc.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/atm/proc.c        2010-07-01 20:45:16.000000000 -0400
+@@ -44,9 +44,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
        seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
--          atomic_read(&stats->tx),atomic_read(&stats->tx_err),
--          atomic_read(&stats->rx),atomic_read(&stats->rx_err),
--          atomic_read(&stats->rx_drop));
-+          atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
-+          atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
-+          atomic_read_unchecked(&stats->rx_drop));
+-                 atomic_read(&stats->tx), atomic_read(&stats->tx_err),
+-                 atomic_read(&stats->rx), atomic_read(&stats->rx_err),
+-                 atomic_read(&stats->rx_drop));
++                 atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
++                 atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
++                 atomic_read_unchecked(&stats->rx_drop));
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-2.6.33.1/net/atm/resources.c linux-2.6.33.1/net/atm/resources.c
---- linux-2.6.33.1/net/atm/resources.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/atm/resources.c 2010-03-20 16:58:42.280534479 -0400
-@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
+diff -urNp linux-2.6.34/net/atm/resources.c linux-2.6.34/net/atm/resources.c
+--- linux-2.6.34/net/atm/resources.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/atm/resources.c   2010-07-01 20:45:16.000000000 -0400
+@@ -159,7 +159,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -51185,7 +52157,7 @@ diff -urNp linux-2.6.33.1/net/atm/resources.c linux-2.6.33.1/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_
+@@ -167,7 +167,7 @@ static void copy_aal_stats(struct k_atm_
  static void subtract_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -51194,22 +52166,10 @@ diff -urNp linux-2.6.33.1/net/atm/resources.c linux-2.6.33.1/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.33.1/net/bridge/br_private.h linux-2.6.33.1/net/bridge/br_private.h
---- linux-2.6.33.1/net/bridge/br_private.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/bridge/br_private.h     2010-03-20 16:58:42.280534479 -0400
-@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 
- 
- #ifdef CONFIG_SYSFS
- /* br_sysfs_if.c */
--extern struct sysfs_ops brport_sysfs_ops;
-+extern const struct sysfs_ops brport_sysfs_ops;
- extern int br_sysfs_addif(struct net_bridge_port *p);
- 
- /* br_sysfs_br.c */
-diff -urNp linux-2.6.33.1/net/bridge/br_stp_if.c linux-2.6.33.1/net/bridge/br_stp_if.c
---- linux-2.6.33.1/net/bridge/br_stp_if.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/bridge/br_stp_if.c      2010-03-20 16:58:42.280534479 -0400
-@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
+diff -urNp linux-2.6.34/net/bridge/br_stp_if.c linux-2.6.34/net/bridge/br_stp_if.c
+--- linux-2.6.34/net/bridge/br_stp_if.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/bridge/br_stp_if.c        2010-07-01 20:45:16.000000000 -0400
+@@ -147,7 +147,7 @@ static void br_stp_stop(struct net_bridg
        char *envp[] = { NULL };
  
        if (br->stp_enabled == BR_USER_STP) {
@@ -51218,22 +52178,10 @@ diff -urNp linux-2.6.33.1/net/bridge/br_stp_if.c linux-2.6.33.1/net/bridge/br_st
                printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
                        br->dev->name, r);
  
-diff -urNp linux-2.6.33.1/net/bridge/br_sysfs_if.c linux-2.6.33.1/net/bridge/br_sysfs_if.c
---- linux-2.6.33.1/net/bridge/br_sysfs_if.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/bridge/br_sysfs_if.c    2010-03-20 16:58:42.280534479 -0400
-@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
-       return ret;
- }
- 
--struct sysfs_ops brport_sysfs_ops = {
-+const struct sysfs_ops brport_sysfs_ops = {
-       .show = brport_show,
-       .store = brport_store,
- };
-diff -urNp linux-2.6.33.1/net/bridge/netfilter/ebtables.c linux-2.6.33.1/net/bridge/netfilter/ebtables.c
---- linux-2.6.33.1/net/bridge/netfilter/ebtables.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/bridge/netfilter/ebtables.c     2010-03-20 16:58:42.284535154 -0400
-@@ -1456,7 +1456,7 @@ static int do_ebt_get_ctl(struct sock *s
+diff -urNp linux-2.6.34/net/bridge/netfilter/ebtables.c linux-2.6.34/net/bridge/netfilter/ebtables.c
+--- linux-2.6.34/net/bridge/netfilter/ebtables.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/bridge/netfilter/ebtables.c       2010-07-01 20:45:16.000000000 -0400
+@@ -1515,7 +1515,7 @@ static int do_ebt_get_ctl(struct sock *s
                        tmp.valid_hooks = t->table->valid_hooks;
                }
                mutex_unlock(&ebt_mutex);
@@ -51242,10 +52190,10 @@ diff -urNp linux-2.6.33.1/net/bridge/netfilter/ebtables.c linux-2.6.33.1/net/bri
                        BUGPRINT("c2u Didn't work\n");
                        ret = -EFAULT;
                        break;
-diff -urNp linux-2.6.33.1/net/core/dev.c linux-2.6.33.1/net/core/dev.c
---- linux-2.6.33.1/net/core/dev.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/core/dev.c      2010-03-20 16:58:42.284535154 -0400
-@@ -2183,7 +2183,7 @@ int netif_rx_ni(struct sk_buff *skb)
+diff -urNp linux-2.6.34/net/core/dev.c linux-2.6.34/net/core/dev.c
+--- linux-2.6.34/net/core/dev.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/core/dev.c        2010-07-01 20:45:16.000000000 -0400
+@@ -2249,7 +2249,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -51254,7 +52202,7 @@ diff -urNp linux-2.6.33.1/net/core/dev.c linux-2.6.33.1/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -2939,7 +2939,7 @@ void netif_napi_del(struct napi_struct *
+@@ -3019,7 +3019,7 @@ void netif_napi_del(struct napi_struct *
  EXPORT_SYMBOL(netif_napi_del);
  
  
@@ -51263,9 +52211,9 @@ diff -urNp linux-2.6.33.1/net/core/dev.c linux-2.6.33.1/net/core/dev.c
  {
        struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
        unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.33.1/net/core/flow.c linux-2.6.33.1/net/core/flow.c
---- linux-2.6.33.1/net/core/flow.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/core/flow.c     2010-03-20 16:58:42.284535154 -0400
+diff -urNp linux-2.6.34/net/core/flow.c linux-2.6.34/net/core/flow.c
+--- linux-2.6.34/net/core/flow.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/core/flow.c       2010-07-01 20:45:16.000000000 -0400
 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
  
  static u32 flow_hash_shift;
@@ -51293,10 +52241,10 @@ diff -urNp linux-2.6.33.1/net/core/flow.c linux-2.6.33.1/net/core/flow.c
  
  #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
  
-diff -urNp linux-2.6.33.1/net/core/sock.c linux-2.6.33.1/net/core/sock.c
---- linux-2.6.33.1/net/core/sock.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/core/sock.c     2010-03-20 16:58:42.284535154 -0400
-@@ -896,7 +896,7 @@ int sock_getsockopt(struct socket *sock,
+diff -urNp linux-2.6.34/net/core/sock.c linux-2.6.34/net/core/sock.c
+--- linux-2.6.34/net/core/sock.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/core/sock.c       2010-07-01 20:45:16.000000000 -0400
+@@ -900,7 +900,7 @@ int sock_getsockopt(struct socket *sock,
                        return -ENOTCONN;
                if (lv < len)
                        return -EINVAL;
@@ -51305,7 +52253,7 @@ diff -urNp linux-2.6.33.1/net/core/sock.c linux-2.6.33.1/net/core/sock.c
                        return -EFAULT;
                goto lenout;
        }
-@@ -929,7 +929,7 @@ int sock_getsockopt(struct socket *sock,
+@@ -933,7 +933,7 @@ int sock_getsockopt(struct socket *sock,
  
        if (len > lv)
                len = lv;
@@ -51314,9 +52262,9 @@ diff -urNp linux-2.6.33.1/net/core/sock.c linux-2.6.33.1/net/core/sock.c
                return -EFAULT;
  lenout:
        if (put_user(len, optlen))
-diff -urNp linux-2.6.33.1/net/dccp/ccids/ccid3.c linux-2.6.33.1/net/dccp/ccids/ccid3.c
---- linux-2.6.33.1/net/dccp/ccids/ccid3.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/dccp/ccids/ccid3.c      2010-03-20 16:58:42.284535154 -0400
+diff -urNp linux-2.6.34/net/dccp/ccids/ccid3.c linux-2.6.34/net/dccp/ccids/ccid3.c
+--- linux-2.6.34/net/dccp/ccids/ccid3.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/dccp/ccids/ccid3.c        2010-07-01 20:45:16.000000000 -0400
 @@ -41,7 +41,7 @@
  static int ccid3_debug;
  #define ccid3_pr_debug(format, a...)  DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -51326,9 +52274,9 @@ diff -urNp linux-2.6.33.1/net/dccp/ccids/ccid3.c linux-2.6.33.1/net/dccp/ccids/c
  #endif
  
  /*
-diff -urNp linux-2.6.33.1/net/dccp/dccp.h linux-2.6.33.1/net/dccp/dccp.h
---- linux-2.6.33.1/net/dccp/dccp.h     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/dccp/dccp.h     2010-03-20 16:58:42.284535154 -0400
+diff -urNp linux-2.6.34/net/dccp/dccp.h linux-2.6.34/net/dccp/dccp.h
+--- linux-2.6.34/net/dccp/dccp.h       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/dccp/dccp.h       2010-07-01 20:45:16.000000000 -0400
 @@ -44,9 +44,9 @@ extern int dccp_debug;
  #define dccp_pr_debug_cat(format, a...)   DCCP_PRINTK(dccp_debug, format, ##a)
  #define dccp_debug(fmt, a...)           dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -51342,9 +52290,9 @@ diff -urNp linux-2.6.33.1/net/dccp/dccp.h linux-2.6.33.1/net/dccp/dccp.h
  #endif
  
  extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.33.1/net/decnet/sysctl_net_decnet.c linux-2.6.33.1/net/decnet/sysctl_net_decnet.c
---- linux-2.6.33.1/net/decnet/sysctl_net_decnet.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/decnet/sysctl_net_decnet.c      2010-03-20 16:58:42.284535154 -0400
+diff -urNp linux-2.6.34/net/decnet/sysctl_net_decnet.c linux-2.6.34/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.34/net/decnet/sysctl_net_decnet.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/decnet/sysctl_net_decnet.c        2010-07-01 20:45:16.000000000 -0400
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
        if (len > *lenp) len = *lenp;
@@ -51363,9 +52311,9 @@ diff -urNp linux-2.6.33.1/net/decnet/sysctl_net_decnet.c linux-2.6.33.1/net/decn
                return -EFAULT;
  
        *lenp = len;
-diff -urNp linux-2.6.33.1/net/ipv4/inet_hashtables.c linux-2.6.33.1/net/ipv4/inet_hashtables.c
---- linux-2.6.33.1/net/ipv4/inet_hashtables.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/inet_hashtables.c  2010-03-20 16:58:42.311008973 -0400
+diff -urNp linux-2.6.34/net/ipv4/inet_hashtables.c linux-2.6.34/net/ipv4/inet_hashtables.c
+--- linux-2.6.34/net/ipv4/inet_hashtables.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/inet_hashtables.c    2010-07-01 20:45:16.000000000 -0400
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -51390,10 +52338,10 @@ diff -urNp linux-2.6.33.1/net/ipv4/inet_hashtables.c linux-2.6.33.1/net/ipv4/ine
                if (tw) {
                        inet_twsk_deschedule(tw, death_row);
                        while (twrefcnt) {
-diff -urNp linux-2.6.33.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.33.1/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.33.1/net/ipv4/netfilter/nf_nat_snmp_basic.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/netfilter/nf_nat_snmp_basic.c      2010-03-20 16:58:42.311008973 -0400
-@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
+diff -urNp linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/netfilter/nf_nat_snmp_basic.c        2010-07-01 20:45:16.000000000 -0400
+@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
  
        *len = 0;
  
@@ -51402,10 +52350,10 @@ diff -urNp linux-2.6.33.1/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.33.1/
        if (*octets == NULL) {
                if (net_ratelimit())
                        printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.33.1/net/ipv4/tcp_ipv4.c linux-2.6.33.1/net/ipv4/tcp_ipv4.c
---- linux-2.6.33.1/net/ipv4/tcp_ipv4.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/tcp_ipv4.c 2010-03-20 17:00:48.140865901 -0400
-@@ -84,6 +84,9 @@
+diff -urNp linux-2.6.34/net/ipv4/tcp_ipv4.c linux-2.6.34/net/ipv4/tcp_ipv4.c
+--- linux-2.6.34/net/ipv4/tcp_ipv4.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/tcp_ipv4.c   2010-07-02 17:33:36.000000000 -0400
+@@ -85,6 +85,9 @@
  int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  
@@ -51415,7 +52363,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_ipv4.c linux-2.6.33.1/net/ipv4/tcp_ipv4.c
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1646,12 +1649,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1654,12 +1657,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);
@@ -51425,8 +52373,8 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_ipv4.c linux-2.6.33.1/net/ipv4/tcp_ipv4.c
 +              ret = 1;
 +#endif
                goto no_tcp_socket;
+-
 +      }
- 
  process:
 -      if (sk->sk_state == TCP_TIME_WAIT)
 +      if (sk->sk_state == TCP_TIME_WAIT) {
@@ -51436,9 +52384,9 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_ipv4.c linux-2.6.33.1/net/ipv4/tcp_ipv4.c
                goto do_time_wait;
 +      }
  
-       if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
-               goto discard_and_relse;
-@@ -1693,6 +1704,10 @@ no_tcp_socket:
+       if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
+               NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
+@@ -1709,6 +1719,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
@@ -51449,10 +52397,10 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_ipv4.c linux-2.6.33.1/net/ipv4/tcp_ipv4.c
                tcp_v4_send_reset(NULL, skb);
        }
  
-diff -urNp linux-2.6.33.1/net/ipv4/tcp_minisocks.c linux-2.6.33.1/net/ipv4/tcp_minisocks.c
---- linux-2.6.33.1/net/ipv4/tcp_minisocks.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/tcp_minisocks.c    2010-03-20 17:06:01.445852790 -0400
-@@ -26,6 +26,10 @@
+diff -urNp linux-2.6.34/net/ipv4/tcp_minisocks.c linux-2.6.34/net/ipv4/tcp_minisocks.c
+--- linux-2.6.34/net/ipv4/tcp_minisocks.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/tcp_minisocks.c      2010-07-01 20:45:16.000000000 -0400
+@@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
  
@@ -51463,23 +52411,21 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_minisocks.c linux-2.6.33.1/net/ipv4/tcp_m
  int sysctl_tcp_syncookies __read_mostly = 1;
  EXPORT_SYMBOL(sysctl_tcp_syncookies);
  
-@@ -698,8 +702,11 @@ listen_overflow:
+@@ -699,6 +703,10 @@ listen_overflow:
  
  embryonic_reset:
        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
--      if (!(flg & TCP_FLAG_RST))
 +
-+#ifndef CONFIG_GRKERNSEC_BLACKHOLE
-+      if (!grsec_enable_blackhole || !(flg & TCP_FLAG_RST))
-               req->rsk_ops->send_reset(sk, skb);
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++      if (!grsec_enable_blackhole)
 +#endif
+       if (!(flg & TCP_FLAG_RST))
+               req->rsk_ops->send_reset(sk, skb);
  
-       inet_csk_reqsk_queue_drop(sk, req, prev);
-       return NULL;
-diff -urNp linux-2.6.33.1/net/ipv4/tcp_probe.c linux-2.6.33.1/net/ipv4/tcp_probe.c
---- linux-2.6.33.1/net/ipv4/tcp_probe.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/tcp_probe.c        2010-03-20 16:58:42.312547376 -0400
-@@ -201,7 +201,7 @@ static ssize_t tcpprobe_read(struct file
+diff -urNp linux-2.6.34/net/ipv4/tcp_probe.c linux-2.6.34/net/ipv4/tcp_probe.c
+--- linux-2.6.34/net/ipv4/tcp_probe.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/tcp_probe.c  2010-07-01 20:45:16.000000000 -0400
+@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
                if (cnt + width >= len)
                        break;
  
@@ -51488,11 +52434,11 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_probe.c linux-2.6.33.1/net/ipv4/tcp_probe
                        return -EFAULT;
                cnt += width;
        }
-diff -urNp linux-2.6.33.1/net/ipv4/tcp_timer.c linux-2.6.33.1/net/ipv4/tcp_timer.c
---- linux-2.6.33.1/net/ipv4/tcp_timer.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/tcp_timer.c        2010-03-20 17:00:48.145360815 -0400
-@@ -21,6 +21,10 @@
- #include <linux/module.h>
+diff -urNp linux-2.6.34/net/ipv4/tcp_timer.c linux-2.6.34/net/ipv4/tcp_timer.c
+--- linux-2.6.34/net/ipv4/tcp_timer.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/tcp_timer.c  2010-07-02 17:34:08.000000000 -0400
+@@ -22,6 +22,10 @@
+ #include <linux/gfp.h>
  #include <net/tcp.h>
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -51502,7 +52448,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_timer.c linux-2.6.33.1/net/ipv4/tcp_timer
  int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
  int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
  int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -193,6 +197,13 @@ static int tcp_write_timeout(struct sock
+@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock
                }
        }
  
@@ -51516,9 +52462,9 @@ diff -urNp linux-2.6.33.1/net/ipv4/tcp_timer.c linux-2.6.33.1/net/ipv4/tcp_timer
        if (retransmits_timed_out(sk, retry_until)) {
                /* Has it gone just too far? */
                tcp_write_err(sk);
-diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
---- linux-2.6.33.1/net/ipv4/udp.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv4/udp.c      2010-03-20 17:06:32.628937453 -0400
+diff -urNp linux-2.6.34/net/ipv4/udp.c linux-2.6.34/net/ipv4/udp.c
+--- linux-2.6.34/net/ipv4/udp.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv4/udp.c        2010-07-02 17:32:10.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -51527,7 +52473,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
  #include <linux/socket.h>
  #include <linux/sockios.h>
  #include <linux/igmp.h>
-@@ -106,6 +107,10 @@
+@@ -107,6 +108,10 @@
  #include <net/xfrm.h>
  #include "udp_impl.h"
  
@@ -51538,7 +52484,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
  struct udp_table udp_table __read_mostly;
  EXPORT_SYMBOL(udp_table);
  
-@@ -562,6 +567,9 @@ found:
+@@ -563,6 +568,9 @@ found:
        return s;
  }
  
@@ -51548,7 +52494,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/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
-@@ -830,9 +838,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
+@@ -831,9 +839,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
                dport = usin->sin_port;
                if (dport == 0)
                        return -EINVAL;
@@ -51567,7 +52513,7 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
                daddr = inet->inet_daddr;
                dport = inet->inet_dport;
                /* Open fast path for connected socket.
-@@ -1137,6 +1154,10 @@ try_again:
+@@ -1138,6 +1155,10 @@ try_again:
        if (!skb)
                goto out;
  
@@ -51576,9 +52522,9 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
 +              goto out_free;
 +
        ulen = skb->len - sizeof(struct udphdr);
-       copied = len;
-       if (copied > ulen)
-@@ -1568,6 +1589,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
+       if (len > ulen)
+               len = ulen;
+@@ -1570,6 +1591,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
                goto csum_error;
  
        UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -51588,10 +52534,10 @@ diff -urNp linux-2.6.33.1/net/ipv4/udp.c linux-2.6.33.1/net/ipv4/udp.c
        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
        /*
-diff -urNp linux-2.6.33.1/net/ipv6/exthdrs.c linux-2.6.33.1/net/ipv6/exthdrs.c
---- linux-2.6.33.1/net/ipv6/exthdrs.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv6/exthdrs.c  2010-03-20 16:58:42.312547376 -0400
-@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
+diff -urNp linux-2.6.34/net/ipv6/exthdrs.c linux-2.6.34/net/ipv6/exthdrs.c
+--- linux-2.6.34/net/ipv6/exthdrs.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv6/exthdrs.c    2010-07-01 20:45:16.000000000 -0400
+@@ -636,7 +636,7 @@ static struct tlvtype_proc tlvprochopopt
                .type   = IPV6_TLV_JUMBO,
                .func   = ipv6_hop_jumbo,
        },
@@ -51600,10 +52546,10 @@ diff -urNp linux-2.6.33.1/net/ipv6/exthdrs.c linux-2.6.33.1/net/ipv6/exthdrs.c
  };
  
  int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.33.1/net/ipv6/raw.c linux-2.6.33.1/net/ipv6/raw.c
---- linux-2.6.33.1/net/ipv6/raw.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv6/raw.c      2010-03-20 16:58:42.312547376 -0400
-@@ -597,7 +597,7 @@ out:
+diff -urNp linux-2.6.34/net/ipv6/raw.c linux-2.6.34/net/ipv6/raw.c
+--- linux-2.6.34/net/ipv6/raw.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv6/raw.c        2010-07-01 20:45:16.000000000 -0400
+@@ -598,7 +598,7 @@ out:
        return err;
  }
  
@@ -51612,46 +52558,82 @@ diff -urNp linux-2.6.33.1/net/ipv6/raw.c linux-2.6.33.1/net/ipv6/raw.c
                        struct flowi *fl, struct rt6_info *rt,
                        unsigned int flags)
  {
-diff -urNp linux-2.6.33.1/net/ipv6/tcp_ipv6.c linux-2.6.33.1/net/ipv6/tcp_ipv6.c
---- linux-2.6.33.1/net/ipv6/tcp_ipv6.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv6/tcp_ipv6.c 2010-03-20 16:58:42.316527391 -0400
-@@ -1625,6 +1625,9 @@ static int tcp_v6_do_rcv(struct sock *sk
-       return 0;
+diff -urNp linux-2.6.34/net/ipv6/tcp_ipv6.c linux-2.6.34/net/ipv6/tcp_ipv6.c
+--- linux-2.6.34/net/ipv6/tcp_ipv6.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv6/tcp_ipv6.c   2010-07-01 20:45:16.000000000 -0400
+@@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
+ }
+ #endif
+ 
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++extern int grsec_enable_blackhole;
++#endif
++
+ static void tcp_v6_hash(struct sock *sk)
+ {
+       if (sk->sk_state != TCP_CLOSE) {
+@@ -1711,12 +1715,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
+       TCP_SKB_CB(skb)->sacked = 0;
  
- reset:
+       sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
+-      if (!sk)
++      if (!sk) {
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++              ret = 1;
++#endif
+               goto no_tcp_socket;
++      }
+ 
+ process:
+-      if (sk->sk_state == TCP_TIME_WAIT)
++      if (sk->sk_state == TCP_TIME_WAIT) {
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+      if (!skb->dev || (skb->dev->flags & IFF_LOOPBACK))
++              ret = 2;
 +#endif
-       tcp_v6_send_reset(sk, skb);
- discard:
-       if (opt_skb)
-@@ -1747,6 +1750,9 @@ no_tcp_socket:
+               goto do_time_wait;
++      }
+ 
+       if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
+               goto discard_and_relse;
+@@ -1759,6 +1771,10 @@ no_tcp_socket:
  bad_packet:
                TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
        } else {
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+              if (skb->dev->flags & IFF_LOOPBACK)
++              if (!grsec_enable_blackhole || (ret == 1 &&
++                  (skb->dev->flags & IFF_LOOPBACK)))
 +#endif
                tcp_v6_send_reset(NULL, skb);
        }
  
-diff -urNp linux-2.6.33.1/net/ipv6/udp.c linux-2.6.33.1/net/ipv6/udp.c
---- linux-2.6.33.1/net/ipv6/udp.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/ipv6/udp.c      2010-03-20 16:58:42.316527391 -0400
-@@ -745,6 +745,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
+diff -urNp linux-2.6.34/net/ipv6/udp.c linux-2.6.34/net/ipv6/udp.c
+--- linux-2.6.34/net/ipv6/udp.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/ipv6/udp.c        2010-07-02 17:35:17.000000000 -0400
+@@ -50,6 +50,10 @@
+ #include <linux/seq_file.h>
+ #include "udp_impl.h"
+ 
++#ifdef CONFIG_GRKERNSEC_BLACKHOLE
++extern int grsec_enable_blackhole;
++#endif
++
+ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
+ {
+       const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
+@@ -748,6 +752,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
                UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
                                proto == IPPROTO_UDPLITE);
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
-+              if (skb->dev->flags & IFF_LOOPBACK)
++              if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
 +#endif
-               icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
+               icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
  
                kfree_skb(skb);
-diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c        2010-03-20 16:58:42.316527391 -0400
-@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
+diff -urNp linux-2.6.34/net/irda/ircomm/ircomm_tty.c linux-2.6.34/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.34/net/irda/ircomm/ircomm_tty.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/irda/ircomm/ircomm_tty.c  2010-07-01 20:45:16.000000000 -0400
+@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
        add_wait_queue(&self->open_wait, &wait);
  
        IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
@@ -51671,7 +52653,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
  
        while (1) {
                if (tty->termios->c_cflag & CBAUD) {
-@@ -329,7 +329,7 @@ static int ircomm_tty_block_til_ready(st
+@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(st
                }
  
                IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
@@ -51680,7 +52662,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
  
                schedule();
        }
-@@ -340,13 +340,13 @@ static int ircomm_tty_block_til_ready(st
+@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(st
        if (extra_count) {
                /* ++ is not atomic, so this should be protected - Jean II */
                spin_lock_irqsave(&self->spinlock, flags);
@@ -51697,7 +52679,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
  
        if (!retval)
                self->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -415,14 +415,14 @@ static int ircomm_tty_open(struct tty_st
+@@ -416,14 +416,14 @@ static int ircomm_tty_open(struct tty_st
        }
        /* ++ is not atomic, so this should be protected - Jean II */
        spin_lock_irqsave(&self->spinlock, flags);
@@ -51714,7 +52696,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
  
        /* Not really used by us, but lets do it anyway */
        self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -511,7 +511,7 @@ static void ircomm_tty_close(struct tty_
+@@ -509,7 +509,7 @@ static void ircomm_tty_close(struct tty_
                return;
        }
  
@@ -51723,7 +52705,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
                /*
                 * Uh, oh.  tty->count is 1, which means that the tty
                 * structure will be freed.  state->count should always
-@@ -521,16 +521,16 @@ static void ircomm_tty_close(struct tty_
+@@ -519,16 +519,16 @@ static void ircomm_tty_close(struct tty_
                 */
                IRDA_DEBUG(0, "%s(), bad serial port count; "
                           "tty->count is 1, state->count is %d\n", __func__ ,
@@ -51746,7 +52728,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
                spin_unlock_irqrestore(&self->spinlock, flags);
  
                IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
-@@ -562,7 +562,7 @@ static void ircomm_tty_close(struct tty_
+@@ -560,7 +560,7 @@ static void ircomm_tty_close(struct tty_
        tty->closing = 0;
        self->tty = NULL;
  
@@ -51755,7 +52737,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
                if (self->close_delay)
                        schedule_timeout_interruptible(self->close_delay);
                wake_up_interruptible(&self->open_wait);
-@@ -1017,7 +1017,7 @@ static void ircomm_tty_hangup(struct tty
+@@ -1012,7 +1012,7 @@ static void ircomm_tty_hangup(struct tty
        spin_lock_irqsave(&self->spinlock, flags);
        self->flags &= ~ASYNC_NORMAL_ACTIVE;
        self->tty = NULL;
@@ -51764,7 +52746,7 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
        spin_unlock_irqrestore(&self->spinlock, flags);
  
        wake_up_interruptible(&self->open_wait);
-@@ -1369,7 +1369,7 @@ static void ircomm_tty_line_info(struct 
+@@ -1364,7 +1364,7 @@ static void ircomm_tty_line_info(struct 
        seq_putc(m, '\n');
  
        seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
@@ -51773,10 +52755,10 @@ diff -urNp linux-2.6.33.1/net/irda/ircomm/ircomm_tty.c linux-2.6.33.1/net/irda/i
        seq_printf(m, "Max data size: %d\n", self->max_data_size);
        seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.33.1/net/mac80211/ieee80211_i.h linux-2.6.33.1/net/mac80211/ieee80211_i.h
---- linux-2.6.33.1/net/mac80211/ieee80211_i.h  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/ieee80211_i.h  2010-03-20 16:58:42.316527391 -0400
-@@ -574,7 +574,7 @@ struct ieee80211_local {
+diff -urNp linux-2.6.34/net/mac80211/ieee80211_i.h linux-2.6.34/net/mac80211/ieee80211_i.h
+--- linux-2.6.34/net/mac80211/ieee80211_i.h    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/ieee80211_i.h    2010-07-01 20:45:16.000000000 -0400
+@@ -630,7 +630,7 @@ struct ieee80211_local {
        /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
        spinlock_t queue_stop_reason_lock;
  
@@ -51785,10 +52767,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/ieee80211_i.h linux-2.6.33.1/net/mac80211
        int monitors, cooked_mntrs;
        /* number of interfaces with corresponding FIF_ flags */
        int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
-diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface.c
---- linux-2.6.33.1/net/mac80211/iface.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/iface.c        2010-03-20 16:58:42.316527391 -0400
-@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
+diff -urNp linux-2.6.34/net/mac80211/iface.c linux-2.6.34/net/mac80211/iface.c
+--- linux-2.6.34/net/mac80211/iface.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/iface.c  2010-07-01 20:45:16.000000000 -0400
+@@ -183,7 +183,7 @@ static int ieee80211_open(struct net_dev
                break;
        }
  
@@ -51797,7 +52779,7 @@ diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface
                res = drv_start(local);
                if (res)
                        goto err_del_bss;
-@@ -198,7 +198,7 @@ static int ieee80211_open(struct net_dev
+@@ -215,7 +215,7 @@ static int ieee80211_open(struct net_dev
         * Validate the MAC address for this device.
         */
        if (!is_valid_ether_addr(dev->dev_addr)) {
@@ -51806,7 +52788,7 @@ diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface
                        drv_stop(local);
                return -EADDRNOTAVAIL;
        }
-@@ -294,7 +294,7 @@ static int ieee80211_open(struct net_dev
+@@ -308,7 +308,7 @@ static int ieee80211_open(struct net_dev
  
        hw_reconf_flags |= __ieee80211_recalc_idle(local);
  
@@ -51815,16 +52797,16 @@ diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface
        if (hw_reconf_flags) {
                ieee80211_hw_config(local, hw_reconf_flags);
                /*
-@@ -322,7 +322,7 @@ static int ieee80211_open(struct net_dev
+@@ -336,7 +336,7 @@ static int ieee80211_open(struct net_dev
   err_del_interface:
-       drv_remove_interface(local, &conf);
+       drv_remove_interface(local, &sdata->vif);
   err_stop:
 -      if (!local->open_count)
 +      if (!atomic_read(&local->open_count))
                drv_stop(local);
   err_del_bss:
        sdata->bss = NULL;
-@@ -422,7 +422,7 @@ static int ieee80211_stop(struct net_dev
+@@ -440,7 +440,7 @@ static int ieee80211_stop(struct net_dev
                WARN_ON(!list_empty(&sdata->u.ap.vlans));
        }
  
@@ -51833,7 +52815,7 @@ diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface
  
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_AP_VLAN:
-@@ -528,7 +528,7 @@ static int ieee80211_stop(struct net_dev
+@@ -543,7 +543,7 @@ static int ieee80211_stop(struct net_dev
  
        ieee80211_recalc_ps(local, -1);
  
@@ -51842,10 +52824,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/iface.c linux-2.6.33.1/net/mac80211/iface
                ieee80211_clear_tx_pending(local);
                ieee80211_stop_device(local);
  
-diff -urNp linux-2.6.33.1/net/mac80211/main.c linux-2.6.33.1/net/mac80211/main.c
---- linux-2.6.33.1/net/mac80211/main.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/main.c 2010-03-20 16:58:42.316527391 -0400
-@@ -129,7 +129,7 @@ int ieee80211_hw_config(struct ieee80211
+diff -urNp linux-2.6.34/net/mac80211/main.c linux-2.6.34/net/mac80211/main.c
+--- linux-2.6.34/net/mac80211/main.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/main.c   2010-07-01 20:45:16.000000000 -0400
+@@ -148,7 +148,7 @@ int ieee80211_hw_config(struct ieee80211
                local->hw.conf.power_level = power;
        }
  
@@ -51854,10 +52836,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/main.c linux-2.6.33.1/net/mac80211/main.c
                ret = drv_config(local, changed);
                /*
                 * Goal:
-diff -urNp linux-2.6.33.1/net/mac80211/pm.c linux-2.6.33.1/net/mac80211/pm.c
---- linux-2.6.33.1/net/mac80211/pm.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/pm.c   2010-03-20 16:58:42.316527391 -0400
-@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
+diff -urNp linux-2.6.34/net/mac80211/pm.c linux-2.6.34/net/mac80211/pm.c
+--- linux-2.6.34/net/mac80211/pm.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/pm.c     2010-07-01 20:45:16.000000000 -0400
+@@ -101,7 +101,7 @@ int __ieee80211_suspend(struct ieee80211
        }
  
        /* stop hardware - this must stop RX */
@@ -51866,10 +52848,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/pm.c linux-2.6.33.1/net/mac80211/pm.c
                ieee80211_stop_device(local);
  
        local->suspended = true;
-diff -urNp linux-2.6.33.1/net/mac80211/rate.c linux-2.6.33.1/net/mac80211/rate.c
---- linux-2.6.33.1/net/mac80211/rate.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/rate.c 2010-03-20 16:58:42.316527391 -0400
-@@ -288,7 +288,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
+diff -urNp linux-2.6.34/net/mac80211/rate.c linux-2.6.34/net/mac80211/rate.c
+--- linux-2.6.34/net/mac80211/rate.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/rate.c   2010-07-01 20:45:16.000000000 -0400
+@@ -355,7 +355,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
        ASSERT_RTNL();
  
@@ -51878,10 +52860,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/rate.c linux-2.6.33.1/net/mac80211/rate.c
                return -EBUSY;
  
        if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.33.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.33.1/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.33.1/net/mac80211/rc80211_pid_debugfs.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/rc80211_pid_debugfs.c  2010-03-20 16:58:42.323982192 -0400
-@@ -191,7 +191,7 @@ static ssize_t rate_control_pid_events_r
+diff -urNp linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/rc80211_pid_debugfs.c    2010-07-01 20:45:16.000000000 -0400
+@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
        spin_unlock_irqrestore(&events->lock, status);
  
@@ -51890,10 +52872,22 @@ diff -urNp linux-2.6.33.1/net/mac80211/rc80211_pid_debugfs.c linux-2.6.33.1/net/
                return -EFAULT;
  
        return p;
-diff -urNp linux-2.6.33.1/net/mac80211/util.c linux-2.6.33.1/net/mac80211/util.c
---- linux-2.6.33.1/net/mac80211/util.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/mac80211/util.c 2010-03-20 16:58:42.329957671 -0400
-@@ -1050,14 +1050,14 @@ int ieee80211_reconfig(struct ieee80211_
+diff -urNp linux-2.6.34/net/mac80211/tx.c linux-2.6.34/net/mac80211/tx.c
+--- linux-2.6.34/net/mac80211/tx.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/tx.c     2010-07-01 20:45:16.000000000 -0400
+@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
+       return cpu_to_le16(dur);
+ }
+ 
+-static int inline is_ieee80211_device(struct ieee80211_local *local,
++static inline int is_ieee80211_device(struct ieee80211_local *local,
+                                     struct net_device *dev)
+ {
+       return local == wdev_priv(dev->ieee80211_ptr);
+diff -urNp linux-2.6.34/net/mac80211/util.c linux-2.6.34/net/mac80211/util.c
+--- linux-2.6.34/net/mac80211/util.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/mac80211/util.c   2010-07-01 20:45:16.000000000 -0400
+@@ -1088,7 +1088,7 @@ int ieee80211_reconfig(struct ieee80211_
                local->resuming = true;
  
        /* restart hardware */
@@ -51902,18 +52896,10 @@ diff -urNp linux-2.6.33.1/net/mac80211/util.c linux-2.6.33.1/net/mac80211/util.c
                /*
                 * Upon resume hardware can sometimes be goofy due to
                 * various platform / driver / bus issues, so restarting
-                * the device may at times not work immediately. Propagate
-                * the error.
-                */
--              res = drv_start(local);
-+                res = drv_start(local);
-               if (res) {
-                       WARN(local->suspended, "Harware became unavailable "
-                            "upon resume. This is could be a software issue"
-diff -urNp linux-2.6.33.1/net/packet/af_packet.c linux-2.6.33.1/net/packet/af_packet.c
---- linux-2.6.33.1/net/packet/af_packet.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/packet/af_packet.c      2010-03-20 16:58:42.329957671 -0400
-@@ -1886,7 +1886,7 @@ static int packet_getsockopt(struct sock
+diff -urNp linux-2.6.34/net/packet/af_packet.c linux-2.6.34/net/packet/af_packet.c
+--- linux-2.6.34/net/packet/af_packet.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/packet/af_packet.c        2010-07-01 20:45:16.000000000 -0400
+@@ -2034,7 +2034,7 @@ static int packet_getsockopt(struct sock
        case PACKET_HDRLEN:
                if (len > sizeof(int))
                        len = sizeof(int);
@@ -51922,7 +52908,7 @@ diff -urNp linux-2.6.33.1/net/packet/af_packet.c linux-2.6.33.1/net/packet/af_pa
                        return -EFAULT;
                switch (val) {
                case TPACKET_V1:
-@@ -1919,7 +1919,7 @@ static int packet_getsockopt(struct sock
+@@ -2066,7 +2066,7 @@ static int packet_getsockopt(struct sock
  
        if (put_user(len, optlen))
                return -EFAULT;
@@ -51931,10 +52917,10 @@ diff -urNp linux-2.6.33.1/net/packet/af_packet.c linux-2.6.33.1/net/packet/af_pa
                return -EFAULT;
        return 0;
  }
-diff -urNp linux-2.6.33.1/net/sctp/socket.c linux-2.6.33.1/net/sctp/socket.c
---- linux-2.6.33.1/net/sctp/socket.c   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/sctp/socket.c   2010-03-20 16:58:42.332512321 -0400
-@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
+diff -urNp linux-2.6.34/net/sctp/socket.c linux-2.6.34/net/sctp/socket.c
+--- linux-2.6.34/net/sctp/socket.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/sctp/socket.c     2010-07-01 20:45:16.000000000 -0400
+@@ -1483,7 +1483,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
        struct sctp_sndrcvinfo *sinfo;
        struct sctp_initmsg *sinit;
        sctp_assoc_t associd = 0;
@@ -51943,7 +52929,7 @@ diff -urNp linux-2.6.33.1/net/sctp/socket.c linux-2.6.33.1/net/sctp/socket.c
        int err;
        sctp_scope_t scope;
        long timeo;
-@@ -4386,7 +4386,7 @@ static int sctp_getsockopt_peer_addrs(st
+@@ -4390,7 +4390,7 @@ static int sctp_getsockopt_peer_addrs(st
                addrlen = sctp_get_af_specific(sk->sk_family)->sockaddr_len;
                if (space_left < addrlen)
                        return -ENOMEM;
@@ -51952,7 +52938,7 @@ diff -urNp linux-2.6.33.1/net/sctp/socket.c linux-2.6.33.1/net/sctp/socket.c
                        return -EFAULT;
                to += addrlen;
                cnt++;
-@@ -5478,7 +5478,6 @@ pp_found:
+@@ -5482,7 +5482,6 @@ pp_found:
                 */
                int reuse = sk->sk_reuse;
                struct sock *sk2;
@@ -51960,18 +52946,18 @@ diff -urNp linux-2.6.33.1/net/sctp/socket.c linux-2.6.33.1/net/sctp/socket.c
  
                SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
                if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
---- linux-2.6.33.1/net/socket.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/socket.c        2010-03-20 16:58:42.332512321 -0400
-@@ -87,6 +87,7 @@
- #include <linux/wireless.h>
+diff -urNp linux-2.6.34/net/socket.c linux-2.6.34/net/socket.c
+--- linux-2.6.34/net/socket.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/socket.c  2010-07-03 19:08:46.000000000 -0400
+@@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
+ #include <linux/slab.h>
 +#include <linux/in.h>
  
  #include <asm/uaccess.h>
  #include <asm/unistd.h>
-@@ -103,6 +104,8 @@
+@@ -104,6 +105,8 @@
  #include <linux/sockios.h>
  #include <linux/atalk.h>
  
@@ -51980,7 +52966,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
  static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
  static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         unsigned long nr_segs, loff_t pos);
-@@ -304,7 +307,7 @@ static int sockfs_get_sb(struct file_sys
+@@ -305,7 +308,7 @@ static int sockfs_get_sb(struct file_sys
                             mnt);
  }
  
@@ -51989,7 +52975,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
  
  static struct file_system_type sock_fs_type = {
        .name =         "sockfs",
-@@ -1310,6 +1313,16 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1311,6 +1314,16 @@ SYSCALL_DEFINE3(socket, int, family, int
        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
  
@@ -52006,7 +52992,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
        retval = sock_create(family, type, protocol, &sock);
        if (retval < 0)
                goto out;
-@@ -1422,6 +1435,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1423,6 +1436,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
        if (sock) {
                err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
                if (err >= 0) {
@@ -52021,7 +53007,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
                        err = security_socket_bind(sock,
                                                   (struct sockaddr *)&address,
                                                   addrlen);
-@@ -1430,6 +1451,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
+@@ -1431,6 +1452,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
                                                      (struct sockaddr *)
                                                      &address, addrlen);
                }
@@ -52029,11 +53015,11 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
                fput_light(sock->file, fput_needed);
        }
        return err;
-@@ -1453,10 +1475,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
+@@ -1454,10 +1476,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
                if ((unsigned)backlog > somaxconn)
                        backlog = somaxconn;
  
-+              if (gr_handle_sock_server_other(sock)) {
++              if (gr_handle_sock_server_other(sock->sk)) {
 +                      err = -EPERM;
 +                      goto error;
 +              }
@@ -52050,11 +53036,11 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
                fput_light(sock->file, fput_needed);
        }
        return err;
-@@ -1499,6 +1531,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1500,6 +1532,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        newsock->type = sock->type;
        newsock->ops = sock->ops;
  
-+      if (gr_handle_sock_server_other(sock)) {
++      if (gr_handle_sock_server_other(sock->sk)) {
 +              err = -EPERM;
 +              sock_release(newsock);
 +              goto out_put;
@@ -52069,7 +53055,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
        /*
         * We don't need try_module_get here, as the listening socket (sock)
         * has the protocol module (sock->ops->owner) held.
-@@ -1537,6 +1581,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
+@@ -1538,6 +1582,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
        fd_install(newfd, newfile);
        err = newfd;
  
@@ -52078,7 +53064,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
  out_put:
        fput_light(sock->file, fput_needed);
  out:
-@@ -1569,6 +1615,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1570,6 +1616,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
                int, addrlen)
  {
        struct socket *sock;
@@ -52086,7 +53072,7 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
        struct sockaddr_storage address;
        int err, fput_needed;
  
-@@ -1579,6 +1626,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
+@@ -1580,6 +1627,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
        if (err < 0)
                goto out_put;
  
@@ -52104,10 +53090,10 @@ diff -urNp linux-2.6.33.1/net/socket.c linux-2.6.33.1/net/socket.c
        err =
            security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
        if (err)
-diff -urNp linux-2.6.33.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.33.1/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.33.1/net/sunrpc/xprtrdma/svc_rdma.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/sunrpc/xprtrdma/svc_rdma.c      2010-03-20 16:58:42.332512321 -0400
-@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
+diff -urNp linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/sunrpc/xprtrdma/svc_rdma.c        2010-07-01 20:45:16.000000000 -0400
+@@ -106,7 +106,7 @@ static int read_reset_stat(ctl_table *ta
                len -= *ppos;
                if (len > *lenp)
                        len = *lenp;
@@ -52116,9 +53102,9 @@ diff -urNp linux-2.6.33.1/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.33.1/net/sunr
                        return -EFAULT;
                *lenp = len;
                *ppos += len;
-diff -urNp linux-2.6.33.1/net/sysctl_net.c linux-2.6.33.1/net/sysctl_net.c
---- linux-2.6.33.1/net/sysctl_net.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/sysctl_net.c    2010-03-20 16:58:42.332512321 -0400
+diff -urNp linux-2.6.34/net/sysctl_net.c linux-2.6.34/net/sysctl_net.c
+--- linux-2.6.34/net/sysctl_net.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/sysctl_net.c      2010-07-01 20:45:16.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
                               struct ctl_table *table)
  {
@@ -52128,9 +53114,24 @@ diff -urNp linux-2.6.33.1/net/sysctl_net.c linux-2.6.33.1/net/sysctl_net.c
                int mode = (table->mode >> 6) & 7;
                return (mode << 6) | (mode << 3) | mode;
        }
-diff -urNp linux-2.6.33.1/net/unix/af_unix.c linux-2.6.33.1/net/unix/af_unix.c
---- linux-2.6.33.1/net/unix/af_unix.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/net/unix/af_unix.c  2010-03-20 16:58:42.332512321 -0400
+diff -urNp linux-2.6.34/net/tipc/socket.c linux-2.6.34/net/tipc/socket.c
+--- linux-2.6.34/net/tipc/socket.c     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/tipc/socket.c     2010-07-01 20:45:16.000000000 -0400
+@@ -1451,8 +1451,9 @@ static int connect(struct socket *sock, 
+       } else {
+               if (res == 0)
+                       res = -ETIMEDOUT;
+-              else
+-                      ; /* leave "res" unchanged */
++              else {
++                      /* leave "res" unchanged */
++              }
+               sock->state = SS_DISCONNECTING;
+       }
+ 
+diff -urNp linux-2.6.34/net/unix/af_unix.c linux-2.6.34/net/unix/af_unix.c
+--- linux-2.6.34/net/unix/af_unix.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/unix/af_unix.c    2010-07-01 20:45:16.000000000 -0400
 @@ -735,6 +735,12 @@ static struct sock *unix_find_other(stru
                err = -ECONNREFUSED;
                if (!S_ISSOCK(inode->i_mode))
@@ -52188,21 +53189,52 @@ diff -urNp linux-2.6.33.1/net/unix/af_unix.c linux-2.6.33.1/net/unix/af_unix.c
                list = &unix_socket_table[addr->hash];
        } else {
                list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-diff -urNp linux-2.6.33.1/samples/kobject/kset-example.c linux-2.6.33.1/samples/kobject/kset-example.c
---- linux-2.6.33.1/samples/kobject/kset-example.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/samples/kobject/kset-example.c      2010-03-20 16:58:42.344967210 -0400
-@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
+diff -urNp linux-2.6.34/net/wireless/wext-core.c linux-2.6.34/net/wireless/wext-core.c
+--- linux-2.6.34/net/wireless/wext-core.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/wireless/wext-core.c      2010-07-01 20:45:16.000000000 -0400
+@@ -744,8 +744,7 @@ static int ioctl_standard_iw_point(struc
+                */
+ 
+               /* Support for very large requests */
+-              if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
+-                  (user_length > descr->max_tokens)) {
++              if (user_length > descr->max_tokens) {
+                       /* Allow userspace to GET more than max so
+                        * we can support any size GET requests.
+                        * There is still a limit : -ENOMEM.
+diff -urNp linux-2.6.34/net/xfrm/xfrm_policy.c linux-2.6.34/net/xfrm/xfrm_policy.c
+--- linux-2.6.34/net/xfrm/xfrm_policy.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/net/xfrm/xfrm_policy.c        2010-07-01 20:45:16.000000000 -0400
+@@ -1510,7 +1510,7 @@ free_dst:
+       goto out;
+ }
+ 
+-static int inline
++static inline int
+ xfrm_dst_alloc_copy(void **target, void *src, int size)
+ {
+       if (!*target) {
+@@ -1522,7 +1522,7 @@ xfrm_dst_alloc_copy(void **target, void 
+       return 0;
  }
  
- /* Our custom sysfs_ops that we will associate with our ktype later on */
--static struct sysfs_ops foo_sysfs_ops = {
-+static const struct sysfs_ops foo_sysfs_ops = {
-       .show = foo_attr_show,
-       .store = foo_attr_store,
- };
-diff -urNp linux-2.6.33.1/scripts/basic/fixdep.c linux-2.6.33.1/scripts/basic/fixdep.c
---- linux-2.6.33.1/scripts/basic/fixdep.c      2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/basic/fixdep.c      2010-03-20 16:58:42.344967210 -0400
+-static int inline
++static inline int
+ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
+ {
+ #ifdef CONFIG_XFRM_SUB_POLICY
+@@ -1534,7 +1534,7 @@ xfrm_dst_update_parent(struct dst_entry 
+ #endif
+ }
+ 
+-static int inline
++static inline int
+ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
+ {
+ #ifdef CONFIG_XFRM_SUB_POLICY
+diff -urNp linux-2.6.34/scripts/basic/fixdep.c linux-2.6.34/scripts/basic/fixdep.c
+--- linux-2.6.34/scripts/basic/fixdep.c        2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/basic/fixdep.c        2010-07-01 20:45:16.000000000 -0400
 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
  
  static void parse_config_file(char *map, size_t len)
@@ -52224,9 +53256,9 @@ diff -urNp linux-2.6.33.1/scripts/basic/fixdep.c linux-2.6.33.1/scripts/basic/fi
  
        if (*p != INT_CONF) {
                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.33.1/scripts/kallsyms.c linux-2.6.33.1/scripts/kallsyms.c
---- linux-2.6.33.1/scripts/kallsyms.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/kallsyms.c  2010-03-20 16:58:42.344967210 -0400
+diff -urNp linux-2.6.34/scripts/kallsyms.c linux-2.6.34/scripts/kallsyms.c
+--- linux-2.6.34/scripts/kallsyms.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/kallsyms.c    2010-07-01 20:45:16.000000000 -0400
 @@ -43,10 +43,10 @@ struct text_range {
  
  static unsigned long long _text;
@@ -52242,9 +53274,9 @@ diff -urNp linux-2.6.33.1/scripts/kallsyms.c linux-2.6.33.1/scripts/kallsyms.c
  };
  #define text_range_text     (&text_ranges[0])
  #define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.33.1/scripts/mod/file2alias.c linux-2.6.33.1/scripts/mod/file2alias.c
---- linux-2.6.33.1/scripts/mod/file2alias.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/mod/file2alias.c    2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/scripts/mod/file2alias.c linux-2.6.34/scripts/mod/file2alias.c
+--- linux-2.6.34/scripts/mod/file2alias.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/mod/file2alias.c      2010-07-01 20:45:16.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
                            unsigned long size, unsigned long id_size,
                            void *symval)
@@ -52299,9 +53331,9 @@ diff -urNp linux-2.6.33.1/scripts/mod/file2alias.c linux-2.6.33.1/scripts/mod/fi
  
        sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.33.1/scripts/mod/modpost.c linux-2.6.33.1/scripts/mod/modpost.c
---- linux-2.6.33.1/scripts/mod/modpost.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/mod/modpost.c       2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/scripts/mod/modpost.c linux-2.6.34/scripts/mod/modpost.c
+--- linux-2.6.34/scripts/mod/modpost.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/mod/modpost.c 2010-07-01 20:45:16.000000000 -0400
 @@ -842,6 +842,7 @@ enum mismatch {
        INIT_TO_EXIT,
        EXIT_TO_INIT,
@@ -52369,9 +53401,9 @@ diff -urNp linux-2.6.33.1/scripts/mod/modpost.c linux-2.6.33.1/scripts/mod/modpo
                goto close_write;
  
        tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.33.1/scripts/mod/modpost.h linux-2.6.33.1/scripts/mod/modpost.h
---- linux-2.6.33.1/scripts/mod/modpost.h       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/mod/modpost.h       2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/scripts/mod/modpost.h linux-2.6.34/scripts/mod/modpost.h
+--- linux-2.6.34/scripts/mod/modpost.h 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/mod/modpost.h 2010-07-01 20:45:16.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -52391,9 +53423,9 @@ diff -urNp linux-2.6.33.1/scripts/mod/modpost.h linux-2.6.33.1/scripts/mod/modpo
  
  struct module {
        struct module *next;
-diff -urNp linux-2.6.33.1/scripts/mod/sumversion.c linux-2.6.33.1/scripts/mod/sumversion.c
---- linux-2.6.33.1/scripts/mod/sumversion.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/mod/sumversion.c    2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/scripts/mod/sumversion.c linux-2.6.34/scripts/mod/sumversion.c
+--- linux-2.6.34/scripts/mod/sumversion.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/mod/sumversion.c      2010-07-01 20:45:16.000000000 -0400
 @@ -455,7 +455,7 @@ static void write_version(const char *fi
                goto out;
        }
@@ -52403,9 +53435,9 @@ diff -urNp linux-2.6.33.1/scripts/mod/sumversion.c linux-2.6.33.1/scripts/mod/su
                warn("writing sum in %s failed: %s\n",
                        filename, strerror(errno));
                goto out;
-diff -urNp linux-2.6.33.1/scripts/pnmtologo.c linux-2.6.33.1/scripts/pnmtologo.c
---- linux-2.6.33.1/scripts/pnmtologo.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/scripts/pnmtologo.c 2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/scripts/pnmtologo.c linux-2.6.34/scripts/pnmtologo.c
+--- linux-2.6.34/scripts/pnmtologo.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/scripts/pnmtologo.c   2010-07-01 20:45:16.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -52432,19 +53464,18 @@ diff -urNp linux-2.6.33.1/scripts/pnmtologo.c linux-2.6.33.1/scripts/pnmtologo.c
            logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.33.1/security/commoncap.c linux-2.6.33.1/security/commoncap.c
---- linux-2.6.33.1/security/commoncap.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/commoncap.c        2010-03-20 16:58:42.348544513 -0400
-@@ -27,7 +27,7 @@
- #include <linux/sched.h>
+diff -urNp linux-2.6.34/security/commoncap.c linux-2.6.34/security/commoncap.c
+--- linux-2.6.34/security/commoncap.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/commoncap.c  2010-07-02 17:30:22.000000000 -0400
+@@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
--
+ #include <linux/syslog.h>
 +#include <net/sock.h>
+ 
  /*
   * If a non-root user executes a setuid-root binary in
-  * !secure(SECURE_NOROOT) mode, then we raise capabilities.
-@@ -50,9 +50,11 @@ static void warn_setuid_and_fcaps_mixed(
+@@ -51,9 +52,11 @@ static void warn_setuid_and_fcaps_mixed(
        }
  }
  
@@ -52457,10 +53488,10 @@ diff -urNp linux-2.6.33.1/security/commoncap.c linux-2.6.33.1/security/commoncap
        return 0;
  }
  
-diff -urNp linux-2.6.33.1/security/integrity/ima/ima_api.c linux-2.6.33.1/security/integrity/ima/ima_api.c
---- linux-2.6.33.1/security/integrity/ima/ima_api.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/integrity/ima/ima_api.c    2010-03-20 16:58:42.348544513 -0400
-@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
+diff -urNp linux-2.6.34/security/integrity/ima/ima_api.c linux-2.6.34/security/integrity/ima/ima_api.c
+--- linux-2.6.34/security/integrity/ima/ima_api.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/integrity/ima/ima_api.c      2010-07-01 20:45:16.000000000 -0400
+@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
        int result;
  
        /* can overflow, only indicator */
@@ -52469,10 +53500,10 @@ diff -urNp linux-2.6.33.1/security/integrity/ima/ima_api.c linux-2.6.33.1/securi
  
        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
-diff -urNp linux-2.6.33.1/security/integrity/ima/ima_fs.c linux-2.6.33.1/security/integrity/ima/ima_fs.c
---- linux-2.6.33.1/security/integrity/ima/ima_fs.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/integrity/ima/ima_fs.c     2010-03-20 16:58:42.348544513 -0400
-@@ -27,12 +27,12 @@
+diff -urNp linux-2.6.34/security/integrity/ima/ima_fs.c linux-2.6.34/security/integrity/ima/ima_fs.c
+--- linux-2.6.34/security/integrity/ima/ima_fs.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/integrity/ima/ima_fs.c       2010-07-01 20:45:16.000000000 -0400
+@@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
  static ssize_t ima_show_htable_value(char __user *buf, size_t count,
@@ -52487,9 +53518,9 @@ diff -urNp linux-2.6.33.1/security/integrity/ima/ima_fs.c linux-2.6.33.1/securit
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.33.1/security/integrity/ima/ima.h linux-2.6.33.1/security/integrity/ima/ima.h
---- linux-2.6.33.1/security/integrity/ima/ima.h        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/integrity/ima/ima.h        2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/security/integrity/ima/ima.h linux-2.6.34/security/integrity/ima/ima.h
+--- linux-2.6.34/security/integrity/ima/ima.h  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/integrity/ima/ima.h  2010-07-01 20:45:16.000000000 -0400
 @@ -83,8 +83,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -52501,10 +53532,10 @@ diff -urNp linux-2.6.33.1/security/integrity/ima/ima.h linux-2.6.33.1/security/i
        struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.33.1/security/integrity/ima/ima_queue.c linux-2.6.33.1/security/integrity/ima/ima_queue.c
---- linux-2.6.33.1/security/integrity/ima/ima_queue.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/integrity/ima/ima_queue.c  2010-03-20 16:58:42.348544513 -0400
-@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
+diff -urNp linux-2.6.34/security/integrity/ima/ima_queue.c linux-2.6.34/security/integrity/ima/ima_queue.c
+--- linux-2.6.34/security/integrity/ima/ima_queue.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/integrity/ima/ima_queue.c    2010-07-01 20:45:16.000000000 -0400
+@@ -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);
  
@@ -52513,10 +53544,10 @@ diff -urNp linux-2.6.33.1/security/integrity/ima/ima_queue.c linux-2.6.33.1/secu
        key = ima_hash_key(entry->digest);
        hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
        return 0;
-diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
---- linux-2.6.33.1/security/Kconfig    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/Kconfig    2010-03-20 17:07:22.208972401 -0400
-@@ -4,6 +4,488 @@
+diff -urNp linux-2.6.34/security/Kconfig linux-2.6.34/security/Kconfig
+--- linux-2.6.34/security/Kconfig      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/Kconfig      2010-07-01 20:45:16.000000000 -0400
+@@ -4,6 +4,499 @@
  
  menu "Security options"
  
@@ -52524,6 +53555,15 @@ diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
 +
 +menu "PaX"
 +
++      config PAX_PER_CPU_PGD
++      bool
++
++      config TASK_SIZE_MAX_SHIFT
++      int
++      depends on X86_64
++      default 47 if !PAX_PER_CPU_PGD
++      default 42 if PAX_PER_CPU_PGD
++
 +config PAX
 +      bool "Enable various PaX features"
 +      depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86)
@@ -52809,6 +53849,7 @@ diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
 +config PAX_KERNEXEC
 +      bool "Enforce non-executable kernel pages"
 +      depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
++      select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
 +      help
 +        This is the kernel land equivalent of PAGEEXEC and MPROTECT,
 +        that is, enabling this option will make it harder to inject
@@ -52944,7 +53985,8 @@ diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
 +
 +config PAX_MEMORY_UDEREF
 +      bool "Prevent invalid userland pointer dereference"
-+      depends on X86_32 && !UML_X86 && !XEN
++      depends on X86 && !UML_X86 && !XEN
++      select PAX_PER_CPU_PGD if X86_64
 +      help
 +        By saying Y here the kernel will be prevented from dereferencing
 +        userland pointers in contexts where the kernel expects only kernel
@@ -53005,7 +54047,7 @@ diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
  config KEYS
        bool "Enable access key retention support"
        help
-@@ -124,7 +606,7 @@ config INTEL_TXT
+@@ -124,7 +617,7 @@ config INTEL_TXT
  config LSM_MMAP_MIN_ADDR
        int "Low address space for LSM to protect from user allocation"
        depends on SECURITY && SECURITY_SELINUX
@@ -53014,9 +54056,9 @@ diff -urNp linux-2.6.33.1/security/Kconfig linux-2.6.33.1/security/Kconfig
        help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.33.1/security/min_addr.c linux-2.6.33.1/security/min_addr.c
---- linux-2.6.33.1/security/min_addr.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/security/min_addr.c 2010-03-20 16:58:42.348544513 -0400
+diff -urNp linux-2.6.34/security/min_addr.c linux-2.6.34/security/min_addr.c
+--- linux-2.6.34/security/min_addr.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/security/min_addr.c   2010-07-01 20:45:16.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -53033,10 +54075,10 @@ diff -urNp linux-2.6.33.1/security/min_addr.c linux-2.6.33.1/security/min_addr.c
  }
  
  /*
-diff -urNp linux-2.6.33.1/sound/aoa/codecs/onyx.c linux-2.6.33.1/sound/aoa/codecs/onyx.c
---- linux-2.6.33.1/sound/aoa/codecs/onyx.c     2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/aoa/codecs/onyx.c     2010-03-20 16:58:42.365465627 -0400
-@@ -53,7 +53,7 @@ struct onyx {
+diff -urNp linux-2.6.34/sound/aoa/codecs/onyx.c linux-2.6.34/sound/aoa/codecs/onyx.c
+--- linux-2.6.34/sound/aoa/codecs/onyx.c       2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/aoa/codecs/onyx.c       2010-07-01 20:45:16.000000000 -0400
+@@ -54,7 +54,7 @@ struct onyx {
                                spdif_locked:1,
                                analog_locked:1,
                                original_mute:2;
@@ -53045,7 +54087,7 @@ diff -urNp linux-2.6.33.1/sound/aoa/codecs/onyx.c linux-2.6.33.1/sound/aoa/codec
        struct codec_info       *codec_info;
  
        /* mutex serializes concurrent access to the device
-@@ -752,7 +752,7 @@ static int onyx_open(struct codec_info_i
+@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_i
        struct onyx *onyx = cii->codec_data;
  
        mutex_lock(&onyx->mutex);
@@ -53054,7 +54096,7 @@ diff -urNp linux-2.6.33.1/sound/aoa/codecs/onyx.c linux-2.6.33.1/sound/aoa/codec
        mutex_unlock(&onyx->mutex);
  
        return 0;
-@@ -764,8 +764,7 @@ static int onyx_close(struct codec_info_
+@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_
        struct onyx *onyx = cii->codec_data;
  
        mutex_lock(&onyx->mutex);
@@ -53064,10 +54106,10 @@ diff -urNp linux-2.6.33.1/sound/aoa/codecs/onyx.c linux-2.6.33.1/sound/aoa/codec
                onyx->spdif_locked = onyx->analog_locked = 0;
        mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.33.1/sound/core/oss/pcm_oss.c linux-2.6.33.1/sound/core/oss/pcm_oss.c
---- linux-2.6.33.1/sound/core/oss/pcm_oss.c    2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/core/oss/pcm_oss.c    2010-03-20 16:58:42.372956563 -0400
-@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
+diff -urNp linux-2.6.34/sound/core/oss/pcm_oss.c linux-2.6.34/sound/core/oss/pcm_oss.c
+--- linux-2.6.34/sound/core/oss/pcm_oss.c      2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/core/oss/pcm_oss.c      2010-07-01 20:45:16.000000000 -0400
+@@ -2962,8 +2962,8 @@ static void snd_pcm_oss_proc_done(struct
        }
  }
  #else /* !CONFIG_SND_VERBOSE_PROCFS */
@@ -53078,9 +54120,9 @@ diff -urNp linux-2.6.33.1/sound/core/oss/pcm_oss.c linux-2.6.33.1/sound/core/oss
  #endif /* CONFIG_SND_VERBOSE_PROCFS */
  
  /*
-diff -urNp linux-2.6.33.1/sound/core/seq/seq_lock.h linux-2.6.33.1/sound/core/seq/seq_lock.h
---- linux-2.6.33.1/sound/core/seq/seq_lock.h   2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/core/seq/seq_lock.h   2010-03-20 16:58:42.376941145 -0400
+diff -urNp linux-2.6.34/sound/core/seq/seq_lock.h linux-2.6.34/sound/core/seq/seq_lock.h
+--- linux-2.6.34/sound/core/seq/seq_lock.h     2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/core/seq/seq_lock.h     2010-07-01 20:45:16.000000000 -0400
 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
  #else /* SMP || CONFIG_SND_DEBUG */
  
@@ -53096,10 +54138,10 @@ diff -urNp linux-2.6.33.1/sound/core/seq/seq_lock.h linux-2.6.33.1/sound/core/se
  
  #endif /* SMP || CONFIG_SND_DEBUG */
  
-diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts64.c
---- linux-2.6.33.1/sound/drivers/mts64.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/drivers/mts64.c       2010-03-20 16:58:42.380965540 -0400
-@@ -65,7 +65,7 @@ struct mts64 {
+diff -urNp linux-2.6.34/sound/drivers/mts64.c linux-2.6.34/sound/drivers/mts64.c
+--- linux-2.6.34/sound/drivers/mts64.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/drivers/mts64.c 2010-07-01 20:45:16.000000000 -0400
+@@ -66,7 +66,7 @@ struct mts64 {
        struct pardevice *pardev;
        int pardev_claimed;
  
@@ -53108,7 +54150,7 @@ diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts
        int current_midi_output_port;
        int current_midi_input_port;
        u8 mode[MTS64_NUM_INPUT_PORTS];
-@@ -695,7 +695,7 @@ static int snd_mts64_rawmidi_open(struct
+@@ -696,7 +696,7 @@ static int snd_mts64_rawmidi_open(struct
  {
        struct mts64 *mts = substream->rmidi->private_data;
  
@@ -53117,7 +54159,7 @@ diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts
                /* We don't need a spinlock here, because this is just called 
                   if the device has not been opened before. 
                   So there aren't any IRQs from the device */
-@@ -703,7 +703,7 @@ static int snd_mts64_rawmidi_open(struct
+@@ -704,7 +704,7 @@ static int snd_mts64_rawmidi_open(struct
  
                msleep(50);
        }
@@ -53126,7 +54168,7 @@ diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts
  
        return 0;
  }
-@@ -713,8 +713,7 @@ static int snd_mts64_rawmidi_close(struc
+@@ -714,8 +714,7 @@ static int snd_mts64_rawmidi_close(struc
        struct mts64 *mts = substream->rmidi->private_data;
        unsigned long flags;
  
@@ -53136,7 +54178,7 @@ diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts
                /* We need the spinlock_irqsave here because we can still
                   have IRQs at this point */
                spin_lock_irqsave(&mts->lock, flags);
-@@ -723,8 +722,8 @@ static int snd_mts64_rawmidi_close(struc
+@@ -724,8 +723,8 @@ static int snd_mts64_rawmidi_close(struc
  
                msleep(500);
  
@@ -53147,10 +54189,10 @@ diff -urNp linux-2.6.33.1/sound/drivers/mts64.c linux-2.6.33.1/sound/drivers/mts
  
        return 0;
  }
-diff -urNp linux-2.6.33.1/sound/drivers/portman2x4.c linux-2.6.33.1/sound/drivers/portman2x4.c
---- linux-2.6.33.1/sound/drivers/portman2x4.c  2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/drivers/portman2x4.c  2010-03-20 16:58:42.396942474 -0400
-@@ -83,7 +83,7 @@ struct portman {
+diff -urNp linux-2.6.34/sound/drivers/portman2x4.c linux-2.6.34/sound/drivers/portman2x4.c
+--- linux-2.6.34/sound/drivers/portman2x4.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/drivers/portman2x4.c    2010-07-01 20:45:16.000000000 -0400
+@@ -84,7 +84,7 @@ struct portman {
        struct pardevice *pardev;
        int pardev_claimed;
  
@@ -53159,9 +54201,9 @@ diff -urNp linux-2.6.33.1/sound/drivers/portman2x4.c linux-2.6.33.1/sound/driver
        int mode[PORTMAN_NUM_INPUT_PORTS];
        struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.33.1/sound/oss/sb_audio.c linux-2.6.33.1/sound/oss/sb_audio.c
---- linux-2.6.33.1/sound/oss/sb_audio.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/oss/sb_audio.c        2010-03-20 16:58:42.404957454 -0400
+diff -urNp linux-2.6.34/sound/oss/sb_audio.c linux-2.6.34/sound/oss/sb_audio.c
+--- linux-2.6.34/sound/oss/sb_audio.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/oss/sb_audio.c  2010-07-01 20:45:16.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
                buf16 = (signed short *)(localbuf + localoffs);
                while (c)
@@ -53171,9 +54213,9 @@ diff -urNp linux-2.6.33.1/sound/oss/sb_audio.c linux-2.6.33.1/sound/oss/sb_audio
                        if (copy_from_user(lbuf8,
                                           userbuf+useroffs + p,
                                           locallen))
-diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_codec.c linux-2.6.33.1/sound/pci/ac97/ac97_codec.c
---- linux-2.6.33.1/sound/pci/ac97/ac97_codec.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/pci/ac97/ac97_codec.c 2010-03-20 16:58:42.416962707 -0400
+diff -urNp linux-2.6.34/sound/pci/ac97/ac97_codec.c linux-2.6.34/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.34/sound/pci/ac97/ac97_codec.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/ac97/ac97_codec.c   2010-07-01 20:45:16.000000000 -0400
 @@ -1962,7 +1962,7 @@ static int snd_ac97_dev_disconnect(struc
  }
  
@@ -53183,9 +54225,9 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_codec.c linux-2.6.33.1/sound/pci/a
  
  #ifdef CONFIG_SND_AC97_POWER_SAVE
  static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/ac97/ac97_patch.c
---- linux-2.6.33.1/sound/pci/ac97/ac97_patch.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/pci/ac97/ac97_patch.c 2010-03-20 16:58:42.440672764 -0400
+diff -urNp linux-2.6.34/sound/pci/ac97/ac97_patch.c linux-2.6.34/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.34/sound/pci/ac97/ac97_patch.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/ac97/ac97_patch.c   2010-07-01 20:45:16.000000000 -0400
 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
        return 0;
  }
@@ -53222,16 +54264,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_wolfson_wm9704_specific,
  };
  
-@@ -555,7 +555,7 @@ static int patch_wolfson_wm9705_specific
-       return 0;
- }
- 
--static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
-+static const struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
-       .build_specific = patch_wolfson_wm9705_specific,
- };
- 
-@@ -692,7 +692,7 @@ static int patch_wolfson_wm9711_specific
+@@ -677,7 +677,7 @@ static int patch_wolfson_wm9711_specific
        return 0;
  }
  
@@ -53240,7 +54273,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_wolfson_wm9711_specific,
  };
  
-@@ -886,7 +886,7 @@ static void patch_wolfson_wm9713_resume 
+@@ -871,7 +871,7 @@ static void patch_wolfson_wm9713_resume 
  }
  #endif
  
@@ -53249,7 +54282,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_wolfson_wm9713_specific,
        .build_3d = patch_wolfson_wm9713_3d,
  #ifdef CONFIG_PM      
-@@ -991,7 +991,7 @@ static int patch_sigmatel_stac97xx_speci
+@@ -976,7 +976,7 @@ static int patch_sigmatel_stac97xx_speci
        return 0;
  }
  
@@ -53258,7 +54291,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_3d       = patch_sigmatel_stac9700_3d,
        .build_specific = patch_sigmatel_stac97xx_specific
  };
-@@ -1038,7 +1038,7 @@ static int patch_sigmatel_stac9708_speci
+@@ -1023,7 +1023,7 @@ static int patch_sigmatel_stac9708_speci
        return patch_sigmatel_stac97xx_specific(ac97);
  }
  
@@ -53267,7 +54300,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_3d       = patch_sigmatel_stac9708_3d,
        .build_specific = patch_sigmatel_stac9708_specific
  };
-@@ -1267,7 +1267,7 @@ static int patch_sigmatel_stac9758_speci
+@@ -1252,7 +1252,7 @@ static int patch_sigmatel_stac9758_speci
        return 0;
  }
  
@@ -53276,7 +54309,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_3d       = patch_sigmatel_stac9700_3d,
        .build_specific = patch_sigmatel_stac9758_specific
  };
-@@ -1342,7 +1342,7 @@ static int patch_cirrus_build_spdif(stru
+@@ -1327,7 +1327,7 @@ static int patch_cirrus_build_spdif(stru
        return 0;
  }
  
@@ -53285,7 +54318,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_spdif = patch_cirrus_build_spdif
  };
  
-@@ -1399,7 +1399,7 @@ static int patch_conexant_build_spdif(st
+@@ -1384,7 +1384,7 @@ static int patch_conexant_build_spdif(st
        return 0;
  }
  
@@ -53294,7 +54327,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_spdif = patch_conexant_build_spdif
  };
  
-@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a
+@@ -1486,7 +1486,7 @@ static const struct snd_ac97_res_table a
        { AC97_VIDEO, 0x9f1f },
        { AC97_AUX, 0x9f1f },
        { AC97_PCM, 0x9f1f },
@@ -53303,7 +54336,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
  };
  
  static int patch_ad1819(struct snd_ac97 * ac97)
-@@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct 
+@@ -1560,7 +1560,7 @@ static void patch_ad1881_chained(struct 
        }
  }
  
@@ -53312,7 +54345,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
  #ifdef CONFIG_PM
        .resume = ad18xx_resume
  #endif
-@@ -1662,7 +1662,7 @@ static int patch_ad1885_specific(struct 
+@@ -1647,7 +1647,7 @@ static int patch_ad1885_specific(struct 
        return 0;
  }
  
@@ -53321,7 +54354,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = &patch_ad1885_specific,
  #ifdef CONFIG_PM
        .resume = ad18xx_resume
-@@ -1689,7 +1689,7 @@ static int patch_ad1886_specific(struct 
+@@ -1674,7 +1674,7 @@ static int patch_ad1886_specific(struct 
        return 0;
  }
  
@@ -53330,7 +54363,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = &patch_ad1886_specific,
  #ifdef CONFIG_PM
        .resume = ad18xx_resume
-@@ -1894,7 +1894,7 @@ static int patch_ad1981a_specific(struct
+@@ -1881,7 +1881,7 @@ static int patch_ad1981a_specific(struct
                                    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
  }
  
@@ -53339,7 +54372,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1981a_specific,
  #ifdef CONFIG_PM
-@@ -1949,7 +1949,7 @@ static int patch_ad1981b_specific(struct
+@@ -1936,7 +1936,7 @@ static int patch_ad1981b_specific(struct
                                    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
  }
  
@@ -53348,7 +54381,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1981b_specific,
  #ifdef CONFIG_PM
-@@ -2088,7 +2088,7 @@ static int patch_ad1888_specific(struct 
+@@ -2075,7 +2075,7 @@ static int patch_ad1888_specific(struct 
        return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
  }
  
@@ -53357,7 +54390,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1888_specific,
  #ifdef CONFIG_PM
-@@ -2137,7 +2137,7 @@ static int patch_ad1980_specific(struct 
+@@ -2124,7 +2124,7 @@ static int patch_ad1980_specific(struct 
        return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
  }
  
@@ -53366,7 +54399,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1980_specific,
  #ifdef CONFIG_PM
-@@ -2252,7 +2252,7 @@ static int patch_ad1985_specific(struct 
+@@ -2239,7 +2239,7 @@ static int patch_ad1985_specific(struct 
                                    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -53375,7 +54408,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1985_specific,
  #ifdef CONFIG_PM
-@@ -2544,7 +2544,7 @@ static int patch_ad1986_specific(struct 
+@@ -2531,7 +2531,7 @@ static int patch_ad1986_specific(struct 
                                    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -53384,7 +54417,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_post_spdif = patch_ad198x_post_spdif,
        .build_specific = patch_ad1986_specific,
  #ifdef CONFIG_PM
-@@ -2649,7 +2649,7 @@ static int patch_alc650_specific(struct 
+@@ -2636,7 +2636,7 @@ static int patch_alc650_specific(struct 
        return 0;
  }
  
@@ -53393,7 +54426,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_alc650_specific,
        .update_jacks = alc650_update_jacks
  };
-@@ -2801,7 +2801,7 @@ static int patch_alc655_specific(struct 
+@@ -2788,7 +2788,7 @@ static int patch_alc655_specific(struct 
        return 0;
  }
  
@@ -53402,7 +54435,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_alc655_specific,
        .update_jacks = alc655_update_jacks
  };
-@@ -2913,7 +2913,7 @@ static int patch_alc850_specific(struct 
+@@ -2900,7 +2900,7 @@ static int patch_alc850_specific(struct 
        return 0;
  }
  
@@ -53411,7 +54444,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_alc850_specific,
        .update_jacks = alc850_update_jacks
  };
-@@ -2975,7 +2975,7 @@ static int patch_cm9738_specific(struct 
+@@ -2962,7 +2962,7 @@ static int patch_cm9738_specific(struct 
        return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
  }
  
@@ -53420,7 +54453,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_cm9738_specific,
        .update_jacks = cm9738_update_jacks
  };
-@@ -3066,7 +3066,7 @@ static int patch_cm9739_post_spdif(struc
+@@ -3053,7 +3053,7 @@ static int patch_cm9739_post_spdif(struc
        return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
  }
  
@@ -53429,7 +54462,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_cm9739_specific,
        .build_post_spdif = patch_cm9739_post_spdif,
        .update_jacks = cm9739_update_jacks
-@@ -3240,7 +3240,7 @@ static int patch_cm9761_specific(struct 
+@@ -3227,7 +3227,7 @@ static int patch_cm9761_specific(struct 
        return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
  }
  
@@ -53438,7 +54471,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_cm9761_specific,
        .build_post_spdif = patch_cm9761_post_spdif,
        .update_jacks = cm9761_update_jacks
-@@ -3336,7 +3336,7 @@ static int patch_cm9780_specific(struct 
+@@ -3323,7 +3323,7 @@ static int patch_cm9780_specific(struct 
        return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
  }
  
@@ -53447,7 +54480,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_cm9780_specific,
        .build_post_spdif = patch_cm9761_post_spdif     /* identical with CM9761 */
  };
-@@ -3456,7 +3456,7 @@ static int patch_vt1616_specific(struct 
+@@ -3443,7 +3443,7 @@ static int patch_vt1616_specific(struct 
        return 0;
  }
  
@@ -53456,7 +54489,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_vt1616_specific
  };
  
-@@ -3810,7 +3810,7 @@ static int patch_it2646_specific(struct 
+@@ -3797,7 +3797,7 @@ static int patch_it2646_specific(struct 
        return 0;
  }
  
@@ -53465,7 +54498,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_it2646_specific,
        .update_jacks = it2646_update_jacks
  };
-@@ -3844,7 +3844,7 @@ static int patch_si3036_specific(struct 
+@@ -3831,7 +3831,7 @@ static int patch_si3036_specific(struct 
        return 0;
  }
  
@@ -53474,7 +54507,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_si3036_specific,
  };
  
-@@ -3877,7 +3877,7 @@ static struct snd_ac97_res_table lm4550_
+@@ -3864,7 +3864,7 @@ static struct snd_ac97_res_table lm4550_
        { AC97_AUX, 0x1f1f },
        { AC97_PCM, 0x1f1f },
        { AC97_REC_GAIN, 0x0f0f },
@@ -53483,7 +54516,7 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
  };
  
  static int patch_lm4550(struct snd_ac97 *ac97)
-@@ -3911,7 +3911,7 @@ static int patch_ucb1400_specific(struct
+@@ -3898,7 +3898,7 @@ static int patch_ucb1400_specific(struct
        return 0;
  }
  
@@ -53492,10 +54525,10 @@ diff -urNp linux-2.6.33.1/sound/pci/ac97/ac97_patch.c linux-2.6.33.1/sound/pci/a
        .build_specific = patch_ucb1400_specific,
  };
  
-diff -urNp linux-2.6.33.1/sound/pci/ens1370.c linux-2.6.33.1/sound/pci/ens1370.c
---- linux-2.6.33.1/sound/pci/ens1370.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/pci/ens1370.c 2010-03-20 16:58:42.452959690 -0400
-@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
+diff -urNp linux-2.6.34/sound/pci/ens1370.c linux-2.6.34/sound/pci/ens1370.c
+--- linux-2.6.34/sound/pci/ens1370.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/ens1370.c   2010-07-01 20:45:16.000000000 -0400
+@@ -452,7 +452,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_audio
        { PCI_VDEVICE(ENSONIQ, 0x5880), 0, },   /* ES1373 - CT5880 */
        { PCI_VDEVICE(ECTIVA, 0x8938), 0, },    /* Ectiva EV1938 */
  #endif
@@ -53504,10 +54537,28 @@ diff -urNp linux-2.6.33.1/sound/pci/ens1370.c linux-2.6.33.1/sound/pci/ens1370.c
  };
  
  MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.33.1/sound/pci/intel8x0.c linux-2.6.33.1/sound/pci/intel8x0.c
---- linux-2.6.33.1/sound/pci/intel8x0.c        2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/pci/intel8x0.c        2010-03-20 16:58:42.464956802 -0400
-@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
+diff -urNp linux-2.6.34/sound/pci/hda/patch_hdmi.c linux-2.6.34/sound/pci/hda/patch_hdmi.c
+--- linux-2.6.34/sound/pci/hda/patch_hdmi.c    2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/hda/patch_hdmi.c    2010-07-01 20:45:16.000000000 -0400
+@@ -657,10 +657,10 @@ static void hdmi_non_intrinsic_event(str
+               cp_ready);
+ 
+       /* TODO */
+-      if (cp_state)
+-              ;
+-      if (cp_ready)
+-              ;
++      if (cp_state) {
++      }
++      if (cp_ready) {
++      }
+ }
+ 
+ 
+diff -urNp linux-2.6.34/sound/pci/intel8x0.c linux-2.6.34/sound/pci/intel8x0.c
+--- linux-2.6.34/sound/pci/intel8x0.c  2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/intel8x0.c  2010-07-01 20:45:16.000000000 -0400
+@@ -444,7 +444,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
        { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },     /* AMD8111 */
        { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL },     /* AMD768 */
        { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
@@ -53525,10 +54576,10 @@ diff -urNp linux-2.6.33.1/sound/pci/intel8x0.c linux-2.6.33.1/sound/pci/intel8x0
  };
  
  static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.33.1/sound/pci/intel8x0m.c linux-2.6.33.1/sound/pci/intel8x0m.c
---- linux-2.6.33.1/sound/pci/intel8x0m.c       2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/sound/pci/intel8x0m.c       2010-03-20 16:58:42.469451186 -0400
-@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
+diff -urNp linux-2.6.34/sound/pci/intel8x0m.c linux-2.6.34/sound/pci/intel8x0m.c
+--- linux-2.6.34/sound/pci/intel8x0m.c 2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/sound/pci/intel8x0m.c 2010-07-01 20:45:16.000000000 -0400
+@@ -239,7 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel
        { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },     /* AMD8111 */
        { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
  #endif
@@ -53546,9 +54597,9 @@ diff -urNp linux-2.6.33.1/sound/pci/intel8x0m.c linux-2.6.33.1/sound/pci/intel8x
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.33.1/usr/gen_init_cpio.c linux-2.6.33.1/usr/gen_init_cpio.c
---- linux-2.6.33.1/usr/gen_init_cpio.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/usr/gen_init_cpio.c 2010-03-20 16:58:42.469451186 -0400
+diff -urNp linux-2.6.34/usr/gen_init_cpio.c linux-2.6.34/usr/gen_init_cpio.c
+--- linux-2.6.34/usr/gen_init_cpio.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/usr/gen_init_cpio.c   2010-07-01 20:45:16.000000000 -0400
 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
        int retval;
        int rc = -1;
@@ -53571,10 +54622,10 @@ diff -urNp linux-2.6.33.1/usr/gen_init_cpio.c linux-2.6.33.1/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-2.6.33.1/virt/kvm/kvm_main.c linux-2.6.33.1/virt/kvm/kvm_main.c
---- linux-2.6.33.1/virt/kvm/kvm_main.c 2010-03-15 12:09:39.000000000 -0400
-+++ linux-2.6.33.1/virt/kvm/kvm_main.c 2010-03-20 16:58:42.489458390 -0400
-@@ -1168,6 +1168,7 @@ static int kvm_vcpu_release(struct inode
+diff -urNp linux-2.6.34/virt/kvm/kvm_main.c linux-2.6.34/virt/kvm/kvm_main.c
+--- linux-2.6.34/virt/kvm/kvm_main.c   2010-05-16 17:17:36.000000000 -0400
++++ linux-2.6.34/virt/kvm/kvm_main.c   2010-07-01 20:45:16.000000000 -0400
+@@ -1288,6 +1288,7 @@ static int kvm_vcpu_release(struct inode
        return 0;
  }
  
@@ -53582,7 +54633,7 @@ diff -urNp linux-2.6.33.1/virt/kvm/kvm_main.c linux-2.6.33.1/virt/kvm/kvm_main.c
  static struct file_operations kvm_vcpu_fops = {
        .release        = kvm_vcpu_release,
        .unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -1624,6 +1625,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -1744,6 +1745,7 @@ static int kvm_vm_mmap(struct file *file
        return 0;
  }
  
@@ -53590,7 +54641,7 @@ diff -urNp linux-2.6.33.1/virt/kvm/kvm_main.c linux-2.6.33.1/virt/kvm/kvm_main.c
  static struct file_operations kvm_vm_fops = {
        .release        = kvm_vm_release,
        .unlocked_ioctl = kvm_vm_ioctl,
-@@ -1714,6 +1716,7 @@ out:
+@@ -1834,6 +1836,7 @@ out:
        return r;
  }
  
@@ -53598,7 +54649,7 @@ diff -urNp linux-2.6.33.1/virt/kvm/kvm_main.c linux-2.6.33.1/virt/kvm/kvm_main.c
  static struct file_operations kvm_chardev_ops = {
        .unlocked_ioctl = kvm_dev_ioctl,
        .compat_ioctl   = kvm_dev_ioctl,
-@@ -1723,6 +1726,9 @@ static struct miscdevice kvm_dev = {
+@@ -1843,6 +1846,9 @@ static struct miscdevice kvm_dev = {
        KVM_MINOR,
        "kvm",
        &kvm_chardev_ops,
@@ -53608,7 +54659,7 @@ diff -urNp linux-2.6.33.1/virt/kvm/kvm_main.c linux-2.6.33.1/virt/kvm/kvm_main.c
  };
  
  static void hardware_enable(void *junk)
-@@ -2050,7 +2056,7 @@ static void kvm_sched_out(struct preempt
+@@ -2179,7 +2185,7 @@ static void kvm_sched_out(struct preempt
        kvm_arch_vcpu_put(vcpu);
  }
  

diff --git a/pkgs/core/kernel/patches/routes-2.6.33-16.patch b/pkgs/core/kernel/patches/routes-2.6.34-16.diff
similarity index 78%
rename from pkgs/core/kernel/patches/routes-2.6.33-16.patch
rename to pkgs/core/kernel/patches/routes-2.6.34-16.diff
index 5f6849410d571f325dc83d5a3180a9da148b40b0..532866f261faf257677c0d5f62e4acf37b55ffb4 100644 (file)
--- a/pkgs/core/kernel/patches/routes-2.6.33-16.patch
+++ b/pkgs/core/kernel/patches/routes-2.6.34-16.diff
@@ -1,6 +1,6 @@
-diff -urp v2.6.33/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
---- v2.6.33/linux/include/linux/rtnetlink.h    2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/linux/rtnetlink.h    2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.h
+--- v2.6.34/linux/include/linux/rtnetlink.h    2010-05-17 10:49:00.000000000 +0300
++++ linux/include/linux/rtnetlink.h    2010-05-18 09:58:49.000000000 +0300
 @@ -304,6 +304,8 @@ struct rtnexthop {
  #define RTNH_F_DEAD           1       /* Nexthop is dead (used by multipath)  */
  #define RTNH_F_PERVASIVE      2       /* Do recursive gateway lookup  */
@@ -10,9 +10,9 @@ diff -urp v2.6.33/linux/include/linux/rtnetlink.h linux/include/linux/rtnetlink.
  
  /* Macros to handle hexthops */
  
-diff -urp v2.6.33/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.33/linux/include/net/flow.h   2009-03-25 09:48:32.000000000 +0200
-+++ linux/include/net/flow.h   2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/flow.h linux/include/net/flow.h
+--- v2.6.34/linux/include/net/flow.h   2009-03-25 09:48:32.000000000 +0200
++++ linux/include/net/flow.h   2010-05-18 09:58:49.000000000 +0300
 @@ -19,6 +19,8 @@ struct flowi {
                struct {
                        __be32                  daddr;
@@ -31,9 +31,9 @@ diff -urp v2.6.33/linux/include/net/flow.h linux/include/net/flow.h
  #define fl4_tos               nl_u.ip4_u.tos
  #define fl4_scope     nl_u.ip4_u.scope
  
-diff -urp v2.6.33/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.33/linux/include/net/ip_fib.h 2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/ip_fib.h 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
+--- v2.6.34/linux/include/net/ip_fib.h 2010-02-25 09:01:36.000000000 +0200
++++ linux/include/net/ip_fib.h 2010-05-18 09:58:49.000000000 +0300
 @@ -207,6 +207,8 @@ extern int fib_lookup(struct net *n, str
  extern struct fib_table *fib_new_table(struct net *net, u32 id);
  extern struct fib_table *fib_get_table(struct net *net, u32 id);
@@ -50,9 +50,9 @@ diff -urp v2.6.33/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
 +extern rwlock_t fib_nhflags_lock;
 +
  #endif  /* _NET_FIB_H */
-diff -urp v2.6.33/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilter/nf_nat.h
---- v2.6.33/linux/include/net/netfilter/nf_nat.h       2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/netfilter/nf_nat.h       2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilter/nf_nat.h
+--- v2.6.34/linux/include/net/netfilter/nf_nat.h       2010-02-25 09:01:36.000000000 +0200
++++ linux/include/net/netfilter/nf_nat.h       2010-05-18 09:58:49.000000000 +0300
 @@ -73,6 +73,13 @@ struct nf_conn_nat {
  #endif
  };
@@ -67,9 +67,9 @@ diff -urp v2.6.33/linux/include/net/netfilter/nf_nat.h linux/include/net/netfilt
  /* Set up the info structure to map into this range. */
  extern unsigned int nf_nat_setup_info(struct nf_conn *ct,
                                      const struct nf_nat_range *range,
-diff -urp v2.6.33/linux/include/net/route.h linux/include/net/route.h
---- v2.6.33/linux/include/net/route.h  2010-02-25 09:01:36.000000000 +0200
-+++ linux/include/net/route.h  2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/include/net/route.h linux/include/net/route.h
+--- v2.6.34/linux/include/net/route.h  2010-05-17 10:49:00.000000000 +0300
++++ linux/include/net/route.h  2010-05-18 09:58:49.000000000 +0300
 @@ -113,6 +113,7 @@ extern int         __ip_route_output_key(struct
  extern int            ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
  extern int            ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
@@ -78,10 +78,10 @@ diff -urp v2.6.33/linux/include/net/route.h linux/include/net/route.h
  extern unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph, unsigned short new_mtu, struct net_device *dev);
  extern void           ip_rt_send_redirect(struct sk_buff *skb);
  
-diff -urp v2.6.33/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
---- v2.6.33/linux/net/bridge/br_netfilter.c    2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/bridge/br_netfilter.c    2010-02-25 11:11:52.000000000 +0200
-@@ -343,6 +343,9 @@ static int br_nf_pre_routing_finish(stru
+diff -urp v2.6.34/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
+--- v2.6.34/linux/net/bridge/br_netfilter.c    2010-05-17 10:49:01.000000000 +0300
++++ linux/net/bridge/br_netfilter.c    2010-05-18 09:58:49.000000000 +0300
+@@ -344,6 +344,9 @@ static int br_nf_pre_routing_finish(stru
        struct rtable *rt;
        int err;
  
@@ -91,10 +91,10 @@ diff -urp v2.6.33/linux/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.
        if (nf_bridge->mask & BRNF_PKT_TYPE) {
                skb->pkt_type = PACKET_OTHERHOST;
                nf_bridge->mask ^= BRNF_PKT_TYPE;
-diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.33/linux/net/ipv4/fib_frontend.c      2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_frontend.c      2010-02-25 11:13:43.000000000 +0200
-@@ -46,6 +46,8 @@
+diff -urp v2.6.34/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
+--- v2.6.34/linux/net/ipv4/fib_frontend.c      2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_frontend.c      2010-05-18 09:58:49.000000000 +0300
+@@ -47,6 +47,8 @@
  
  #ifndef CONFIG_IP_MULTIPLE_TABLES
  
@@ -103,7 +103,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
  static int __net_init fib4_rules_init(struct net *net)
  {
        struct fib_table *local_table, *main_table;
-@@ -70,6 +72,8 @@ fail:
+@@ -71,6 +73,8 @@ fail:
  }
  #else
  
@@ -112,7 +112,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
  struct fib_table *fib_new_table(struct net *net, u32 id)
  {
        struct fib_table *tb;
-@@ -124,7 +128,8 @@ void fib_select_default(struct net *net,
+@@ -125,7 +129,8 @@ void fib_select_default(struct net *net,
        table = res->r->table;
  #endif
        tb = fib_get_table(net, table);
@@ -122,7 +122,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                fib_table_select_default(tb, flp, res);
  }
  
-@@ -241,6 +246,9 @@ int fib_validate_source(__be32 src, __be
+@@ -242,6 +247,9 @@ int fib_validate_source(__be32 src, __be
                            .iif = oif };
  
        struct fib_result res;
@@ -132,7 +132,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
        int no_addr, rpf, accept_local;
        int ret;
        struct net *net;
-@@ -269,31 +277,35 @@ int fib_validate_source(__be32 src, __be
+@@ -270,31 +278,35 @@ int fib_validate_source(__be32 src, __be
        }
        *spec_dst = FIB_RES_PREFSRC(res);
        fib_combine_itag(itag, &res);
@@ -175,7 +175,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
        return ret;
  
  last_resort:
-@@ -916,9 +928,7 @@ static int fib_inetaddr_event(struct not
+@@ -917,9 +929,7 @@ static int fib_inetaddr_event(struct not
        switch (event) {
        case NETDEV_UP:
                fib_add_ifaddr(ifa);
@@ -185,7 +185,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-@@ -954,9 +964,7 @@ static int fib_netdev_event(struct notif
+@@ -955,9 +965,7 @@ static int fib_netdev_event(struct notif
                for_ifa(in_dev) {
                        fib_add_ifaddr(ifa);
                } endfor_ifa(in_dev);
@@ -195,10 +195,10 @@ diff -urp v2.6.33/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.33/linux/net/ipv4/fib_hash.c  2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_hash.c  2010-02-25 11:11:52.000000000 +0200
-@@ -277,25 +277,35 @@ out:
+diff -urp v2.6.34/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
+--- v2.6.34/linux/net/ipv4/fib_hash.c  2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_hash.c  2010-05-18 09:58:49.000000000 +0300
+@@ -278,25 +278,35 @@ out:
  void fib_table_select_default(struct fib_table *tb,
                              const struct flowi *flp, struct fib_result *res)
  {
@@ -237,7 +237,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
                list_for_each_entry(fa, &f->fn_alias, fa_list) {
                        struct fib_info *next_fi = fa->fa_info;
  
-@@ -303,42 +313,56 @@ void fib_table_select_default(struct fib
+@@ -304,42 +314,56 @@ void fib_table_select_default(struct fib
                            fa->fa_type != RTN_UNICAST)
                                continue;
  
@@ -308,7 +308,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
  out:
        read_unlock(&fib_hash_lock);
  }
-@@ -462,6 +486,7 @@ int fib_table_insert(struct fib_table *t
+@@ -463,6 +487,7 @@ int fib_table_insert(struct fib_table *t
                        write_lock_bh(&fib_hash_lock);
                        fi_drop = fa->fa_info;
                        fa->fa_info = fi;
@@ -316,7 +316,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
                        fa->fa_type = cfg->fc_type;
                        fa->fa_scope = cfg->fc_scope;
                        state = fa->fa_state;
-@@ -516,6 +541,7 @@ int fib_table_insert(struct fib_table *t
+@@ -517,6 +542,7 @@ int fib_table_insert(struct fib_table *t
        new_fa->fa_type = cfg->fc_type;
        new_fa->fa_scope = cfg->fc_scope;
        new_fa->fa_state = 0;
@@ -324,9 +324,9 @@ diff -urp v2.6.33/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
  
        /*
         * Insert new entry to the list.
-diff -urp v2.6.33/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.33/linux/net/ipv4/fib_lookup.h        2009-09-11 10:27:17.000000000 +0300
-+++ linux/net/ipv4/fib_lookup.h        2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
+--- v2.6.34/linux/net/ipv4/fib_lookup.h        2009-09-11 10:27:17.000000000 +0300
++++ linux/net/ipv4/fib_lookup.h        2010-05-18 09:58:49.000000000 +0300
 @@ -8,6 +8,7 @@
  struct fib_alias {
        struct list_head        fa_list;
@@ -345,9 +345,9 @@ diff -urp v2.6.33/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
  
  static inline void fib_result_assign(struct fib_result *res,
                                     struct fib_info *fi)
-diff -urp v2.6.33/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.33/linux/net/ipv4/fib_rules.c 2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_rules.c 2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
+--- v2.6.34/linux/net/ipv4/fib_rules.c 2010-02-25 09:01:36.000000000 +0200
++++ linux/net/ipv4/fib_rules.c 2010-05-18 09:58:49.000000000 +0300
 @@ -54,6 +54,11 @@ u32 fib_rules_tclass(struct fib_result *
  }
  #endif
@@ -360,10 +360,10 @@ diff -urp v2.6.33/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
  int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)
  {
        struct fib_lookup_arg arg = {
-diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.33/linux/net/ipv4/fib_semantics.c     2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_semantics.c     2010-02-25 11:11:52.000000000 +0200
-@@ -50,6 +50,7 @@ static struct hlist_head *fib_info_hash;
+diff -urp v2.6.34/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
+--- v2.6.34/linux/net/ipv4/fib_semantics.c     2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_semantics.c     2010-05-18 09:58:49.000000000 +0300
+@@ -51,6 +51,7 @@ static struct hlist_head *fib_info_hash;
  static struct hlist_head *fib_info_laddrhash;
  static unsigned int fib_hash_size;
  static unsigned int fib_info_cnt;
@@ -371,7 +371,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  
  #define DEVINDEX_HASHBITS 8
  #define DEVINDEX_HASHSIZE (1U << DEVINDEX_HASHBITS)
-@@ -186,7 +187,7 @@ static __inline__ int nh_comp(const stru
+@@ -187,7 +188,7 @@ static __inline__ int nh_comp(const stru
  #ifdef CONFIG_NET_CLS_ROUTE
                    nh->nh_tclassid != onh->nh_tclassid ||
  #endif
@@ -380,7 +380,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                        return -1;
                onh++;
        } endfor_nexthops(fi);
-@@ -237,7 +238,7 @@ static struct fib_info *fib_find_info(co
+@@ -238,7 +239,7 @@ static struct fib_info *fib_find_info(co
                    nfi->fib_priority == fi->fib_priority &&
                    memcmp(nfi->fib_metrics, fi->fib_metrics,
                           sizeof(fi->fib_metrics)) == 0 &&
@@ -389,7 +389,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                    (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
                        return fi;
        }
-@@ -349,26 +350,70 @@ struct fib_alias *fib_find_alias(struct 
+@@ -350,26 +351,70 @@ struct fib_alias *fib_find_alias(struct 
  }
  
  int fib_detect_death(struct fib_info *fi, int order,
@@ -476,7 +476,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  }
  
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
-@@ -540,8 +585,11 @@ static int fib_check_nh(struct fib_confi
+@@ -538,8 +583,11 @@ static int fib_check_nh(struct fib_confi
                                return -EINVAL;
                        if ((dev = __dev_get_by_index(net, nh->nh_oif)) == NULL)
                                return -ENODEV;
@@ -490,7 +490,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                        nh->nh_dev = dev;
                        dev_hold(dev);
                        nh->nh_scope = RT_SCOPE_LINK;
-@@ -561,24 +609,48 @@ static int fib_check_nh(struct fib_confi
+@@ -559,24 +607,48 @@ static int fib_check_nh(struct fib_confi
                        /* It is not necessary, but requires a bit of thinking */
                        if (fl.fl4_scope < RT_SCOPE_LINK)
                                fl.fl4_scope = RT_SCOPE_LINK;
@@ -555,7 +555,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        } else {
                struct in_device *in_dev;
  
-@@ -589,8 +661,11 @@ out:
+@@ -587,8 +659,11 @@ out:
                if (in_dev == NULL)
                        return -ENODEV;
                if (!(in_dev->dev->flags&IFF_UP)) {
@@ -569,7 +569,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                }
                nh->nh_dev = in_dev->dev;
                dev_hold(nh->nh_dev);
-@@ -899,8 +974,12 @@ int fib_semantic_match(struct list_head 
+@@ -897,8 +972,12 @@ int fib_semantic_match(struct list_head 
                                for_nexthops(fi) {
                                        if (nh->nh_flags&RTNH_F_DEAD)
                                                continue;
@@ -584,34 +584,34 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
                                }
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
                                if (nhsel < fi->fib_nhs) {
-@@ -1080,18 +1159,29 @@ int fib_sync_down_dev(struct net_device 
+@@ -1078,18 +1157,29 @@ int fib_sync_down_dev(struct net_device 
                prev_fi = fi;
                dead = 0;
                change_nexthops(fi) {
--                      if (nh->nh_flags&RTNH_F_DEAD)
+-                      if (nexthop_nh->nh_flags&RTNH_F_DEAD)
 -                              dead++;
--                      else if (nh->nh_dev == dev &&
--                                      nh->nh_scope != scope) {
--                              nh->nh_flags |= RTNH_F_DEAD;
-+                      if (nh->nh_flags&RTNH_F_DEAD) {
+-                      else if (nexthop_nh->nh_dev == dev &&
+-                               nexthop_nh->nh_scope != scope) {
+-                              nexthop_nh->nh_flags |= RTNH_F_DEAD;
++                      if (nexthop_nh->nh_flags&RTNH_F_DEAD) {
 +                              if (fi->fib_protocol!=RTPROT_STATIC ||
-+                                  nh->nh_dev == NULL ||
-+                                  __in_dev_get_rtnl(nh->nh_dev) == NULL ||
-+                                  nh->nh_dev->flags&IFF_UP)
++                                  nexthop_nh->nh_dev == NULL ||
++                                  __in_dev_get_rtnl(nexthop_nh->nh_dev) == NULL ||
++                                  nexthop_nh->nh_dev->flags&IFF_UP)
 +                                      dead++;
-+                      } else if (nh->nh_dev == dev &&
-+                                 nh->nh_scope != scope) {
++                      } else if (nexthop_nh->nh_dev == dev &&
++                                 nexthop_nh->nh_scope != scope) {
 +                              write_lock_bh(&fib_nhflags_lock);
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
 -                              spin_lock_bh(&fib_multipath_lock);
 +                              spin_lock(&fib_multipath_lock);
-+                              nh->nh_flags |= RTNH_F_DEAD;
-                               fi->fib_power -= nh->nh_power;
-                               nh->nh_power = 0;
++                              nexthop_nh->nh_flags |= RTNH_F_DEAD;
+                               fi->fib_power -= nexthop_nh->nh_power;
+                               nexthop_nh->nh_power = 0;
 -                              spin_unlock_bh(&fib_multipath_lock);
 +                              spin_unlock(&fib_multipath_lock);
 +#else
-+                              nh->nh_flags |= RTNH_F_DEAD;
++                              nexthop_nh->nh_flags |= RTNH_F_DEAD;
  #endif
 -                              dead++;
 +                              write_unlock_bh(&fib_nhflags_lock);
@@ -621,8 +621,8 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +                                      dead++;
                        }
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
-                       if (force > 1 && nh->nh_dev == dev) {
-@@ -1109,11 +1199,8 @@ int fib_sync_down_dev(struct net_device 
+                       if (force > 1 && nexthop_nh->nh_dev == dev) {
+@@ -1107,11 +1197,8 @@ int fib_sync_down_dev(struct net_device 
        return ret;
  }
  
@@ -635,7 +635,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
   */
  
  int fib_sync_up(struct net_device *dev)
-@@ -1123,8 +1210,10 @@ int fib_sync_up(struct net_device *dev)
+@@ -1121,8 +1208,10 @@ int fib_sync_up(struct net_device *dev)
        struct hlist_head *head;
        struct hlist_node *node;
        struct fib_nh *nh;
@@ -647,7 +647,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        if (!(dev->flags&IFF_UP))
                return 0;
  
-@@ -1132,6 +1221,7 @@ int fib_sync_up(struct net_device *dev)
+@@ -1130,6 +1219,7 @@ int fib_sync_up(struct net_device *dev)
        hash = fib_devindex_hashfn(dev->ifindex);
        head = &fib_info_devhash[hash];
        ret = 0;
@@ -655,25 +655,27 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
  
        hlist_for_each_entry(nh, node, head, nh_hash) {
                struct fib_info *fi = nh->nh_parent;
-@@ -1144,19 +1234,39 @@ int fib_sync_up(struct net_device *dev)
+@@ -1142,21 +1232,41 @@ int fib_sync_up(struct net_device *dev)
                prev_fi = fi;
                alive = 0;
                change_nexthops(fi) {
--                      if (!(nh->nh_flags&RTNH_F_DEAD)) {
+-                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
 -                              alive++;
-+                      if (!(nh->nh_flags&RTNH_F_DEAD))
++                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD))
                                continue;
 -                      }
-                       if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP))
+                       if (nexthop_nh->nh_dev == NULL ||
+                           !(nexthop_nh->nh_dev->flags&IFF_UP))
                                continue;
-                       if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev))
+                       if (nexthop_nh->nh_dev != dev ||
+                           !__in_dev_get_rtnl(dev))
                                continue;
-+                      if (nh->nh_gw && fi->fib_protocol == RTPROT_STATIC) {
++                      if (nexthop_nh->nh_gw && fi->fib_protocol == RTPROT_STATIC) {
 +                              struct flowi fl = {
 +                                      .nl_u = { .ip4_u =
-+                                                { .daddr = nh->nh_gw,
-+                                                  .scope = nh->nh_scope } },
-+                                      .oif =  nh->nh_oif,
++                                                { .daddr = nexthop_nh->nh_gw,
++                                                  .scope = nexthop_nh->nh_scope } },
++                                      .oif =  nexthop_nh->nh_oif,
 +                              };
 +                              if (fib_lookup(dev_net(dev), &fl, &res) != 0)
 +                                      continue;
@@ -682,16 +684,16 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +                                      fib_res_put(&res);
 +                                      continue;
 +                              }
-+                              nh->nh_scope = res.scope;
++                              nexthop_nh->nh_scope = res.scope;
 +                              fib_res_put(&res);
 +                              rep = 1;
 +                      }
                        alive++;
 +#ifdef CONFIG_IP_ROUTE_MULTIPATH
                        spin_lock_bh(&fib_multipath_lock);
-                       nh->nh_power = 0;
+                       nexthop_nh->nh_power = 0;
 +#endif
-                       nh->nh_flags &= ~RTNH_F_DEAD;
+                       nexthop_nh->nh_flags &= ~RTNH_F_DEAD;
 +#ifdef CONFIG_IP_ROUTE_MULTIPATH
                        spin_unlock_bh(&fib_multipath_lock);
 +#endif
@@ -725,14 +727,14 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
 +              int sel = -1;
 +              w = -1;
 +              change_nexthops(fi) {
-+                      if (flp->oif != nh->nh_oif)
++                      if (flp->oif != nexthop_nh->nh_oif)
 +                              continue;
-+                      if (flp->fl4_gw && flp->fl4_gw != nh->nh_gw &&
-+                          nh->nh_gw && nh->nh_scope == RT_SCOPE_LINK)
++                      if (flp->fl4_gw && flp->fl4_gw != nexthop_nh->nh_gw &&
++                          nexthop_nh->nh_gw && nexthop_nh->nh_scope == RT_SCOPE_LINK)
 +                              continue;
-+                      if (!(nh->nh_flags&RTNH_F_BADSTATE)) {
-+                              if (nh->nh_power > w) {
-+                                      w = nh->nh_power;
++                      if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
++                              if (nexthop_nh->nh_power > w) {
++                                      w = nexthop_nh->nh_power;
 +                                      sel = nhsel;
 +                              }
 +                      }
@@ -749,10 +751,10 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        if (fi->fib_power <= 0) {
                int power = 0;
                change_nexthops(fi) {
--                      if (!(nh->nh_flags&RTNH_F_DEAD)) {
-+                      if (!(nh->nh_flags&RTNH_F_BADSTATE)) {
-                               power += nh->nh_weight;
-                               nh->nh_power = nh->nh_weight;
+-                      if (!(nexthop_nh->nh_flags&RTNH_F_DEAD)) {
++                      if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE)) {
+                               power += nexthop_nh->nh_weight;
+                               nexthop_nh->nh_power = nexthop_nh->nh_weight;
                        }
                } endfor_nexthops(fi);
                fi->fib_power = power;
@@ -767,16 +769,17 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        }
  
  
-@@ -1203,20 +1338,40 @@ void fib_select_multipath(const struct f
+@@ -1203,21 +1338,41 @@ void fib_select_multipath(const struct f
  
        w = jiffies % fi->fib_power;
  
 +      alive = 0;
        change_nexthops(fi) {
--              if (!(nh->nh_flags&RTNH_F_DEAD) && nh->nh_power) {
-+              if (!(nh->nh_flags&RTNH_F_BADSTATE) && nh->nh_power) {
-                       if ((w -= nh->nh_power) <= 0) {
-                               nh->nh_power--;
+-              if (!(nexthop_nh->nh_flags&RTNH_F_DEAD) &&
++              if (!(nexthop_nh->nh_flags&RTNH_F_BADSTATE) &&
+                   nexthop_nh->nh_power) {
+                       if ((w -= nexthop_nh->nh_power) <= 0) {
+                               nexthop_nh->nh_power--;
                                fi->fib_power--;
 -                              res->nh_sel = nhsel;
                                spin_unlock_bh(&fib_multipath_lock);
@@ -811,10 +814,10 @@ diff -urp v2.6.33/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
        spin_unlock_bh(&fib_multipath_lock);
  }
  #endif
-diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
---- v2.6.33/linux/net/ipv4/fib_trie.c  2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/fib_trie.c  2010-02-25 11:11:52.000000000 +0200
-@@ -1272,6 +1272,7 @@ int fib_table_insert(struct fib_table *t
+diff -urp v2.6.34/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
+--- v2.6.34/linux/net/ipv4/fib_trie.c  2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/fib_trie.c  2010-05-18 09:58:49.000000000 +0300
+@@ -1277,6 +1277,7 @@ int fib_table_insert(struct fib_table *t
                        fi_drop = fa->fa_info;
                        new_fa->fa_tos = fa->fa_tos;
                        new_fa->fa_info = fi;
@@ -822,7 +825,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
                        new_fa->fa_type = cfg->fc_type;
                        new_fa->fa_scope = cfg->fc_scope;
                        state = fa->fa_state;
-@@ -1312,6 +1313,7 @@ int fib_table_insert(struct fib_table *t
+@@ -1317,6 +1318,7 @@ int fib_table_insert(struct fib_table *t
        new_fa->fa_type = cfg->fc_type;
        new_fa->fa_scope = cfg->fc_scope;
        new_fa->fa_state = 0;
@@ -830,7 +833,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
        /*
         * Insert new entry to the list.
         */
-@@ -1812,24 +1814,31 @@ void fib_table_select_default(struct fib
+@@ -1817,24 +1819,31 @@ void fib_table_select_default(struct fib
                              struct fib_result *res)
  {
        struct trie *t = (struct trie *) tb->tb_data;
@@ -865,7 +868,7 @@ diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
        if (!fa_head)
                goto out;
  
-@@ -1843,39 +1852,52 @@ void fib_table_select_default(struct fib
+@@ -1848,39 +1857,52 @@ void fib_table_select_default(struct fib
                    fa->fa_type != RTN_UNICAST)
                        continue;
  
@@ -932,9 +935,9 @@ diff -urp v2.6.33/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
  out:
        rcu_read_unlock();
  }
-diff -urp v2.6.33/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.33/linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- v2.6.34/linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-02-25 09:01:36.000000000 +0200
++++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c  2010-05-18 09:58:49.000000000 +0300
 @@ -51,7 +51,7 @@ masquerade_tg(struct sk_buff *skb, const
        enum ip_conntrack_info ctinfo;
        struct nf_nat_range newrange;
@@ -978,10 +981,10 @@ diff -urp v2.6.33/linux/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfi
        nat->masq_index = par->out->ifindex;
  
        /* Transfer from original range. */
-diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilter/nf_nat_core.c
---- v2.6.33/linux/net/ipv4/netfilter/nf_nat_core.c     2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/nf_nat_core.c     2010-02-25 11:11:52.000000000 +0200
-@@ -710,6 +710,52 @@ static struct pernet_operations nf_nat_n
+diff -urp v2.6.34/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilter/nf_nat_core.c
+--- v2.6.34/linux/net/ipv4/netfilter/nf_nat_core.c     2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_core.c     2010-05-18 09:58:49.000000000 +0300
+@@ -715,6 +715,52 @@ static struct pernet_operations nf_nat_n
        .exit = nf_nat_net_exit,
  };
  
@@ -1034,10 +1037,10 @@ diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_core.c linux/net/ipv4/netfilte
  static int __init nf_nat_init(void)
  {
        size_t i;
-diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/netfilter/nf_nat_standalone.c
---- v2.6.33/linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-02-25 11:11:52.000000000 +0200
-@@ -255,6 +255,14 @@ static struct nf_hook_ops nf_nat_ops[] _
+diff -urp v2.6.34/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/netfilter/nf_nat_standalone.c
+--- v2.6.34/linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_standalone.c       2010-05-18 09:58:49.000000000 +0300
+@@ -256,6 +256,14 @@ static struct nf_hook_ops nf_nat_ops[] _
                .hooknum        = NF_INET_PRE_ROUTING,
                .priority       = NF_IP_PRI_NAT_DST,
        },
@@ -1052,9 +1055,9 @@ diff -urp v2.6.33/linux/net/ipv4/netfilter/nf_nat_standalone.c linux/net/ipv4/ne
        /* After packet filtering, change source */
        {
                .hook           = nf_nat_out,
-diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.33/linux/net/ipv4/route.c     2010-02-25 09:01:36.000000000 +0200
-+++ linux/net/ipv4/route.c     2010-02-25 11:11:52.000000000 +0200
+diff -urp v2.6.34/linux/net/ipv4/route.c linux/net/ipv4/route.c
+--- v2.6.34/linux/net/ipv4/route.c     2010-05-17 10:49:01.000000000 +0300
++++ linux/net/ipv4/route.c     2010-05-18 09:58:49.000000000 +0300
 @@ -695,6 +695,8 @@ static inline int compare_keys(struct fl
        return ((__force u32)((fl1->nl_u.ip4_u.daddr ^ fl2->nl_u.ip4_u.daddr) |
                (fl1->nl_u.ip4_u.saddr ^ fl2->nl_u.ip4_u.saddr)) |
@@ -1064,7 +1067,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                (*(u16 *)&fl1->nl_u.ip4_u.tos ^
                 *(u16 *)&fl2->nl_u.ip4_u.tos) |
                (fl1->oif ^ fl2->oif) |
-@@ -1430,6 +1432,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+@@ -1460,6 +1462,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
  
                                /* Gateway is different ... */
                                rt->rt_gateway          = new_gw;
@@ -1072,7 +1075,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
                                /* Redirect received -> path was valid */
                                dst_confirm(&rth->u.dst);
-@@ -1875,6 +1878,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1909,6 +1912,7 @@ static int ip_route_input_mc(struct sk_b
        rth->fl.fl4_tos = tos;
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
@@ -1080,7 +1083,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_src     = saddr;
  #ifdef CONFIG_NET_CLS_ROUTE
        rth->u.dst.tclassid = itag;
-@@ -1885,6 +1889,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1919,6 +1923,7 @@ static int ip_route_input_mc(struct sk_b
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
        rth->fl.oif     = 0;
@@ -1088,7 +1091,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->rt_genid   = rt_genid(dev_net(dev));
-@@ -1949,7 +1954,7 @@ static int __mkroute_input(struct sk_buf
+@@ -1983,7 +1988,7 @@ static int __mkroute_input(struct sk_buf
                           struct fib_result *res,
                           struct in_device *in_dev,
                           __be32 daddr, __be32 saddr, u32 tos,
@@ -1097,7 +1100,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  {
  
        struct rtable *rth;
-@@ -1983,6 +1988,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2017,6 +2022,7 @@ static int __mkroute_input(struct sk_buf
                flags |= RTCF_DIRECTSRC;
  
        if (out_dev == in_dev && err &&
@@ -1105,7 +1108,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
            (IN_DEV_SHARED_MEDIA(out_dev) ||
             inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
                flags |= RTCF_DOREDIRECT;
-@@ -2016,6 +2022,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2055,6 +2061,7 @@ static int __mkroute_input(struct sk_buf
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
        rth->rt_src     = saddr;
@@ -1113,15 +1116,15 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_iif     =
                rth->fl.iif     = in_dev->dev->ifindex;
-@@ -2023,6 +2030,7 @@ static int __mkroute_input(struct sk_buf
+@@ -2062,6 +2069,7 @@ static int __mkroute_input(struct sk_buf
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
        rth->fl.oif     = 0;
 +      rth->fl.fl4_gw  = 0;
        rth->rt_spec_dst= spec_dst;
  
-       rth->u.dst.input = ip_forward;
-@@ -2043,21 +2051,23 @@ static int __mkroute_input(struct sk_buf
+       rth->u.dst.obsolete = -1;
+@@ -2083,21 +2091,23 @@ static int __mkroute_input(struct sk_buf
  
  static int ip_mkroute_input(struct sk_buff *skb,
                            struct fib_result *res,
@@ -1148,7 +1151,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        if (err)
                return err;
  
-@@ -2078,18 +2088,19 @@ static int ip_mkroute_input(struct sk_bu
+@@ -2118,18 +2128,19 @@ static int ip_mkroute_input(struct sk_bu
   */
  
  static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -1171,7 +1174,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        unsigned        flags = 0;
        u32             itag = 0;
        struct rtable * rth;
-@@ -2125,6 +2136,12 @@ static int ip_route_input_slow(struct sk
+@@ -2165,6 +2176,12 @@ static int ip_route_input_slow(struct sk
            ipv4_is_loopback(daddr))
                goto martian_destination;
  
@@ -1184,7 +1187,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        /*
         *      Now we are ready to route packet.
         */
-@@ -2134,6 +2151,8 @@ static int ip_route_input_slow(struct sk
+@@ -2174,6 +2191,8 @@ static int ip_route_input_slow(struct sk
                goto no_route;
        }
        free_res = 1;
@@ -1193,7 +1196,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
        RT_CACHE_STAT_INC(in_slow_tot);
  
-@@ -2158,7 +2177,7 @@ static int ip_route_input_slow(struct sk
+@@ -2198,7 +2217,7 @@ static int ip_route_input_slow(struct sk
        if (res.type != RTN_UNICAST)
                goto martian_destination;
  
@@ -1202,7 +1205,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  done:
        in_dev_put(in_dev);
        if (free_res)
-@@ -2168,6 +2187,8 @@ out:     return err;
+@@ -2208,6 +2227,8 @@ out:     return err;
  brd_input:
        if (skb->protocol != htons(ETH_P_IP))
                goto e_inval;
@@ -1211,7 +1214,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
        if (ipv4_is_zeronet(saddr))
                spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-@@ -2209,6 +2230,7 @@ local_input:
+@@ -2250,6 +2271,7 @@ local_input:
        rth->u.dst.dev  = net->loopback_dev;
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
@@ -1219,7 +1222,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->u.dst.input= ip_local_deliver;
-@@ -2259,8 +2281,9 @@ martian_source:
+@@ -2300,8 +2322,9 @@ martian_source:
        goto e_inval;
  }
  
@@ -1231,7 +1234,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  {
        struct rtable * rth;
        unsigned        hash;
-@@ -2281,6 +2304,7 @@ int ip_route_input(struct sk_buff *skb, 
+@@ -2322,6 +2345,7 @@ int ip_route_input(struct sk_buff *skb, 
                if (((rth->fl.fl4_dst ^ daddr) |
                     (rth->fl.fl4_src ^ saddr) |
                     (rth->fl.iif ^ iif) |
@@ -1239,7 +1242,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                     rth->fl.oif |
                     (rth->fl.fl4_tos ^ tos)) == 0 &&
                    rth->fl.mark == skb->mark &&
-@@ -2330,7 +2354,19 @@ skip_cache:
+@@ -2371,7 +2395,19 @@ skip_cache:
                rcu_read_unlock();
                return -EINVAL;
        }
@@ -1260,7 +1263,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  }
  
  static int __mkroute_output(struct rtable **result,
-@@ -2402,6 +2438,7 @@ static int __mkroute_output(struct rtabl
+@@ -2443,6 +2479,7 @@ static int __mkroute_output(struct rtabl
        rth->fl.fl4_tos = tos;
        rth->fl.fl4_src = oldflp->fl4_src;
        rth->fl.oif     = oldflp->oif;
@@ -1268,7 +1271,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
        rth->fl.mark    = oldflp->mark;
        rth->rt_dst     = fl->fl4_dst;
        rth->rt_src     = fl->fl4_src;
-@@ -2483,6 +2520,7 @@ static int ip_route_output_slow(struct n
+@@ -2525,6 +2562,7 @@ static int ip_route_output_slow(struct n
        struct flowi fl = { .nl_u = { .ip4_u =
                                      { .daddr = oldflp->fl4_dst,
                                        .saddr = oldflp->fl4_src,
@@ -1276,7 +1279,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                                        .tos = tos & IPTOS_RT_MASK,
                                        .scope = ((tos & RTO_ONLINK) ?
                                                  RT_SCOPE_LINK :
-@@ -2594,6 +2632,7 @@ static int ip_route_output_slow(struct n
+@@ -2636,6 +2674,7 @@ static int ip_route_output_slow(struct n
                dev_out = net->loopback_dev;
                dev_hold(dev_out);
                fl.oif = net->loopback_dev->ifindex;
@@ -1284,7 +1287,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                res.type = RTN_LOCAL;
                flags |= RTCF_LOCAL;
                goto make_route;
-@@ -2601,7 +2640,7 @@ static int ip_route_output_slow(struct n
+@@ -2643,7 +2682,7 @@ static int ip_route_output_slow(struct n
  
        if (fib_lookup(net, &fl, &res)) {
                res.fi = NULL;
@@ -1293,7 +1296,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                        /* Apparently, routing tables are wrong. Assume,
                           that the destination is on link.
  
-@@ -2641,6 +2680,7 @@ static int ip_route_output_slow(struct n
+@@ -2683,6 +2722,7 @@ static int ip_route_output_slow(struct n
                dev_out = net->loopback_dev;
                dev_hold(dev_out);
                fl.oif = dev_out->ifindex;
@@ -1301,7 +1304,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                if (res.fi)
                        fib_info_put(res.fi);
                res.fi = NULL;
-@@ -2648,13 +2688,12 @@ static int ip_route_output_slow(struct n
+@@ -2690,13 +2730,12 @@ static int ip_route_output_slow(struct n
                goto make_route;
        }
  
@@ -1318,7 +1321,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
  
        if (!fl.fl4_src)
                fl.fl4_src = FIB_RES_PREFSRC(res);
-@@ -2695,6 +2734,7 @@ int __ip_route_output_key(struct net *ne
+@@ -2737,6 +2776,7 @@ int __ip_route_output_key(struct net *ne
                    rth->fl.fl4_src == flp->fl4_src &&
                    rth->fl.iif == 0 &&
                    rth->fl.oif == flp->oif &&
@@ -1326,7 +1329,7 @@ diff -urp v2.6.33/linux/net/ipv4/route.c linux/net/ipv4/route.c
                    rth->fl.mark == flp->mark &&
                    !((rth->fl.fl4_tos ^ flp->fl4_tos) &
                            (IPTOS_RT_MASK | RTO_ONLINK)) &&
-@@ -3416,3 +3456,4 @@ void __init ip_static_sysctl_init(void)
+@@ -3456,3 +3496,4 @@ void __init ip_static_sysctl_init(void)
  EXPORT_SYMBOL(__ip_select_ident);
  EXPORT_SYMBOL(ip_route_input);
  EXPORT_SYMBOL(ip_route_output_key);