rpms/kernel/devel patch-2.6.31-git18.bz2.sign, NONE, 1.1 .cvsignore, 1.1128, 1.1129 hdpvr-ir-enable.patch, 1.5, 1.6 kernel.spec, 1.1808, 1.1809 linux-2.6-build-nonintconfig.patch, 1.16, 1.17 linux-2.6-debug-sizeof-structs.patch, 1.7, 1.8 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.4, 1.5 linux-2.6-execshield.patch, 1.109, 1.110 linux-2.6-makefile-after_link.patch, 1.1, 1.2 linux-2.6-serial-460800.patch, 1.2, 1.3 linux-2.6-utrace.patch, 1.117, 1.118 sources, 1.1086, 1.1087 upstream, 1.1000, 1.1001 via-hwmon-temp-sensor.patch, 1.3, 1.4 linux-2.6-die-closed-source-bios-muppets-die.patch, 1.2, NONE linux-2.6-intel-iommu-updates.patch, 1.1, NONE linux-2.6-ksm-fix-munlock.patch, 1.1, NONE linux-2.6-ksm-updates.patch, 1.1, NONE linux-2.6-ksm.patch, 1.3, NONE linux-2.6-rtc-show-hctosys.patch, 1.1, NONE patch-2.6.31-git4.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Sep 28 05:09:50 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22205
Modified Files:
.cvsignore hdpvr-ir-enable.patch kernel.spec
linux-2.6-build-nonintconfig.patch
linux-2.6-debug-sizeof-structs.patch
linux-2.6-debug-vm-would-have-oomkilled.patch
linux-2.6-execshield.patch linux-2.6-makefile-after_link.patch
linux-2.6-serial-460800.patch linux-2.6-utrace.patch sources
upstream via-hwmon-temp-sensor.patch
Added Files:
patch-2.6.31-git18.bz2.sign
Removed Files:
linux-2.6-die-closed-source-bios-muppets-die.patch
linux-2.6-intel-iommu-updates.patch
linux-2.6-ksm-fix-munlock.patch linux-2.6-ksm-updates.patch
linux-2.6-ksm.patch linux-2.6-rtc-show-hctosys.patch
patch-2.6.31-git4.bz2.sign
Log Message:
* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.31-git18
- rebased:
- hdpvr-ir-enable.patch
- linux-2.6-build-nonintconfig.patch
- linux-2.6-debug-sizeof-structs.patch
- linux-2.6-debug-vm-would-have-oomkilled.patch
- linux-2.6-execshield.patch
- linux-2.6-makefile-after_link.patch
- linux-2.6-serial-460800.patch
- linux-2.6-utrace.patch
- via-hwmon-temp-sensor.patch
- merged:
- linux-2.6-tracehook.patch
- linux-2.6-die-closed-source-bios-muppets-die.patch
- linux-2.6-intel-iommu-updates.patch
- linux-2.6-ksm.patch
- linux-2.6-ksm-updates.patch
- linux-2.6-ksm-fix-munlock.patch
- linux-2.6-vga-arb.patch
- v4l-dvb-fix-cx25840-firmware-loading.patch
- linux-2.6-rtc-show-hctosys.patch
--- NEW FILE patch-2.6.31-git18.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKvq6lyGugalF9Dw4RAthHAJ9CjmPMOEMp/jv65FfTeEwuz5eTKACfRx+1
2P4sY9VbCfvSX+l6wfTbhVY=
=mSp6
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -p -r1.1128 -r1.1129
--- .cvsignore 15 Sep 2009 14:47:35 -0000 1.1128
+++ .cvsignore 28 Sep 2009 05:09:48 -0000 1.1129
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.31
linux-2.6.31.tar.bz2
-patch-2.6.31-git4.bz2
+patch-2.6.31-git18.bz2
hdpvr-ir-enable.patch:
0 files changed
Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- hdpvr-ir-enable.patch 5 Sep 2009 01:22:31 -0000 1.5
+++ hdpvr-ir-enable.patch 28 Sep 2009 05:09:48 -0000 1.6
@@ -1,227 +0,0 @@
-From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request
-
----
- drivers/media/video/hdpvr/Makefile | 4 +-
- drivers/media/video/hdpvr/hdpvr-core.c | 12 ++---
- drivers/media/video/hdpvr/hdpvr-i2c.c | 88 ++++++++++++++++++++++---------
- drivers/media/video/hdpvr/hdpvr.h | 2 +-
- 4 files changed, 68 insertions(+), 38 deletions(-)
-
-diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
-index e0230fc..79ad2e1 100644
---- a/drivers/media/video/hdpvr/Makefile
-+++ b/drivers/media/video/hdpvr/Makefile
-@@ -1,6 +1,4 @@
--hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o
--
--hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
-+hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o
-
- obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
-
-diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 188bd5a..d2bb4c2 100644
---- a/drivers/media/video/hdpvr/hdpvr-core.c
-+++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -362,9 +362,8 @@ static int hdpvr_probe(struct usb_interface *interface,
- goto error;
- }
-
--#ifdef CONFIG_I2C
-- /* until i2c is working properly */
-- retval = 0; /* hdpvr_register_i2c_adapter(dev); */
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+ retval = hdpvr_register_i2c_adapter(dev);
- if (retval < 0) {
- v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
- goto error;
-@@ -414,12 +413,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
- mutex_unlock(&dev->io_mutex);
-
- /* deregister I2C adapter */
--#ifdef CONFIG_I2C
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- mutex_lock(&dev->i2c_mutex);
-- if (dev->i2c_adapter)
-- i2c_del_adapter(dev->i2c_adapter);
-- kfree(dev->i2c_adapter);
-- dev->i2c_adapter = NULL;
-+ i2c_del_adapter(&dev->i2c_adapter);
- mutex_unlock(&dev->i2c_mutex);
- #endif /* CONFIG_I2C */
-
-diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index c4b5d15..7cd977f 100644
---- a/drivers/media/video/hdpvr/hdpvr-i2c.c
-+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,7 @@
- *
- */
-
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- #include <linux/i2c.h>
-
- #include "hdpvr.h"
-@@ -19,10 +20,13 @@
-
- #define REQTYPE_I2C_READ 0xb1
- #define REQTYPE_I2C_WRITE 0xb0
--#define REQTYPE_I2C_WRITE_STATT 0xd0
-+#define REQTYPE_I2C_WRITE_STAT 0xd0
-+
-+#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR 0x70
-+#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR 0x71
-
- static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
-- char *data, int len)
-+ char *data, int len, int bus)
- {
- int ret;
- char *buf = kmalloc(len, GFP_KERNEL);
-@@ -32,7 +36,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- ret = usb_control_msg(dev->udev,
- usb_rcvctrlpipe(dev->udev, 0),
- REQTYPE_I2C_READ, CTRL_READ_REQUEST,
-- 0x100|addr, 0, buf, len, 1000);
-+ bus<<8 | addr, 0, buf, len, 1000);
-
- if (ret == len) {
- memcpy(data, buf, len);
-@@ -46,7 +50,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- }
-
- static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
-- char *data, int len)
-+ char *data, int len, int bus)
- {
- int ret;
- char *buf = kmalloc(len, GFP_KERNEL);
-@@ -57,17 +61,17 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
- ret = usb_control_msg(dev->udev,
- usb_sndctrlpipe(dev->udev, 0),
- REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
-- 0x100|addr, 0, buf, len, 1000);
-+ bus<<8 | addr, 0, buf, len, 1000);
-
- if (ret < 0)
- goto error;
-
- ret = usb_control_msg(dev->udev,
- usb_rcvctrlpipe(dev->udev, 0),
-- REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-+ REQTYPE_I2C_WRITE_STAT, CTRL_READ_REQUEST,
- 0, 0, buf, 2, 1000);
-
-- if (ret == 2)
-+ if ((ret == 2) && (buf[1] == (len - 1)))
- ret = 0;
- else if (ret >= 0)
- ret = -EIO;
-@@ -93,10 +97,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
-
- if (msgs[i].flags & I2C_M_RD)
- retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
-- msgs[i].len);
-+ msgs[i].len, 1);
- else
- retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
-- msgs[i].len);
-+ msgs[i].len, 1);
- }
-
- mutex_unlock(&dev->i2c_mutex);
-@@ -114,32 +118,64 @@ static struct i2c_algorithm hdpvr_algo = {
- .functionality = hdpvr_functionality,
- };
-
-+static struct i2c_adapter hdpvr_i2c_adap_template = {
-+ .name = "Hauppauge HD PVR I2C",
-+ .owner = THIS_MODULE,
-+ .id = I2C_HW_B_HDPVR,
-+ .algo = &hdpvr_algo,
-+ .class = I2C_CLASS_TV_ANALOG,
-+};
-+
-+#if 1
-+static struct i2c_board_info hdpvr_i2c_board_info = {
-+ I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
-+ I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
-+};
-+#endif
-+
-+static int hdpvr_activate_ir(struct hdpvr_device *dev)
-+{
-+ char buffer[8];
-+
-+ mutex_lock(&dev->i2c_mutex);
-+
-+ hdpvr_i2c_read(dev, 0x54, buffer, 1, 0);
-+
-+ buffer[0] = 0;
-+ buffer[1] = 0x8;
-+ hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
-+
-+ buffer[1] = 0x18;
-+ hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
-+
-+ mutex_unlock(&dev->i2c_mutex);
-+ return 0;
-+}
-+
- int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
- {
-- struct i2c_adapter *i2c_adap;
- int retval = -ENOMEM;
-
-- i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-- if (i2c_adap == NULL)
-- goto error;
-+ hdpvr_activate_ir(dev);
-+
-+ memcpy(&dev->i2c_adapter, &hdpvr_i2c_adap_template,
-+ sizeof(struct i2c_adapter));
-
-- strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
-- sizeof(i2c_adap->name));
-- i2c_adap->algo = &hdpvr_algo;
-- i2c_adap->class = I2C_CLASS_TV_ANALOG;
-- i2c_adap->id = I2C_HW_B_HDPVR;
-- i2c_adap->owner = THIS_MODULE;
-- i2c_adap->dev.parent = &dev->udev->dev;
-+ dev->i2c_adapter.dev.parent = &dev->udev->dev;
-
-- i2c_set_adapdata(i2c_adap, dev);
-+ i2c_set_adapdata(&dev->i2c_adapter, dev);
-
-- retval = i2c_add_adapter(i2c_adap);
-+ retval = i2c_add_adapter(&dev->i2c_adapter);
-
-- if (!retval)
-- dev->i2c_adapter = i2c_adap;
-- else
-- kfree(i2c_adap);
-+ if (retval)
-+ goto error;
-+
-+#if 1
-+ i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
-+#endif
-
- error:
- return retval;
- }
-+
-+#endif /* CONFIG_I2C */
-diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
-index 1edd875..173aefa 100644
---- a/drivers/media/video/hdpvr/hdpvr.h
-+++ b/drivers/media/video/hdpvr/hdpvr.h
-@@ -101,7 +101,7 @@ struct hdpvr_device {
- struct work_struct worker;
-
- /* I2C adapter */
-- struct i2c_adapter *i2c_adapter;
-+ struct i2c_adapter i2c_adapter;
- /* I2C lock */
- struct mutex i2c_mutex;
-
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1808
retrieving revision 1.1809
diff -u -p -r1.1808 -r1.1809
--- kernel.spec 21 Sep 2009 17:55:22 -0000 1.1808
+++ kernel.spec 28 Sep 2009 05:09:48 -0000 1.1809
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 4
+%define gitrev 18
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -611,10 +611,6 @@ Patch22: linux-2.6-utrace.patch
Patch41: linux-2.6-sysrq-c.patch
-# Intel IOMMU fixes/workarounds
-Patch100: linux-2.6-die-closed-source-bios-muppets-die.patch
-Patch101: linux-2.6-intel-iommu-updates.patch
-
Patch141: linux-2.6-ps3-storage-alias.patch
Patch143: linux-2.6-g5-therm-shutdown.patch
Patch144: linux-2.6-vio-modalias.patch
@@ -673,10 +669,7 @@ Patch1515: lirc-2.6.31.patch
Patch1517: hdpvr-ir-enable.patch
# virt + ksm patches
-Patch1550: linux-2.6-ksm.patch
Patch1551: linux-2.6-ksm-kvm.patch
-Patch1552: linux-2.6-ksm-updates.patch
-Patch1553: linux-2.6-ksm-fix-munlock.patch
Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
# nouveau + drm fixes
@@ -691,7 +684,6 @@ Patch1824: drm-intel-next.patch
Patch1825: drm-intel-pm.patch
# vga arb
-Patch1900: linux-2.6-vga-arb.patch
Patch1901: drm-vga-arb.patch
# kludge to make ich9 e1000 work
@@ -709,7 +701,6 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
Patch2900: linux-2.6-v4l-dvb-update.patch
Patch2901: linux-2.6-v4l-dvb-experimental.patch
Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
-Patch2904: v4l-dvb-fix-cx25840-firmware-loading.patch
# fs fixes
@@ -722,7 +713,6 @@ Patch11010: via-hwmon-temp-sensor.patch
# patches headed upstream
Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
-Patch12012: linux-2.6-rtc-show-hctosys.patch
Patch12013: linux-2.6-rfkill-all.patch
%endif
@@ -1141,7 +1131,7 @@ ApplyOptionalPatch linux-2.6-upstream-re
ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-tracehook.patch
+#ApplyPatch linux-2.6-tracehook.patch # merged
ApplyPatch linux-2.6-utrace.patch
# enable sysrq-c on all kernels, not only kexec
@@ -1155,12 +1145,6 @@ ApplyPatch linux-2.6-dell-laptop-rfkill-
#
# Intel IOMMU
#
-# Quiesce USB host controllers before setting up the IOMMU
-ApplyPatch linux-2.6-die-closed-source-bios-muppets-die.patch
-# Some performance fixes, unify hardware/software passthrough support, and
-# most importantly: notice when the BIOS points us to a region that returns
-# all 0xFF, and claims that there's an IOMMU there.
-ApplyPatch linux-2.6-intel-iommu-updates.patch
#
# PowerPC
@@ -1200,11 +1184,11 @@ ApplyPatch linux-2.6-execshield.patch
# eCryptfs
# NFSv4
-ApplyPatch linux-2.6-nfsd4-proots.patch
+#ApplyPatch linux-2.6-nfsd4-proots.patch
# USB
ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
-ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
+#ApplyPatch linux-2.6-fix-usb-serial-autosuspend.diff
ApplyPatch linux-2.6-qcserial-autosuspend.diff
ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
@@ -1283,9 +1267,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
# Mark kernel data as NX
-ApplyPatch linux-2.6.31-nx-data.patch
+#ApplyPatch linux-2.6.31-nx-data.patch
# Apply NX/RO to modules
-ApplyPatch linux-2.6.31-modules-ro-nx.patch
+#ApplyPatch linux-2.6.31-modules-ro-nx.patch
# /dev/crash driver.
ApplyPatch linux-2.6-crash-driver.patch
@@ -1299,9 +1283,6 @@ ApplyPatch lirc-2.6.31.patch
ApplyPatch hdpvr-ir-enable.patch
# Add kernel KSM support
-ApplyPatch linux-2.6-ksm.patch
-ApplyPatch linux-2.6-ksm-updates.patch
-ApplyPatch linux-2.6-ksm-fix-munlock.patch
# Optimize KVM for KSM support
#ApplyPatch linux-2.6-ksm-kvm.patch
@@ -1319,7 +1300,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
#ApplyPatch drm-nouveau.patch
# pm broken on my thinkpad t60p - airlied
#ApplyPatch drm-radeon-pm.patch
-ApplyPatch drm-i915-resume-force-mode.patch
+#ApplyPatch drm-i915-resume-force-mode.patch
ApplyPatch drm-intel-big-hammer.patch
#ApplyPatch drm-page-flip.patch
ApplyOptionalPatch drm-intel-next.patch
@@ -1327,7 +1308,6 @@ ApplyOptionalPatch drm-intel-next.patch
#ApplyPatch drm-intel-pm.patch
# VGA arb + drm
-ApplyPatch linux-2.6-vga-arb.patch
#ApplyPatch drm-vga-arb.patch
# linux1394 git patches
@@ -1342,10 +1322,8 @@ ApplyPatch linux-2.6-silence-acpi-blackl
#ApplyPatch linux-2.6-v4l-dvb-update.patch
#ApplyPatch linux-2.6-v4l-dvb-experimental.patch
#ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
-ApplyPatch v4l-dvb-fix-cx25840-firmware-loading.patch
# Patches headed upstream
-ApplyPatch linux-2.6-rtc-show-hctosys.patch
ApplyPatch linux-2.6-rfkill-all.patch
# END OF PATCH APPLICATIONS
@@ -2005,6 +1983,29 @@ fi
# ##############################################################
%changelog
+* Sun Sep 27 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.31-git18
+- rebased:
+ - hdpvr-ir-enable.patch
+ - linux-2.6-build-nonintconfig.patch
+ - linux-2.6-debug-sizeof-structs.patch
+ - linux-2.6-debug-vm-would-have-oomkilled.patch
+ - linux-2.6-execshield.patch
+ - linux-2.6-makefile-after_link.patch
+ - linux-2.6-serial-460800.patch
+ - linux-2.6-utrace.patch
+ - via-hwmon-temp-sensor.patch
+- merged:
+ - linux-2.6-tracehook.patch
+ - linux-2.6-die-closed-source-bios-muppets-die.patch
+ - linux-2.6-intel-iommu-updates.patch
+ - linux-2.6-ksm.patch
+ - linux-2.6-ksm-updates.patch
+ - linux-2.6-ksm-fix-munlock.patch
+ - linux-2.6-vga-arb.patch
+ - v4l-dvb-fix-cx25840-firmware-loading.patch
+ - linux-2.6-rtc-show-hctosys.patch
+
* Fri Sep 18 2009 Dave Jones <davej at redhat.com>
- %ghost the dracut initramfs file.
linux-2.6-build-nonintconfig.patch:
Makefile | 5 +++++
conf.c | 36 ++++++++++++++++++++++++++++++++----
2 files changed, 37 insertions(+), 4 deletions(-)
Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- linux-2.6-build-nonintconfig.patch 15 Sep 2009 14:47:35 -0000 1.16
+++ linux-2.6-build-nonintconfig.patch 28 Sep 2009 05:09:48 -0000 1.17
@@ -15,7 +15,7 @@ index 6d69c7c..ff84d12 100644
# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
# The symlink is used to repair a deficiency in arch/um
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
-index 3baaaec..2a81742 100644
+index 9960d1c..ac8d455 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -23,6 +23,8 @@ enum {
@@ -27,16 +27,7 @@ index 3baaaec..2a81742 100644
set_default,
set_yes,
set_mod,
-@@ -40,6 +42,8 @@ static struct menu *rootEntry;
-
- static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
-
-+static int return_value = 0;
-+
- static const char *get_help(struct menu *menu)
- {
- if (menu_has_help(menu))
-@@ -360,7 +364,10 @@ static void conf(struct menu *menu)
+@@ -360,7 +362,10 @@ static void conf(struct menu *menu)
switch (prop->type) {
case P_MENU:
@@ -48,6 +39,15 @@ index 3baaaec..2a81742 100644
check_conf(menu);
return;
}
+@@ -406,6 +411,8 @@ conf_childs:
+ indent -= 2;
+ }
+
++static int return_value;
++
+ static void check_conf(struct menu *menu)
+ {
+ struct symbol *sym;
@@ -418,12 +425,21 @@ static void check_conf(struct menu *menu)
if (sym && !sym_has_value(sym)) {
if (sym_is_changable(sym) ||
linux-2.6-debug-sizeof-structs.patch:
main.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
Index: linux-2.6-debug-sizeof-structs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-sizeof-structs.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- linux-2.6-debug-sizeof-structs.patch 8 Jul 2009 17:28:48 -0000 1.7
+++ linux-2.6-debug-sizeof-structs.patch 28 Sep 2009 05:09:48 -0000 1.8
@@ -1,19 +1,10 @@
-From 3def38bec43d38391d0c9e910dee10317b2ef250 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:01:42 -0400
-Subject: [PATCH 1/6] fedora: linux-2.6-debug-sizeof-structs.patch
-
----
- init/main.c | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
diff --git a/init/main.c b/init/main.c
-index 2c5ade7..1c25f08 100644
+index 7449819..98cfaae 100644
--- a/init/main.c
+++ b/init/main.c
-@@ -397,6 +397,10 @@ static void __init setup_per_cpu_areas(void)
+@@ -369,6 +369,10 @@ static void __init setup_nr_cpu_ids(void)
+ nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
}
- #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
+#include <linux/ext3_fs_i.h>
+#include <linux/skbuff.h>
@@ -22,7 +13,7 @@ index 2c5ade7..1c25f08 100644
/* Called by boot processor to activate the rest. */
static void __init smp_init(void)
{
-@@ -419,6 +423,15 @@ static void __init smp_init(void)
+@@ -391,6 +395,15 @@ static void __init smp_init(void)
/* Any cleanup work */
printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
smp_cpus_done(setup_max_cpus);
@@ -38,6 +29,3 @@ index 2c5ade7..1c25f08 100644
}
#endif
---
-1.6.2.5
-
linux-2.6-debug-vm-would-have-oomkilled.patch:
kernel/sysctl.c | 9 +++++++++
mm/oom_kill.c | 15 +++++++++++++++
2 files changed, 24 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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-debug-vm-would-have-oomkilled.patch 19 Aug 2009 12:46:27 -0000 1.4
+++ linux-2.6-debug-vm-would-have-oomkilled.patch 28 Sep 2009 05:09:48 -0000 1.5
@@ -1,8 +1,8 @@
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index b2a2d68..3b132ee 100644
+index 0d949c5..8fb2bd9 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -67,6 +67,7 @@ extern int sysctl_overcommit_ratio;
+@@ -72,6 +72,7 @@ extern int sysctl_overcommit_ratio;
extern int sysctl_panic_on_oom;
extern int sysctl_oom_kill_allocating_task;
extern int sysctl_oom_dump_tasks;
@@ -10,7 +10,7 @@ index b2a2d68..3b132ee 100644
extern int max_threads;
extern int core_uses_pid;
extern int suid_dumpable;
-@@ -861,6 +862,14 @@ static struct ctl_table vm_table[] = {
+@@ -1073,6 +1074,14 @@ static struct ctl_table vm_table[] = {
.proc_handler = &proc_dointvec,
},
{
@@ -26,7 +26,7 @@ index b2a2d68..3b132ee 100644
.procname = "overcommit_ratio",
.data = &sysctl_overcommit_ratio,
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index f255eda..3335a94 100644
+index ea2147d..3b31a4a 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -31,6 +31,7 @@
@@ -37,7 +37,7 @@ index f255eda..3335a94 100644
static DEFINE_SPINLOCK(zone_scan_lock);
/* #define DEBUG */
-@@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
+@@ -356,6 +357,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
return;
}
@@ -50,16 +50,18 @@ index f255eda..3335a94 100644
if (verbose)
printk(KERN_ERR "Killed process %d (%s)\n",
task_pid_nr(p), p->comm);
-@@ -363,6 +370,12 @@ static int oom_kill_task(struct task_struct *p)
- return 1;
- } while_each_thread(g, q);
+@@ -384,6 +391,14 @@ static int oom_kill_task(struct task_struct *p)
+ if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
+ return 1;
-+ if (sysctl_would_have_oomkilled == 1) {
-+ printk(KERN_ERR "Would have killed process %d (%s). But continuing instead.\n",
-+ task_pid_nr(p), p->comm);
-+ 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/init_32.c | 48 ++++++++++++
arch/x86/mm/mmap.c | 5 +
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, 507 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.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- linux-2.6-execshield.patch 15 Sep 2009 14:47:35 -0000 1.109
+++ linux-2.6-execshield.patch 28 Sep 2009 05:09:48 -0000 1.110
@@ -71,10 +71,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 40d6586..c75290e 100644
+index 8aebcc4..cbbd2b0 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
-@@ -306,6 +306,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+@@ -289,6 +289,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
{
PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
}
@@ -88,10 +88,10 @@ index 40d6586..c75290e 100644
{
PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 25402d0..d825de0 100644
+index dd0f5b3..c2727ef 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
-@@ -132,6 +132,9 @@ struct pv_cpu_ops {
+@@ -118,6 +118,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);
@@ -102,10 +102,10 @@ index 25402d0..d825de0 100644
void (*load_tls)(struct thread_struct *t, unsigned int cpu);
#ifdef CONFIG_X86_64
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index e08ea04..329836f 100644
+index c3429e8..62cc460 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -160,6 +160,9 @@ static inline int hlt_works(int cpu)
+@@ -161,6 +161,9 @@ static inline int hlt_works(int cpu)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
@@ -116,10 +116,10 @@ index e08ea04..329836f 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 2055fc2..68c1e79 100644
+index cc25c2b..6ce4863 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -799,6 +799,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -798,6 +798,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);
@@ -141,10 +141,10 @@ index 2055fc2..68c1e79 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 f5b0b4a..b102671 100644
+index 1b1739d..c2dda16 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
-@@ -370,6 +370,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -345,6 +345,9 @@ struct pv_cpu_ops pv_cpu_ops = {
.read_tscp = native_read_tscp,
.load_tr_desc = native_load_tr_desc,
.set_ldt = native_set_ldt,
@@ -233,10 +233,10 @@ index 4cf7956..b2407dc 100644
+ set_user_cs(&mm->context.user_cs, 0);
+}
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 8326492..4b645d3 100644
+index 7e37dce..92ae538 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)
+@@ -115,6 +115,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
if (!user_mode_vm(regs))
die(str, regs, err);
}
@@ -313,7 +313,7 @@ index 8326492..4b645d3 100644
#endif
static void __kprobes
-@@ -276,6 +346,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -273,6 +343,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
if (!user_mode(regs))
goto gp_in_kernel;
@@ -343,7 +343,7 @@ index 8326492..4b645d3 100644
tsk->thread.error_code = error_code;
tsk->thread.trap_no = 13;
-@@ -884,19 +977,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -881,19 +974,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
}
#ifdef CONFIG_X86_32
@@ -391,10 +391,10 @@ index 8326492..4b645d3 100644
#endif
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 0607119..a48b69c 100644
+index 73ffd55..0cf2a7b 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
-@@ -212,6 +212,12 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -149,6 +149,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");
@@ -408,7 +408,7 @@ index 0607119..a48b69c 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 3cd7711..771b1e5 100644
+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)
@@ -467,10 +467,10 @@ index 3cd7711..771b1e5 100644
static unsigned int highmem_pages = -1;
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 1658296..72056cf 100644
+index c8191de..7d84d01 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
-@@ -111,13 +111,16 @@ static unsigned long mmap_legacy_base(void)
+@@ -124,13 +124,16 @@ static unsigned long mmap_legacy_base(void)
*/
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -489,7 +489,7 @@ index 1658296..72056cf 100644
}
}
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index c814e14..d4dd851 100644
+index 36fe08e..3806a45 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -6,6 +6,7 @@
@@ -500,7 +500,7 @@ index c814e14..d4dd851 100644
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
#include <asm/apic.h>
-@@ -129,6 +130,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -130,6 +131,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
union smp_flush_state *f;
cpu = smp_processor_id();
@@ -527,7 +527,7 @@ index 58bc00f..1fdafb5 100644
ret = addr;
goto up_fail;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 0dd0c2c..661ecf1 100644
+index 3439616..31e5c6f 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -323,6 +323,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
@@ -555,7 +555,7 @@ index 0dd0c2c..661ecf1 100644
static void xen_load_gdt(const struct desc_ptr *dtr)
{
unsigned long va = dtr->address;
-@@ -959,6 +977,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -949,6 +967,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
.load_tr_desc = paravirt_nop,
.set_ldt = xen_set_ldt,
@@ -566,7 +566,7 @@ index 0dd0c2c..661ecf1 100644
.load_idt = xen_load_idt,
.load_tls = xen_load_tls,
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 7c1e65d..8d25676 100644
+index b9b3bb5..1e55926 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
@@ -626,10 +626,10 @@ index 7c1e65d..8d25676 100644
* load_elf_interp() returns relocation
* adjustment
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 9a72cc7..d571ff3 100644
+index 24c3956..88f944d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1118,7 +1118,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1129,7 +1129,13 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
@@ -645,7 +645,7 @@ index 9a72cc7..d571ff3 100644
extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 0042090..c675fb7 100644
+index 84a524a..a81e0db 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -206,6 +206,9 @@ struct mm_struct {
@@ -676,12 +676,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 f3d74bd..26417ac 100644
+index 75e6e60..0bce489 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -102,6 +102,9 @@ struct fs_struct;
struct bts_context;
- struct perf_counter_context;
+ struct perf_event_context;
+extern int exec_shield;
+extern int print_fatal_signals;
@@ -689,7 +689,7 @@ index f3d74bd..26417ac 100644
/*
* List of flags we want to share for kernel threads,
* if only because they are not used by them anyway.
-@@ -373,6 +376,10 @@ extern int sysctl_max_map_count;
+@@ -378,6 +381,10 @@ extern int sysctl_max_map_count;
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
unsigned long, unsigned long);
@@ -701,7 +701,7 @@ index f3d74bd..26417ac 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 6bb59f7..58b2801 100644
+index 0d949c5..12ca319 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -88,6 +88,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
@@ -731,7 +731,7 @@ index 6bb59f7..58b2801 100644
#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -403,6 +423,14 @@ static struct ctl_table kern_table[] = {
+@@ -408,6 +428,14 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec,
},
{
@@ -747,13 +747,13 @@ index 6bb59f7..58b2801 100644
.procname = "core_uses_pid",
.data = &core_uses_pid,
diff --git a/mm/mmap.c b/mm/mmap.c
-index 8101de4..543272b 100644
+index 73f5e4b..814b95f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -29,6 +29,7 @@
#include <linux/rmap.h>
#include <linux/mmu_notifier.h>
- #include <linux/perf_counter.h>
+ #include <linux/perf_event.h>
+#include <linux/random.h>
#include <asm/uaccess.h>
@@ -795,7 +795,7 @@ index 8101de4..543272b 100644
}
/*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -798,6 +815,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
} else /* cases 2, 5, 7 */
vma_adjust(prev, prev->vm_start,
end, prev->vm_pgoff, NULL);
@@ -804,7 +804,7 @@ index 8101de4..543272b 100644
return prev;
}
-@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -970,7 +989,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
/* Obtain the address to map to. we verify (or select) it and ensure
* that it represents a valid section of the address space.
*/
@@ -814,7 +814,7 @@ index 8101de4..543272b 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1453,13 +1473,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -835,7 +835,7 @@ index 8101de4..543272b 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);
-@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1473,8 +1497,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
return arch_rebalance_pgtables(addr, len);
}
@@ -913,7 +913,7 @@ index 8101de4..543272b 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)
-@@ -1535,6 +1627,14 @@ out:
+@@ -1549,6 +1641,14 @@ out:
return prev ? prev->vm_next : vma;
}
@@ -928,7 +928,7 @@ index 8101de4..543272b 100644
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1565,7 +1665,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
@@ -937,7 +937,7 @@ index 8101de4..543272b 100644
return -ENOMEM;
/* mlock limit tests */
-@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1875,10 +1975,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);
@@ -954,8 +954,8 @@ index 8101de4..543272b 100644
vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
return 0;
-@@ -2113,6 +2217,7 @@ void exit_mmap(struct mm_struct *mm)
- vm_unacct_memory(nr_accounted);
+@@ -2128,6 +2232,7 @@ void exit_mmap(struct mm_struct *mm)
+
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
+ arch_flush_exec_range(mm);
@@ -963,11 +963,11 @@ index 8101de4..543272b 100644
/*
* Walk the list again, actually closing and freeing it,
diff --git a/mm/mprotect.c b/mm/mprotect.c
-index d80311b..032423d 100644
+index 8bc969d..3c9b4fc 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -26,9 +26,14 @@
- #include <linux/perf_counter.h>
+ #include <linux/perf_event.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
@@ -1001,10 +1001,10 @@ index d80311b..032423d 100644
if (is_vm_hugetlb_page(vma))
hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
diff --git a/mm/mremap.c b/mm/mremap.c
-index a39b7b9..6bebfde 100644
+index 97bff25..17a9fd7 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
-@@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -414,8 +414,8 @@ unsigned long do_mremap(unsigned long addr,
if (vma->vm_flags & VM_MAYSHARE)
map_flags |= MAP_SHARED;
linux-2.6-makefile-after_link.patch:
Makefile | 4 ++++
arch/powerpc/kernel/vdso32/Makefile | 3 ++-
arch/powerpc/kernel/vdso64/Makefile | 3 ++-
arch/x86/vdso/Makefile | 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
Index: linux-2.6-makefile-after_link.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-makefile-after_link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-makefile-after_link.patch 7 Oct 2008 21:58:20 -0000 1.1
+++ linux-2.6-makefile-after_link.patch 28 Sep 2009 05:09:49 -0000 1.2
@@ -1,24 +1,8 @@
-From f072f7db2194c8255c003d985b61ad2f97ebbee0 Mon Sep 17 00:00:00 2001
-From: Roland McGrath <roland at redhat.com>
-Date: Mon, 6 Oct 2008 23:03:03 -0700
-Subject: [PATCH] kbuild: AFTER_LINK
-
-If the make variable AFTER_LINK is set, it is a command line to run
-after each final link. This includes vmlinux itself and vDSO images.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
----
- Makefile | 4 ++++
- arch/powerpc/kernel/vdso32/Makefile | 3 ++-
- arch/powerpc/kernel/vdso64/Makefile | 3 ++-
- arch/x86/vdso/Makefile | 3 ++-
- 4 files changed, 10 insertions(+), 3 deletions(-)
-
diff --git a/Makefile b/Makefile
-index ce9eceb..b27b1b7 100644
+index f908acc..960ff6f 100644
--- a/Makefile
+++ b/Makefile
-@@ -679,6 +679,10 @@ quiet_cmd_vmlinux__ ?= LD $@
+@@ -746,6 +746,10 @@ quiet_cmd_vmlinux__ ?= LD $@
--start-group $(vmlinux-main) --end-group \
$(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^)
@@ -30,10 +14,10 @@ index ce9eceb..b27b1b7 100644
quiet_cmd_vmlinux_version = GEN .version
cmd_vmlinux_version = set -e; \
diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
-index c3d57bd..c9519c5 100644
+index 51ead52..ad21273 100644
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
-@@ -40,7 +40,8 @@ $(obj-vdso32): %.o: %.S
+@@ -41,7 +41,8 @@ $(obj-vdso32): %.o: %.S
# actual build commands
quiet_cmd_vdso32ld = VDSO32L $@
@@ -44,10 +28,10 @@ index c3d57bd..c9519c5 100644
cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
-index fa7f1b8..712fe1d 100644
+index 79da65d..f11c21b 100644
--- a/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
-@@ -34,7 +34,8 @@ $(obj-vdso64): %.o: %.S
+@@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S
# actual build commands
quiet_cmd_vdso64ld = VDSO64L $@
@@ -58,7 +42,7 @@ index fa7f1b8..712fe1d 100644
cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 4d6ef0a..5203ae9 100644
+index 6b4ffed..cbc3d05 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -120,7 +120,8 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
@@ -69,8 +53,5 @@ index 4d6ef0a..5203ae9 100644
+ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \
+ $(if $(AFTER_LINK),; $(AFTER_LINK))
- VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
-
---
-1.5.5.1
-
+ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+ GCOV_PROFILE := n
linux-2.6-serial-460800.patch:
8250.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
Index: linux-2.6-serial-460800.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-serial-460800.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-serial-460800.patch 28 May 2007 01:22:43 -0000 1.2
+++ linux-2.6-serial-460800.patch 28 Sep 2009 05:09:49 -0000 1.3
@@ -1,9 +1,7 @@
-http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
-http://lkml.org/lkml/2006/8/2/208
-
---- linux-2.6.13-org/drivers/serial/8250.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13/drivers/serial/8250.c 2005-09-16 12:18:14.000000000 +0200
+diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
+index 2209620..659c1bb 100644
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
@@ -7,6 +7,9 @@
*
* Copyright (C) 2001 Russell King.
@@ -14,7 +12,7 @@ http://lkml.org/lkml/2006/8/2/208
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
-@@ -1652,6 +1655,14 @@
+@@ -2227,6 +2230,14 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int
else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
baud == (port->uartclk/8))
quot = 0x8002;
@@ -29,7 +27,7 @@ http://lkml.org/lkml/2006/8/2/208
else
quot = uart_get_divisor(port, baud);
-@@ -1665,7 +1676,7 @@
+@@ -2240,7 +2251,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
struct uart_8250_port *up = (struct uart_8250_port *)port;
unsigned char cval, fcr = 0;
unsigned long flags;
@@ -38,21 +36,22 @@ http://lkml.org/lkml/2006/8/2/208
switch (termios->c_cflag & CSIZE) {
case CS5:
-@@ -2034,7 +2034,8 @@ serial8250_set_termios(struct uart_port
+@@ -2272,9 +2283,10 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
/*
* Ask the core to calculate the divisor for us.
*/
-- baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+ max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
-+ baud = uart_get_baud_rate(port, termios, old, 0, max_baud);
+ baud = uart_get_baud_rate(port, termios, old,
+ port->uartclk / 16 / 0xffff,
+- port->uartclk / 16);
++ max_baud);
quot = serial8250_get_divisor(port, baud);
/*
-@@ -1733,6 +1745,19 @@
- */
+@@ -2311,6 +2323,19 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
spin_lock_irqsave(&up->port.lock, flags);
-+ /*
+ /*
+ * 16C950 supports additional prescaler ratios between 1:16 and 1:4
+ * thus increasing max baud rate to uartclk/4.
+ */
@@ -65,7 +64,7 @@ http://lkml.org/lkml/2006/8/2/208
+ serial_icr_write(up, UART_TCR, 0);
+ }
+
- /*
++ /*
* Update the per-port timeout.
*/
-
+ uart_update_timeout(port, termios->c_cflag, baud);
linux-2.6-utrace.patch:
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 | 62
include/linux/utrace.h | 692 +++++++++++
include/linux/utrace_struct.h | 58
init/Kconfig | 9
kernel/Makefile | 1
kernel/ptrace.c | 32
kernel/utrace.c | 2357 ++++++++++++++++++++++++++++++++++++++
12 files changed, 3809 insertions(+), 4 deletions(-)
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- linux-2.6-utrace.patch 25 Jun 2009 01:27:31 -0000 1.117
+++ linux-2.6-utrace.patch 28 Sep 2009 05:09:49 -0000 1.118
@@ -1,5 +1,5 @@
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 9632444..bf4b9e8 100644
+index ab8300f..95f59e4 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -9,7 +9,7 @@
@@ -608,18 +608,18 @@ index 0000000..6cc58a1
+
+</book>
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 725a650..e299a63 100644
+index 07f77a7..882dc90 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
-@@ -82,6 +82,7 @@
- #include <linux/pid_namespace.h>
+@@ -83,6 +83,7 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
+ #include <linux/swapops.h>
+#include <linux/utrace.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
+@@ -189,6 +190,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);
@@ -629,22 +629,22 @@ 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 5368fbd..aecd24e 100644
+index 21a6f5d..a598a6b 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -167,6 +167,7 @@ extern struct cred init_cred;
+@@ -177,6 +177,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_PERF_EVENTS(tsk) \
INIT_TRACE_IRQFLAGS \
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 4d07542..2060aa1 100644
+index 75e6e60..94ca5c5 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -59,6 +59,7 @@ struct sched_param {
+@@ -61,6 +61,7 @@ struct sched_param {
#include <linux/errno.h>
#include <linux/nodemask.h>
#include <linux/mm_types.h>
@@ -652,7 +652,7 @@ index 4d07542..2060aa1 100644
#include <asm/system.h>
#include <asm/page.h>
-@@ -1313,6 +1314,11 @@ struct task_struct {
+@@ -1393,6 +1394,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -665,7 +665,7 @@ index 4d07542..2060aa1 100644
u32 parent_exec_id;
u32 self_exec_id;
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 7c2bfd9..a91d9a4 100644
+index 1eb44a9..17c103e 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
@@ -811,16 +811,17 @@ index 7c2bfd9..a91d9a4 100644
return 0;
}
-@@ -485,6 +516,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
+@@ -485,6 +516,9 @@ static inline int tracehook_get_signal(struct task_struct *task,
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
+ if (task_utrace_flags(current) & UTRACE_EVENT(JCTL))
+ utrace_report_jctl(notify, why);
++
return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
}
-@@ -508,6 +541,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
+@@ -517,6 +551,8 @@ static inline void tracehook_finish_jctl(void)
static inline int tracehook_notify_death(struct task_struct *task,
void **death_cookie, int group_dead)
{
@@ -829,7 +830,7 @@ index 7c2bfd9..a91d9a4 100644
if (task_detached(task))
return task->ptrace ? SIGCHLD : DEATH_REAP;
-@@ -544,6 +579,20 @@ static inline void tracehook_report_death(struct task_struct *task,
+@@ -553,6 +589,20 @@ static inline void tracehook_report_death(struct task_struct *task,
int signal, void *death_cookie,
int group_dead)
{
@@ -850,7 +851,7 @@ index 7c2bfd9..a91d9a4 100644
}
#ifdef TIF_NOTIFY_RESUME
-@@ -573,10 +622,20 @@ static inline void set_notify_resume(struct task_struct *task)
+@@ -582,10 +632,20 @@ static inline void set_notify_resume(struct task_struct *task)
* asynchronously, this will be called again before we return to
* user mode.
*
@@ -1635,10 +1636,10 @@ index 0000000..aba7e09
+
+#endif /* linux/utrace_struct.h */
diff --git a/init/Kconfig b/init/Kconfig
-index 1ce05a4..f720929 100644
+index c7bac39..96993b2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1191,6 +1191,15 @@ config STOP_MACHINE
+@@ -1187,6 +1187,15 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1655,10 +1656,10 @@ index 1ce05a4..f720929 100644
config PREEMPT_NOTIFIERS
diff --git a/kernel/Makefile b/kernel/Makefile
-index 780c8dc..cd16d49 100644
+index b8d4cd8..8f41620 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1667,7 +1668,7 @@ index 780c8dc..cd16d49 100644
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_GCOV_KERNEL) += gcov/
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 61c78b2..935eeee 100644
+index 23bd09c..470f604 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,6 +16,7 @@
@@ -1718,7 +1719,7 @@ index 61c78b2..935eeee 100644
ret = security_ptrace_traceme(current->parent);
/*
* Check PF_EXITING to ensure ->real_parent has not passed
-@@ -577,7 +595,17 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -580,7 +598,17 @@ int ptrace_request(struct task_struct *child, long request,
return ret;
}
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -p -r1.1086 -r1.1087
--- sources 15 Sep 2009 14:47:35 -0000 1.1086
+++ sources 28 Sep 2009 05:09:49 -0000 1.1087
@@ -1,2 +1,2 @@
84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2
-3894e5c148d260a7cb891b86a1939f69 patch-2.6.31-git4.bz2
+53e607f1d8eab73b69d3ad6ebfd1bc71 patch-2.6.31-git18.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -p -r1.1000 -r1.1001
--- upstream 15 Sep 2009 14:47:35 -0000 1.1000
+++ upstream 28 Sep 2009 05:09:49 -0000 1.1001
@@ -1,2 +1,2 @@
linux-2.6.31.tar.bz2
-patch-2.6.31-git4.bz2
+patch-2.6.31-git18.bz2
via-hwmon-temp-sensor.patch:
Kconfig | 8 +
Makefile | 1
via-cputemp.c | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 363 insertions(+)
Index: via-hwmon-temp-sensor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-hwmon-temp-sensor.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- via-hwmon-temp-sensor.patch 19 Jun 2009 21:49:01 -0000 1.3
+++ via-hwmon-temp-sensor.patch 28 Sep 2009 05:09:49 -0000 1.4
@@ -1,14 +1,10 @@
-Subject: hwmon: Add driver for VIA CPU core temperature
-Now at patch ../patches/1-linux-2.6-via.git-bb3796c7c8d2209e7c3ab112f32ec4dec63e0d48.patch
-
-Subject: hwmon: Make sure via-cputemp complies with hwmon conventions
-Now at patch ../patches/2-linux-2.6-via.git-d2891d15eeef1033893dcc524543e8ad8fef019f.patch
-
---- work-2.6.29.4.orig/drivers/hwmon/Kconfig
-+++ work-2.6.29.4/drivers/hwmon/Kconfig
-@@ -720,6 +720,14 @@ config SENSORS_THMC50
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 6857560..4414182 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -795,6 +795,14 @@ config SENSORS_TMP421
This driver can also be built as a module. If so, the module
- will be called tmp401.
+ will be called tmp421.
+config SENSORS_VIA_CPUTEMP
+ tristate "VIA CPU temperature sensor"
@@ -21,18 +17,23 @@ Now at patch ../patches/2-linux-2.6-via.
config SENSORS_VIA686A
tristate "VIA686A"
depends on PCI
---- work-2.6.29.4.orig/drivers/hwmon/Makefile
-+++ work-2.6.29.4/drivers/hwmon/Makefile
-@@ -75,6 +75,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc4
- obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 9f46cb0..32ed56a 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -85,6 +85,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
obj-$(CONFIG_SENSORS_TMP401) += tmp401.o
+ obj-$(CONFIG_SENSORS_TMP421) += tmp421.o
+obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o
obj-$(CONFIG_SENSORS_VIA686A) += via686a.o
obj-$(CONFIG_SENSORS_VT1211) += vt1211.o
obj-$(CONFIG_SENSORS_VT8231) += vt8231.o
+diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
+new file mode 100644
+index 0000000..2abe516
--- /dev/null
-+++ work-2.6.29.4/drivers/hwmon/via-cputemp.c
++++ b/drivers/hwmon/via-cputemp.c
@@ -0,0 +1,354 @@
+/*
+ * via-cputemp.c - Driver for VIA CPU core temperature monitoring
--- linux-2.6-die-closed-source-bios-muppets-die.patch DELETED ---
--- linux-2.6-intel-iommu-updates.patch DELETED ---
--- linux-2.6-ksm-fix-munlock.patch DELETED ---
--- linux-2.6-ksm-updates.patch DELETED ---
--- linux-2.6-ksm.patch DELETED ---
--- linux-2.6-rtc-show-hctosys.patch DELETED ---
--- patch-2.6.31-git4.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list