rpms/kernel/devel Makefile, 1.112, 1.113 config-generic, 1.327, 1.328 config-ia64-generic, 1.26, 1.27 config-nodebug, 1.41, 1.42 config-powerpc-generic, 1.50, 1.51 config-powerpc32-generic, 1.35, 1.36 config-powerpc64, 1.34, 1.35 config-s390x, 1.19, 1.20 config-sparc64-generic, 1.29, 1.30 config-x86-generic, 1.88, 1.89 config-x86_64-generic, 1.90, 1.91 kernel.spec, 1.1811, 1.1812 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.5, 1.6 linux-2.6-execshield.patch, 1.110, 1.111

Kyle McMartin kyle at fedoraproject.org
Mon Sep 28 22:57:24 UTC 2009


Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8704

Modified Files:
	Makefile config-generic config-ia64-generic config-nodebug 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-s390x config-sparc64-generic 
	config-x86-generic config-x86_64-generic kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
	linux-2.6-execshield.patch 
Log Message:
* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
- sick of rejects.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- Makefile	28 Sep 2009 22:41:52 -0000	1.112
+++ Makefile	28 Sep 2009 22:57:20 -0000	1.113
@@ -74,6 +74,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
 
@@ -124,6 +125,7 @@ release:
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- config-generic	28 Sep 2009 22:41:52 -0000	1.327
+++ config-generic	28 Sep 2009 22:57:21 -0000	1.328
@@ -12,6 +12,8 @@ CONFIG_LOCALVERSION=""
 CONFIG_EXPERIMENTAL=y
 CONFIG_HOTPLUG=y
 CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
@@ -236,6 +238,7 @@ CONFIG_MTD_SCB2_FLASH=m
 # CONFIG_MTD_L440GX is not set
 CONFIG_MTD_PCI=m
 CONFIG_MTD_TS5500=m
+# CONFIG_MTD_GPIO_ADDR is not set
 
 #
 # Self-contained MTD device drivers
@@ -613,6 +616,7 @@ CONFIG_PATA_SIS=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
+CONFIG_PATA_ATP867X=m
 
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_INITIO=m
@@ -674,6 +678,8 @@ CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
@@ -1418,6 +1424,7 @@ CONFIG_ATMEL=m
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
 CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 # CONFIG_B43_FORCE_PIO is not set
@@ -1563,6 +1570,7 @@ CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
@@ -1840,6 +1848,10 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_QT2160=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -1901,6 +1913,7 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_W90X900=m
+CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
@@ -1913,6 +1926,8 @@ CONFIG_INPUT_KEYSPAN_REMOTE=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
 
+CONFIG_INPUT_WM831X_ON=m
+
 #
 # Character devices
 #
@@ -1983,6 +1998,7 @@ CONFIG_PPDEV=m
 # I2C support
 #
 CONFIG_I2C=m
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -2128,6 +2144,9 @@ CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_WM831X=m
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2196,6 +2215,7 @@ CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_WM8350_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2239,6 +2259,8 @@ CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_M48T35=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_WM831X=m
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2362,6 +2384,7 @@ CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_SAA7164=m
 
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -2381,6 +2404,7 @@ CONFIG_MEDIA_ATTACH=y
 #
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
+CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
 
 # CONFIG_DVB_FE_CUSTOMISE is not set
@@ -2399,6 +2423,7 @@ CONFIG_DVB_USB_DTV5100=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_DRX397XD=m
 CONFIG_DVB_LGDT3304=m
@@ -2454,6 +2479,8 @@ CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
 
+CONFIG_DVB_PT1=m
+
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_TUNER=m
@@ -2765,6 +2792,7 @@ CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_ISP1362_HCD=m
 
 #
 # USB Device Class drivers
@@ -2866,6 +2894,9 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_GSPCA_SQ905=m
 CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_JEILINJ=m
+
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 # CONFIG_USB_OV511 is not set
@@ -3043,7 +3074,10 @@ CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
 CONFIG_USB_MR800=m
 CONFIG_USB_STKWEBCAM=m
 # CONFIG_USB_TEST is not set
@@ -3086,6 +3120,8 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8350_I2C=m
 CONFIG_MFD_WM8350=m
+CONFIG_MFD_WM831X=m
+CONFIG_AB3100_OTP=m
 
 #
 # File systems
@@ -3108,6 +3144,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4DEV_COMPAT=y
 CONFIG_JBD2=y
 CONFIG_JBD2_DEBUG=y
@@ -3217,6 +3254,7 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
 CONFIG_FUSE_FS=m
 CONFIG_OMFS_FS=m
 CONFIG_CUSE=m
@@ -3517,6 +3555,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_WM831X=m
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -3752,6 +3791,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_WM831X_STATUS=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -3799,6 +3839,7 @@ CONFIG_CFAG12864B_RATE=20
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_APM_POWER=m
+CONFIG_WM831X_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_PMU=m
@@ -3815,6 +3856,7 @@ CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3939,6 +3981,10 @@ CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_USERSPACE_CONSUMER=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_WM831X=m
 
 CONFIG_WM8350_POWER=m
 
@@ -3995,6 +4041,17 @@ CONFIG_USB_ATMEL=m
 # CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
 # CONFIG_RT3070 is not set
 # CONFIG_RTL8192SU is not set
+# CONFIG_COWLOOP is not set
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_VT6656 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_HYPERV is not set
 
 #
 # Android
@@ -4095,3 +4152,5 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- config-ia64-generic	18 Jun 2009 19:05:53 -0000	1.26
+++ config-ia64-generic	28 Sep 2009 22:57:22 -0000	1.27
@@ -210,3 +210,6 @@ CONFIG_PARAVIRT=y
 CONFIG_DMAR_DEFAULT_ON=y
 
 CONFIG_RCU_FANOUT=64
+
+CONFIG_ACPI_POWER_METER=m
+CONFIG_I2C_SCMI=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- config-nodebug	28 Sep 2009 22:41:52 -0000	1.41
+++ config-nodebug	28 Sep 2009 22:57:22 -0000	1.42
@@ -53,4 +53,6 @@ CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
 
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+
 CONFIG_EXT4_DEBUG=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- config-powerpc-generic	15 Sep 2009 15:12:45 -0000	1.50
+++ config-powerpc-generic	28 Sep 2009 22:57:22 -0000	1.51
@@ -333,3 +333,9 @@ CONFIG_SWIOTLB=y
 CONFIG_PPC_DISABLE_WERROR=y
 
 CONFIG_XILINX_EMACLITE=m
+
+CONFIG_GPIO_WM831X=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_UCB1400 is not set
+CONFIG_EDAC_MPC85XX=m
+


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- config-powerpc32-generic	23 Jul 2009 17:45:33 -0000	1.35
+++ config-powerpc32-generic	28 Sep 2009 22:57:22 -0000	1.36
@@ -187,5 +187,6 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_RCU_FANOUT=32
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- config-powerpc64	23 Jul 2009 17:45:33 -0000	1.34
+++ config-powerpc64	28 Sep 2009 22:57:22 -0000	1.35
@@ -185,4 +185,5 @@ CONFIG_RELOCATABLE=y
 CONFIG_RCU_FANOUT=64
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- config-s390x	14 Sep 2009 21:33:54 -0000	1.19
+++ config-s390x	28 Sep 2009 22:57:22 -0000	1.20
@@ -231,5 +231,6 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/jokes"
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- config-sparc64-generic	15 Sep 2009 15:12:45 -0000	1.29
+++ config-sparc64-generic	28 Sep 2009 22:57:22 -0000	1.30
@@ -207,4 +207,5 @@ CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- config-x86-generic	20 Aug 2009 16:03:17 -0000	1.88
+++ config-x86-generic	28 Sep 2009 22:57:23 -0000	1.89
@@ -169,11 +169,13 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=y
+CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_PNPACPI=y
+CONFIG_ACPI_POWER_METER=m
 
 
 #
@@ -473,6 +475,7 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_OLD_MCE is not set
@@ -480,3 +483,15 @@ CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_X86_MRST=y
+CONFIG_SFI=y
+
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_I2C_SCMI=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EDAC_I3200=m
+
+CONFIG_GPIO_LANGWELL=y
+
+# CONFIG_INTEL_TXT is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- config-x86_64-generic	20 Aug 2009 16:03:17 -0000	1.90
+++ config-x86_64-generic	28 Sep 2009 22:57:23 -0000	1.91
@@ -107,6 +107,7 @@ CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_VIDEO=m
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_POWER_METER=m
 
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
@@ -377,6 +378,16 @@ CONFIG_RCU_FANOUT=64
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
+CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_SFI=y
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_I2C_SCMI=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EDAC_I3200=m
+CONFIG_TOPSTAR_LAPTOP=m
+# CONFIG_INTEL_TXT is not set
+CONFIG_GPIO_LANGWELL=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -p -r1.1811 -r1.1812
--- kernel.spec	28 Sep 2009 22:41:52 -0000	1.1811
+++ kernel.spec	28 Sep 2009 22:57:23 -0000	1.1812
@@ -1358,6 +1358,8 @@ do
   make ARCH=$Arch %{oldconfig_target} > /dev/null
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
+  rm -f include/generated/kernel.arch
+  rm -f include/generated/kernel.cross
 done
 # end of kernel config
 %endif
@@ -1454,7 +1456,7 @@ BuildKernel() {
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/dracut-$KernelVer.img
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
 %else
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
 %endif
@@ -1983,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
+- sick of rejects.
+
 * Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix up some items missing in make debug vs. make release,
   rearrange so the options are in the same order.
@@ -1991,6 +1996,10 @@ fi
   CONFIG_DEBUG_FORCE_WEAK_PER_CPU
 
 * Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
+- Must now make mrproper after each config pass, due to Kbuild
+  stashing away the $ARCH variable.
+
+* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.31-git18
 - rebased:
  - hdpvr-ir-enable.patch

linux-2.6-debug-vm-would-have-oomkilled.patch:
 kernel/sysctl.c |    9 +++++++++
 mm/oom_kill.c   |    7 +++++++
 2 files changed, 16 insertions(+)

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-debug-vm-would-have-oomkilled.patch	28 Sep 2009 05:09:48 -0000	1.5
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	28 Sep 2009 22:57:23 -0000	1.6
@@ -26,7 +26,7 @@ index 0d949c5..8fb2bd9 100644
  		.procname	= "overcommit_ratio",
  		.data		= &sysctl_overcommit_ratio,
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index ea2147d..3b31a4a 100644
+index ea2147d..788fe84 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -31,6 +31,7 @@
@@ -50,18 +50,3 @@ index ea2147d..3b31a4a 100644
  	if (verbose)
  		printk(KERN_ERR "Killed process %d (%s)\n",
  				task_pid_nr(p), p->comm);
-@@ -384,6 +391,14 @@ static int oom_kill_task(struct task_struct *p)
- 	if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
- 		return 1;
- 
-+	/*
-+	 * Don't kill the process if any threads are set to OOM_DISABLE
-+	 */
-+	do_each_thread(g, q) {
-+		if (q->mm == mm && q->oomkilladj == OOM_DISABLE)
-+			return 1;
-+	} while_each_thread(g, q);
-+
- 	__oom_kill_task(p, 1);
- 
- 	return 0;

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  129 +++++++++++++++++++++++++++++++---
 arch/x86/mm/init.c                    |    6 +
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    4 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 24 files changed, 463 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- linux-2.6-execshield.patch	28 Sep 2009 05:09:48 -0000	1.110
+++ linux-2.6-execshield.patch	28 Sep 2009 22:57:23 -0000	1.111
@@ -407,65 +407,6 @@ index 73ffd55..0cf2a7b 100644
  
  	/* Enable PSE if available */
  	if (cpu_has_pse)
-diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 30938c1..599e0a4 100644
---- a/arch/x86/mm/init_32.c
-+++ b/arch/x86/mm/init_32.c
-@@ -591,6 +591,54 @@ void zap_low_mappings(bool early)
- pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
- 
-+#ifdef CONFIG_X86_PAE
-+
-+static int disable_nx __initdata;
-+
-+/*
-+ * noexec = on|off
-+ *
-+ * Control non executable mappings.
-+ *
-+ * on      Enable
-+ * off     Disable (disables exec-shield too)
-+ */
-+static int __init noexec_setup(char *str)
-+{
-+	if (!str || !strcmp(str, "on")) {
-+		if (cpu_has_nx) {
-+			__supported_pte_mask |= _PAGE_NX;
-+			disable_nx = 0;
-+		}
-+	} else if (!strcmp(str, "off")) {
-+		disable_nx = 1;
-+		__supported_pte_mask &= ~_PAGE_NX;
-+		exec_shield = 0;
-+	} else
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+early_param("noexec", noexec_setup);
-+
-+void __init set_nx(void)
-+{
-+	unsigned int v[4], l, h;
-+
-+	if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
-+		cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
-+
-+		if ((v[3] & (1 << 20)) && !disable_nx) {
-+			rdmsr(MSR_EFER, l, h);
-+			l |= EFER_NX;
-+			wrmsr(MSR_EFER, l, h);
-+			nx_enabled = 1;
-+			__supported_pte_mask |= _PAGE_NX;
-+		}
-+	}
-+}
-+#endif
-+
- /* user-defined highmem size */
- static unsigned int highmem_pages = -1;
- 
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
 index c8191de..7d84d01 100644
 --- a/arch/x86/mm/mmap.c
@@ -488,6 +429,25 @@ index c8191de..7d84d01 100644
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
+diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
+index 513d8ed..c614a90 100644
+--- a/arch/x86/mm/setup_nx.c
++++ b/arch/x86/mm/setup_nx.c
+@@ -1,3 +1,4 @@
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+@@ -27,6 +28,9 @@ static int __init noexec_setup(char *str)
+ 	} else if (!strncmp(str, "off", 3)) {
+ 		disable_nx = 1;
+ 		__supported_pte_mask &= ~_PAGE_NX;
++#ifdef CONFIG_X86_32
++		exec_shield = 0;
++#endif
+ 	}
+ 	return 0;
+ }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
 index 36fe08e..3806a45 100644
 --- a/arch/x86/mm/tlb.c




More information about the fedora-extras-commits mailing list