From: Michael Tremer Date: Mon, 5 Jul 2010 00:02:47 +0000 (+0200) Subject: kernel: Update patches and configuration for 2.6.34. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df50ba0c0e03a576b8f6828833509858044c2425;p=ipfire-3.x.git kernel: Update patches and configuration for 2.6.34. --- diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config index 7c4f9e5d5..08ddcc66d 100644 --- 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 ef625f495..80377b2d5 100644 --- 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 1f037ba5a..96b4d7e47 100644 --- 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 + +-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 #include @@ -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(¤t->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 #include #include -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 /* -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 #include /* 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(¤t->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 #include @@ -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 -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 @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 #include -@@ -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 #include @@ -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 #include -@@ -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 + #include + #include ++#include + #include + + /* Avoid __ASSEMBLER__'ifying 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 @@ -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 #include @@ -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 #include +#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 @@ -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 - - 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 @@ -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 #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 + + 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 + #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 +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 + #include #include - ++#include ++ +#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 #include #include +#include -+#include #include #include -+#include - #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 #include @@ -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, ®s->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 - #include - -+#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 #include @@ -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 just for this. */ #include -@@ -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 #include #include @@ -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 - #include - #include -+#include - +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 #include @@ -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 #include @@ -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 #include @@ -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 µcode_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 µcode_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 @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 @@ -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 */ .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 @@ -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 */ .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 + #include + #include ++#include + + .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 + #include + #include ++#include + + .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 #include #include +#include ++#include .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 */ - .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 - -- .section .altinstr_replacement,"ax" -+ .section .altinstr_replacement,"a" - 1: .byte 0xeb /* jmp */ - .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 #include #include +- +#include - ++#include /* -@@ -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 #include @@ -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 /* __kprobes, ... */ #include /* kmmio_handler, ... */ #include /* 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 /* kmemcheck_*(), ... */ +#include +#include ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#include ++#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<= 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<> 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 + #include + #include +-#include + + 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); ++/* + 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 + #include + ++#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 @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 --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; idev_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 @@ -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, 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 */ { 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 +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 #include + #include +#include #include