Tue Mar 30 04:24:04 UTC 2010

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29219

Modified Files:
	die-floppy-die.patch hda_intel-prealloc-4mb-dmabuffer.patch 
	kernel.spec linux-2.6-crash-driver.patch 
	linux-2.6-debug-nmi-timeout.patch 
	linux-2.6-defaults-pci_no_msi.patch linux-2.6-execshield.patch 
	linux-2.6-input-kill-stupid-messages.patch 
Added Files:
	pci-hush-rom-warning.patch 
Removed Files:
	crystalhd-2.6.34-staging.patch 
	linux-2.6-dell-laptop-rfkill-fix.patch 
	linux-2.6-g5-therm-shutdown.patch 
	linux-2.6-input-fix-toshiba-hotkeys.patch 
	linux-2.6-nfs4-callback-hidden.patch 
	linux-2.6-pciehp-update.patch 
	linux-2.6.30-hush-rom-warning.patch 
Log Message:
* Tue Mar 30 2010 Kyle McMartin <kyle at redhat.com>
- nuke linux-2.6-g5-therm-shutdown.patch, upstream now
- nuke linux-2.6-dell-laptop-rfkill-fix.patch, upstream in different form
- nuke linux-2.6-nfs4-callback-hidden.patch, upstream now
- rebase hda_intel-prealloc-4mb-dmabuffer.patch
- rebase linux-2.6-execshield.patch
- rebase linux-2.6-input-kill-stupid-messages.patch
- rebase die-floppy-die.patch
- rebase linux-2.6-crash-driver.patch
- nuke some other upstream patches, or patches that have been unapplied
  for a very long time


pci-hush-rom-warning.patch:
 setup-res.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE pci-hush-rom-warning.patch ---
>From 3da769ea10f0711d6d93fd7f248dcb0636f367eb Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at phobos.i.jkkm.org>
Date: Tue, 30 Mar 2010 00:09:47 -0400
Subject: pci-hush-rom-warning.patch

---
 drivers/pci/setup-res.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 17bed18..9e75a81 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -104,7 +104,12 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
 
 	conflict = request_resource_conflict(root, res);
 	if (conflict) {
-		dev_err(&dev->dev,
+		if (resource == 6) /* KERN_INFO for ROM */
+			dev_info(&dev->dev,
+			"address space collision: %pR conflicts with %s %pR\n",
+			res, conflict->name, conflict);
+		else
+			dev_err(&dev->dev,
 			"address space collision: %pR conflicts with %s %pR\n",
 			res, conflict->name, conflict);
 		return -EBUSY;
-- 
1.7.0.1


die-floppy-die.patch:
 floppy.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: die-floppy-die.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/die-floppy-die.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- die-floppy-die.patch	6 Aug 2009 04:05:38 -0000	1.1
+++ die-floppy-die.patch	30 Mar 2010 04:23:58 -0000	1.2
@@ -1,18 +1,30 @@
+From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:04:29 -0400
+Subject: die-floppy-die
+
 Kill the floppy.ko pnp modalias. We were surviving just fine without
 autoloading floppy drivers, tyvm.
 
 Please feel free to register all complaints in the wastepaper bin.
+---
+ drivers/block/floppy.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 91b7530..2ea84a6 100644
+index 90c4038..f4a0b90 100644
 --- a/drivers/block/floppy.c
 +++ b/drivers/block/floppy.c
-@@ -4631,7 +4631,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
- 	{ "PNP0700", 0 },
- 	{ }
+@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+ 	{"PNP0700", 0},
+ 	{}
  };
+-
 -MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
 +/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
  
  #else
  
+-- 
+1.7.0.1
+

hda_intel-prealloc-4mb-dmabuffer.patch:
 hda_intel.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Index: hda_intel-prealloc-4mb-dmabuffer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hda_intel-prealloc-4mb-dmabuffer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hda_intel-prealloc-4mb-dmabuffer.patch	3 Mar 2009 18:36:19 -0000	1.1
+++ hda_intel-prealloc-4mb-dmabuffer.patch	30 Mar 2010 04:23:58 -0000	1.2
@@ -1,16 +1,25 @@
+From c69fcbd1f60b0842f7c1ad2c95692ffd19c4932b Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:56:08 -0400
+Subject: hda_intel-prealloc-4mb-dmabuffer
+
+---
+ sound/pci/hda/hda_intel.c |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index c8d9178..7d3bb15 100644
+index 4bb9067..37db515 100644
 --- a/sound/pci/hda/hda_intel.c
 +++ b/sound/pci/hda/hda_intel.c
-@@ -1774,6 +1774,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
+@@ -1986,6 +1986,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
  	struct azx_pcm *apcm;
  	int pcm_dev = cpcm->device;
  	int s, err;
 +	size_t prealloc_min = 64*1024;	/* 64KB */
  
- 	if (pcm_dev >= AZX_MAX_PCMS) {
+ 	if (pcm_dev >= HDA_MAX_PCMS) {
  		snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
-@@ -1807,10 +1808,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
+@@ -2019,10 +2020,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
  		if (cpcm->stream[s].substreams)
  			snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
  	}
@@ -33,3 +42,6 @@ index c8d9178..7d3bb15 100644
  	return 0;
  }
  
+-- 
+1.7.0.1
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -p -r1.1955 -r1.1956
--- kernel.spec	30 Mar 2010 02:59:24 -0000	1.1955
+++ kernel.spec	30 Mar 2010 04:23:59 -0000	1.1956
@@ -627,7 +627,6 @@ Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ptrace.patch
 
-Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
@@ -645,13 +644,10 @@ Patch305: linux-2.6-fix-btusb-autosuspen
 Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
 Patch360: linux-2.6-debug-always-inline-kzalloc.patch
 Patch380: linux-2.6-defaults-pci_no_msi.patch
-Patch381: linux-2.6-pciehp-update.patch
-Patch382: linux-2.6-defaults-pciehp.patch
 Patch383: linux-2.6-defaults-aspm.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
-Patch451: linux-2.6-input-fix-toshiba-hotkeys.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
 
 Patch460: linux-2.6-serial-460800.patch
@@ -659,7 +655,7 @@ Patch460: linux-2.6-serial-460800.patch
 Patch470: die-floppy-die.patch
 
 Patch510: linux-2.6-silence-noise.patch
-Patch520: linux-2.6.30-hush-rom-warning.patch
+Patch520: pci-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
@@ -680,7 +676,6 @@ Patch900: linux-2.6-cantiga-iommu-gfx.pa
 
 Patch1515: lirc-2.6.33.patch
 Patch1517: hdpvr-ir-enable.patch
-Patch1520: crystalhd-2.6.34-staging.patch
 
 # virt + ksm patches
 Patch1551: linux-2.6-ksm-kvm.patch
@@ -714,12 +709,10 @@ Patch2905: linux-2.6-v4l-dvb-gspca-fixes
 # fs fixes
 
 # NFSv4
-Patch3051: linux-2.6-nfs4-callback-hidden.patch
 
 # VIA Nano / VX8xx updates
 
 # patches headed upstream
-Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
@@ -1156,7 +1149,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
 
 # Architecture patches
 # x86(-64)
-#ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
 #
 # Intel IOMMU
@@ -1166,8 +1158,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
 # PowerPC
 #
 ### NOT (YET) UPSTREAM:
-# Alleviate G5 thermal shutdown problems
-#ApplyPatch linux-2.6-g5-therm-shutdown.patch
 # Provide modalias in sysfs for vio devices
 ApplyPatch linux-2.6-vio-modalias.patch
 
@@ -1179,7 +1169,7 @@ ApplyPatch linux-2.6.29-sparc-IOC_TYPECH
 #
 # Exec shield
 #
-#ApplyPatch linux-2.6-execshield.patch
+ApplyPatch linux-2.6-execshield.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -1194,7 +1184,6 @@ ApplyPatch linux-2.6.29-sparc-IOC_TYPECH
 # eCryptfs
 
 # NFSv4
-#ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
 # USB
 #ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1210,7 +1199,7 @@ ApplyPatch linux-2.6-acpi-video-dos.patc
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
+ApplyPatch linux-2.6-debug-nmi-timeout.patch
 ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1218,12 +1207,8 @@ ApplyPatch linux-2.6-debug-always-inline
 #
 # PCI
 #
-# disable message signaled interrupts
-#ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-# update the pciehp driver
-#ApplyPatch linux-2.6-pciehp-update.patch
-# default to enabling passively listening for hotplug events
-#ApplyPatch linux-2.6-defaults-pciehp.patch
+# make default state of PCI MSI a config option
+ApplyPatch linux-2.6-defaults-pci_no_msi.patch
 # enable ASPM by default on hardware we expect to work
 ApplyPatch linux-2.6-defaults-aspm.patch
 
@@ -1232,19 +1217,16 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 #
 
 # ALSA
-#ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
+ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
 
 # Networking
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
-#ApplyPatch linux-2.6-input-kill-stupid-messages.patch
+ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 
 # stop floppy.ko from autoloading during udev...
-#ApplyPatch die-floppy-die.patch #x
-
-# Get away from having to poll Toshibas
-#ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
+ApplyPatch die-floppy-die.patch
 
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
@@ -1253,7 +1235,7 @@ ApplyPatch linux-2.6-serial-460800.patch
 
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
-#ApplyPatch linux-2.6.30-hush-rom-warning.patch
+ApplyPatch pci-hush-rom-warning.patch
 
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
@@ -1281,7 +1263,7 @@ ApplyPatch linux-2.6-ata-quirk.patch
 #ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
-#ApplyPatch linux-2.6-crash-driver.patch
+ApplyPatch linux-2.6-crash-driver.patch
 
 # Cantiga chipset b0rkage
 ApplyPatch linux-2.6-cantiga-iommu-gfx.patch
@@ -1290,8 +1272,6 @@ ApplyPatch linux-2.6-cantiga-iommu-gfx.p
 ApplyPatch lirc-2.6.33.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
-# Broadcom Crystal HD video decoder
-#ApplyPatch crystalhd-2.6.34-staging.patch
 
 # Add kernel KSM support
 # Optimize KVM for KSM support
@@ -2002,6 +1982,18 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Mar 30 2010 Kyle McMartin <kyle at redhat.com>
+- nuke linux-2.6-g5-therm-shutdown.patch, upstream now
+- nuke linux-2.6-dell-laptop-rfkill-fix.patch, upstream in different form
+- nuke linux-2.6-nfs4-callback-hidden.patch, upstream now
+- rebase hda_intel-prealloc-4mb-dmabuffer.patch
+- rebase linux-2.6-execshield.patch
+- rebase linux-2.6-input-kill-stupid-messages.patch
+- rebase die-floppy-die.patch
+- rebase linux-2.6-crash-driver.patch
+- nuke some other upstream patches, or patches that have been unapplied
+  for a very long time
+
 * Mon Mar 29 2010 Kyle McMartin <kyle at redhat.com>
 - rebase linux-2.6-utrace-ptrace.patch
 

linux-2.6-crash-driver.patch:
 arch/ia64/include/asm/crash.h |   90 +++++++++++++++++++++++++++++
 arch/ia64/kernel/ia64_ksyms.c |    3 
 arch/x86/include/asm/crash.h  |   75 ++++++++++++++++++++++++
 arch/x86/mm/ioremap.c         |    2 
 drivers/char/Kconfig          |    2 
 drivers/char/Makefile         |    2 
 drivers/char/crash.c          |  129 +++++++++++++++++++++++++++++++++++++++++-
 7 files changed, 302 insertions(+), 1 deletion(-)

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- linux-2.6-crash-driver.patch	28 Sep 2009 23:50:52 -0000	1.16
+++ linux-2.6-crash-driver.patch	30 Mar 2010 04:24:00 -0000	1.17
@@ -1,3 +1,21 @@
+From df42d15cd28f468ecd4c30465b98a53cce90617c Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:16:25 -0400
+Subject: dev-crash-driver.patch
+
+---
+ arch/ia64/include/asm/crash.h |   90 +++++++++++++++++++++++++++++
+ arch/ia64/kernel/ia64_ksyms.c |    3 +
+ arch/x86/include/asm/crash.h  |   75 ++++++++++++++++++++++++
+ arch/x86/mm/ioremap.c         |    2 +
+ drivers/char/Kconfig          |    2 +
+ drivers/char/Makefile         |    2 +
+ drivers/char/crash.c          |  128 +++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 302 insertions(+), 0 deletions(-)
+ create mode 100644 arch/ia64/include/asm/crash.h
+ create mode 100644 arch/x86/include/asm/crash.h
+ create mode 100644 drivers/char/crash.c
+
 diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
 new file mode 100644
 index 0000000..541af84
@@ -95,7 +113,7 @@ index 0000000..541af84
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 14d39e3..cf3d040 100644
+index 7f4a0ed..552fe24 100644
 --- a/arch/ia64/kernel/ia64_ksyms.c
 +++ b/arch/ia64/kernel/ia64_ksyms.c
 @@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
@@ -190,22 +208,23 @@ index 0000000..dfcc006
 +
 +#endif /* _ASM_I386_CRASH_H */
 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 334e63c..8e1ccbc 100644
+index 5eb1ba7..3e525d2 100644
 --- a/arch/x86/mm/ioremap.c
 +++ b/arch/x86/mm/ioremap.c
-@@ -60,6 +60,7 @@ int page_is_ram(unsigned long pagenr)
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(page_is_ram);
+@@ -24,6 +24,8 @@
+ 
+ #include "physaddr.h"
  
++EXPORT_SYMBOL_GPL(page_is_ram);
++
  /*
   * Fix up the linear direct mapping of the kernel to avoid cache attribute
+  * conflicts.
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 08a6f50..8bc5e9a 100644
+index 3141dd3..153658c 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
-@@ -484,6 +484,8 @@ config LEGACY_PTYS
+@@ -471,6 +471,8 @@ config LEGACY_PTYS
  	  security.  This option enables these legacy devices; on most
  	  systems, it is safe to say N.
  
@@ -215,10 +234,10 @@ index 08a6f50..8bc5e9a 100644
  config LEGACY_PTY_COUNT
  	int "Maximum number of legacy PTY in use"
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 19a79dd..0bee860 100644
+index f957edf..604c418 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -112,6 +112,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+@@ -111,6 +111,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
  obj-$(CONFIG_JS_RTC)		+= js-rtc.o
  js-rtc-y = rtc.o
  
@@ -361,3 +380,6 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
+-- 
+1.7.0.1
+

linux-2.6-debug-nmi-timeout.patch:
 arch/x86/kernel/apic/nmi.c |    2 +-
 lib/Kconfig.debug          |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

Index: linux-2.6-debug-nmi-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-nmi-timeout.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linux-2.6-debug-nmi-timeout.patch	11 Jan 2010 19:38:45 -0000	1.6
+++ linux-2.6-debug-nmi-timeout.patch	30 Mar 2010 04:24:00 -0000	1.7
@@ -1,7 +1,7 @@
-From c2dcc88ee3aca407471246c38c11a100cca39076 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at treachery.i.jkkm.org>
-Date: Mon, 11 Jan 2010 08:20:51 -0500
-Subject: linux-2.6-debug-nmi-timeout.patch
+From 542dee6f43067fa0101b53925aadf1d08c997cd4 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:40:27 -0400
+Subject: linux-2.6-debug-nmi-timeout
 
 ---
  arch/x86/kernel/apic/nmi.c |    2 +-
@@ -9,23 +9,23 @@ Subject: linux-2.6-debug-nmi-timeout.pat
  2 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
-index 0159a69..2bbca2b 100644
+index 8aa65ad..ba7d55e 100644
 --- a/arch/x86/kernel/apic/nmi.c
 +++ b/arch/x86/kernel/apic/nmi.c
 @@ -439,7 +439,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
  		 * wait a few IRQs (5 seconds) before doing the oops ...
  		 */
- 		__this_cpu_inc(per_cpu_var(alert_counter));
--		if (__this_cpu_read(per_cpu_var(alert_counter)) == 5 * nmi_hz)
-+		if (__this_cpu_read(per_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
+ 		__this_cpu_inc(alert_counter);
+-		if (__this_cpu_read(alert_counter) == 5 * nmi_hz)
++		if (__this_cpu_read(alert_counter) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
  			/*
  			 * die_nmi will return ONLY if NOTIFY_STOP happens..
  			 */
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 25c3ed5..6d67975 100644
+index 1fafb4b..963e78b 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -253,6 +253,14 @@ config SCHEDSTATS
+@@ -254,6 +254,14 @@ config SCHEDSTATS
  	  application, you can say N to avoid the very slight overhead
  	  this adds.
  
@@ -41,5 +41,5 @@ index 25c3ed5..6d67975 100644
  	bool "Collect kernel timers statistics"
  	depends on DEBUG_KERNEL && PROC_FS
 -- 
-1.6.5.2
+1.7.0.1
 

linux-2.6-defaults-pci_no_msi.patch:
 Documentation/kernel-parameters.txt |    3 +++
 drivers/pci/Kconfig                 |   12 ++++++++++++
 drivers/pci/msi.c                   |    9 +++++++++
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    3 ++-
 5 files changed, 28 insertions(+), 1 deletion(-)

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linux-2.6-defaults-pci_no_msi.patch	24 Jun 2009 18:37:56 -0000	1.6
+++ linux-2.6-defaults-pci_no_msi.patch	30 Mar 2010 04:24:01 -0000	1.7
@@ -1,6 +1,21 @@
---- linux-2.6.30.noarch/Documentation/kernel-parameters.txt~	2009-06-24 14:25:04.000000000 -0400
-+++ linux-2.6.30.noarch/Documentation/kernel-parameters.txt	2009-06-24 14:25:32.000000000 -0400
-@@ -1811,6 +1811,9 @@ and is between 256 and 4096 characters. 
+From 14bdd0d36f5284108468bb73afd50726b07c7a84 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:43:49 -0400
+Subject: linux-2.6-defaults-pci_no_msi
+
+---
+ Documentation/kernel-parameters.txt |    3 +++
+ drivers/pci/Kconfig                 |   12 ++++++++++++
+ drivers/pci/msi.c                   |    9 +++++++++
+ drivers/pci/pci.c                   |    2 ++
+ drivers/pci/pci.h                   |    2 ++
+ 5 files changed, 28 insertions(+), 0 deletions(-)
+
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index e4cbca5..8154a0f 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1911,6 +1911,9 @@ and is between 256 and 4096 characters. It is defined in the file
  		check_enable_amd_mmconf [X86] check for and enable
  				properly configured MMIO access to PCI
  				config space on AMD family 10h CPU
@@ -11,7 +26,7 @@
  				enabled, this kernel boot option can be used to
  				disable the use of MSI interrupts system-wide.
 diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
-index 2a4501d..209758c 100644
+index 7858a11..b12fcad 100644
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
 @@ -21,6 +21,18 @@ config PCI_MSI
@@ -30,14 +45,14 @@ index 2a4501d..209758c 100644
 +
 +	  If you don't know what to do here, say N.
 +
- config PCI_LEGACY
- 	bool "Enable deprecated pci_find_* API"
- 	depends on PCI
+ config PCI_DEBUG
+ 	bool "PCI Debugging"
+ 	depends on PCI && DEBUG_KERNEL
 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index 896a15d..53df583 100644
+index f9cf317..6b0539a 100644
 --- a/drivers/pci/msi.c
 +++ b/drivers/pci/msi.c
-@@ -23,7 +23,11 @@
+@@ -22,7 +22,11 @@
  #include "pci.h"
  #include "msi.h"
  
@@ -49,7 +64,7 @@ index 896a15d..53df583 100644
  
  /* Arch hooks */
  
-@@ -786,6 +790,11 @@ int pci_msi_enabled(void)
+@@ -836,6 +840,11 @@ int pci_msi_enabled(void)
  }
  EXPORT_SYMBOL(pci_msi_enabled);
  
@@ -62,10 +77,10 @@ index 896a15d..53df583 100644
  {
  	INIT_LIST_HEAD(&dev->msi_list);
 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 17bd932..e9bc9fe 100644
+index 1531f3a..3cb332b 100644
 --- a/drivers/pci/pci.c
 +++ b/drivers/pci/pci.c
-@@ -2393,6 +2393,8 @@ static int __init pci_setup(char *str)
+@@ -2983,6 +2983,8 @@ static int __init pci_setup(char *str)
  		if (*str && (str = pcibios_setup(str)) && *str) {
  			if (!strcmp(str, "nomsi")) {
  				pci_no_msi();
@@ -75,10 +90,10 @@ index 17bd932..e9bc9fe 100644
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 26ddf78..85efe81 100644
+index 4eb10f4..caa051e 100644
 --- a/drivers/pci/pci.h
 +++ b/drivers/pci/pci.h
-@@ -111,9 +111,11 @@ extern unsigned int pci_pm_d3_delay;
+@@ -122,9 +122,11 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
@@ -90,3 +105,6 @@ index 26ddf78..85efe81 100644
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
  #endif
  
+-- 
+1.7.0.1
+

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/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    6 +
 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                             |  123 ++++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    5 -
 23 files changed, 461 insertions(+), 28 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- linux-2.6-execshield.patch	18 Jan 2010 19:43:38 -0000	1.116
+++ linux-2.6-execshield.patch	30 Mar 2010 04:24:01 -0000	1.117
@@ -1,6 +1,6 @@
-From f19502d20f5c1e59244fa361496371f320dff55e Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
-Date: Mon, 18 Jan 2010 14:39:29 -0500
+From 5006dd0fae6126c149868102c100cd90a20ef2e3 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:20:18 -0400
 Subject: execshield
 
 ---
@@ -24,10 +24,10 @@ Subject: execshield
  include/linux/resource.h              |    5 +-
  include/linux/sched.h                 |    7 ++
  kernel/sysctl.c                       |   28 +++++++
- mm/mmap.c                             |  121 +++++++++++++++++++++++++++++--
+ mm/mmap.c                             |  123 +++++++++++++++++++++++++++++--
  mm/mprotect.c                         |   10 +++-
  mm/mremap.c                           |    4 +-
- 23 files changed, 459 insertions(+), 27 deletions(-)
+ 23 files changed, 461 insertions(+), 27 deletions(-)
 
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
 index 617bd56..526248d 100644
@@ -102,7 +102,7 @@ index 80a1dee..8314c66 100644
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index dd59a85..9ba7d12 100644
+index 5653f43..55dadb2 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
 @@ -289,6 +289,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
@@ -119,7 +119,7 @@ index dd59a85..9ba7d12 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 b1e70d5..0071abd 100644
+index db9ef55..19c2793 100644
 --- a/arch/x86/include/asm/paravirt_types.h
 +++ b/arch/x86/include/asm/paravirt_types.h
 @@ -118,6 +118,9 @@ struct pv_cpu_ops {
@@ -133,7 +133,7 @@ index b1e70d5..0071abd 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 fc801ba..8d2df5c 100644
+index b753ea5..4893156 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
 @@ -162,6 +162,9 @@ static inline int hlt_works(int cpu)
@@ -172,7 +172,7 @@ index 4868e4a..6c8d2ca 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 1b1739d..c2dda16 100644
+index 1db183e..238b97d 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
 @@ -345,6 +345,9 @@ struct pv_cpu_ops pv_cpu_ops = {
@@ -186,10 +186,10 @@ index 1b1739d..c2dda16 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 37ad1e0..9524afe 100644
+index f6c6266..8ac2589 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -257,7 +257,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -251,7 +251,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)
  {
@@ -200,7 +200,7 @@ index 37ad1e0..9524afe 100644
  	regs->fs		= 0;
  	set_fs(USER_DS);
  	regs->ds		= __USER_DS;
-@@ -266,6 +269,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -260,6 +263,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;
@@ -212,7 +212,7 @@ index 37ad1e0..9524afe 100644
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -325,6 +333,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -319,6 +327,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	if (preload_fpu)
  		prefetch(next->xstate);
  
@@ -222,7 +222,7 @@ index 37ad1e0..9524afe 100644
  	/*
  	 * Reload esp0.
  	 */
-@@ -418,3 +429,40 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -412,3 +423,40 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -264,7 +264,7 @@ index 37ad1e0..9524afe 100644
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 3339917..9b03688 100644
+index 1168e44..c452918 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
 @@ -115,6 +115,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
@@ -374,7 +374,7 @@ index 3339917..9b03688 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -860,19 +953,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -863,19 +956,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -422,7 +422,7 @@ index 3339917..9b03688 100644
  #endif
  
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index c8191de..7d84d01 100644
+index 1dab519..360f39d 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
 @@ -124,13 +124,16 @@ static unsigned long mmap_legacy_base(void)
@@ -472,7 +472,7 @@ index a3250aa..e0d9cce 100644
  		       "missing in CPU or disabled in BIOS!\n");
  	} else {
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 65b58e4..cf1ea57 100644
+index 426f3a1..e0286b1 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
@@ -510,10 +510,10 @@ index 02b442e..957bb67 100644
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 36daccb..4ad374a 100644
+index b607239..e426a3f 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -333,6 +333,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -334,6 +334,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -538,7 +538,7 @@ index 36daccb..4ad374a 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 = {
+@@ -960,6 +978,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -549,10 +549,10 @@ index 36daccb..4ad374a 100644
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index edd90c4..33f2f2d 100644
+index 535e763..d114af6 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
+@@ -74,7 +74,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -561,7 +561,7 @@ index edd90c4..33f2f2d 100644
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -721,6 +721,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -701,6 +701,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -573,7 +573,7 @@ index edd90c4..33f2f2d 100644
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -740,6 +745,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -717,6 +722,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -589,7 +589,7 @@ index edd90c4..33f2f2d 100644
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -747,7 +761,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -724,7 +738,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -599,7 +599,7 @@ index edd90c4..33f2f2d 100644
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -912,7 +927,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -890,7 +905,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -609,10 +609,10 @@ index edd90c4..33f2f2d 100644
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 60c467b..8eb1643 100644
+index e70f21b..44e6d63 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1148,7 +1148,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1259,7 +1259,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -628,10 +628,10 @@ index 60c467b..8eb1643 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 36f9627..bd4fe42 100644
+index b8bb9a6..f478e39 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -209,6 +209,9 @@ struct mm_struct {
+@@ -227,6 +227,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -659,7 +659,7 @@ index f1e914e..d2aef9a 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 6f7bba9..ffbcf8c 100644
+index dad7f66..c5a3948 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -102,6 +102,9 @@ struct fs_struct;
@@ -672,7 +672,7 @@ index 6f7bba9..ffbcf8c 100644
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -382,6 +385,10 @@ extern void arch_pick_mmap_layout(struct mm_struct *mm);
+@@ -390,6 +393,10 @@ extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -684,10 +684,10 @@ index 6f7bba9..ffbcf8c 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 8a68b24..2c605b1 100644
+index 8686b0f..a4fad81 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -87,6 +87,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -99,6 +99,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifndef CONFIG_MMU
  extern int sysctl_nr_trim_pages;
  #endif
@@ -711,10 +711,10 @@ index 8a68b24..2c605b1 100644
 +}
 +__setup("exec-shield=", setup_exec_shield);
 +
- #ifdef CONFIG_RCU_TORTURE_TEST
- extern int rcutorture_runnable;
- #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -410,6 +430,14 @@ static struct ctl_table kern_table[] = {
+ #ifdef CONFIG_BLOCK
+ extern int blk_iopoll_enabled;
+ #endif
+@@ -400,6 +420,14 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
@@ -730,7 +730,7 @@ index 8a68b24..2c605b1 100644
  	{
  		.procname	= "tainted",
 diff --git a/mm/mmap.c b/mm/mmap.c
-index ee22989..5bc99f8 100644
+index 75557c6..8173284 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -28,6 +28,7 @@
@@ -769,7 +769,7 @@ index ee22989..5bc99f8 100644
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -490,6 +505,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -489,6 +504,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -778,16 +778,16 @@ index ee22989..5bc99f8 100644
  }
  
  /*
-@@ -797,6 +814,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,
+ 			err = vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
 +		if (prev->vm_flags & VM_EXEC)
 +			arch_add_exec_range(mm, prev->vm_end);
+ 		if (err)
+ 			return NULL;
  		return prev;
- 	}
- 
-@@ -947,7 +966,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -952,7 +971,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.
  	 */
@@ -797,7 +797,7 @@ index ee22989..5bc99f8 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1479,8 +1499,8 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1504,8 +1524,8 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -808,7 +808,7 @@ index ee22989..5bc99f8 100644
  {
  	unsigned long (*get_area)(struct file *, unsigned long,
  				  unsigned long, unsigned long, unsigned long);
-@@ -1493,7 +1513,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1518,7 +1538,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  	if (len > TASK_SIZE)
  		return -ENOMEM;
  
@@ -821,7 +821,7 @@ index ee22989..5bc99f8 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);
-@@ -1507,8 +1531,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1532,8 +1556,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -899,31 +899,33 @@ index ee22989..5bc99f8 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)
-@@ -1583,6 +1675,14 @@ out:
+@@ -1608,6 +1700,16 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
 +static int over_stack_limit(unsigned long sz)
 +{
++	struct rlimit *rlim = current->signal->rlim;
++
 +	if (sz < EXEC_STACK_BIAS)
 +		return 0;
 +	return (sz - EXEC_STACK_BIAS) >
-+			current->signal->rlim[RLIMIT_STACK].rlim_cur;
++			ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur);
 +}
 +
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1599,7 +1699,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1624,7 +1726,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
--	if (size > rlim[RLIMIT_STACK].rlim_cur)
+-	if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
 +	if (over_stack_limit(size))
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1906,10 +2006,14 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1936,10 +2038,14 @@ static 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);
  
@@ -931,16 +933,16 @@ index ee22989..5bc99f8 100644
 +	if (new_below) {
 +		unsigned long old_end = vma->vm_end;
 +
- 		vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff +
+ 		err = vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff +
  			((addr - new->vm_start) >> PAGE_SHIFT), new);
 -	else
 +		if (vma->vm_flags & VM_EXEC)
 +			arch_remove_exec_range(mm, old_end);
 +	} else
- 		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
+ 		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
- 	return 0;
-@@ -2176,6 +2280,7 @@ void exit_mmap(struct mm_struct *mm)
+ 	/* Success. */
+@@ -2223,6 +2329,7 @@ void exit_mmap(struct mm_struct *mm)
  
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -987,10 +989,10 @@ index 8bc969d..3c9b4fc 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 8451908..d5de807 100644
+index e9c75ef..0a5379f 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -485,10 +485,10 @@ unsigned long do_mremap(unsigned long addr,
+@@ -488,10 +488,10 @@ unsigned long do_mremap(unsigned long addr,
  		if (vma->vm_flags & VM_MAYSHARE)
  			map_flags |= MAP_SHARED;
  
@@ -1004,5 +1006,5 @@ index 8451908..d5de807 100644
  			ret = new_addr;
  			goto out;
 -- 
-1.6.5.2
+1.7.0.1
 

linux-2.6-input-kill-stupid-messages.patch:
 atkbd.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6-input-kill-stupid-messages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-input-kill-stupid-messages.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-input-kill-stupid-messages.patch	12 Feb 2008 06:18:04 -0000	1.5
+++ linux-2.6-input-kill-stupid-messages.patch	30 Mar 2010 04:24:02 -0000	1.6
@@ -1,17 +1,40 @@
---- linux-2.6.21.noarch/drivers/input/keyboard/atkbd.c~	2007-07-06 10:51:04.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/input/keyboard/atkbd.c	2007-07-06 10:51:33.000000000 -0400
-@@ -409,10 +409,14 @@ static irqreturn_t atkbd_interrupt(struc
- 			goto out;
- 		case ATKBD_RET_ACK:
- 		case ATKBD_RET_NAK:
+From b2c6d55b2351152696aafb8c9bf3ec8968acf77c Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:59:58 -0400
+Subject: linux-2.6-input-kill-stupid-messages
+
+---
+ drivers/input/keyboard/atkbd.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
+index d358ef8..38db098 100644
+--- a/drivers/input/keyboard/atkbd.c
++++ b/drivers/input/keyboard/atkbd.c
+@@ -410,6 +410,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
+ 	}
+ 
+ 	switch (code) {
++<<<<<<< HEAD
+ 	case ATKBD_RET_BAT:
+ 		atkbd->enabled = false;
+ 		serio_reconnect(atkbd->ps2dev.serio);
+@@ -425,11 +426,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
+ 		goto out;
+ 	case ATKBD_RET_ACK:
+ 	case ATKBD_RET_NAK:
 +#if 0
-+			/* Quite a few key switchers and other tools trigger this and it confuses
-+			   people who can do nothing about it */
- 			if (printk_ratelimit())
- 				printk(KERN_WARNING "atkbd.c: Spurious %s on %s. "
- 				       "Some program might be trying access hardware directly.\n",
- 				       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
++		/* Quite a few key switchers and other tools trigger this
++		 * and it confuses people who can do nothing about it */
+ 		if (printk_ratelimit())
+ 			dev_warn(&serio->dev,
+ 				 "Spurious %s on %s. "
+ 				 "Some program might be trying access hardware directly.\n",
+ 				 data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
 +#endif
- 			goto out;
- 		case ATKBD_RET_ERR:
- 			atkbd->err_count++;
+ 		goto out;
+ 	case ATKBD_RET_ERR:
+ 		atkbd->err_count++;
+-- 
+1.7.0.1
+


--- crystalhd-2.6.34-staging.patch DELETED ---


--- linux-2.6-dell-laptop-rfkill-fix.patch DELETED ---


--- linux-2.6-g5-therm-shutdown.patch DELETED ---


--- linux-2.6-input-fix-toshiba-hotkeys.patch DELETED ---


--- linux-2.6-nfs4-callback-hidden.patch DELETED ---


--- linux-2.6-pciehp-update.patch DELETED ---


--- linux-2.6.30-hush-rom-warning.patch DELETED ---

