Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2638.git;a=commitdiff;h=33a86cf88d1b56076ff93d91e74d7f401bcad86e
commit 33a86cf88d1b56076ff93d91e74d7f401bcad86e Author: Miklos Vajna <[email protected]> Date: Sun Mar 20 12:37:19 2011 +0100 kernel-2.6.38-1-i686 - version bump - x86_64 and ppc config not yet updated diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 2122e1a..4c3395c 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -4,8 +4,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} if ! Fuse $USE_DEVEL; then - _F_kernel_patches=(sched-cgroup-use-exit-hook-to-avoid-use-after-free-c.patch \ - libata-set-queue-dma-alignment-to-sector-size-for-atapi-too.patch) + _F_kernel_patches=() else # example for a tagged rc release: 2.6.32.rc5 # example for a random snapshot (based on git describe output): 2.6.32.rc5.81.g964fe08 diff --git a/source/base/kernel/config.i686 b/source/base/kernel/config.i686 index 2185fe7..0fde24e 100644 --- a/source/base/kernel/config.i686 +++ b/source/base/kernel/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37 Kernel Configuration -# Mon Jan 10 20:04:10 2011 +# Linux/i386 2.6.38 Kernel Configuration +# Sun Mar 20 10:54:44 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -47,7 +47,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y -CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y @@ -72,10 +71,12 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -98,7 +99,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y @@ -142,6 +142,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -150,10 +151,12 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y CONFIG_RD_LZO=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -202,6 +205,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y @@ -284,9 +288,11 @@ CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_ELAN=y +# CONFIG_X86_INTEL_CE is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_32_NON_STANDARD is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y # CONFIG_XEN_PRIVILEGED_GUEST is not set @@ -302,6 +308,7 @@ CONFIG_MEMTEST=y CONFIG_X86_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=4 CONFIG_X86_CMPXCHG=y +CONFIG_CMPXCHG_LOCAL=y CONFIG_X86_L1_CACHE_SHIFT=4 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y @@ -369,6 +376,8 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -379,6 +388,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_HIGHPTE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -417,7 +429,6 @@ CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP_SMP=y CONFIG_PM_SLEEP=y -CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATION=y @@ -438,6 +449,7 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m @@ -1005,7 +1017,10 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y CONFIG_DCB=y CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_RPS=y +CONFIG_XPS=y # # Network testing @@ -1044,6 +1059,7 @@ CONFIG_CAN_BCM=m # CAN Device Drivers # CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m CONFIG_CAN_DEV=m # CONFIG_CAN_CALC_BITTIMING is not set CONFIG_CAN_MCP251X=m @@ -1061,6 +1077,8 @@ CONFIG_CAN_TSCAN1=m # CONFIG_CAN_EMS_USB=m # CONFIG_CAN_ESD_USB2 is not set +CONFIG_CAN_SOFTING=m +CONFIG_CAN_SOFTING_CS=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_IRDA=m @@ -1226,6 +1244,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_OF_PARTS=y CONFIG_MTD_AR7_PARTS=m # @@ -1276,6 +1295,7 @@ CONFIG_MTD_ABSENT=m CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_PHYSMAP_OF=m CONFIG_MTD_SC520CDP=m CONFIG_MTD_NETSC520=m CONFIG_MTD_TS5500=m @@ -1363,6 +1383,20 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 # UBI debugging options # # CONFIG_MTD_UBI_DEBUG is not set +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +# CONFIG_PROC_DEVICETREE is not set +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_SPI=y +CONFIG_OF_MDIO=m CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1751,6 +1785,7 @@ CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=y # CONFIG_SATA_AHCI_PLATFORM is not set CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m CONFIG_SATA_SIL24=y CONFIG_ATA_SFF=y @@ -1854,6 +1889,7 @@ CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m +CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m @@ -1861,6 +1897,10 @@ CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m CONFIG_FUSION=y CONFIG_FUSION_SPI=y CONFIG_FUSION_FC=m @@ -2146,6 +2186,7 @@ CONFIG_ATH_COMMON=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH5K_PCI=y CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m @@ -2163,6 +2204,7 @@ CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y # CONFIG_B43_SDIO is not set CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y @@ -2234,14 +2276,13 @@ CONFIG_RT2X00=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m CONFIG_RT61PCI=m -CONFIG_RT2800PCI_PCI=y CONFIG_RT2800PCI=m -# CONFIG_RT2800PCI_RT30XX is not set +CONFIG_RT2800PCI_RT33XX=y # CONFIG_RT2800PCI_RT35XX is not set CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m -# CONFIG_RT2800USB_RT30XX is not set +CONFIG_RT2800USB_RT33XX=y # CONFIG_RT2800USB_RT35XX is not set # CONFIG_RT2800USB_UNKNOWN is not set CONFIG_RT2800_LIB=m @@ -2253,13 +2294,18 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTLWIFI=m CONFIG_WL1251=m CONFIG_WL1251_SPI=m CONFIG_WL1251_SDIO=m +CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m -CONFIG_WL1271=m -# CONFIG_WL1271_SPI is not set -# CONFIG_WL1271_SDIO is not set +# CONFIG_WL12XX_HT is not set +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO=m +CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set @@ -2283,6 +2329,7 @@ CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_SMSC75XX is not set CONFIG_USB_NET_SMSC95XX=m @@ -2650,6 +2697,7 @@ CONFIG_JOYSTICK_ZHENHUA=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m # CONFIG_JOYSTICK_JOYDUMP is not set CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y @@ -2711,6 +2759,7 @@ CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m # CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set @@ -2725,11 +2774,12 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_WINBOND_CIR=m CONFIG_INPUT_PCF50633_PMU=m # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m # # Hardware I/O ports @@ -2812,9 +2862,13 @@ CONFIG_SERIAL_8250_MCA=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_OF_PLATFORM is not set # CONFIG_SERIAL_TIMBERDALE is not set +CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set +CONFIG_SERIAL_IFX6X60=m +CONFIG_SERIAL_PCH_UART=m CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y @@ -2854,7 +2908,6 @@ CONFIG_MWAVE=m CONFIG_SCx200_GPIO=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 CONFIG_HPET=y @@ -2916,6 +2969,7 @@ CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_SIMTEC=m # CONFIG_I2C_XILINX is not set +CONFIG_I2C_EG20T=m # # External I2C/SMBus adapter drivers @@ -2946,9 +3000,10 @@ CONFIG_SPI_BITBANG=m # CONFIG_SPI_BUTTERFLY is not set CONFIG_SPI_GPIO=m # CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=y CONFIG_SPI_TOPCLIFF_PCH=m CONFIG_SPI_XILINX=m -CONFIG_SPI_XILINX_PLTFM=m # CONFIG_SPI_DESIGNWARE is not set # @@ -2968,6 +3023,11 @@ CONFIG_PPS=m # # CONFIG_PPS_CLIENT_KTIMER is not set # CONFIG_PPS_CLIENT_LDISC is not set +CONFIG_PPS_CLIENT_PARPORT=m + +# +# PPS generators support +# CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set @@ -2997,6 +3057,7 @@ CONFIG_GPIO_ADP5588=m CONFIG_GPIO_CS5535=m # CONFIG_GPIO_LANGWELL is not set CONFIG_GPIO_PCH=m +CONFIG_GPIO_ML_IOH=m # CONFIG_GPIO_RDC321X is not set # @@ -3031,6 +3092,7 @@ CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2423=m CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y @@ -3046,8 +3108,10 @@ CONFIG_BATTERY_OLPC=m CONFIG_BATTERY_BQ20Z75=m CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m CONFIG_CHARGER_PCF50633=m CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_GPIO=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3075,6 +3139,7 @@ CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m @@ -3115,6 +3180,7 @@ CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SIS5595=m # CONFIG_SENSORS_SMM665 is not set CONFIG_SENSORS_DME1737=m @@ -3167,6 +3233,7 @@ CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_F71808E_WDT is not set +CONFIG_SP5100_TCO=m CONFIG_GEODE_WDT=m CONFIG_SC520_WDT=m CONFIG_SBC_FITPC2_WATCHDOG=m @@ -3184,6 +3251,7 @@ CONFIG_HP_WATCHDOG=m CONFIG_SC1200_WDT=m CONFIG_SCx200_WDT=m CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m CONFIG_SBC7240_WDT=m @@ -3251,11 +3319,13 @@ CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m # CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set +CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_DUMMY is not set @@ -3271,11 +3341,14 @@ CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_PCF50633=m CONFIG_REGULATOR_LP3971=m CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_MC13XXX_CORE=m CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set +CONFIG_REGULATOR_TPS6524X=m CONFIG_MEDIA_SUPPORT=m # @@ -3283,8 +3356,6 @@ CONFIG_MEDIA_SUPPORT=m # CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_DVB_CORE=m CONFIG_VIDEO_MEDIA=m @@ -3293,8 +3364,7 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m -CONFIG_IR_CORE=m -CONFIG_VIDEO_IR=m +CONFIG_RC_CORE=m CONFIG_LIRC=m CONFIG_RC_MAP=m CONFIG_IR_NEC_DECODER=m @@ -3309,6 +3379,8 @@ CONFIG_IR_LIRC_CODEC=m # CONFIG_IR_MCEUSB is not set CONFIG_IR_NUVOTON=m # CONFIG_IR_STREAMZAP is not set +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_LOOPBACK=m # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set @@ -3332,10 +3404,10 @@ CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m @@ -3370,6 +3442,7 @@ CONFIG_VIDEO_SAA6588=m # # Video decoders # +CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_BT866=m @@ -3429,6 +3502,7 @@ CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_TIMBERDALE=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m @@ -3455,6 +3529,7 @@ CONFIG_SOC_CAMERA_MT9V022=m CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV2640=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m @@ -3512,12 +3587,7 @@ CONFIG_VIDEO_EM28XX_DVB=m # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_CX231XX is not set CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m CONFIG_USB_ET61X251=m -CONFIG_USB_SE401=m CONFIG_USB_SN9C102=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set @@ -3532,7 +3602,6 @@ CONFIG_RADIO_RTRACK=m CONFIG_RADIO_RTRACK2=m CONFIG_RADIO_AZTECH=m CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m CONFIG_RADIO_MIROPCM20=m @@ -3550,6 +3619,7 @@ CONFIG_USB_MR800=m CONFIG_RADIO_TEA5764=m # CONFIG_RADIO_SAA7706H is not set CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -3731,6 +3801,7 @@ CONFIG_DVB_S5H1411=m # # ISDB-T (terrestrial) frontends # +CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m # @@ -3755,8 +3826,6 @@ CONFIG_DVB_IX2505V=m # Tools to develop new frontends # # CONFIG_DVB_DUMMY_FE is not set -CONFIG_DAB=y -CONFIG_USB_DABUSB=m # # Graphics support @@ -3806,6 +3875,7 @@ CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m CONFIG_FB_SVGALIB=m @@ -3872,6 +3942,7 @@ CONFIG_FB_VIA=m CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_SM501=m +CONFIG_FB_UDL=m # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4080,7 +4151,6 @@ CONFIG_SND_HDA_GENERIC=y # CONFIG_SND_HDA_POWER_SAVE is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m -CONFIG_SND_HIFIER=m CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m @@ -4144,6 +4214,7 @@ CONFIG_HID_CHICONY=y CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=y # CONFIG_DRAGONRISE_FF is not set +CONFIG_HID_EMS_FF=m # CONFIG_HID_EGALAX is not set # CONFIG_HID_ELECOM is not set CONFIG_HID_EZKEY=y @@ -4162,6 +4233,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_HID_MICROSOFT=y # CONFIG_HID_MOSART is not set CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=y CONFIG_HID_ORTEK=y CONFIG_HID_PANTHERLORD=y @@ -4171,6 +4243,7 @@ CONFIG_HID_PETALYNX=y # CONFIG_HID_QUANTA is not set CONFIG_HID_ROCCAT=m # CONFIG_HID_ROCCAT_KONE is not set +CONFIG_HID_ROCCAT_KONEPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y @@ -4377,13 +4450,15 @@ CONFIG_USB_GADGET=m CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_R8A66597 is not set +# CONFIG_USB_GADGET_PXA_U2O is not set # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_CI13XXX_PCI is not set CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LANGWELL is not set +# CONFIG_USB_GADGET_EG20T is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m @@ -4391,6 +4466,7 @@ CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_ETH_EEM is not set +CONFIG_USB_G_NCM=m CONFIG_USB_GADGETFS=m # CONFIG_USB_FUNCTIONFS is not set CONFIG_USB_FILE_STORAGE=m @@ -4421,6 +4497,7 @@ CONFIG_UWB_I1480U=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set # # MMC/SD/SDIO Card Drivers @@ -4437,6 +4514,7 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m # CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -4496,6 +4574,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # +# CONFIG_NFC_DEVICES is not set # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m @@ -4620,8 +4699,8 @@ CONFIG_DMADEVICES=y # # CONFIG_INTEL_MID_DMAC is not set CONFIG_INTEL_IOATDMA=m -# CONFIG_TIMB_DMA is not set -# CONFIG_PCH_DMA is not set +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y # @@ -4663,10 +4742,10 @@ CONFIG_VIDEO_GO7007_TW2804=m CONFIG_VIDEO_CX25821=m CONFIG_VIDEO_CX25821_ALSA=m # CONFIG_VIDEO_TM6000 is not set -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_STRADIS=m +CONFIG_USB_DABUSB=m +CONFIG_USB_SE401=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m CONFIG_USB_IP_COMMON=m CONFIG_USB_IP_VHCI_HCD=m CONFIG_USB_IP_HOST=m @@ -4783,7 +4862,6 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_USB_SERIAL_QUATECH_USB2=m CONFIG_VT6655=m CONFIG_VT6656=m -CONFIG_FB_UDL=m CONFIG_HYPERV=m CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_BLOCK=m @@ -4806,6 +4884,7 @@ CONFIG_VME_USER=m # VME Board Drivers # # CONFIG_VMIVME_7805 is not set +CONFIG_DX_SEP=m CONFIG_IIO=m CONFIG_IIO_RING_BUFFER=y CONFIG_IIO_SW_RING=m @@ -4814,6 +4893,9 @@ CONFIG_IIO_TRIGGER=y # # Accelerometers # +CONFIG_ADIS16201=m +CONFIG_ADIS16203=m +CONFIG_ADIS16204=m # CONFIG_ADIS16209 is not set # CONFIG_ADIS16220 is not set # CONFIG_ADIS16240 is not set @@ -4826,14 +4908,53 @@ CONFIG_LIS3L02DQ=m # CONFIG_MAX1363=m CONFIG_MAX1363_RING_BUFFER=y +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7314=m CONFIG_AD799X=m CONFIG_AD799X_RING_BUFFER=y CONFIG_AD7476=m +CONFIG_AD7887=m +CONFIG_AD7745=m +CONFIG_AD7816=m +CONFIG_ADT75=m +CONFIG_ADT7310=m +CONFIG_ADT7410=m + +# +# Analog digital bi-direction convertors +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Digital to analog convertors +# +CONFIG_AD5624R_SPI=m +CONFIG_AD5446=m + +# +# Direct Digital Synthesis +# +CONFIG_AD5930=m +CONFIG_AD9832=m +CONFIG_AD9834=m +CONFIG_AD9850=m +CONFIG_AD9852=m +CONFIG_AD9910=m +CONFIG_AD9951=m # # Digital gyroscope sensors # +CONFIG_ADIS16060=m +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m # CONFIG_ADIS16260 is not set +CONFIG_ADIS16251=m # # Inertial measurement units @@ -4855,15 +4976,35 @@ CONFIG_SENSORS_AK8975=m # CONFIG_SENSORS_HMC5843 is not set # +# Active energy metering IC +# +CONFIG_ADE7753=m +CONFIG_ADE7754=m +CONFIG_ADE7758=m +CONFIG_ADE7759=m +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S120X=m +CONFIG_AD2S1210=m +# CONFIG_AD2S1210_GPIO_INPUT is not set +# CONFIG_AD2S1210_GPIO_OUTPUT is not set +CONFIG_AD2S1210_GPIO_NONE=y + +# # Triggers - standalone # # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set # CONFIG_IIO_GPIO_TRIGGER is not set +CONFIG_CS5535_GPIO=m # CONFIG_ZRAM is not set # CONFIG_WLAGS49_H2 is not set # CONFIG_WLAGS49_H25 is not set -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_SAMSUNG_LAPTOP=m CONFIG_FB_SM7XX=m # CONFIG_VIDEO_DT3155 is not set @@ -4874,7 +5015,6 @@ CONFIG_CRYSTALHD=m # Texas Instruments shared transport line discipline # # CONFIG_ST_BT is not set -# CONFIG_ADIS16255 is not set # CONFIG_FB_XGI is not set # CONFIG_LIRC_STAGING is not set CONFIG_SMB_FS=m @@ -4920,6 +5060,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5004,7 +5146,6 @@ CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y @@ -5021,6 +5162,7 @@ CONFIG_OCFS2_DEBUG_FS=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y @@ -5124,6 +5266,7 @@ CONFIG_CRAMFS=m CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_XATTR is not set # CONFIG_SQUASHFS_LZO is not set +CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 CONFIG_VXFS_FS=m @@ -5331,6 +5474,7 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5370,6 +5514,7 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set # CONFIG_DEBUG_RODATA is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set @@ -5392,6 +5537,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # Security options # CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y @@ -5461,6 +5608,7 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_FPU=m # # Hash modes @@ -5493,6 +5641,7 @@ CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m @@ -5522,6 +5671,9 @@ CONFIG_CRYPTO_LZO=m # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -5534,6 +5686,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -5567,9 +5720,19 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m @@ -5585,3 +5748,4 @@ CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y diff --git a/source/base/kernel/libata-set-queue-dma-alignment-to-sector-size-for-atapi-too.patch b/source/base/kernel/libata-set-queue-dma-alignment-to-sector-size-for-atapi-too.patch deleted file mode 100644 index 8c9422a..0000000 --- a/source/base/kernel/libata-set-queue-dma-alignment-to-sector-size-for-atapi-too.patch +++ /dev/null @@ -1,80 +0,0 @@ -6a300e628a48cf12bac93a964a535e83cd1d Mon Sep 17 00:00:00 2001 -From: Tejun Heo <[email protected]> -Date: Thu, 20 Jan 2011 13:59:06 +0100 -Subject: libata: set queue DMA alignment to sector size for ATAPI too - -From: Tejun Heo <[email protected]> - -commit 729a6a300e628a48cf12bac93a964a535e83cd1d upstream. - -ata_pio_sectors() expects buffer for each sector to be contained in a -single page; otherwise, it ends up overrunning the first page. This -is achieved by setting queue DMA alignment. If sector_size is smaller -than PAGE_SIZE and all buffers are sector_size aligned, buffer for -each sector is always contained in a single page. - -This wasn't applied to ATAPI devices but IDENTIFY_PACKET is executed -as ATA_PROT_PIO and thus uses ata_pio_sectors(). Newer versions of -udev issue IDENTIFY_PACKET with unaligned buffer triggering the -problem and causing oops. - -This patch fixes the problem by setting sdev->sector_size to -ATA_SECT_SIZE on ATATPI devices and always setting DMA alignment to -sector_size. While at it, add a warning for the unlikely but still -possible scenario where sector_size is larger than PAGE_SIZE, in which -case the alignment wouldn't be enough. - -Signed-off-by: Tejun Heo <[email protected]> -Reported-by: John Stanley <[email protected]> -Tested-by: John Stanley <[email protected]> -Signed-off-by: Jeff Garzik <[email protected]> -Signed-off-by: Greg Kroah-Hartman <[email protected]> - ---- - drivers/ata/libata-scsi.c | 24 ++++++++++++++++++------ - 1 file changed, 18 insertions(+), 6 deletions(-) - ---- a/drivers/ata/libata-scsi.c -+++ b/drivers/ata/libata-scsi.c -@@ -1102,9 +1102,9 @@ static int ata_scsi_dev_config(struct sc - struct request_queue *q = sdev->request_queue; - void *buf; - -- /* set the min alignment and padding */ -- blk_queue_update_dma_alignment(sdev->request_queue, -- ATA_DMA_PAD_SZ - 1); -+ sdev->sector_size = ATA_SECT_SIZE; -+ -+ /* set DMA padding */ - blk_queue_update_dma_pad(sdev->request_queue, - ATA_DMA_PAD_SZ - 1); - -@@ -1118,13 +1118,25 @@ static int ata_scsi_dev_config(struct sc - - blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN); - } else { -- /* ATA devices must be sector aligned */ - sdev->sector_size = ata_id_logical_sector_size(dev->id); -- blk_queue_update_dma_alignment(sdev->request_queue, -- sdev->sector_size - 1); - sdev->manage_start_stop = 1; - } - -+ /* -+ * ata_pio_sectors() expects buffer for each sector to not cross -+ * page boundary. Enforce it by requiring buffers to be sector -+ * aligned, which works iff sector_size is not larger than -+ * PAGE_SIZE. ATAPI devices also need the alignment as -+ * IDENTIFY_PACKET is executed as ATA_PROT_PIO. -+ */ -+ if (sdev->sector_size > PAGE_SIZE) -+ ata_dev_printk(dev, KERN_WARNING, -+ "sector_size=%u > PAGE_SIZE, PIO may malfunction\n", -+ sdev->sector_size); -+ -+ blk_queue_update_dma_alignment(sdev->request_queue, -+ sdev->sector_size - 1); -+ - if (dev->flags & ATA_DFLAG_AN) - set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); - diff --git a/source/base/kernel/sched-cgroup-use-exit-hook-to-avoid-use-after-free-c.patch b/source/base/kernel/sched-cgroup-use-exit-hook-to-avoid-use-after-free-c.patch deleted file mode 100644 index 502df84..0000000 --- a/source/base/kernel/sched-cgroup-use-exit-hook-to-avoid-use-after-free-c.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 068c5cc5ac7414a8e9eb7856b4bf3cc4d4744267 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <[email protected]> -Date: Wed, 19 Jan 2011 12:26:11 +0100 -Subject: [PATCH] sched, cgroup: Use exit hook to avoid use-after-free crash - -By not notifying the controller of the on-exit move back to -init_css_set, we fail to move the task out of the previous -cgroup's cfs_rq. This leads to an opportunity for a -cgroup-destroy to come in and free the cgroup (there are no -active tasks left in it after all) to which the not-quite dead -task is still enqueued. - -Reported-by: Miklos Vajna <[email protected]> -Fixed-by: Mike Galbraith <[email protected]> -Signed-off-by: Peter Zijlstra <[email protected]> -Cc: <[email protected]> -Cc: Mike Galbraith <[email protected]> -Signed-off-by: Ingo Molnar <[email protected]> -LKML-Reference: <1293206353.29444.205.camel@laptop> ---- - kernel/sched.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -diff --git a/kernel/sched.c b/kernel/sched.c -index 0a169a8..fa5272a 100644 ---- a/kernel/sched.c -+++ b/kernel/sched.c -@@ -606,6 +606,9 @@ static inline struct task_group *task_group(struct task_struct *p) - struct task_group *tg; - struct cgroup_subsys_state *css; - -+ if (p->flags & PF_EXITING) -+ return &root_task_group; -+ - css = task_subsys_state_check(p, cpu_cgroup_subsys_id, - lockdep_is_held(&task_rq(p)->lock)); - tg = container_of(css, struct task_group, css); -@@ -8880,6 +8883,20 @@ cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, - } - } - -+static void -+cpu_cgroup_exit(struct cgroup_subsys *ss, struct task_struct *task) -+{ -+ /* -+ * cgroup_exit() is called in the copy_process() failure path. -+ * Ignore this case since the task hasn't ran yet, this avoids -+ * trying to poke a half freed task state from generic code. -+ */ -+ if (!(task->flags & PF_EXITING)) -+ return; -+ -+ sched_move_task(task); -+} -+ - #ifdef CONFIG_FAIR_GROUP_SCHED - static int cpu_shares_write_u64(struct cgroup *cgrp, struct cftype *cftype, - u64 shareval) -@@ -8952,6 +8969,7 @@ struct cgroup_subsys cpu_cgroup_subsys = { - .destroy = cpu_cgroup_destroy, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -+ .exit = cpu_cgroup_exit, - .populate = cpu_cgroup_populate, - .subsys_id = cpu_cgroup_subsys_id, - .early_init = 1, --- -1.7.3.2.164.g6f10c.dirty - diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index d45ddc3..010eb81 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -15,8 +15,8 @@ # * _F_kernelver_rel: the kernel release # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### -_F_kernelver_ver=2.6.37 -_F_kernelver_rel=2 +_F_kernelver_ver=2.6.38 +_F_kernelver_rel=1 _F_kernelver_stable= ### _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
