rpms/kernel/devel patch-2.6.30-git13.bz2.sign, NONE, 1.1 .cvsignore, 1.1079, 1.1080 config-arm, 1.3, 1.4 config-generic, 1.288, 1.289 config-i686-PAE, 1.1, 1.2 config-ia64-generic, 1.25, 1.26 config-nodebug, 1.32, 1.33 config-powerpc-generic, 1.44, 1.45 config-powerpc32-generic, 1.31, 1.32 config-powerpc64, 1.31, 1.32 config-s390x, 1.14, 1.15 config-sparc64-generic, 1.24, 1.25 config-x86-generic, 1.80, 1.81 config-x86_64-generic, 1.82, 1.83 kernel.spec, 1.1573, 1.1574 linux-2.6-execshield.patch, 1.106, 1.107 linux-2.6-utrace.patch, 1.113, 1.114 sources, 1.1037, 1.1038 upstream, 1.951, 1.952 linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch, 1.1, NONE via-padlock-30-fix-might-sleep.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Thu Jun 18 19:06:26 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10482
Modified Files:
.cvsignore config-arm config-generic config-i686-PAE
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-execshield.patch
linux-2.6-utrace.patch sources upstream
Added Files:
patch-2.6.30-git13.bz2.sign
Removed Files:
linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
via-padlock-30-fix-might-sleep.patch
Log Message:
* Thu Jun 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.10.rc0.git13
- 2.6.30-git13
- config changes:
- arm:
- CONFIG_UACCESS_WITH_MEMCPY is not set
- i686-PAE:
- CONFIG_XEN_DEV_EVTCHN=m
- CONFIG_XEN_SYS_HYPERVISOR=y
- ia64:
- CONFIG_RCU_FANOUT=64
- nodebug:
- CONFIG_DEBUG_KMEMLEAK is not set
- CONFIG_DEBUG_KMEMLEAK_TEST=m
- powerpc:
- CONFIG_CAN_SJA1000_OF_PLATFORM=m
- CONFIG_PPC_EMULATED_STATS=y
- CONFIG_SWIOTLB=y
- CONFIG_RDS is not set (broken on ppc32)
- powerpc32:
- CONFIG_RCU_FANOUT=32
- powerpc64:
- CONFIG_RCU_FANOUT=64
- CONFIG_PERF_COUNTERS is not set (broken on ppc64)
- s390x:
- CONFIG_RCU_FANOUT=64
- CONFIG_SECCOMP=y
- CONFIG_PM=y
- CONFIG_HIBERNATION=y
- CONFIG_PM_STD_PARTITION="/dev/jokes"
- sparc64:
- CONFIG_RCU_FANOUT=64
- x86:
- CONFIG_RCU_FANOUT=32
- CONFIG_IOMMU_STRESS is not set
- CONFIG_PERF_COUNTERS=y
- CONFIG_X86_OLD_MCE is not set
- CONFIG_X86_MCE_INTEL=y
- CONFIG_X86_MCE_AMD=y
- CONFIG_X86_ANCIENT_MCE is not set
- CONFIG_X86_MCE_INJECT is not set
- x86_64:
- CONFIG_EDAC_AMD64=m
- CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
- CONFIG_XEN_DEV_EVTCHN=m
- CONFIG_XEN_SYS_HYPERVISOR=y
- CONFIG_RCU_FANOUT=64
- CONFIG_IOMMU_STRESS is not set
- CONFIG_PERF_COUNTERS=y
- CONFIG_X86_MCE_INJECT is not set
- generic:
- CONFIG_RCU_FANOUT=32
- CONFIG_MMC_SDHCI_PLTFM=m
- CONFIG_MMC_CB710=m
- CONFIG_CB710_CORE=m
- CONFIG_CB710_DEBUG is not set
- CONFIG_SCSI_MVSAS_DEBUG is not set
- CONFIG_SCSI_BNX2_ISCSI=m
- CONFIG_NETFILTER_XT_MATCH_OSF=m
- CONFIG_RFKILL_INPUT=y (used to be =m, which was invalid)
- CONFIG_DE2104X_DSL=0
- CONFIG_KS8842 is not set
- CONFIG_CFG80211_DEBUGFS=y
- CONFIG_MAC80211_DEFAULT_PS=y
- CONFIG_IWM=m
- CONFIG_IWM_DEBUG is not set
- CONFIG_RT2800USB=m
- CONFIG_CAN_DEV=m
- CONFIG_CAN_CALC_BITTIMING=y
- CONFIG_CAN_SJA1000=m
- CONFIG_CAN_SJA1000_PLATFORM=m
- CONFIG_CAN_EMS_PCI=m
- CONFIG_CAN_KVASER_PCI=m
- CONFIG_EEPROM_MAX6875=m
- CONFIG_SENSORS_TMP401=m
- CONFIG_MEDIA_SUPPORT=m
- CONFIG_SND_CTXFI=m
- CONFIG_SND_LX6464ES=m
- CONFIG_SND_HDA_CODEC_CA0110=y
- CONFIG_USB_XHCI_HCD=m
- CONFIG_USB_XHCI_HCD_DEBUGGING is not set
- CONFIG_DRAGONRISE_FF=y (used to be =m)
- CONFIG_GREENASIA_FF=y (used to be =m)
- CONFIG_SMARTJOYPLUS_FF=y (used to be =m)
- CONFIG_USB_NET_INT51X1=m
- CONFIG_CUSE=m
- CONFIG_FUNCTION_PROFILER=y
- CONFIG_RING_BUFFER_BENCHMARK=m
- CONFIG_REGULATOR_USERSPACE_CONSUMER=m
- CONFIG_REGULATOR_MAX1586=m
- CONFIG_REGULATOR_LP3971=m
- CONFIG_RCU_FANOUT_EXACT is not set
- CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
- CONFIG_FSNOTIFY=y
- CONFIG_IEEE802154=m
- CONFIG_IEEE802154_DRIVERS=m
- CONFIG_IEEE802154_FAKEHARD=m
- CONFIG_CNIC=m
--- NEW FILE patch-2.6.30-git13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKOi6dyGugalF9Dw4RAhd9AJ46CPbhKRQXKQdOfL3isRrWpJZu1wCfcDTk
gUKX4oM4+qa9apWmj+TbQ2w=
=C9Kz
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -p -r1.1079 -r1.1080
--- .cvsignore 10 Jun 2009 16:00:28 -0000 1.1079
+++ .cvsignore 18 Jun 2009 19:05:53 -0000 1.1080
@@ -5,3 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.30
linux-2.6.30.tar.bz2
+patch-2.6.30-git13.bz2
Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- config-arm 31 Mar 2009 01:14:01 -0000 1.3
+++ config-arm 18 Jun 2009 19:05:53 -0000 1.4
@@ -38,6 +38,8 @@ CONFIG_ARM_THUMB=y
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+
CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
CONFIG_NO_HZ=y
@@ -95,3 +97,5 @@ CONFIG_RTC_DRV_PL031=m
# CONFIG_DEBUG_LL is not set
CONFIG_ARM_UNWIND=y
+
+CONFIG_RCU_FANOUT=32
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- config-generic 12 Jun 2009 15:04:32 -0000 1.288
+++ config-generic 18 Jun 2009 19:05:53 -0000 1.289
@@ -124,6 +124,11 @@ CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_CB710=m
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_MTHCA=m
@@ -519,6 +524,7 @@ CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
CONFIG_SCSI_MPT2SAS_LOGGING=y
@@ -528,6 +534,9 @@ CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_OSD_DPRINT_SENSE=1
# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_SCSI_BNX2_ISCSI=m
+
+
CONFIG_ATA=y
CONFIG_ATA_SFF=y
CONFIG_ATA_PIIX=y
@@ -864,6 +873,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_BRIDGE_NETFILTER=y
@@ -1149,7 +1159,7 @@ CONFIG_ATM_NICSTAR=m
# CONFIG_ATM_SOLOS is not set
CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
+CONFIG_RFKILL_INPUT=y
#
# Ethernet (10 or 100Mbit)
@@ -1191,6 +1201,7 @@ CONFIG_DNET=m
#
CONFIG_NET_TULIP=y
CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
CONFIG_TULIP=m
# CONFIG_TULIP_NAPI is not set
# CONFIG_TULIP_MWI is not set
@@ -1216,6 +1227,7 @@ CONFIG_ADAPTEC_STARFIRE_NAPI=y
CONFIG_B44=m
CONFIG_B44_PCI=y
CONFIG_BNX2=m
+CONFIG_CNIC=m
CONFIG_QLA3XXX=m
CONFIG_ATL1=m
CONFIG_ATL1C=m
@@ -1253,6 +1265,7 @@ CONFIG_DE620=m
CONFIG_CASSINI=m
# CONFIG_FEC_8XX is not set
CONFIG_ETHOC=m
+# CONFIG_KS8842 is not set
#
# Ethernet (1000 Mbit)
@@ -1346,6 +1359,7 @@ CONFIG_WLAN_80211=y
CONFIG_WIRELESS=y
CONFIG_CFG80211=m
# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEBUGFS=y
CONFIG_NL80211=y
# CONFIG_WIRELESS_OLD_REGULATORY is not set
CONFIG_WIRELESS_EXT=y
@@ -1366,6 +1380,7 @@ CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_DEFAULT_PS=y
CONFIG_WIMAX=y
CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1430,6 +1445,8 @@ CONFIG_IWL3945_RFKILL=y
CONFIG_IWL3945_DEBUG=y
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
CONFIG_IWL3945_LEDS=y
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
CONFIG_MAC80211_HWSIM=m
CONFIG_NORTEL_HERMES=m
CONFIG_P54_COMMON=m
@@ -1458,6 +1475,7 @@ CONFIG_RT61PCI_RFKILL=y
CONFIG_RT61PCI_LEDS=y
CONFIG_RT2500USB=m
CONFIG_RT2500USB_LEDS=y
+CONFIG_RT2800USB=m
CONFIG_RT73USB=m
CONFIG_RT73USB_LEDS=y
CONFIG_RTL8180=m
@@ -1514,6 +1532,12 @@ CONFIG_CAN=m
CONFIG_CAN_RAW=m
CONFIG_CAN_BCM=m
CONFIG_CAN_VCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
CONFIG_NETROM=m
CONFIG_ROSE=m
CONFIG_MKISS=m
@@ -1952,6 +1976,7 @@ CONFIG_I2C_ALGOPCA=m
CONFIG_EEPROM_AT24=m
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_MAX6875=m
CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_OCORES is not set
@@ -2046,6 +2071,7 @@ CONFIG_SENSORS_SMSC47M1=m
CONFIG_SENSORS_SMSC47M192=m
CONFIG_SENSORS_SMSC47B397=m
CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP401=m
CONFIG_SENSORS_TSL2550=m
CONFIG_SENSORS_VIA686A=m
CONFIG_SENSORS_VIA_CPUTEMP=m
@@ -2222,6 +2248,7 @@ CONFIG_HANGCHECK_TIMER=m
#
# Multimedia devices
#
+CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -2580,10 +2607,13 @@ CONFIG_SND_ES1938=m
CONFIG_SND_ES1968=m
CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_LX6464ES=m
CONFIG_SND_HDA_INTEL=y
CONFIG_SND_HDA_INPUT_BEEP=y
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -2681,6 +2711,8 @@ CONFIG_USB_OHCI_HCD=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_CS is not set
# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
#
# USB Device Class drivers
@@ -2726,14 +2758,15 @@ CONFIG_HID_FF=y
CONFIG_HID_PID=y
# CONFIG_HID_COMPAT is not set
CONFIG_LOGITECH_FF=y
-CONFIG_GREENASIA_FF=m
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_PANTHERLORD_FF=y
CONFIG_THRUSTMASTER_FF=y
CONFIG_ZEROPLUS_FF=y
CONFIG_USB_HIDDEV=y
CONFIG_USB_IDMOUSE=m
-CONFIG_DRAGONRISE_FF=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_GREENASIA_FF=y
+CONFIG_SMARTJOYPLUS_FF=y
#
# USB Imaging devices
@@ -2817,6 +2850,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_INT51X1=m
#
# USB Host-to-Host Cables
@@ -2982,6 +3016,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
# CONFIG_MFD_PCF50633 is not set
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
+CONFIG_AB3100_CORE=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_CHARGER_PCF50633=m
@@ -3127,6 +3162,7 @@ CONFIG_UFS_FS=m
CONFIG_9P_FS=m
CONFIG_FUSE_FS=m
CONFIG_OMFS_FS=m
+CONFIG_CUSE=m
#
# Network File Systems
@@ -3697,6 +3733,8 @@ CONFIG_DYNAMIC_FTRACE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_TRACE_BRANCH_PROFILING is not set
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_RING_BUFFER_BENCHMARK=m
CONFIG_KPROBES=y
@@ -3853,6 +3891,9 @@ CONFIG_REGULATOR_BQ24022=m
CONFIG_REGULATOR_WM8350=m
CONFIG_REGULATOR_WM8400=m
CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_LP3971=m
CONFIG_WM8350_POWER=m
@@ -3950,3 +3991,15 @@ CONFIG_SLOW_WORK=y
# CONFIG_CRASH is not set
CONFIG_STRIP_ASM_SYMS=y
+
+# CONFIG_RCU_FANOUT_EXACT is not set
+
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+
+CONFIG_FSNOTIFY=y
+
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+
+
Index: config-i686-PAE
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i686-PAE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- config-i686-PAE 12 Jul 2007 19:15:37 -0000 1.1
+++ config-i686-PAE 18 Jun 2009 19:05:53 -0000 1.2
@@ -3,3 +3,5 @@ CONFIG_M686=y
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_SYS_HYPERVISOR=y
Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- config-ia64-generic 22 Apr 2009 20:40:44 -0000 1.25
+++ config-ia64-generic 18 Jun 2009 19:05:53 -0000 1.26
@@ -208,3 +208,5 @@ CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_DMAR_DEFAULT_ON=y
+
+CONFIG_RCU_FANOUT=64
Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- config-nodebug 8 Apr 2009 15:39:50 -0000 1.32
+++ config-nodebug 18 Jun 2009 19:05:53 -0000 1.33
@@ -49,3 +49,6 @@ CONFIG_DEBUG_NOTIFIERS=y
CONFIG_DMA_API_DEBUG=y
CONFIG_MMIOTRACE=y
+
+# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_KMEMLEAK_TEST=m
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- config-powerpc-generic 28 May 2009 16:48:11 -0000 1.44
+++ config-powerpc-generic 18 Jun 2009 19:05:53 -0000 1.45
@@ -320,3 +320,11 @@ CONFIG_DTL=y
CONFIG_MMC_SDHCI_OF=m
# CONFIG_CONSISTENT_SIZE_BOOL is not set
+
+CONFIG_CAN_SJA1000_OF_PLATFORM=m
+
+CONFIG_PPC_EMULATED_STATS=y
+
+CONFIG_SWIOTLB=y
+
+# CONFIG_RDS is not set
Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- config-powerpc32-generic 12 Mar 2009 03:23:02 -0000 1.31
+++ config-powerpc32-generic 18 Jun 2009 19:05:53 -0000 1.32
@@ -183,3 +183,4 @@ CONFIG_MTD_NAND_FSL_UPM=m
CONFIG_USB_GPIO_VBUS=m
+CONFIG_RCU_FANOUT=32
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- config-powerpc64 22 Apr 2009 13:54:28 -0000 1.31
+++ config-powerpc64 18 Jun 2009 19:05:53 -0000 1.32
@@ -180,3 +180,7 @@ CONFIG_RTC_DRV_PS3=y
CONFIG_CRASH_DUMP=y
CONFIG_RELOCATABLE=y
+
+CONFIG_RCU_FANOUT=64
+
+CONFIG_PERF_COUNTERS=y
Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- config-s390x 20 Apr 2009 17:51:59 -0000 1.14
+++ config-s390x 18 Jun 2009 19:05:53 -0000 1.15
@@ -218,3 +218,11 @@ CONFIG_CHSC_SCH=m
# CONFIG_MISDN_HFCMULTI is not set
CONFIG_HVC_IUCV=y
+
+CONFIG_RCU_FANOUT=64
+
+CONFIG_SECCOMP=y
+
+CONFIG_PM=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="/dev/jokes"
Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config-sparc64-generic 12 Mar 2009 03:23:03 -0000 1.24
+++ config-sparc64-generic 18 Jun 2009 19:05:53 -0000 1.25
@@ -197,3 +197,5 @@ CONFIG_US3_MC=y
CONFIG_SENSORS_ULTRA45=m
CONFIG_LEDS_SUNFIRE=m
CONFIG_TADPOLE_TS102_UCTRL=m
+
+CONFIG_RCU_FANOUT=64
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- config-x86-generic 9 Jun 2009 06:07:14 -0000 1.80
+++ config-x86-generic 18 Jun 2009 19:05:53 -0000 1.81
@@ -461,3 +461,15 @@ CONFIG_POWER_TRACER=y
CONFIG_HW_BRANCH_TRACER=y
# CONFIG_SPARSE_IRQ is not set
+
+CONFIG_RCU_FANOUT=32
+
+# CONFIG_IOMMU_STRESS is not set
+
+CONFIG_PERF_COUNTERS=y
+
+# CONFIG_X86_OLD_MCE is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+# CONFIG_X86_MCE_INJECT is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- config-x86_64-generic 10 Jun 2009 19:00:54 -0000 1.82
+++ config-x86_64-generic 18 Jun 2009 19:05:54 -0000 1.83
@@ -207,6 +207,8 @@ CONFIG_EDAC_I82975X=m
CONFIG_EDAC_R82600=m
CONFIG_EDAC_AMD8131=m
CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
CONFIG_SCHED_MC=y
@@ -300,6 +302,8 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XENFS=m
CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_DMADEVICES=y
CONFIG_INTEL_IOATDMA=m
@@ -365,3 +369,11 @@ CONFIG_HW_BRANCH_TRACER=y
CONFIG_X86_X2APIC=y
CONFIG_SPARSE_IRQ=y
CONFIG_NUMA_MIGRATE_IRQ_DESC=y
+
+CONFIG_RCU_FANOUT=64
+
+# CONFIG_IOMMU_STRESS is not set
+
+CONFIG_PERF_COUNTERS=y
+
+# CONFIG_X86_MCE_INJECT is not set
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1573
retrieving revision 1.1574
diff -u -p -r1.1573 -r1.1574
--- kernel.spec 17 Jun 2009 18:03:50 -0000 1.1573
+++ kernel.spec 18 Jun 2009 19:05:54 -0000 1.1574
@@ -3,7 +3,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%define released_kernel 1
+%define released_kernel 0
# Versions of various parts
@@ -56,9 +56,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 8
+%define rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 13
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -102,7 +102,7 @@ Summary: The Linux kernel
%define doc_build_fail true
%endif
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
%if 0%{?rawhide_skip_docs}
%define with_doc 0
%endif
@@ -671,11 +671,9 @@ Patch3000: linux-2.6-btrfs-experimental-
Patch10000: linux-2.6-missing-rfc2465-stats.patch
# VIA Nano / VX8xx updates
-Patch11000: linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
Patch11010: via-hwmon-temp-sensor.patch
Patch11020: via-padlock-10-enable-64bit.patch
Patch11030: via-padlock-20-add-x86-dependency.patch
-Patch11040: via-padlock-30-fix-might-sleep.patch
Patch11050: via-padlock-40-nano-ecb.patch
Patch11060: via-padlock-50-nano-cbc.patch
Patch11070: via-rng-enable-64bit.patch
@@ -1088,19 +1086,17 @@ ApplyPatch linux-2.6-utrace.patch
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
-ApplyPatch linux-2.6-missing-rfc2465-stats.patch
+#ApplyPatch linux-2.6-missing-rfc2465-stats.patch
# Architecture patches
# x86(-64)
-ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
-ApplyPatch via-hwmon-temp-sensor.patch
-ApplyPatch via-padlock-10-enable-64bit.patch
-ApplyPatch via-padlock-20-add-x86-dependency.patch
-ApplyPatch via-padlock-30-fix-might-sleep.patch
+#ApplyPatch via-hwmon-temp-sensor.patch
+#ApplyPatch via-padlock-10-enable-64bit.patch
+#ApplyPatch via-padlock-20-add-x86-dependency.patch
ApplyPatch via-padlock-40-nano-ecb.patch
ApplyPatch via-padlock-50-nano-cbc.patch
-ApplyPatch via-rng-enable-64bit.patch
-ApplyPatch via-sdmmc.patch
+#ApplyPatch via-rng-enable-64bit.patch
+#ApplyPatch via-sdmmc.patch
#
# PowerPC
@@ -1150,7 +1146,7 @@ ApplyPatch linux-2.6-debug-sizeof-struct
#ApplyPatch linux-2.6-debug-nmi-timeout.patch
#ApplyPatch linux-2.6-debug-taint-vm.patch
ApplyPatch linux-2.6-debug-spinlock-taint.patch
-ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
+#ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
#
@@ -1179,7 +1175,7 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuf
ApplyPatch linux-2.6-input-kill-stupid-messages.patch
# Get away from having to poll Toshibas
-ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
+#ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
@@ -1211,7 +1207,7 @@ ApplyPatch linux-2.6-ata-quirk.patch
ApplyPatch linux-2.6-crash-driver.patch
# neigh: fix state transition INCOMPLETE->FAILED via Netlink request
-ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
+#ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
# http://www.lirc.org/
ApplyPatch linux-2.6.29-lirc.patch
@@ -1827,6 +1823,104 @@ fi
# and build.
%changelog
+* Thu Jun 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.11.rc0.git13
+- 2.6.30-git13
+- config changes:
+ - arm:
+ - CONFIG_UACCESS_WITH_MEMCPY is not set
+ - i686-PAE:
+ - CONFIG_XEN_DEV_EVTCHN=m
+ - CONFIG_XEN_SYS_HYPERVISOR=y
+ - ia64:
+ - CONFIG_RCU_FANOUT=64
+ - nodebug:
+ - CONFIG_DEBUG_KMEMLEAK is not set
+ - CONFIG_DEBUG_KMEMLEAK_TEST=m
+ - powerpc:
+ - CONFIG_CAN_SJA1000_OF_PLATFORM=m
+ - CONFIG_PPC_EMULATED_STATS=y
+ - CONFIG_SWIOTLB=y
+ - CONFIG_RDS is not set (broken on ppc32)
+ - powerpc32:
+ - CONFIG_RCU_FANOUT=32
+ - powerpc64:
+ - CONFIG_RCU_FANOUT=64
+ - CONFIG_PERF_COUNTERS is not set (broken on ppc64)
+ - s390x:
+ - CONFIG_RCU_FANOUT=64
+ - CONFIG_SECCOMP=y
+ - CONFIG_PM=y
+ - CONFIG_HIBERNATION=y
+ - CONFIG_PM_STD_PARTITION="/dev/jokes"
+ - sparc64:
+ - CONFIG_RCU_FANOUT=64
+ - x86:
+ - CONFIG_RCU_FANOUT=32
+ - CONFIG_IOMMU_STRESS is not set
+ - CONFIG_PERF_COUNTERS=y
+ - CONFIG_X86_OLD_MCE is not set
+ - CONFIG_X86_MCE_INTEL=y
+ - CONFIG_X86_MCE_AMD=y
+ - CONFIG_X86_ANCIENT_MCE is not set
+ - CONFIG_X86_MCE_INJECT is not set
+ - x86_64:
+ - CONFIG_EDAC_AMD64=m
+ - CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+ - CONFIG_XEN_DEV_EVTCHN=m
+ - CONFIG_XEN_SYS_HYPERVISOR=y
+ - CONFIG_RCU_FANOUT=64
+ - CONFIG_IOMMU_STRESS is not set
+ - CONFIG_PERF_COUNTERS=y
+ - CONFIG_X86_MCE_INJECT is not set
+ - generic:
+ - CONFIG_RCU_FANOUT=32
+ - CONFIG_MMC_SDHCI_PLTFM=m
+ - CONFIG_MMC_CB710=m
+ - CONFIG_CB710_CORE=m
+ - CONFIG_CB710_DEBUG is not set
+ - CONFIG_SCSI_MVSAS_DEBUG is not set
+ - CONFIG_SCSI_BNX2_ISCSI=m
+ - CONFIG_NETFILTER_XT_MATCH_OSF=m
+ - CONFIG_RFKILL_INPUT=y (used to be =m, which was invalid)
+ - CONFIG_DE2104X_DSL=0
+ - CONFIG_KS8842 is not set
+ - CONFIG_CFG80211_DEBUGFS=y
+ - CONFIG_MAC80211_DEFAULT_PS=y
+ - CONFIG_IWM=m
+ - CONFIG_IWM_DEBUG is not set
+ - CONFIG_RT2800USB=m
+ - CONFIG_CAN_DEV=m
+ - CONFIG_CAN_CALC_BITTIMING=y
+ - CONFIG_CAN_SJA1000=m
+ - CONFIG_CAN_SJA1000_PLATFORM=m
+ - CONFIG_CAN_EMS_PCI=m
+ - CONFIG_CAN_KVASER_PCI=m
+ - CONFIG_EEPROM_MAX6875=m
+ - CONFIG_SENSORS_TMP401=m
+ - CONFIG_MEDIA_SUPPORT=m
+ - CONFIG_SND_CTXFI=m
+ - CONFIG_SND_LX6464ES=m
+ - CONFIG_SND_HDA_CODEC_CA0110=y
+ - CONFIG_USB_XHCI_HCD=m
+ - CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+ - CONFIG_DRAGONRISE_FF=y (used to be =m)
+ - CONFIG_GREENASIA_FF=y (used to be =m)
+ - CONFIG_SMARTJOYPLUS_FF=y (used to be =m)
+ - CONFIG_USB_NET_INT51X1=m
+ - CONFIG_CUSE=m
+ - CONFIG_FUNCTION_PROFILER=y
+ - CONFIG_RING_BUFFER_BENCHMARK=m
+ - CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+ - CONFIG_REGULATOR_MAX1586=m
+ - CONFIG_REGULATOR_LP3971=m
+ - CONFIG_RCU_FANOUT_EXACT is not set
+ - CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+ - CONFIG_FSNOTIFY=y
+ - CONFIG_IEEE802154=m
+ - CONFIG_IEEE802154_DRIVERS=m
+ - CONFIG_IEEE802154_FAKEHARD=m
+ - CONFIG_CNIC=m
+
* Wed Jun 17 2009 Jarod Wilson <jarod at redhat.com>
- New lirc_imon hotness, update 2:
* support dual-interface devices with a single lirc device
linux-2.6-execshield.patch:
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- linux-2.6-execshield.patch 13 Apr 2009 04:02:17 -0000 1.106
+++ linux-2.6-execshield.patch 18 Jun 2009 19:05:54 -0000 1.107
@@ -1,5 +1,5 @@
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index 5623c50..353a24e 100644
+index c45f415..3a6dbad 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -6,6 +6,7 @@
@@ -73,10 +73,10 @@ index 80a1dee..8314c66 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 7727aa8..5d6083c 100644
+index 4fb37c8..d5cc31c 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
-@@ -138,6 +138,9 @@ struct pv_cpu_ops {
+@@ -139,6 +139,9 @@ struct pv_cpu_ops {
void (*store_gdt)(struct desc_ptr *);
void (*store_idt)(struct desc_ptr *);
void (*set_ldt)(const void *desc, unsigned entries);
@@ -86,7 +86,7 @@ index 7727aa8..5d6083c 100644
unsigned long (*store_tr)(void);
void (*load_tls)(struct thread_struct *t, unsigned int cpu);
#ifdef CONFIG_X86_64
-@@ -953,6 +956,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -955,6 +958,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
{
PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
}
@@ -100,10 +100,10 @@ index 7727aa8..5d6083c 100644
{
PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 34c5237..4fc080f 100644
+index c776826..fb6b579 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -159,6 +159,9 @@ static inline int hlt_works(int cpu)
+@@ -160,6 +160,9 @@ static inline int hlt_works(int cpu)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
@@ -114,10 +114,10 @@ index 34c5237..4fc080f 100644
extern struct pt_regs *idle_regs(struct pt_regs *);
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index c4f6678..0a680c0 100644
+index 3ffdcfa..62cba96 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -789,6 +789,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -804,6 +804,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
/* Filter out anything that depends on CPUID levels we don't have */
filter_cpuid_features(c, true);
@@ -139,7 +139,7 @@ index c4f6678..0a680c0 100644
if (!c->x86_model_id[0]) {
const char *p;
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index 8e45f44..13c0535 100644
+index 70ec9b9..d956b8c 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -369,6 +369,9 @@ struct pv_cpu_ops pv_cpu_ops = {
@@ -153,10 +153,10 @@ index 8e45f44..13c0535 100644
.load_idt = native_load_idt,
.store_gdt = native_store_gdt,
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 76f8f84..4118f17 100644
+index 59f4524..068e286 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
-@@ -301,7 +301,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -299,7 +299,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
void
start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
{
@@ -167,7 +167,7 @@ index 76f8f84..4118f17 100644
regs->fs = 0;
set_fs(USER_DS);
regs->ds = __USER_DS;
-@@ -310,6 +313,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -308,6 +311,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
regs->cs = __USER_CS;
regs->ip = new_ip;
regs->sp = new_sp;
@@ -179,7 +179,7 @@ index 76f8f84..4118f17 100644
/*
* Free the old FP and other extended state
*/
-@@ -356,7 +364,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -354,7 +362,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
__unlazy_fpu(prev_p);
@@ -189,11 +189,10 @@ index 76f8f84..4118f17 100644
/* we're going to use this soon, after a few expensive things */
if (next_p->fpu_counter > 5)
-@@ -509,3 +518,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+@@ -495,3 +504,40 @@ unsigned long get_wchan(struct task_struct *p)
+ return 0;
}
-+
+
+static void modify_cs(struct mm_struct *mm, unsigned long limit)
+{
+ mm->context.exec_limit = limit;
@@ -232,7 +231,7 @@ index 76f8f84..4118f17 100644
+ set_user_cs(&mm->context.user_cs, 0);
+}
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index a1d2883..453b616 100644
+index 07d60c8..41e9129 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -118,6 +118,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
@@ -342,7 +341,7 @@ index a1d2883..453b616 100644
tsk->thread.error_code = error_code;
tsk->thread.trap_no = 13;
-@@ -888,19 +981,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -885,19 +978,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
}
#ifdef CONFIG_X86_32
@@ -390,55 +389,81 @@ index a1d2883..453b616 100644
#endif
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index fd3da1d..ac54294 100644
+index 34c1bfb..32c3d8d 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
-@@ -163,7 +163,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -228,6 +228,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
set_nx();
if (nx_enabled)
printk(KERN_INFO "NX (Execute Disable) protection: active\n");
++#ifdef CONFIG_X86_32
+ else
- #endif
+ if (exec_shield)
+ printk(KERN_INFO "Using x86 segment limits to approximate "
+ "NX protection\n");
++#endif
/* 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 749559e..ad9943c 100644
+index 949708d..c1373b6 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
-@@ -602,7 +602,7 @@ static int disable_nx __initdata;
- * Control non executable mappings.
- *
- * on Enable
-- * off Disable
+@@ -587,6 +587,54 @@ void zap_low_mappings(void)
+ 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)
- {
-@@ -611,14 +611,12 @@ static int __init noexec_setup(char *str)
- __supported_pte_mask |= _PAGE_NX;
- disable_nx = 0;
- }
-- } else {
-- if (!strcmp(str, "off")) {
-- disable_nx = 1;
-- __supported_pte_mask &= ~_PAGE_NX;
-- } else {
-- return -EINVAL;
-- }
-- }
++ */
++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;
- return 0;
- }
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index 1658296..72056cf 100644
--- a/arch/x86/mm/mmap.c
@@ -487,7 +512,7 @@ index 821e970..ea5a4c3 100644
* orig_rax contains the negated interrupt vector.
* Use that to determine where the sender put the data.
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 1241f11..3f2c44c 100644
+index 58bc00f..1fdafb5 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
@@ -500,10 +525,10 @@ index 1241f11..3f2c44c 100644
ret = addr;
goto up_fail;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 82cd39a..702e3a0 100644
+index 0a1700a..37b8744 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -282,6 +282,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -321,6 +321,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
xen_mc_issue(PARAVIRT_LAZY_CPU);
}
@@ -527,8 +552,8 @@ index 82cd39a..702e3a0 100644
+
static void xen_load_gdt(const struct desc_ptr *dtr)
{
- unsigned long *frames;
-@@ -792,6 +810,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+ unsigned long va = dtr->address;
+@@ -886,6 +904,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
.load_tr_desc = paravirt_nop,
.set_ldt = xen_set_ldt,
@@ -599,10 +624,10 @@ index 40381df..f856fab 100644
* load_elf_interp() returns relocation
* adjustment
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index bff1f0d..88c5efa 100644
+index ad613ed..08f08d0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1138,7 +1138,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1135,7 +1135,13 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
@@ -649,12 +674,12 @@ index 40fc7e6..68c2549 100644
/*
* GPG2 wants 64kB of mlocked memory, to make sure pass phrases
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index b94f354..aed6221 100644
+index 4896fdf..3513e03 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -99,6 +99,9 @@ struct bio;
- struct bts_tracer;
- struct fs_struct;
+@@ -101,6 +101,9 @@ struct fs_struct;
+ struct bts_context;
+ struct perf_counter_context;
+extern int exec_shield;
+extern int print_fatal_signals;
@@ -662,7 +687,7 @@ index b94f354..aed6221 100644
/*
* List of flags we want to share for kernel threads,
* if only because they are not used by them anyway.
-@@ -351,6 +354,10 @@ extern int sysctl_max_map_count;
+@@ -359,6 +362,10 @@ extern int sysctl_max_map_count;
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
unsigned long, unsigned long);
@@ -674,10 +699,10 @@ index b94f354..aed6221 100644
arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 82350f8..d89dd29 100644
+index ce664f9..1905e22 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -86,6 +86,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -87,6 +87,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
#ifndef CONFIG_MMU
extern int sysctl_nr_trim_pages;
#endif
@@ -704,7 +729,7 @@ index 82350f8..d89dd29 100644
#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
+@@ -382,6 +402,14 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec,
},
{
@@ -720,18 +745,18 @@ index 82350f8..d89dd29 100644
.procname = "core_uses_pid",
.data = &core_uses_pid,
diff --git a/mm/mmap.c b/mm/mmap.c
-index 4a38411..12ca810 100644
+index 34579b2..260bb3c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -28,6 +28,7 @@
- #include <linux/mempolicy.h>
+@@ -29,6 +29,7 @@
#include <linux/rmap.h>
#include <linux/mmu_notifier.h>
+ #include <linux/perf_counter.h>
+#include <linux/random.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -44,6 +45,18 @@
+@@ -45,6 +46,18 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -787,7 +812,7 @@ index 4a38411..12ca810 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1442,13 +1462,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -808,7 +833,7 @@ index 4a38411..12ca810 100644
if (file && file->f_op && file->f_op->get_unmapped_area)
get_area = file->f_op->get_unmapped_area;
addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1462,8 +1486,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
return arch_rebalance_pgtables(addr, len);
}
@@ -886,7 +911,7 @@ index 4a38411..12ca810 100644
/* Look up the first VMA which satisfies addr < vm_end, NULL if none. */
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1536,6 +1628,14 @@ out:
+@@ -1538,6 +1630,14 @@ out:
return prev ? prev->vm_next : vma;
}
@@ -901,7 +926,7 @@ index 4a38411..12ca810 100644
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1554,7 +1654,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
@@ -910,7 +935,7 @@ index 4a38411..12ca810 100644
return -ENOMEM;
/* mlock limit tests */
-@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1864,10 +1964,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -927,7 +952,7 @@ index 4a38411..12ca810 100644
vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
return 0;
-@@ -2114,6 +2218,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2116,6 +2220,7 @@ void exit_mmap(struct mm_struct *mm)
vm_unacct_memory(nr_accounted);
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
@@ -936,11 +961,11 @@ index 4a38411..12ca810 100644
/*
* Walk the list again, actually closing and freeing it,
diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 258197b..9af91a3 100644
+index d80311b..032423d 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
-@@ -25,9 +25,14 @@
- #include <linux/migrate.h>
+@@ -26,9 +26,14 @@
+ #include <linux/perf_counter.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
@@ -954,7 +979,7 @@ index 258197b..9af91a3 100644
#ifndef pgprot_modify
static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
{
-@@ -138,7 +143,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -139,7 +144,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
struct mm_struct *mm = vma->vm_mm;
unsigned long oldflags = vma->vm_flags;
long nrpages = (end - start) >> PAGE_SHIFT;
@@ -963,7 +988,7 @@ index 258197b..9af91a3 100644
pgoff_t pgoff;
int error;
int dirty_accountable = 0;
-@@ -203,6 +208,9 @@ success:
+@@ -204,6 +209,9 @@ success:
dirty_accountable = 1;
}
linux-2.6-utrace.patch:
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- linux-2.6-utrace.patch 9 Jun 2009 05:53:06 -0000 1.113
+++ linux-2.6-utrace.patch 18 Jun 2009 19:05:54 -0000 1.114
@@ -1,46 +1,5 @@
-utrace core
-
-This adds the utrace facility, a new modular interface in the kernel for
-implementing user thread tracing and debugging. This fits on top of the
-tracehook_* layer, so the new code is well-isolated.
-
-The new interface is in <linux/utrace.h> and the DocBook utrace book
-describes it. It allows for multiple separate tracing engines to work in
-parallel without interfering with each other. Higher-level tracing
-facilities can be implemented as loadable kernel modules using this layer.
-
-The new facility is made optional under CONFIG_UTRACE.
-When this is not enabled, no new code is added.
-It can only be enabled on machines that have all the
-prerequisites and select CONFIG_HAVE_ARCH_TRACEHOOK.
-
-In this initial version, utrace and ptrace do not play together at all.
-If ptrace is attached to a thread, the attach calls in the utrace kernel
-API return -EBUSY. If utrace is attached to a thread, the PTRACE_ATTACH
-or PTRACE_TRACEME request will return EBUSY to userland. The old ptrace
-code is otherwise unchanged and nothing using ptrace should be affected
-by this patch as long as utrace is not used at the same time. In the
-future we can clean up the ptrace implementation and rework it to use
-the utrace API.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
----
- Documentation/DocBook/Makefile | 2 +-
- Documentation/DocBook/utrace.tmpl | 590 ++++++++++
- fs/proc/array.c | 3 +
- include/linux/init_task.h | 1 +
- include/linux/sched.h | 6 +
- include/linux/tracehook.h | 61 +-
- include/linux/utrace.h | 692 +++++++++++
- include/linux/utrace_struct.h | 58 +
- init/Kconfig | 9 +
- kernel/Makefile | 1 +
- kernel/ptrace.c | 18 +-
- kernel/utrace.c | 2357 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3795 insertions(+), 3 deletions(-)
-
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index b1eb661..02851f6 100644
+index 9632444..bf4b9e8 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -9,7 +9,7 @@
@@ -54,7 +13,7 @@ index b1eb661..02851f6 100644
mac80211.xml debugobjects.xml sh.xml regulator.xml \
diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
new file mode 100644
-index ...6cc58a1 100644
+index 0000000..6cc58a1
--- /dev/null
+++ b/Documentation/DocBook/utrace.tmpl
@@ -0,0 +1,590 @@
@@ -649,7 +608,7 @@ index ...6cc58a1 100644
+
+</book>
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 725a650..e299a63 100644
+index 725a650..e299a63 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -82,6 +82,7 @@
@@ -660,7 +619,7 @@ index 725a650..e299a63 100644
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -188,6 +189,8 @@ static inline void task_state(struct seq
+@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
cred->uid, cred->euid, cred->suid, cred->fsuid,
cred->gid, cred->egid, cred->sgid, cred->fsgid);
@@ -670,19 +629,19 @@ index 725a650..e299a63 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index d87247d..0d0b55d 100644
+index 28b1f30..edf3369 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -170,6 +170,7 @@ extern struct cred init_cred;
+@@ -179,6 +179,7 @@ extern struct cred init_cred;
[PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
}, \
.dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
+ INIT_UTRACE(tsk) \
INIT_IDS \
+ INIT_PERF_COUNTERS(tsk) \
INIT_TRACE_IRQFLAGS \
- INIT_LOCKDEP \
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index b4c38bc..30db106 100644
+index 4896fdf..0633dfd 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -59,6 +59,7 @@ struct sched_param {
@@ -693,7 +652,7 @@ index b4c38bc..30db106 100644
#include <asm/system.h>
#include <asm/page.h>
-@@ -1291,6 +1292,11 @@ struct task_struct {
+@@ -1314,6 +1315,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -706,7 +665,7 @@ index b4c38bc..30db106 100644
u32 parent_exec_id;
u32 self_exec_id;
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 4ec4821..a7de30f 100644
+index 6a168b9..d59e159 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
@@ -726,7 +685,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall
+@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
static inline __must_check int tracehook_report_syscall_entry(
struct pt_regs *regs)
{
@@ -736,7 +695,7 @@ index 4ec4821..a7de30f 100644
ptrace_report_syscall(regs);
return 0;
}
-@@ -134,6 +140,8 @@ static inline __must_check int tracehook
+@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry(
*/
static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
{
@@ -745,7 +704,7 @@ index 4ec4821..a7de30f 100644
ptrace_report_syscall(regs);
}
-@@ -194,6 +202,8 @@ static inline void tracehook_report_exec
+@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
struct linux_binprm *bprm,
struct pt_regs *regs)
{
@@ -754,7 +713,7 @@ index 4ec4821..a7de30f 100644
if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) &&
unlikely(task_ptrace(current) & PT_PTRACED))
send_sig(SIGTRAP, current, 0);
-@@ -211,6 +221,8 @@ static inline void tracehook_report_exec
+@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
*/
static inline void tracehook_report_exit(long *exit_code)
{
@@ -763,7 +722,7 @@ index 4ec4821..a7de30f 100644
ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code);
}
-@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon
+@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags)
static inline void tracehook_finish_clone(struct task_struct *child,
unsigned long clone_flags, int trace)
{
@@ -771,7 +730,7 @@ index 4ec4821..a7de30f 100644
ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
}
-@@ -280,6 +293,8 @@ static inline void tracehook_report_clon
+@@ -278,6 +291,8 @@ static inline void tracehook_report_clone(struct pt_regs *regs,
unsigned long clone_flags,
pid_t pid, struct task_struct *child)
{
@@ -780,7 +739,7 @@ index 4ec4821..a7de30f 100644
if (unlikely(task_ptrace(child))) {
/*
* It doesn't matter who attached/attaching to this
-@@ -311,6 +326,9 @@ static inline void tracehook_report_clon
+@@ -310,6 +325,9 @@ static inline void tracehook_report_clone_complete(int trace,
pid_t pid,
struct task_struct *child)
{
@@ -790,7 +749,7 @@ index 4ec4821..a7de30f 100644
if (unlikely(trace))
ptrace_event(0, trace, pid);
}
-@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor
+@@ -344,6 +362,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child,
*/
static inline void tracehook_prepare_release_task(struct task_struct *task)
{
@@ -798,7 +757,7 @@ index 4ec4821..a7de30f 100644
}
/**
-@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel
+@@ -358,6 +377,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task)
static inline void tracehook_finish_release_task(struct task_struct *task)
{
ptrace_release_task(task);
@@ -806,7 +765,7 @@ index 4ec4821..a7de30f 100644
}
/**
-@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand
+@@ -379,6 +399,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
const struct k_sigaction *ka,
struct pt_regs *regs, int stepping)
{
@@ -815,7 +774,7 @@ index 4ec4821..a7de30f 100644
if (stepping)
ptrace_notify(SIGTRAP);
}
-@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand
+@@ -396,6 +418,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
static inline int tracehook_consider_ignored_signal(struct task_struct *task,
int sig)
{
@@ -824,7 +783,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign
+@@ -415,6 +439,9 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
static inline int tracehook_consider_fatal_signal(struct task_struct *task,
int sig)
{
@@ -834,7 +793,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat
+@@ -429,6 +456,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
*/
static inline int tracehook_force_sigpending(void)
{
@@ -843,7 +802,7 @@ index 4ec4821..a7de30f 100644
return 0;
}
-@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s
+@@ -458,6 +487,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
siginfo_t *info,
struct k_sigaction *return_ka)
{
@@ -852,7 +811,7 @@ index 4ec4821..a7de30f 100644
return 0;
}
-@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s
+@@ -485,6 +516,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
@@ -861,7 +820,7 @@ index 4ec4821..a7de30f 100644
return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
}
-@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(
+@@ -508,6 +541,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
static inline int tracehook_notify_death(struct task_struct *task,
void **death_cookie, int group_dead)
{
@@ -870,7 +829,7 @@ index 4ec4821..a7de30f 100644
if (task_detached(task))
return task->ptrace ? SIGCHLD : DEATH_REAP;
-@@ -545,6 +580,20 @@ static inline void tracehook_report_deat
+@@ -544,6 +579,20 @@ static inline void tracehook_report_death(struct task_struct *task,
int signal, void *death_cookie,
int group_dead)
{
@@ -891,7 +850,7 @@ index 4ec4821..a7de30f 100644
}
#ifdef TIF_NOTIFY_RESUME
-@@ -574,10 +623,20 @@ static inline void set_notify_resume(str
+@@ -573,10 +622,20 @@ static inline void set_notify_resume(struct task_struct *task)
* asynchronously, this will be called again before we return to
* user mode.
*
@@ -915,7 +874,7 @@ index 4ec4821..a7de30f 100644
diff --git a/include/linux/utrace.h b/include/linux/utrace.h
new file mode 100644
-index ...f877ec6 100644
+index 0000000..f877ec6
--- /dev/null
+++ b/include/linux/utrace.h
@@ -0,0 +1,692 @@
@@ -1613,7 +1572,7 @@ index ...f877ec6 100644
+#endif /* linux/utrace.h */
diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h
new file mode 100644
-index ...aba7e09 100644
+index 0000000..aba7e09
--- /dev/null
+++ b/include/linux/utrace_struct.h
@@ -0,0 +1,58 @@
@@ -1676,10 +1635,10 @@ index ...aba7e09 100644
+
+#endif /* linux/utrace_struct.h */
diff --git a/init/Kconfig b/init/Kconfig
-index 7be4d38..a6987df 100644
+index c649657..1be4b01 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1149,6 +1149,15 @@ config STOP_MACHINE
+@@ -1184,6 +1184,15 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1696,7 +1655,7 @@ index 7be4d38..a6987df 100644
config PREEMPT_NOTIFIERS
diff --git a/kernel/Makefile b/kernel/Makefile
-index 4242366..a79634e 100644
+index 90b53f6..5f695ca 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1708,7 +1667,7 @@ index 4242366..a79634e 100644
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 0692ab5..1d33e9c 100644
+index f6d8b8c..8a9f59e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,6 +16,7 @@
@@ -1719,7 +1678,7 @@ index 0692ab5..1d33e9c 100644
#include <linux/security.h>
#include <linux/signal.h>
#include <linux/audit.h>
-@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struc
+@@ -164,6 +165,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
return !err;
}
@@ -1734,7 +1693,7 @@ index 0692ab5..1d33e9c 100644
int ptrace_attach(struct task_struct *task)
{
int retval;
-@@ -212,6 +221,11 @@ repeat:
+@@ -203,6 +212,11 @@ repeat:
goto repeat;
}
@@ -1746,7 +1705,7 @@ index 0692ab5..1d33e9c 100644
if (!task->mm)
goto bad;
/* the same process cannot be attached many times */
-@@ -588,7 +602,9 @@ int ptrace_traceme(void)
+@@ -581,7 +595,9 @@ int ptrace_traceme(void)
*/
repeat:
task_lock(current);
@@ -1759,7 +1718,7 @@ index 0692ab5..1d33e9c 100644
*/
diff --git a/kernel/utrace.c b/kernel/utrace.c
new file mode 100644
-index ...74b5fc5 100644
+index 0000000..74b5fc5
--- /dev/null
+++ b/kernel/utrace.c
@@ -0,0 +1,2357 @@
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1037
retrieving revision 1.1038
diff -u -p -r1.1037 -r1.1038
--- sources 10 Jun 2009 16:00:29 -0000 1.1037
+++ sources 18 Jun 2009 19:05:54 -0000 1.1038
@@ -1 +1,2 @@
7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
+e0a66ed3d46ae936c0fb57e143e12a25 patch-2.6.30-git13.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -p -r1.951 -r1.952
--- upstream 10 Jun 2009 16:00:29 -0000 1.951
+++ upstream 18 Jun 2009 19:05:54 -0000 1.952
@@ -1 +1,2 @@
linux-2.6.30.tar.bz2
+patch-2.6.30-git13.bz2
--- linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch DELETED ---
--- via-padlock-30-fix-might-sleep.patch DELETED ---
More information about the fedora-extras-commits
mailing list