#32529 enable SPI driver, remove not needed patches
This commit is contained in:
Tobias Powalowski
parent
4251576bf4
commit
98e672d298
2
PKGBUILD
2
PKGBUILD
@ -21,7 +21,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
|
||||
'CVE-2013-1763.patch')
|
||||
md5sums=('1c738edfc54e7c65faeb90c436104e2f'
|
||||
'9710fb1b1e08eb1fc5214dc2fb34ebcc'
|
||||
'b2449cb9f5335fc864fe5b0a6330265a'
|
||||
'03b1dad90f3558dba3031901398c1ca4'
|
||||
'eb14dcfd80c00852ef81ded6e826826a'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'420991808fe4cba143013427c0737aa9')
|
||||
|
||||
92
config
92
config
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/i386 3.8.0 Kernel Configuration
|
||||
# Linux/i386 3.8.0-2 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
@ -1493,6 +1493,9 @@ CONFIG_MTD_PLATRAM=m
|
||||
CONFIG_MTD_PMC551=m
|
||||
# CONFIG_MTD_PMC551_BUGFIX is not set
|
||||
# CONFIG_MTD_PMC551_DEBUG is not set
|
||||
# CONFIG_MTD_DATAFLASH is not set
|
||||
# CONFIG_MTD_M25P80 is not set
|
||||
# CONFIG_MTD_SST25L is not set
|
||||
# CONFIG_MTD_SLRAM is not set
|
||||
CONFIG_MTD_PHRAM=m
|
||||
CONFIG_MTD_MTDRAM=m
|
||||
@ -1614,6 +1617,7 @@ CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_SENSORS_LIS3LV02D=m
|
||||
CONFIG_AD525X_DPOT=m
|
||||
CONFIG_AD525X_DPOT_I2C=m
|
||||
# CONFIG_AD525X_DPOT_SPI is not set
|
||||
# CONFIG_IBM_ASM is not set
|
||||
CONFIG_PHANTOM=m
|
||||
CONFIG_INTEL_MID_PTI=m
|
||||
@ -1635,9 +1639,11 @@ CONFIG_SENSORS_BH1770=m
|
||||
CONFIG_SENSORS_APDS990X=m
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_DS1682=m
|
||||
# CONFIG_TI_DAC7512 is not set
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085_I2C=m
|
||||
# CONFIG_BMP085_SPI is not set
|
||||
# CONFIG_PCH_PHUB is not set
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
CONFIG_C2PORT=m
|
||||
@ -1647,9 +1653,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
|
||||
# EEPROM support
|
||||
#
|
||||
CONFIG_EEPROM_AT24=m
|
||||
# CONFIG_EEPROM_AT25 is not set
|
||||
CONFIG_EEPROM_LEGACY=m
|
||||
CONFIG_EEPROM_MAX6875=m
|
||||
CONFIG_EEPROM_93CX6=m
|
||||
# CONFIG_EEPROM_93XX46 is not set
|
||||
CONFIG_CB710_CORE=m
|
||||
# CONFIG_CB710_DEBUG is not set
|
||||
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
||||
@ -2203,8 +2211,11 @@ CONFIG_MLX4_CORE=m
|
||||
CONFIG_MLX4_DEBUG=y
|
||||
CONFIG_NET_VENDOR_MICREL=y
|
||||
CONFIG_KS8842=m
|
||||
# CONFIG_KS8851 is not set
|
||||
CONFIG_KS8851_MLL=m
|
||||
CONFIG_KSZ884X_PCI=m
|
||||
CONFIG_NET_VENDOR_MICROCHIP=y
|
||||
# CONFIG_ENC28J60 is not set
|
||||
CONFIG_NET_VENDOR_MYRI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_MYRI10GE_DCA=y
|
||||
@ -2323,6 +2334,7 @@ CONFIG_MICREL_PHY=m
|
||||
CONFIG_MDIO_BUS_MUX=m
|
||||
CONFIG_MDIO_BUS_MUX_GPIO=m
|
||||
CONFIG_MDIO_BUS_MUX_MMIOREG=m
|
||||
# CONFIG_MICREL_KS8995MA is not set
|
||||
CONFIG_PLIP=m
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
@ -2502,6 +2514,7 @@ CONFIG_LIBERTAS=m
|
||||
CONFIG_LIBERTAS_USB=m
|
||||
CONFIG_LIBERTAS_CS=m
|
||||
CONFIG_LIBERTAS_SDIO=m
|
||||
# CONFIG_LIBERTAS_SPI is not set
|
||||
# CONFIG_LIBERTAS_DEBUG is not set
|
||||
CONFIG_LIBERTAS_MESH=y
|
||||
CONFIG_HERMES=m
|
||||
@ -2517,6 +2530,7 @@ CONFIG_ORINOCO_USB=m
|
||||
CONFIG_P54_COMMON=m
|
||||
CONFIG_P54_USB=m
|
||||
CONFIG_P54_PCI=m
|
||||
# CONFIG_P54_SPI is not set
|
||||
CONFIG_P54_LEDS=y
|
||||
CONFIG_RT2X00=m
|
||||
CONFIG_RT2400PCI=m
|
||||
@ -2552,10 +2566,12 @@ CONFIG_RTLWIFI=m
|
||||
CONFIG_RTL8192C_COMMON=m
|
||||
CONFIG_WL_TI=y
|
||||
CONFIG_WL1251=m
|
||||
# CONFIG_WL1251_SPI is not set
|
||||
CONFIG_WL1251_SDIO=m
|
||||
CONFIG_WL12XX=m
|
||||
CONFIG_WL18XX=m
|
||||
CONFIG_WLCORE=m
|
||||
# CONFIG_WLCORE_SPI is not set
|
||||
CONFIG_WLCORE_SDIO=m
|
||||
CONFIG_WL12XX_PLATFORM_DATA=y
|
||||
CONFIG_ZD1211RW=m
|
||||
@ -2575,6 +2591,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
|
||||
CONFIG_IEEE802154_DRIVERS=m
|
||||
CONFIG_IEEE802154_FAKEHARD=m
|
||||
CONFIG_IEEE802154_FAKELB=m
|
||||
CONFIG_IEEE802154_AT86RF230=m
|
||||
# CONFIG_IEEE802154_MRF24J40 is not set
|
||||
CONFIG_VMXNET3=m
|
||||
CONFIG_HYPERV_NET=m
|
||||
CONFIG_ISDN=y
|
||||
@ -2830,14 +2848,18 @@ CONFIG_TABLET_USB_HANWANG=m
|
||||
CONFIG_TABLET_USB_KBTAB=m
|
||||
CONFIG_TABLET_USB_WACOM=m
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
# CONFIG_TOUCHSCREEN_ADS7846 is not set
|
||||
# CONFIG_TOUCHSCREEN_AD7877 is not set
|
||||
CONFIG_TOUCHSCREEN_AD7879=m
|
||||
CONFIG_TOUCHSCREEN_AD7879_I2C=m
|
||||
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
|
||||
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
|
||||
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
|
||||
CONFIG_TOUCHSCREEN_BU21013=m
|
||||
CONFIG_TOUCHSCREEN_CY8CTMG110=m
|
||||
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
|
||||
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
|
||||
# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
|
||||
CONFIG_TOUCHSCREEN_DYNAPRO=m
|
||||
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
|
||||
CONFIG_TOUCHSCREEN_EETI=m
|
||||
@ -2888,12 +2910,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
|
||||
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
||||
CONFIG_TOUCHSCREEN_TOUCHIT213=m
|
||||
CONFIG_TOUCHSCREEN_TSC_SERIO=m
|
||||
# CONFIG_TOUCHSCREEN_TSC2005 is not set
|
||||
CONFIG_TOUCHSCREEN_TSC2007=m
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_AD714X=m
|
||||
CONFIG_INPUT_AD714X_I2C=m
|
||||
CONFIG_INPUT_AD714X_SPI=m
|
||||
CONFIG_INPUT_BMA150=m
|
||||
CONFIG_INPUT_PCSPKR=m
|
||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||
@ -2919,6 +2943,7 @@ CONFIG_INPUT_PWM_BEEPER=m
|
||||
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
|
||||
CONFIG_INPUT_ADXL34X=m
|
||||
CONFIG_INPUT_ADXL34X_I2C=m
|
||||
CONFIG_INPUT_ADXL34X_SPI=m
|
||||
CONFIG_INPUT_CMA3000=m
|
||||
CONFIG_INPUT_CMA3000_I2C=m
|
||||
|
||||
@ -2989,6 +3014,8 @@ CONFIG_SERIAL_8250_DW=m
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
#
|
||||
# CONFIG_SERIAL_MAX3100 is not set
|
||||
# CONFIG_SERIAL_MAX310X is not set
|
||||
CONFIG_SERIAL_MFD_HSU=m
|
||||
CONFIG_SERIAL_CORE=y
|
||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
@ -3000,6 +3027,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
|
||||
CONFIG_SERIAL_ALTERA_UART=m
|
||||
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
|
||||
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
|
||||
# CONFIG_SERIAL_IFX6X60 is not set
|
||||
CONFIG_SERIAL_PCH_UART=m
|
||||
CONFIG_SERIAL_XILINX_PS_UART=m
|
||||
CONFIG_SERIAL_ARC=m
|
||||
@ -3125,7 +3153,32 @@ CONFIG_SCx200_ACB=m
|
||||
# CONFIG_I2C_DEBUG_CORE is not set
|
||||
# CONFIG_I2C_DEBUG_ALGO is not set
|
||||
# CONFIG_I2C_DEBUG_BUS is not set
|
||||
# CONFIG_SPI is not set
|
||||
CONFIG_SPI=y
|
||||
# CONFIG_SPI_DEBUG is not set
|
||||
CONFIG_SPI_MASTER=y
|
||||
|
||||
#
|
||||
# SPI Master Controller Drivers
|
||||
#
|
||||
# CONFIG_SPI_ALTERA is not set
|
||||
# CONFIG_SPI_BITBANG is not set
|
||||
# CONFIG_SPI_BUTTERFLY is not set
|
||||
# CONFIG_SPI_GPIO is not set
|
||||
# CONFIG_SPI_LM70_LLP is not set
|
||||
# CONFIG_SPI_OC_TINY is not set
|
||||
# CONFIG_SPI_PXA2XX is not set
|
||||
# CONFIG_SPI_PXA2XX_PCI is not set
|
||||
# CONFIG_SPI_SC18IS602 is not set
|
||||
# CONFIG_SPI_TOPCLIFF_PCH is not set
|
||||
# CONFIG_SPI_XCOMM is not set
|
||||
# CONFIG_SPI_XILINX is not set
|
||||
# CONFIG_SPI_DESIGNWARE is not set
|
||||
|
||||
#
|
||||
# SPI Protocol Masters
|
||||
#
|
||||
# CONFIG_SPI_SPIDEV is not set
|
||||
# CONFIG_SPI_TLE62X0 is not set
|
||||
# CONFIG_HSI is not set
|
||||
|
||||
#
|
||||
@ -3194,7 +3247,10 @@ CONFIG_GPIO_AMD8111=m
|
||||
#
|
||||
# SPI GPIO expanders:
|
||||
#
|
||||
# CONFIG_GPIO_MAX7301 is not set
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
# CONFIG_GPIO_MC33880 is not set
|
||||
# CONFIG_GPIO_74X164 is not set
|
||||
|
||||
#
|
||||
# AC97 GPIO expanders:
|
||||
@ -3241,8 +3297,10 @@ CONFIG_HWMON_VID=m
|
||||
#
|
||||
CONFIG_SENSORS_ABITUGURU=m
|
||||
CONFIG_SENSORS_ABITUGURU3=m
|
||||
# CONFIG_SENSORS_AD7314 is not set
|
||||
CONFIG_SENSORS_AD7414=m
|
||||
CONFIG_SENSORS_AD7418=m
|
||||
# CONFIG_SENSORS_ADCXX is not set
|
||||
CONFIG_SENSORS_ADM1021=m
|
||||
CONFIG_SENSORS_ADM1025=m
|
||||
CONFIG_SENSORS_ADM1026=m
|
||||
@ -3279,6 +3337,7 @@ CONFIG_SENSORS_IT87=m
|
||||
CONFIG_SENSORS_JC42=m
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LM63=m
|
||||
# CONFIG_SENSORS_LM70 is not set
|
||||
CONFIG_SENSORS_LM73=m
|
||||
CONFIG_SENSORS_LM75=m
|
||||
CONFIG_SENSORS_LM77=m
|
||||
@ -3296,6 +3355,7 @@ CONFIG_SENSORS_LTC4245=m
|
||||
CONFIG_SENSORS_LTC4261=m
|
||||
CONFIG_SENSORS_LM95241=m
|
||||
CONFIG_SENSORS_LM95245=m
|
||||
# CONFIG_SENSORS_MAX1111 is not set
|
||||
CONFIG_SENSORS_MAX16065=m
|
||||
CONFIG_SENSORS_MAX1619=m
|
||||
CONFIG_SENSORS_MAX1668=m
|
||||
@ -3335,6 +3395,7 @@ CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
CONFIG_SENSORS_ADS7828=m
|
||||
# CONFIG_SENSORS_ADS7871 is not set
|
||||
CONFIG_SENSORS_AMC6821=m
|
||||
CONFIG_SENSORS_INA2XX=m
|
||||
CONFIG_SENSORS_THMC50=m
|
||||
@ -3483,18 +3544,25 @@ CONFIG_MFD_LM3533=m
|
||||
CONFIG_TPS65010=m
|
||||
CONFIG_TPS6507X=m
|
||||
CONFIG_MFD_TPS65217=m
|
||||
# CONFIG_MFD_TPS65912_SPI is not set
|
||||
# CONFIG_MFD_STMPE is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
# CONFIG_MFD_DA9052_SPI is not set
|
||||
CONFIG_MFD_ARIZONA=y
|
||||
CONFIG_MFD_ARIZONA_I2C=m
|
||||
# CONFIG_MFD_ARIZONA_SPI is not set
|
||||
CONFIG_MFD_WM5102=y
|
||||
CONFIG_MFD_WM5110=y
|
||||
# CONFIG_MFD_WM831X_SPI is not set
|
||||
CONFIG_MFD_PCF50633=m
|
||||
CONFIG_PCF50633_ADC=m
|
||||
CONFIG_PCF50633_GPIO=m
|
||||
CONFIG_MFD_MC13783=m
|
||||
CONFIG_MFD_MC13XXX=m
|
||||
# CONFIG_MFD_MC13XXX_SPI is not set
|
||||
CONFIG_MFD_MC13XXX_I2C=m
|
||||
CONFIG_ABX500_CORE=y
|
||||
# CONFIG_EZX_PCAP is not set
|
||||
CONFIG_MFD_CS5535=m
|
||||
# CONFIG_MFD_TIMBERDALE is not set
|
||||
CONFIG_LPC_SCH=m
|
||||
@ -4206,7 +4274,16 @@ CONFIG_FB_VIRTUAL=m
|
||||
# CONFIG_EXYNOS_VIDEO is not set
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_LCD_CLASS_DEVICE=m
|
||||
# CONFIG_LCD_L4F00242T03 is not set
|
||||
# CONFIG_LCD_LMS283GF05 is not set
|
||||
# CONFIG_LCD_LTV350QV is not set
|
||||
# CONFIG_LCD_ILI9320 is not set
|
||||
# CONFIG_LCD_TDO24M is not set
|
||||
# CONFIG_LCD_VGG2432A4 is not set
|
||||
CONFIG_LCD_PLATFORM=m
|
||||
# CONFIG_LCD_S6E63M0 is not set
|
||||
# CONFIG_LCD_LD9040 is not set
|
||||
# CONFIG_LCD_AMS369FG06 is not set
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
# CONFIG_BACKLIGHT_GENERIC is not set
|
||||
CONFIG_BACKLIGHT_LM3533=m
|
||||
@ -4429,6 +4506,7 @@ CONFIG_SND_VIA82XX_MODEM=m
|
||||
CONFIG_SND_VIRTUOSO=m
|
||||
CONFIG_SND_VX222=m
|
||||
CONFIG_SND_YMFPCI=m
|
||||
CONFIG_SND_SPI=y
|
||||
CONFIG_SND_USB=y
|
||||
CONFIG_SND_USB_AUDIO=m
|
||||
CONFIG_SND_USB_UA101=m
|
||||
@ -4880,6 +4958,7 @@ CONFIG_LEDS_LP5523=m
|
||||
CONFIG_LEDS_CLEVO_MAIL=m
|
||||
CONFIG_LEDS_PCA955X=m
|
||||
CONFIG_LEDS_PCA9633=m
|
||||
# CONFIG_LEDS_DAC124S085 is not set
|
||||
CONFIG_LEDS_BD2802=m
|
||||
CONFIG_LEDS_INTEL_SS4200=m
|
||||
CONFIG_LEDS_LT3593=m
|
||||
@ -4973,6 +5052,15 @@ CONFIG_RTC_DRV_RV3029C2=m
|
||||
#
|
||||
# SPI RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_M41T93 is not set
|
||||
# CONFIG_RTC_DRV_M41T94 is not set
|
||||
# CONFIG_RTC_DRV_DS1305 is not set
|
||||
# CONFIG_RTC_DRV_DS1390 is not set
|
||||
# CONFIG_RTC_DRV_MAX6902 is not set
|
||||
# CONFIG_RTC_DRV_R9701 is not set
|
||||
# CONFIG_RTC_DRV_RS5C348 is not set
|
||||
# CONFIG_RTC_DRV_DS3234 is not set
|
||||
# CONFIG_RTC_DRV_PCF2123 is not set
|
||||
|
||||
#
|
||||
# Platform RTC drivers
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86_64 3.8.0 Kernel Configuration
|
||||
# Linux/x86_64 3.8.0-2 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -1460,6 +1460,9 @@ CONFIG_MTD_PLATRAM=m
|
||||
CONFIG_MTD_PMC551=m
|
||||
# CONFIG_MTD_PMC551_BUGFIX is not set
|
||||
# CONFIG_MTD_PMC551_DEBUG is not set
|
||||
# CONFIG_MTD_DATAFLASH is not set
|
||||
# CONFIG_MTD_M25P80 is not set
|
||||
# CONFIG_MTD_SST25L is not set
|
||||
# CONFIG_MTD_SLRAM is not set
|
||||
CONFIG_MTD_PHRAM=m
|
||||
CONFIG_MTD_MTDRAM=m
|
||||
@ -1562,6 +1565,7 @@ CONFIG_BLK_DEV_RBD=m
|
||||
CONFIG_SENSORS_LIS3LV02D=m
|
||||
CONFIG_AD525X_DPOT=m
|
||||
CONFIG_AD525X_DPOT_I2C=m
|
||||
# CONFIG_AD525X_DPOT_SPI is not set
|
||||
# CONFIG_IBM_ASM is not set
|
||||
CONFIG_PHANTOM=m
|
||||
CONFIG_INTEL_MID_PTI=m
|
||||
@ -1583,9 +1587,11 @@ CONFIG_SENSORS_BH1770=m
|
||||
CONFIG_SENSORS_APDS990X=m
|
||||
CONFIG_HMC6352=m
|
||||
CONFIG_DS1682=m
|
||||
# CONFIG_TI_DAC7512 is not set
|
||||
CONFIG_VMWARE_BALLOON=m
|
||||
CONFIG_BMP085=y
|
||||
CONFIG_BMP085_I2C=m
|
||||
# CONFIG_BMP085_SPI is not set
|
||||
CONFIG_PCH_PHUB=m
|
||||
CONFIG_USB_SWITCH_FSA9480=m
|
||||
CONFIG_C2PORT=m
|
||||
@ -1595,9 +1601,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
|
||||
# EEPROM support
|
||||
#
|
||||
CONFIG_EEPROM_AT24=m
|
||||
# CONFIG_EEPROM_AT25 is not set
|
||||
CONFIG_EEPROM_LEGACY=m
|
||||
CONFIG_EEPROM_MAX6875=m
|
||||
CONFIG_EEPROM_93CX6=m
|
||||
# CONFIG_EEPROM_93XX46 is not set
|
||||
CONFIG_CB710_CORE=m
|
||||
# CONFIG_CB710_DEBUG is not set
|
||||
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
|
||||
@ -2108,8 +2116,11 @@ CONFIG_MLX4_CORE=m
|
||||
CONFIG_MLX4_DEBUG=y
|
||||
CONFIG_NET_VENDOR_MICREL=y
|
||||
CONFIG_KS8842=m
|
||||
# CONFIG_KS8851 is not set
|
||||
CONFIG_KS8851_MLL=m
|
||||
CONFIG_KSZ884X_PCI=m
|
||||
CONFIG_NET_VENDOR_MICROCHIP=y
|
||||
# CONFIG_ENC28J60 is not set
|
||||
CONFIG_NET_VENDOR_MYRI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_MYRI10GE_DCA=y
|
||||
@ -2215,6 +2226,7 @@ CONFIG_STE10XP=m
|
||||
CONFIG_LSI_ET1011C_PHY=m
|
||||
CONFIG_MICREL_PHY=m
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MICREL_KS8995MA is not set
|
||||
CONFIG_PLIP=m
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
@ -2394,6 +2406,7 @@ CONFIG_LIBERTAS=m
|
||||
CONFIG_LIBERTAS_USB=m
|
||||
CONFIG_LIBERTAS_CS=m
|
||||
CONFIG_LIBERTAS_SDIO=m
|
||||
# CONFIG_LIBERTAS_SPI is not set
|
||||
# CONFIG_LIBERTAS_DEBUG is not set
|
||||
CONFIG_LIBERTAS_MESH=y
|
||||
CONFIG_HERMES=m
|
||||
@ -2409,6 +2422,7 @@ CONFIG_ORINOCO_USB=m
|
||||
CONFIG_P54_COMMON=m
|
||||
CONFIG_P54_USB=m
|
||||
CONFIG_P54_PCI=m
|
||||
# CONFIG_P54_SPI is not set
|
||||
CONFIG_P54_LEDS=y
|
||||
CONFIG_RT2X00=m
|
||||
CONFIG_RT2400PCI=m
|
||||
@ -2444,10 +2458,12 @@ CONFIG_RTLWIFI=m
|
||||
CONFIG_RTL8192C_COMMON=m
|
||||
CONFIG_WL_TI=y
|
||||
CONFIG_WL1251=m
|
||||
# CONFIG_WL1251_SPI is not set
|
||||
CONFIG_WL1251_SDIO=m
|
||||
CONFIG_WL12XX=m
|
||||
CONFIG_WL18XX=m
|
||||
CONFIG_WLCORE=m
|
||||
# CONFIG_WLCORE_SPI is not set
|
||||
CONFIG_WLCORE_SDIO=m
|
||||
CONFIG_WL12XX_PLATFORM_DATA=y
|
||||
CONFIG_ZD1211RW=m
|
||||
@ -2467,6 +2483,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
|
||||
CONFIG_IEEE802154_DRIVERS=m
|
||||
CONFIG_IEEE802154_FAKEHARD=m
|
||||
CONFIG_IEEE802154_FAKELB=m
|
||||
CONFIG_IEEE802154_AT86RF230=m
|
||||
# CONFIG_IEEE802154_MRF24J40 is not set
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_VMXNET3=m
|
||||
@ -2703,14 +2721,18 @@ CONFIG_TABLET_USB_HANWANG=m
|
||||
CONFIG_TABLET_USB_KBTAB=m
|
||||
CONFIG_TABLET_USB_WACOM=m
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
# CONFIG_TOUCHSCREEN_ADS7846 is not set
|
||||
# CONFIG_TOUCHSCREEN_AD7877 is not set
|
||||
CONFIG_TOUCHSCREEN_AD7879=m
|
||||
CONFIG_TOUCHSCREEN_AD7879_I2C=m
|
||||
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
|
||||
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
|
||||
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
|
||||
CONFIG_TOUCHSCREEN_BU21013=m
|
||||
CONFIG_TOUCHSCREEN_CY8CTMG110=m
|
||||
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
|
||||
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
|
||||
# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
|
||||
CONFIG_TOUCHSCREEN_DYNAPRO=m
|
||||
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
|
||||
CONFIG_TOUCHSCREEN_EETI=m
|
||||
@ -2759,12 +2781,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
|
||||
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
||||
CONFIG_TOUCHSCREEN_TOUCHIT213=m
|
||||
CONFIG_TOUCHSCREEN_TSC_SERIO=m
|
||||
# CONFIG_TOUCHSCREEN_TSC2005 is not set
|
||||
CONFIG_TOUCHSCREEN_TSC2007=m
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_AD714X=m
|
||||
CONFIG_INPUT_AD714X_I2C=m
|
||||
CONFIG_INPUT_AD714X_SPI=m
|
||||
CONFIG_INPUT_BMA150=m
|
||||
CONFIG_INPUT_PCSPKR=m
|
||||
CONFIG_INPUT_MC13783_PWRBUTTON=m
|
||||
@ -2788,6 +2812,7 @@ CONFIG_INPUT_PCF8574=m
|
||||
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
|
||||
CONFIG_INPUT_ADXL34X=m
|
||||
CONFIG_INPUT_ADXL34X_I2C=m
|
||||
CONFIG_INPUT_ADXL34X_SPI=m
|
||||
CONFIG_INPUT_CMA3000=m
|
||||
CONFIG_INPUT_CMA3000_I2C=m
|
||||
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
|
||||
@ -2858,6 +2883,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
#
|
||||
# CONFIG_SERIAL_MAX3100 is not set
|
||||
# CONFIG_SERIAL_MAX310X is not set
|
||||
CONFIG_SERIAL_MFD_HSU=m
|
||||
CONFIG_SERIAL_CORE=y
|
||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
@ -2868,6 +2895,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
|
||||
CONFIG_SERIAL_ALTERA_UART=m
|
||||
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
|
||||
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
|
||||
# CONFIG_SERIAL_IFX6X60 is not set
|
||||
CONFIG_SERIAL_PCH_UART=m
|
||||
CONFIG_SERIAL_ARC=m
|
||||
CONFIG_SERIAL_ARC_NR_PORTS=1
|
||||
@ -2987,7 +3015,31 @@ CONFIG_I2C_VIPERBOARD=m
|
||||
# CONFIG_I2C_DEBUG_CORE is not set
|
||||
# CONFIG_I2C_DEBUG_ALGO is not set
|
||||
# CONFIG_I2C_DEBUG_BUS is not set
|
||||
# CONFIG_SPI is not set
|
||||
CONFIG_SPI=y
|
||||
# CONFIG_SPI_DEBUG is not set
|
||||
CONFIG_SPI_MASTER=y
|
||||
|
||||
#
|
||||
# SPI Master Controller Drivers
|
||||
#
|
||||
# CONFIG_SPI_ALTERA is not set
|
||||
# CONFIG_SPI_BITBANG is not set
|
||||
# CONFIG_SPI_BUTTERFLY is not set
|
||||
# CONFIG_SPI_GPIO is not set
|
||||
# CONFIG_SPI_LM70_LLP is not set
|
||||
# CONFIG_SPI_OC_TINY is not set
|
||||
# CONFIG_SPI_PXA2XX_PCI is not set
|
||||
# CONFIG_SPI_SC18IS602 is not set
|
||||
# CONFIG_SPI_TOPCLIFF_PCH is not set
|
||||
# CONFIG_SPI_XCOMM is not set
|
||||
# CONFIG_SPI_XILINX is not set
|
||||
# CONFIG_SPI_DESIGNWARE is not set
|
||||
|
||||
#
|
||||
# SPI Protocol Masters
|
||||
#
|
||||
# CONFIG_SPI_SPIDEV is not set
|
||||
# CONFIG_SPI_TLE62X0 is not set
|
||||
# CONFIG_HSI is not set
|
||||
|
||||
#
|
||||
@ -3053,7 +3105,10 @@ CONFIG_GPIO_LANGWELL=y
|
||||
#
|
||||
# SPI GPIO expanders:
|
||||
#
|
||||
# CONFIG_GPIO_MAX7301 is not set
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
# CONFIG_GPIO_MC33880 is not set
|
||||
# CONFIG_GPIO_74X164 is not set
|
||||
|
||||
#
|
||||
# AC97 GPIO expanders:
|
||||
@ -3098,8 +3153,10 @@ CONFIG_HWMON_VID=m
|
||||
#
|
||||
CONFIG_SENSORS_ABITUGURU=m
|
||||
CONFIG_SENSORS_ABITUGURU3=m
|
||||
# CONFIG_SENSORS_AD7314 is not set
|
||||
CONFIG_SENSORS_AD7414=m
|
||||
CONFIG_SENSORS_AD7418=m
|
||||
# CONFIG_SENSORS_ADCXX is not set
|
||||
CONFIG_SENSORS_ADM1021=m
|
||||
CONFIG_SENSORS_ADM1025=m
|
||||
CONFIG_SENSORS_ADM1026=m
|
||||
@ -3136,6 +3193,7 @@ CONFIG_SENSORS_IT87=m
|
||||
CONFIG_SENSORS_JC42=m
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LM63=m
|
||||
# CONFIG_SENSORS_LM70 is not set
|
||||
CONFIG_SENSORS_LM73=m
|
||||
CONFIG_SENSORS_LM75=m
|
||||
CONFIG_SENSORS_LM77=m
|
||||
@ -3153,6 +3211,7 @@ CONFIG_SENSORS_LTC4245=m
|
||||
CONFIG_SENSORS_LTC4261=m
|
||||
CONFIG_SENSORS_LM95241=m
|
||||
CONFIG_SENSORS_LM95245=m
|
||||
# CONFIG_SENSORS_MAX1111 is not set
|
||||
CONFIG_SENSORS_MAX16065=m
|
||||
CONFIG_SENSORS_MAX1619=m
|
||||
CONFIG_SENSORS_MAX1668=m
|
||||
@ -3192,6 +3251,7 @@ CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
CONFIG_SENSORS_ADS7828=m
|
||||
# CONFIG_SENSORS_ADS7871 is not set
|
||||
CONFIG_SENSORS_AMC6821=m
|
||||
CONFIG_SENSORS_INA2XX=m
|
||||
CONFIG_SENSORS_THMC50=m
|
||||
@ -3333,18 +3393,25 @@ CONFIG_MFD_LM3533=m
|
||||
CONFIG_TPS65010=m
|
||||
CONFIG_TPS6507X=m
|
||||
CONFIG_MFD_TPS65217=m
|
||||
# CONFIG_MFD_TPS65912_SPI is not set
|
||||
# CONFIG_MFD_STMPE is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
# CONFIG_MFD_DA9052_SPI is not set
|
||||
CONFIG_MFD_ARIZONA=y
|
||||
CONFIG_MFD_ARIZONA_I2C=m
|
||||
# CONFIG_MFD_ARIZONA_SPI is not set
|
||||
CONFIG_MFD_WM5102=y
|
||||
CONFIG_MFD_WM5110=y
|
||||
# CONFIG_MFD_WM831X_SPI is not set
|
||||
CONFIG_MFD_PCF50633=m
|
||||
CONFIG_PCF50633_ADC=m
|
||||
CONFIG_PCF50633_GPIO=m
|
||||
CONFIG_MFD_MC13783=m
|
||||
CONFIG_MFD_MC13XXX=m
|
||||
# CONFIG_MFD_MC13XXX_SPI is not set
|
||||
CONFIG_MFD_MC13XXX_I2C=m
|
||||
CONFIG_ABX500_CORE=y
|
||||
# CONFIG_EZX_PCAP is not set
|
||||
CONFIG_MFD_CS5535=m
|
||||
# CONFIG_MFD_TIMBERDALE is not set
|
||||
CONFIG_LPC_SCH=m
|
||||
@ -4045,7 +4112,16 @@ CONFIG_XEN_FBDEV_FRONTEND=m
|
||||
# CONFIG_EXYNOS_VIDEO is not set
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_LCD_CLASS_DEVICE=m
|
||||
# CONFIG_LCD_L4F00242T03 is not set
|
||||
# CONFIG_LCD_LMS283GF05 is not set
|
||||
# CONFIG_LCD_LTV350QV is not set
|
||||
# CONFIG_LCD_ILI9320 is not set
|
||||
# CONFIG_LCD_TDO24M is not set
|
||||
# CONFIG_LCD_VGG2432A4 is not set
|
||||
CONFIG_LCD_PLATFORM=m
|
||||
# CONFIG_LCD_S6E63M0 is not set
|
||||
# CONFIG_LCD_LD9040 is not set
|
||||
# CONFIG_LCD_AMS369FG06 is not set
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
# CONFIG_BACKLIGHT_GENERIC is not set
|
||||
CONFIG_BACKLIGHT_LM3533=m
|
||||
@ -4227,6 +4303,7 @@ CONFIG_SND_VIA82XX_MODEM=m
|
||||
CONFIG_SND_VIRTUOSO=m
|
||||
CONFIG_SND_VX222=m
|
||||
CONFIG_SND_YMFPCI=m
|
||||
CONFIG_SND_SPI=y
|
||||
CONFIG_SND_USB=y
|
||||
CONFIG_SND_USB_AUDIO=m
|
||||
CONFIG_SND_USB_UA101=m
|
||||
@ -4637,6 +4714,7 @@ CONFIG_MMC_SDHCI_ACPI=m
|
||||
CONFIG_MMC_SDHCI_PLTFM=m
|
||||
CONFIG_MMC_WBSD=m
|
||||
CONFIG_MMC_TIFM_SD=m
|
||||
# CONFIG_MMC_SPI is not set
|
||||
CONFIG_MMC_SDRICOH_CS=m
|
||||
CONFIG_MMC_CB710=m
|
||||
CONFIG_MMC_VIA_SDMMC=m
|
||||
@ -4677,6 +4755,7 @@ CONFIG_LEDS_LP5523=m
|
||||
CONFIG_LEDS_CLEVO_MAIL=m
|
||||
CONFIG_LEDS_PCA955X=m
|
||||
CONFIG_LEDS_PCA9633=m
|
||||
# CONFIG_LEDS_DAC124S085 is not set
|
||||
CONFIG_LEDS_BD2802=m
|
||||
CONFIG_LEDS_INTEL_SS4200=m
|
||||
CONFIG_LEDS_LT3593=m
|
||||
@ -4768,6 +4847,15 @@ CONFIG_RTC_DRV_RV3029C2=m
|
||||
#
|
||||
# SPI RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_M41T93 is not set
|
||||
# CONFIG_RTC_DRV_M41T94 is not set
|
||||
# CONFIG_RTC_DRV_DS1305 is not set
|
||||
# CONFIG_RTC_DRV_DS1390 is not set
|
||||
# CONFIG_RTC_DRV_MAX6902 is not set
|
||||
# CONFIG_RTC_DRV_R9701 is not set
|
||||
# CONFIG_RTC_DRV_RS5C348 is not set
|
||||
# CONFIG_RTC_DRV_DS3234 is not set
|
||||
# CONFIG_RTC_DRV_PCF2123 is not set
|
||||
|
||||
#
|
||||
# Platform RTC drivers
|
||||
|
||||
@ -1,153 +0,0 @@
|
||||
From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Sun, 16 Dec 2012 16:15:00 +0000
|
||||
Subject: [PATCH] drm: Only evict the blocks required to create the requested
|
||||
hole
|
||||
|
||||
Avoid clobbering adjacent blocks if they happen to expire earlier and
|
||||
amalgamate together to form the requested hole.
|
||||
|
||||
In passing this fixes a regression from
|
||||
commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c
|
||||
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Date: Fri Feb 18 17:59:12 2011 +0100
|
||||
|
||||
drm: mm: track free areas implicitly
|
||||
|
||||
which swaps the end address for size (with a potential overflow) and
|
||||
effectively causes the eviction code to clobber almost all earlier
|
||||
buffers above the evictee.
|
||||
|
||||
v2: Check the original hole not the adjusted as the coloring may confuse
|
||||
us when later searching for the overlapping nodes. Also make sure that
|
||||
we do apply the range restriction and color adjustment in the same
|
||||
order for both scanning, searching and insertion.
|
||||
|
||||
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
---
|
||||
drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++----------------------------
|
||||
include/drm/drm_mm.h | 2 +-
|
||||
2 files changed, 18 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
|
||||
index 0761a03..665553c 100644
|
||||
--- a/drivers/gpu/drm/drm_mm.c
|
||||
+++ b/drivers/gpu/drm/drm_mm.c
|
||||
@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
|
||||
|
||||
BUG_ON(!hole_node->hole_follows || node->allocated);
|
||||
|
||||
- if (mm->color_adjust)
|
||||
- mm->color_adjust(hole_node, color, &adj_start, &adj_end);
|
||||
-
|
||||
if (adj_start < start)
|
||||
adj_start = start;
|
||||
+ if (adj_end > end)
|
||||
+ adj_end = end;
|
||||
+
|
||||
+ if (mm->color_adjust)
|
||||
+ mm->color_adjust(hole_node, color, &adj_start, &adj_end);
|
||||
|
||||
if (alignment) {
|
||||
unsigned tmp = adj_start % alignment;
|
||||
@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm,
|
||||
mm->scan_size = size;
|
||||
mm->scanned_blocks = 0;
|
||||
mm->scan_hit_start = 0;
|
||||
- mm->scan_hit_size = 0;
|
||||
+ mm->scan_hit_end = 0;
|
||||
mm->scan_check_range = 0;
|
||||
mm->prev_scanned_node = NULL;
|
||||
}
|
||||
@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm,
|
||||
mm->scan_size = size;
|
||||
mm->scanned_blocks = 0;
|
||||
mm->scan_hit_start = 0;
|
||||
- mm->scan_hit_size = 0;
|
||||
+ mm->scan_hit_end = 0;
|
||||
mm->scan_start = start;
|
||||
mm->scan_end = end;
|
||||
mm->scan_check_range = 1;
|
||||
@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
|
||||
struct drm_mm *mm = node->mm;
|
||||
struct drm_mm_node *prev_node;
|
||||
unsigned long hole_start, hole_end;
|
||||
- unsigned long adj_start;
|
||||
- unsigned long adj_end;
|
||||
+ unsigned long adj_start, adj_end;
|
||||
|
||||
mm->scanned_blocks++;
|
||||
|
||||
@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
|
||||
node->node_list.next = &mm->prev_scanned_node->node_list;
|
||||
mm->prev_scanned_node = node;
|
||||
|
||||
- hole_start = drm_mm_hole_node_start(prev_node);
|
||||
- hole_end = drm_mm_hole_node_end(prev_node);
|
||||
-
|
||||
- adj_start = hole_start;
|
||||
- adj_end = hole_end;
|
||||
-
|
||||
- if (mm->color_adjust)
|
||||
- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end);
|
||||
+ adj_start = hole_start = drm_mm_hole_node_start(prev_node);
|
||||
+ adj_end = hole_end = drm_mm_hole_node_end(prev_node);
|
||||
|
||||
if (mm->scan_check_range) {
|
||||
if (adj_start < mm->scan_start)
|
||||
@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
|
||||
adj_end = mm->scan_end;
|
||||
}
|
||||
|
||||
+ if (mm->color_adjust)
|
||||
+ mm->color_adjust(prev_node, mm->scan_color,
|
||||
+ &adj_start, &adj_end);
|
||||
+
|
||||
if (check_free_hole(adj_start, adj_end,
|
||||
mm->scan_size, mm->scan_alignment)) {
|
||||
mm->scan_hit_start = hole_start;
|
||||
- mm->scan_hit_size = hole_end;
|
||||
-
|
||||
+ mm->scan_hit_end = hole_end;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node)
|
||||
node_list);
|
||||
|
||||
prev_node->hole_follows = node->scanned_preceeds_hole;
|
||||
- INIT_LIST_HEAD(&node->node_list);
|
||||
list_add(&node->node_list, &prev_node->node_list);
|
||||
|
||||
- /* Only need to check for containement because start&size for the
|
||||
- * complete resulting free block (not just the desired part) is
|
||||
- * stored. */
|
||||
- if (node->start >= mm->scan_hit_start &&
|
||||
- node->start + node->size
|
||||
- <= mm->scan_hit_start + mm->scan_hit_size) {
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
+ return (drm_mm_hole_node_end(node) > mm->scan_hit_start &&
|
||||
+ node->start < mm->scan_hit_end);
|
||||
}
|
||||
EXPORT_SYMBOL(drm_mm_scan_remove_block);
|
||||
|
||||
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
|
||||
index 06d7f79..a1b66b7 100644
|
||||
--- a/include/drm/drm_mm.h
|
||||
+++ b/include/drm/drm_mm.h
|
||||
@@ -70,7 +70,7 @@ struct drm_mm {
|
||||
unsigned long scan_color;
|
||||
unsigned long scan_size;
|
||||
unsigned long scan_hit_start;
|
||||
- unsigned scan_hit_size;
|
||||
+ unsigned long scan_hit_end;
|
||||
unsigned scanned_blocks;
|
||||
unsigned long scan_start;
|
||||
unsigned long scan_end;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62
|
||||
|
||||
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
|
||||
index 997c6a1..75a2ab3 100644
|
||||
--- a/kernel/watchdog.c
|
||||
+++ b/kernel/watchdog.c
|
||||
@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu)
|
||||
{
|
||||
struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
|
||||
|
||||
+ /* kick off the timer for the hardlockup detector */
|
||||
+ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
+ hrtimer->function = watchdog_timer_fn;
|
||||
+
|
||||
if (!watchdog_enabled) {
|
||||
kthread_park(current);
|
||||
return;
|
||||
@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu)
|
||||
/* Enable the perf event */
|
||||
watchdog_nmi_enable(cpu);
|
||||
|
||||
- /* kick off the timer for the hardlockup detector */
|
||||
- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
- hrtimer->function = watchdog_timer_fn;
|
||||
-
|
||||
/* done here because hrtimer_start can only pin to smp_processor_id() */
|
||||
hrtimer_start(hrtimer, ns_to_ktime(sample_period),
|
||||
HRTIMER_MODE_REL_PINNED);
|
||||
@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu)
|
||||
{
|
||||
struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
|
||||
|
||||
- if (!watchdog_enabled)
|
||||
- return;
|
||||
-
|
||||
watchdog_set_prio(SCHED_NORMAL, 0);
|
||||
hrtimer_cancel(hrtimer);
|
||||
/* disable the perf event */
|
||||
Loading…
Reference in New Issue
Block a user