Mon May 28 03:29:46 UTC 2007

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8714

Modified Files:
	kernel-2.6.spec linux-2.6-ata-quirk.patch 
	linux-2.6-build-nonintconfig.patch 
	linux-2.6-debug-boot-delay.patch 
	linux-2.6-debug-must_check.patch 
	linux-2.6-debug-spinlock-taint.patch 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-defaults-fat-utf8.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch linux-2.6-modsign-verify.patch 
	linux-2.6-obsolete-oss-warning.patch 
	linux-2.6-raid-autorun.patch linux-2.6-sleepon.patch 
	linux-2.6-unexport-symbols.patch 
	linux-2.6-vm-silence-atomic-alloc-failures.patch 
Removed Files:
	linux-2.6-PT_LOAD-align.patch 
	linux-2.6-acpi-clear-fadt_cstate-control.patch 
	linux-2.6-module_version.patch 
Log Message:
* Sun May 27 2007 Dave Jones <davej at redhat.com>
- Apply all patches using -F1, rediff where necessary.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3180
retrieving revision 1.3181
diff -u -r1.3180 -r1.3181

--- kernel-2.6.spec	28 May 2007 01:55:04 -0000	1.3180
+++ kernel-2.6.spec	28 May 2007 03:29:08 -0000	1.3181
@@ -377,207 +377,6 @@
 Source81: config-rhel-x86-generic
 Source82: config-olpc-generic
 
-#
-# Patches 0 through 100 are meant for core subsystem upgrades
-#
-Patch1: patch-2.6.22-rc3.bz2
-
-# Patches 10 through 99 are for things that are going upstream really soon.
-Patch10: linux-2.6-utrace.patch
-Patch11: nouveau-drm.patch
-
-# enable sysrq-c on all kernels, not only kexec
-# FIXME: upstream soon? When? It's been here for ages.
-Patch16: linux-2.6-sysrq-c.patch
-
-# Patches 100 through 500 are meant for architecture patches
-
-# 200 - 299   x86(-64)
-
-Patch200: linux-2.6-x86-tune-generic.patch
-Patch201: linux-2.6-x86-vga-vidfail.patch
-Patch202: linux-2.6-x86-64-edac-support.patch
-Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
-Patch206: linux-2.6-x86-fsc-interrupt-controller-quirk.patch
-Patch207: linux-2.6-x86-dell-hpet.patch
-
-# 300 - 399   ppc(64)
-Patch300: linux-2.6-g5-therm-shutdown.patch
-Patch301: linux-2.6-powerpc-slabalign.patch
-Patch303: linux-2.6-ppc32-ucmpdi2.patch
-Patch304: linux-2.6-ibmvscsi-schizo.patch
-Patch305: linux-2.6-pmac-zilog.patch
-
-# 500 - 599   s390x
-
-# 600 - 699   sparc(64)
-
-# 700 - 799   alpha
-
-#
-# Patches 800 through 899 are reserved for bugfixes to the core system
-# and patches related to how RPMs are build
-#
-Patch800: linux-2.6-build-nonintconfig.patch
-
-# Exec-shield.
-Patch810: linux-2.6-execshield.patch
-
-# Module signing infrastructure.
-Patch900: linux-2.6-modsign-mpilib.patch
-Patch901: linux-2.6-modsign-crypto.patch
-Patch902: linux-2.6-modsign-include.patch
-Patch903: linux-2.6-modsign-verify.patch
-Patch904: linux-2.6-modsign-ksign.patch
-Patch905: linux-2.6-modsign-core.patch
-Patch906: linux-2.6-modsign-script.patch
-
-# Tux http accelerator.
-Patch910: linux-2.6-tux.patch
-
-# 950 - 999 Xen
-Patch950: linux-2.6-xen.patch
-Patch951: linux-2.6-xen-utrace.patch
-Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
-Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
-Patch954: linux-2.6-xen-execshield.patch
-Patch955: linux-2.6-xen-tux.patch
-Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch960: linux-2.6-xen-blktap-fixes.patch
-Patch961: linux-2.6-xen-blktap-cleanup.patch
-Patch962: linux-2.6-xen-blktap-dynamic-major.patch
-Patch963: linux-2.6-xen-blktap-sysfs.patch
-Patch990: linux-2.6-xen-pvfb.patch
-
-#
-# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
-#
-
-Patch1010: linux-2.6-debug-sizeof-structs.patch
-Patch1011: linux-2.6-debug-slab-backtrace.patch
-Patch1012: linux-2.6-debug-nmi-timeout.patch
-Patch1013: linux-2.6-debug-taint-vm.patch
-Patch1015: linux-2.6-debug-spinlock-taint.patch
-Patch1016: linux-2.6-debug-extra-warnings.patch
-Patch1017: linux-2.6-debug-slub-debug.patch
-Patch1018: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1019: linux-2.6-debug-must_check.patch
-Patch1020: linux-2.6-debug-no-quiet.patch
-Patch1021: linux-2.6-debug-boot-delay.patch
-Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
-Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
-
-# Restrict /dev/mem usage.
-Patch1050: linux-2.6-devmem.patch
-Patch1051: linux-2.6-devmem-xen.patch
-
-# Provide read only /dev/crash driver.
-Patch1060: linux-2.6-crash-driver.patch
-Patch1061: linux-2.6-crash-driver-xen.patch
-
-Patch1070: linux-2.6-sleepon.patch
-
-# SCSI bits.
-Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
-
-# NFS bits.
-Patch1201: linux-2.6-NFSD-badness.patch
-
-# NIC driver fixes
-
-# Filesystem stuff.
-# Squashfs
-Patch1400: linux-2.6-squashfs.patch
-
-# Networking core.
-Patch1500: linux-2.6-net-silence-noisy-printks.patch
-
-# Misc bits.
-Patch1600: linux-2.6-module_version.patch
-Patch1601: linux-2.6-sha_alignment.patch
-Patch1610: linux-2.6-input-kill-stupid-messages.patch
-Patch1640: linux-2.6-module-override-modparam-cmdline.patch
-Patch1650: linux-2.6-serial-460800.patch
-Patch1681: linux-2.6-xfs-umount-fix.patch
-Patch1690: linux-2.6-PT_LOAD-align.patch
-Patch1720: linux-2.6-proc-self-maps-fix.patch
-Patch1740: linux-2.6-softlockup-disable.patch
-Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1771: linux-2.6-silence-noise.patch
-Patch1791: linux-2.6-libertas.diff
-Patch1792: linux-2.6-olpc-touchpad.diff
-Patch1793: linux-2.6-raid-autorun.patch
-Patch1794: linux-2.6-i82875-edac-pci-setup.patch
-Patch1795: linux-2.6-crap-sysfs-workaround.patch
-
-# SELinux/audit patches.
-Patch1801: linux-2.6-selinux-mprotect-checks.patch
-
-# Warn about usage of various obsolete functionality that may go away.
-Patch1900: linux-2.6-obsolete-oss-warning.patch
-
-# no external module should use these symbols.
-Patch1910: linux-2.6-unexport-symbols.patch
-
-# VM bits.
-Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-
-# Tweak some defaults.
-Patch2100: linux-2.6-defaults-fat-utf8.patch
-Patch2103: linux-2.6-defaults-unicode-vt.patch
-Patch2105: linux-2.6-defaults-nonmi.patch
-Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch
-
-# ATA Bits
-Patch2200: linux-2.6-sata-promise-pata-ports.patch
-Patch2201: linux-2.6-libata-hpa.patch
-Patch2203: linux-2.6-libata-ali-atapi-dma.patch
-Patch2204: linux-2.6-ata-quirk.patch
-
-# Wireless bits
-Patch2300: linux-2.6-wireless.patch
-Patch2301: git-wireless-dev.patch
-Patch2302: git-iwlwifi.patch
-Patch2303: linux-2.6-bcm43xx-pci-neuter.patch
-Patch2304: linux-2.6-iwlwifi-preferred_rate_control.patch
-Patch2305: linux-2.6-iwlwifi-irq_tasklet.patch
-Patch2306: linux-2.6-mac80211-fixes.patch
-Patch2307: linux-2.6-iwlwifi-sw-scan-default.patch
-Patch2308: linux-2.6-mac80211-scan-optimizations.patch
-Patch2309: linux-2.6-bcm43xx-mac80211-fixes.patch
-
-# Assorted dyntick/clock/timer fixes.
-Patch2403: linux-2.6-clockevents-fix-resume-logic.patch
-
-# ACPI bits
-Patch2500: linux-2.6-acpi-clear-fadt_cstate-control.patch
-Patch2501: linux-2.6-acpi-dock-oops.patch
-
-# Excessive wakeups.
-Patch2600: linux-2.6-wakeups-hdaps.patch
-
-# Add the new firewire stack. Diff between the v2.6.20 tag and commit
-# a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
-Patch5000: linux-2.6-firewire.patch
-
-#
-# 10000 to 20000 is for stuff that has to come last due to the
-# amount of drivers they touch. But only these should go here.
-# Not patches you're too lazy for to put in the proper place.
-#
-
-Patch10000: linux-2.6-compile-fixes.patch
-Patch10001: linux-2.6-warnings-inline.patch
-Patch10002: linux-2.6-warnings-emptymacros.patch
-Patch10003: linux-2.6-warnings-register.patch
-
-# Xen hypervisor patches (20000+)
-Patch20000: xen-printf-rate-limit.patch
-Patch20001: xen-11668-hvm_disable_fix.patch
-Patch20002: xen-dom0-reboot.patch
-
-# END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
 
@@ -961,310 +760,257 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
+ApplyPatch()
+{
+    patch -p1 -F1 -s < ../../$1
+}
+
+
 # Update to latest upstream.
-%patch1 -p1
+bzcat ../../patch-2.6.22-rc3.bz2 | patch -p1 -F1 -s
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Roland's utrace ptrace replacement.
-%patch10 -p1
+ApplyPatch linux-2.6-utrace.patch
 
-# Nouveau
-#%patch11 -p1
+# Nouveau DRM
+#ApplyPatch nouveau-drm.patch
 
-# sysrq works always
-%patch16 -p1
+# enable sysrq-c on all kernels, not only kexec
+# FIXME: upstream soon? When? It's been here for ages.
+ApplyPatch linux-2.6-sysrq-c.patch
 
 # Architecture patches
-
-#
 # x86(-64)
-#
 # Compile 686 kernels tuned for Pentium4.
-%patch200 -p1
+ApplyPatch linux-2.6-x86-tune-generic.patch
 # add vidfail capability;
 # without this patch specifying a framebuffer on the kernel prompt would
 # make the boot stop if there's no supported framebuffer device; this is bad
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
-%patch201 -p1
+ApplyPatch linux-2.6-x86-vga-vidfail.patch
 # EDAC support for K8
-%patch202 -p1
+ApplyPatch linux-2.6-x86-64-edac-support.patch
 # Suppress APIC errors on UP x86-64.
-%patch203 -p1
+ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # quirk for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller
-%patch206 -p1
+ApplyPatch linux-2.6-x86-fsc-interrupt-controller-quirk.patch
 # Blacklist Dell Optiplex 320 from using the HPET
-%patch207 -p1
+ApplyPatch linux-2.6-x86-dell-hpet.patch
 
 #
 # PowerPC
 #
 # Alleviate G5 thermal shutdown problems
-%patch300 -p1
+ApplyPatch linux-2.6-g5-therm-shutdown.patch
 # Ensure slab objects are aligned enough for a uint64_t (#235392)
-%patch301 -p1
-#%patch302 -p1
+#ApplyPatch linux-2.6-powerpc-slabalign.patch
 # Temporary hack to work around GCC PR #25724 / #21237
-%patch303 -p1
+ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 # Fix up ibmvscsi for combined pSeries/iSeries build
-%patch304 -p1
+ApplyPatch linux-2.6-ibmvscsi-schizo.patch
 # Move pmac_zilog to its newly-registered device number
-%patch305 -p1
+ApplyPatch linux-2.6-pmac-zilog.patch
 
-# S390
 
 #
-# Patches 800 through 899 are reserved for bugfixes to the core system
-# and patches related to how RPMs are build
+# Bugfixes to the core system and patches related to how RPMs are build
 #
 
-
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
 # builds (as used in the buildsystem).
-%patch800 -p1
+ApplyPatch linux-2.6-build-nonintconfig.patch
 
 # Exec shield
-%patch810 -p1
+ApplyPatch linux-2.6-execshield.patch
 
 #
 # GPG signed kernel modules
 #
-%patch900 -p1
-%patch901 -p1
-%patch902 -p1
-%patch903 -p1
-%patch904 -p1
-%patch905 -p1
-%patch906 -p1
-
-# Tux
-#%patch910 -p1
+ApplyPatch linux-2.6-modsign-mpilib.patch
+ApplyPatch linux-2.6-modsign-crypto.patch
+ApplyPatch linux-2.6-modsign-include.patch
+ApplyPatch linux-2.6-modsign-verify.patch
+ApplyPatch linux-2.6-modsign-ksign.patch
+ApplyPatch linux-2.6-modsign-core.patch
+ApplyPatch linux-2.6-modsign-script.patch
 
 #
 # Xen
 #
 %if %{includexen}
-#
-# Apply the main xen patch...
-#%patch951 -p1
-%patch950 -p1 -b .p.xen
-#
-# ... and back out all the tpm additions, they need fixing
-#
-for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \
-    g=`dirname $f`/`basename $f .p.xen`; \
-    mv "$f" "$g"; \
-    if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
-done
-# Delete the rest of the backup files, they just confuse the build later
-find -name "*.p.xen" | xargs rm -f
-
-# Xen utrace
-%patch951 -p1
-%patch952 -p1
-%patch953 -p1
-# Xen exec-shield bits
-%patch954 -p1
-%patch955 -p1
-%patch956 -p1
-# ia64 xen cleanups for kexec/kdump
-%patch958 -p1
-
-# xen blktap fixes
-%patch960 -p1
-# The blktap patch needs to rename a file.  For now, that is far more easily
-# done in the spec file than in the patch itself.
-mv drivers/xen/blktap/blktap.c drivers/xen/blktap/blktapmain.c
-%patch961 -p1
-%patch962 -p1
-%patch963 -p1
-
-# xen framebuffer patches
-%patch990 -p1
-
+ApplyPatch linux-2.6-xen.patch
 %endif
 
 #
-# Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
+# bugfixes to drivers and filesystems
 #
 
 
 # Various low-impact patches to aid debugging.
-%patch1010 -p1
-%patch1011 -p1
-%patch1012 -p1
-%patch1013 -p1
-%patch1015 -p1
+ApplyPatch linux-2.6-debug-sizeof-structs.patch
+ApplyPatch linux-2.6-debug-nmi-timeout.patch
+ApplyPatch linux-2.6-debug-taint-vm.patch
+ApplyPatch linux-2.6-debug-spinlock-taint.patch
+
 %if ! %{debugbuildsenabled}
 # Only spew extra warnings on rawhide builds.
-%patch1016 -p1
+ApplyPatch linux-2.6-debug-extra-warnings.patch
 # Turn slub debug on by default in rawhide
-%patch1017 -p1
-%endif
-%patch1018 -p1
-%patch1019 -p1
-%patch1020 -p1
-%patch1021 -p1
-%patch1022 -p1
-%if %{includexen}
-%patch1023 -p1
+ApplyPatch linux-2.6-debug-slub-debug.patch
 %endif
 
+ApplyPatch linux-2.6-debug-sleep-in-irq-warning.patch
+ApplyPatch linux-2.6-debug-must_check.patch
+ApplyPatch linux-2.6-debug-no-quiet.patch
+ApplyPatch linux-2.6-debug-boot-delay.patch
+ApplyPatch linux-2.6-debug-sysfs-crash-debugging.patch
+
 #
 # Make /dev/mem a need-to-know function
 #
-%patch1050 -p1
+ApplyPatch linux-2.6-devmem.patch
 %if %{includexen}
-%patch1051 -p1
+ApplyPatch linux-2.6-devmem-xen.patch
 %endif
 
 #
 # /dev/crash driver for the crashdump analysis tool
 #
-%patch1060 -p1
+ApplyPatch linux-2.6-crash-driver.patch
 %if %{includexen}
-%patch1061 -p1
+ApplyPatch linux-2.6-crash-driver-xen.patch
 %endif
 
 #
 # Most^WAll users of sleep_on are broken; fix a bunch
 #
-%patch1070 -p1
+ApplyPatch linux-2.6-sleepon.patch
 
 #
 # SCSI Bits.
 #
 # fix cpqarray pci enable
-%patch1106 -p1
+ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
 #
 # Various NFS/NFSD fixes.
 #
 # Fix badness.
-%patch1201 -p1
-
-# NIC driver fixes
+ApplyPatch linux-2.6-NFSD-badness.patch
 
 # Filesystem patches.
 # Squashfs
-%patch1400 -p1
+ApplyPatch linux-2.6-squashfs.patch
 
 # Networking
 # Disable easy to trigger printk's.
-%patch1500 -p1
+ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 
 # Misc fixes
-# Add missing MODULE_VERSION tags to some modules.
-%patch1600 -p1
 # Fix SHA1 alignment problem on ia64
-%patch1601 -p1
+ApplyPatch linux-2.6-sha_alignment.patch
 # The input layer spews crap no-one cares about.
-%patch1610 -p1
-# Allow overriding module parameters from kernel command_line
-#%patch1640 -p1
+ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 # Allow to use 480600 baud on 16C950 UARTs
-%patch1650 -p1
+ApplyPatch linux-2.6-serial-460800.patch
 # Fix XFS umount bug.
-%patch1681 -p1
-# Align kernel data segment to page boundary.
-%patch1690 -p1
+ApplyPatch linux-2.6-xfs-umount-fix.patch
 # setuid /proc/self/maps fix.
-%patch1720 -p1
+ApplyPatch linux-2.6-proc-self-maps-fix.patch
 # Add a safety net to softlockup so that it doesn't prevent installs.
-%patch1740 -p1
+ApplyPatch linux-2.6-softlockup-disable.patch
 # Speed up spinlock debug.
-%patch1770 -p1
+ApplyPatch linux-2.6-optimise-spinlock-debug.patch
 # Silence some useless messages that still get printed with 'quiet'
-%patch1771 -p1
+ApplyPatch linux-2.6-silence-noise.patch
 
 # OLPC specific patches
 %if 0%{?olpc}
 # Marvell Libertas wireless driver
-%patch1791 -p1
+ApplyPatch linux-2.6-libertas.diff
 # OLPC touchpad
-%patch1792 -p1
+ApplyPatch linux-2.6-olpc-touchpad.diff
 %endif
 
 # temporarily restore START_ARRAY ioctl
-%patch1793 -p1
+ApplyPatch linux-2.6-raid-autorun.patch
 # Work around sysfs/uevent use-after-free problems with Bluetooth HID
-%patch1795 -p1
+ApplyPatch linux-2.6-crap-sysfs-workaround.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-%patch1801 -p1
+ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 
 # Warn about obsolete functionality usage.
-%patch1900 -p1
+ApplyPatch linux-2.6-obsolete-oss-warning.patch
+
 # Remove kernel-internal functionality that nothing external should use.
-%patch1910 -p1
+ApplyPatch linux-2.6-unexport-symbols.patch
 
 #
 # VM related fixes.
 #
 # Silence GFP_ATOMIC failures.
-%patch2001 -p1
+ApplyPatch linux-2.6-vm-silence-atomic-alloc-failures.patch
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
-%patch2100 -p1
+ApplyPatch linux-2.6-defaults-fat-utf8.patch
 # Use unicode VT's by default.
-%patch2103 -p1
+ApplyPatch linux-2.6-defaults-unicode-vt.patch
 # Disable NMI watchdog by default.
-%patch2105 -p1
+ApplyPatch linux-2.6-defaults-nonmi.patch
 # Disable MMCONFIG & MSI by default.
-#%patch2106 -p1
+#ApplyPatch linux-2.6-defaults-pci_no_msi_mmconf.patch
 
 # Enable PATA ports on Promise SATA.
-#%patch2200 -p1
+#ApplyPatch linux-2.6-sata-promise-pata-ports.patch
 # Disable ATAPI DMA on ALI chipsets.
-%patch2203 -p1
+ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
-%patch2204 -p1
+ApplyPatch linux-2.6-ata-quirk.patch
 
 # Add critical wireless updates from 2.6.22
-#%patch2300 -p1
+#ApplyPatch linux-2.6-wireless.patch
 # Add the new wireless stack and drivers from wireless-dev
-#%patch2301 -p1
+#ApplyPatch git-wireless-dev.patch
 # ...and the iwlwifi driver from Intel
-#%patch2302 -p1
+#ApplyPatch git-iwlwifi.patch
 # avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
-#%patch2303 -p1
+#ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
 # let iwl3945 specify its preferred rate control algorithm
-#%patch2304 -p1
+#ApplyPatch linux-2.6-iwlwifi-preferred_rate_control.patch
 # kill iwl3945 irq_tasklet at module remove 
-#%patch2305 -p1
+#ApplyPatch linux-2.6-iwlwifi-irq_tasklet.patch
 # some mac80211 bug fixes (defrag mem leak, reassoc failure handling)
-#%patch2306 -p1
+#ApplyPatch linux-2.6-mac80211-fixes.patch
 # iwl3945: default to sw scan
-#%patch2307 -p1
+#ApplyPatch linux-2.6-iwlwifi-sw-scan-default.patch
 # mac80211: improve scan performance
-#%patch2308 -p1
+#ApplyPatch linux-2.6-mac80211-scan-optimizations.patch
 # bcm43xx-mac80211: important phy and ssb bus fixes
-#%patch2309 -p1
+#ApplyPatch linux-2.6-bcm43xx-mac80211-fixes.patch
 
 # Assorted dyntick/clock/timer fixes.
-%patch2403 -p1
+ApplyPatch linux-2.6-clockevents-fix-resume-logic.patch
 
 # ACPI patches
-# ACPI: Fix 2.6.21 boot regression on P4/HT
-%patch2500 -p1
 # Fix ACPI dock oops (#238054)
-%patch2501 -p1
+ApplyPatch linux-2.6-acpi-dock-oops.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
-%patch2600 -p1
+ApplyPatch linux-2.6-wakeups-hdaps.patch
 
-#
-# Patches 5000 to 6000 are reserved for new drivers that are about to
-# be merged upstream
-#
 
 # Pull in the new firewire stack
-#%patch5000 -p1
+#  Diff between the v2.6.20 tag and commit
+# a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
+#ApplyPatch linux-2.6-firewire.patch
 
 #
 # final stuff
@@ -1273,10 +1019,10 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
-%patch10001 -p1
-%patch10002 -p1
-%patch10003 -p1
+#ApplyPatch linux-2.6-compile-fixes.patch
+ApplyPatch linux-2.6-warnings-inline.patch
+ApplyPatch linux-2.6-warnings-emptymacros.patch
+ApplyPatch linux-2.6-warnings-register.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1327,9 +1073,11 @@
 %setup -D -T -q -n %{name}-%{version} -a1
 cd xen
 # Any necessary hypervisor patches go here
-%patch20000 -p1
-%patch20001 -p2
-%patch20002 -p2
+
+# Xen hypervisor patches (20000+)
+ApplyPatch xen-printf-rate-limit.patch
+ApplyPatch xen-11668-hvm_disable_fix.patch
+ApplyPatch xen-dom0-reboot.patch
 %endif
 
 
@@ -2223,6 +1971,9 @@
 
 %changelog
 * Sun May 27 2007 Dave Jones <davej at redhat.com>
+- Apply all patches using -F1, rediff where necessary.
+
+* Sun May 27 2007 Dave Jones <davej at redhat.com>
 - Switch to using slub as allocator by default.
 
 * Sun May 27 2007 Dave Jones <davej at redhat.com>

linux-2.6-ata-quirk.patch:

Index: linux-2.6-ata-quirk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ata-quirk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ata-quirk.patch	27 Feb 2007 02:02:54 -0000	1.1
+++ linux-2.6-ata-quirk.patch	28 May 2007 03:29:08 -0000	1.2
@@ -46,13 +46,13 @@
 +
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_11, quirk_intel_ide_controller);
 +
---- linux-2.6.20/arch/ia64/kernel/Makefile	2007-02-08 02:13:41.000000000 -0500
-+++ linux-2.6.20_fix/arch/ia64/kernel/Makefile	2007-02-12 09:49:39.000000000 -0500
+--- linux-2.6.21.noarch/arch/ia64/kernel/Makefile~	2007-05-27 23:23:36.000000000 -0400
++++ linux-2.6.21.noarch/arch/ia64/kernel/Makefile	2007-05-27 23:23:48.000000000 -0400
 @@ -33,6 +33,7 @@ obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
  obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o
  obj-$(CONFIG_AUDIT)		+= audit.o
  obj-$(CONFIG_PCI_MSI)		+= msi_ia64.o
 +obj-$(CONFIG_PCI)		+= quirks.o
  mca_recovery-y			+= mca_drv.o mca_drv_asm.o
+ obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
  
- obj-$(CONFIG_IA64_ESI)		+= esi.o

linux-2.6-build-nonintconfig.patch:

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-build-nonintconfig.patch	27 Jun 2006 00:39:13 -0000	1.6
+++ linux-2.6-build-nonintconfig.patch	28 May 2007 03:29:08 -0000	1.7
@@ -42,9 +42,9 @@
  		case ask_new:
  		case ask_silent:
  			if (!is_new) {
-@@ -472,7 +485,10 @@ static void check_conf(struct menu *menu
+@@ -495,7 +495,10 @@ static void check_conf(struct menu *menu
  			if (!conf_cnt++)
- 				printf("*\n* Restart config...\n*\n");
+ 				printf(_("*\n* Restart config...\n*\n"));
  			rootEntry = menu_get_parent_menu(menu);
 -			conf(rootEntry);
 +			if (input_mode == dont_ask)
@@ -52,9 +52,9 @@
 +			else
 +				conf(rootEntry);
  		}
- 		if (sym_is_choice(sym) && sym_get_tristate_value(sym) != mod)
- 			return;
-@@ -493,6 +509,9 @@ int main(int ac, char **av)
+ 	}
+ 
+@@ -517,6 +517,9 @@ int main(int ac, char **av)
  		case 'o':
  			input_mode = ask_new;
  			break;
@@ -100,41 +100,3 @@
  update-po-config: $(obj)/kxgettext
  	xgettext --default-domain=linux \
            --add-comments --keyword=_ --keyword=N_ \
---- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-10 14:55:46.000000000 -0500
-+++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-10 14:56:01.000000000 -0500
-@@ -161,7 +161,7 @@ load:
- 			if (def == S_DEF_USER) {
- 				sym = sym_find(line + 9);
- 				if (!sym) {
--					conf_warning("trying to assign nonexistent symbol %s", line + 9);
-+					conf_warning("trying to assign nonexistent symbol %s", line + 9);
- 					break;
- 				}
- 			} else {
-@@ -197,7 +197,7 @@ load:
- 			if (def == S_DEF_USER) {
- 				sym = sym_find(line + 7);
- 				if (!sym) {
--					conf_warning("trying to assign nonexistent symbol %s", line + 7);
-+					conf_warning("trying to assign nonexistent symbol %s", line + 7);
- 					break;
- 				}
- 			} else {
---- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-15 23:51:37.000000000 -0500
-+++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-15 23:52:50.000000000 -0500
-@@ -153,7 +153,6 @@ int conf_read_simple(const char *name)
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
--				break;
- 			}
- 			switch (sym->type) {
- 			case S_BOOLEAN:
-@@ -183,7 +182,6 @@ int conf_read_simple(const char *name)
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
--				break;
- 			}
- 			switch (sym->type) {
- 			case S_TRISTATE:

linux-2.6-debug-boot-delay.patch:

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-boot-delay.patch	12 Dec 2006 15:03:47 -0000	1.4
+++ linux-2.6-debug-boot-delay.patch	28 May 2007 03:29:08 -0000	1.5
@@ -69,17 +69,17 @@
  static int __init lpj_setup(char *str)
  {
  	preset_lpj = simple_strtoul(str,NULL,0);
---- linux-2615-work.orig/kernel/printk.c
-+++ linux-2615-work/kernel/printk.c
-@@ -23,6 +23,8 @@
- #include <linux/smp_lock.h>
+--- linux-2.6.21.noarch/kernel/printk.c~	2007-05-27 23:01:29.000000000 -0400
++++ linux-2.6.21.noarch/kernel/printk.c	2007-05-27 23:01:37.000000000 -0400
+@@ -22,6 +22,8 @@
+ #include <linux/tty_driver.h>
  #include <linux/console.h>
  #include <linux/init.h>
 +#include <linux/jiffies.h>
 +#include <linux/nmi.h>
  #include <linux/module.h>
+ #include <linux/moduleparam.h>
  #include <linux/interrupt.h>			/* For in_interrupt() */
- #include <linux/config.h>
 @@ -201,6 +202,34 @@ out:
  
  __setup("log_buf_len=", log_buf_len_setup);
@@ -127,11 +127,11 @@
  	return r;
  }
  
---- linux-2615-work.orig/lib/Kconfig.debug
-+++ linux-2615-work/lib/Kconfig.debug
-@@ -186,6 +186,24 @@ config FRAME_POINTER
- 	  some architectures or if you use external debuggers.
- 	  If you don't debug the kernel, you can say N.
+--- linux-2.6.21.noarch/lib/Kconfig.debug~	2007-05-27 23:02:18.000000000 -0400
++++ linux-2.6.21.noarch/lib/Kconfig.debug	2007-05-27 23:03:14.000000000 -0400
+@@ -394,6 +394,24 @@ config FORCED_INLINING
+ 	  become the default in the future, until then this option is there to
+ 	  test gcc for this.
  
 +config BOOT_DELAY
 +	bool "Delay each boot message by N milliseconds"
@@ -154,4 +154,3 @@
  config RCU_TORTURE_TEST
  	tristate "torture tests for RCU"
  	depends on DEBUG_KERNEL
-

linux-2.6-debug-must_check.patch:

Index: linux-2.6-debug-must_check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-must_check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-must_check.patch	17 Feb 2006 19:07:26 -0000	1.1
+++ linux-2.6-debug-must_check.patch	28 May 2007 03:29:08 -0000	1.2
@@ -45,12 +45,12 @@
  {
  	if (nbits <= BITS_PER_LONG)
  		return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
-@@ -239,7 +239,7 @@ static inline int bitmap_full(const unsi
+@@ -248,7 +248,7 @@ static inline int __must_check bitmap_fu
  		return __bitmap_full(src, nbits);
  }
  
 -static inline int bitmap_weight(const unsigned long *src, int nbits)
 +static inline int __must_check bitmap_weight(const unsigned long *src, int nbits)
  {
- 	return __bitmap_weight(src, nbits);
- }
+ 	if (nbits <= BITS_PER_LONG)
+ 		return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));

linux-2.6-debug-spinlock-taint.patch:

Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-debug-spinlock-taint.patch	4 Jul 2006 21:03:12 -0000	1.6
+++ linux-2.6-debug-spinlock-taint.patch	28 May 2007 03:29:08 -0000	1.7
@@ -12,18 +12,18 @@
  	printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
  			".owner_cpu: %d\n",
  		lock, lock->magic,
-@@ -112,9 +112,9 @@ static void __spin_lock_debug(spinlock_t
+@@ -114,9 +114,9 @@ static void __spin_lock_debug(spinlock_t
  		if (print_once) {
  			print_once = 0;
  			printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
 -					"%s/%d, %p\n",
-+					"%s/%d, %p (%s)\n",
++					"%s/%d, %p [%s]\n",
  				raw_smp_processor_id(), current->comm,
 -				current->pid, lock);
 +				current->pid, lock, print_tainted());
  			dump_stack();
- 		}
- 	}
+ #ifdef CONFIG_SMP
+ 			trigger_all_cpu_backtrace();
 @@ -154,9 +154,9 @@ static void rwlock_bug(rwlock_t *lock, c
  	if (!debug_locks_off())
  		return;

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-debug-taint-vm.patch	28 May 2007 01:22:43 -0000	1.13
+++ linux-2.6-debug-taint-vm.patch	28 May 2007 03:29:08 -0000	1.14
@@ -59,9 +59,9 @@
  	dump_stack();
  	page->flags &= ~(1 << PG_lru	|
  			1 << PG_private |
---- linux-2.6.20.noarch/mm/slab.c~	2007-04-04 16:36:51.000000000 -0400
-+++ linux-2.6.20.noarch/mm/slab.c	2007-04-04 16:37:03.000000000 -0400
-@@ -1802,8 +1802,8 @@ static void check_poison_obj(struct kmem
+--- linux-2.6.21.noarch/mm/slab.c~	2007-05-27 22:57:44.000000000 -0400
++++ linux-2.6.21.noarch/mm/slab.c	2007-05-27 22:58:08.000000000 -0400
+@@ -1816,8 +1816,8 @@ static void check_poison_obj(struct kmem
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -70,8 +70,8 @@
 +					"Slab corruption (%s): %s start=%p, len=%d\n",
 +					print_tainted(), cachep->name, realobj, size);
  				print_objinfo(cachep, objp, 0);
- 				dump_stack();
  			}
+ 			/* Hexdump the affected line */
 --- linux-2.6.21.noarch/mm/slab.c~	2007-05-14 11:51:33.000000000 -0400
 +++ linux-2.6.21.noarch/mm/slab.c	2007-05-14 11:53:00.000000000 -0400
 @@ -2924,8 +2924,8 @@ static void check_slabp(struct kmem_cach
@@ -85,3 +85,36 @@
  		for (i = 0;
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
+--- linux-2.6.21.noarch/mm/slub.c~	2007-05-27 22:51:45.000000000 -0400
++++ linux-2.6.21.noarch/mm/slub.c	2007-05-27 22:56:48.000000000 -0400
+@@ -446,8 +446,8 @@ static void object_err(struct kmem_cache
+ {
+ 	u8 *addr = page_address(page);
+ 
+-	printk(KERN_ERR "*** SLUB %s: %s at 0x%p slab 0x%p\n",
+-			s->name, reason, object, page);
++	printk(KERN_ERR "*** SLUB %s: %s at 0x%p slab 0x%p [%s]\n",
++			s->name, reason, object, page, print_tainted());
+ 	printk(KERN_ERR "    offset=%tu flags=0x%04lx inuse=%u freelist=0x%p\n",
+ 		object - addr, page->flags, page->inuse, page->freelist);
+ 	if (object > addr + 16)
+@@ -465,8 +465,8 @@ static void slab_err(struct kmem_cache *
+ 	va_start(args, reason);
+ 	vsnprintf(buf, sizeof(buf), reason, args);
+ 	va_end(args);
+-	printk(KERN_ERR "*** SLUB %s: %s in slab @0x%p\n", s->name, buf,
+-		page);
++	printk(KERN_ERR "*** SLUB %s: %s in slab @0x%p [%s]\n", s->name, buf,
++		page, print_tainted());
+ 	dump_stack();
+ }
+ 
+@@ -737,7 +737,7 @@ static int on_freelist(struct kmem_cache
+ 							s->objects - nr);
+ 		page->inuse = s->objects - nr;
+ 		printk(KERN_ERR "@@@ SLUB %s: Object count adjusted. "
+-			"Slab @0x%p\n", s->name, page);
++			"Slab @0x%p [%s]\n", s->name, page, print_tainted());
+ 	}
+ 	return search == NULL;
+ }

linux-2.6-defaults-fat-utf8.patch:

Index: linux-2.6-defaults-fat-utf8.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-fat-utf8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-fat-utf8.patch	21 Feb 2006 20:53:00 -0000	1.1
+++ linux-2.6-defaults-fat-utf8.patch	28 May 2007 03:29:08 -0000	1.2
@@ -1,9 +1,9 @@
 
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963
 
---- linux-2.6.15.noarch/fs/fat/inode.c~	2006-02-20 23:20:12.000000000 -0500
-+++ linux-2.6.15.noarch/fs/fat/inode.c	2006-02-20 23:21:42.000000000 -0500
-@@ -952,7 +952,8 @@ static int parse_options(char *options, 
+--- linux-2.6.21.noarch/fs/fat/inode.c~	2007-05-27 23:22:31.000000000 -0400
++++ linux-2.6.21.noarch/fs/fat/inode.c	2007-05-27 23:22:50.000000000 -0400
+@@ -950,7 +950,8 @@ static int parse_options(char *options, 
  		opts->shortname = 0;
  	opts->name_check = 'n';
  	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
@@ -11,5 +11,5 @@
 +	opts->utf8 = 1;
 +	opts->unicode_xlate = 0;
  	opts->numtail = 1;
- 	opts->nocase = 0;
+ 	opts->usefree = opts->nocase = 0;
  	*debug = 0;

linux-2.6-devmem.patch:

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-devmem.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-devmem.patch	28 May 2007 01:22:43 -0000	1.13
+++ linux-2.6-devmem.patch	28 May 2007 03:29:08 -0000	1.14
@@ -78,13 +78,11 @@
  	for_each_online_pgdat(pgdat) {
  		for (i = 0; i < pgdat->node_spanned_pages; i++) {
  			if (!pfn_valid(pgdat->node_start_pfn + i))
-Index: linux-2.6/arch/s390/mm/init.c
-===================================================================
---- linux-2.6.orig/arch/s390/mm/init.c
-+++ linux-2.6/arch/s390/mm/init.c
-@@ -241,6 +241,11 @@ void __init paging_init(void)
+--- linux-2.6.21.noarch/arch/s390/mm/init.c~	2007-05-27 23:04:09.000000000 -0400
++++ linux-2.6.21.noarch/arch/s390/mm/init.c	2007-05-27 23:04:20.000000000 -0400
+@@ -156,6 +156,11 @@ void __init paging_init(void)
+ 	free_area_init_nodes(max_zone_pfns);
  }
- #endif /* CONFIG_64BIT */
  
 +int page_is_ram (unsigned long pagenr)
 +{
@@ -342,13 +340,13 @@
  	.mmap		= mmap_kmem,
  	.open		= open_kmem,
  	.get_unmapped_area = get_unmapped_area_mem,
-@@ -954,7 +855,6 @@ static const struct {
+@@ -859,7 +859,6 @@ static const struct {
  	const struct file_operations	*fops;
  } devlist[] = { /* list of minor devices */
  	{1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
 -	{2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
  	{3, "null",    S_IRUGO | S_IWUGO,           &null_fops},
- #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
+ #ifdef CONFIG_DEVPORT
  	{4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
 Index: linux-2.6/fs/proc/kcore.c
 ===================================================================
@@ -591,18 +589,17 @@
  #include <asm-generic/page.h>
  
  #endif /* __KERNEL__ */
-Index: linux-2.6/include/asm-um/page.h
-===================================================================
---- linux-2.6.orig/include/asm-um/page.h
-+++ linux-2.6/include/asm-um/page.h
-@@ -113,6 +113,7 @@ extern unsigned long uml_physmem;
- 
+--- linux-2.6.21.noarch/include/asm-um/page.h~	2007-05-27 23:05:22.000000000 -0400
++++ linux-2.6.21.noarch/include/asm-um/page.h	2007-05-27 23:05:34.000000000 -0400
+@@ -114,6 +114,8 @@ extern unsigned long uml_physmem;
  extern struct page *arch_validate(struct page *page, gfp_t mask, int order);
  #define HAVE_ARCH_VALIDATE
+ 
 +#define devmem_is_allowed(x) 1
++
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
  
- extern void arch_free_page(struct page *page, int order);
- #define HAVE_ARCH_FREE_PAGE
 Index: linux-2.6/include/asm-v850/page.h
 ===================================================================
 --- linux-2.6.orig/include/asm-v850/page.h

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- linux-2.6-execshield.patch	28 May 2007 01:22:43 -0000	1.52
+++ linux-2.6-execshield.patch	28 May 2007 03:29:08 -0000	1.53
@@ -16,19 +16,18 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
-Index: linux-2.6/arch/i386/kernel/process.c
-===================================================================
---- linux-2.6.orig/arch/i386/kernel/process.c
-+++ linux-2.6/arch/i386/kernel/process.c
-@@ -647,6 +647,8 @@ struct task_struct fastcall * __switch_t
+--- linux-2.6.21.noarch/arch/i386/kernel/process.c~	2007-05-27 22:27:45.000000000 -0400
++++ linux-2.6.21.noarch/arch/i386/kernel/process.c	2007-05-27 22:28:22.000000000 -0400
+@@ -649,7 +649,8 @@ struct task_struct fastcall * __switch_t
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
+-
 +	if (next_p->mm)
 +		load_user_cs_desc(cpu, next_p->mm);
  
- 	/*
- 	 * Reload esp0.
+ 	/* we're going to use this soon, after a few expensive things */
+ 	if (next_p->fpu_counter > 5)
 @@ -907,3 +909,60 @@ unsigned long arch_align_stack(unsigned 
  		sp -= get_random_int() % 8192;
  	return sp & ~0xf;
@@ -121,16 +120,16 @@
  #include <linux/module.h>
  
  #include <asm/cpufeature.h>
-@@ -118,7 +118,8 @@ static struct vm_operations_struct sysca
+@@ -265,7 +265,8 @@ int __init sysenter_setup(void)
  extern void SYSENTER_RETURN;
  
  /* Setup a VMA at program startup for the vsyscall page */
 -int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
 +int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack,
-+				unsigned long start_code, unsigned long interp_map_address)
++		unsigned long start_code, unsigned long interp_map_address)
  {
- 	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
+ 	unsigned long addr;
 @@ -284,7 +284,7 @@ int arch_setup_additional_pages(struct l
  	if (compat)
  		addr = VDSO_HIGH_BASE;
@@ -140,13 +139,11 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
-Index: linux-2.6/kernel/sysctl.c
-===================================================================
---- linux-2.6.orig/kernel/sysctl.c
-+++ linux-2.6/kernel/sysctl.c
-@@ -77,6 +77,26 @@
- extern int percpu_pagelist_fraction;
- extern int compat_log;
+--- linux-2.6.21.noarch/kernel/sysctl.c~	2007-05-27 22:30:01.000000000 -0400
++++ linux-2.6.21.noarch/kernel/sysctl.c	2007-05-27 22:30:30.000000000 -0400
+@@ -79,6 +79,26 @@ extern int compat_log;
+ extern int maps_protect;
+ extern int sysctl_stat_interval;
  
 +int exec_shield = (1<<0);
 +/* exec_shield is a bitmask:
@@ -161,9 +158,9 @@
 +
 +static int __init setup_exec_shield(char *str)
 +{
-+        get_option (&str, &exec_shield);
++	get_option (&str, &exec_shield);
 +
-+        return 1;
++	return 1;
 +}
 +
 +__setup("exec-shield=", setup_exec_shield);
@@ -481,15 +478,15 @@
  
  	/*
  	 * Perform the lazy TSS's I/O bitmap copy. If the TSS has an
-@@ -672,7 +748,6 @@ fastcall void __kprobes do_general_prote
+@@ -676,7 +676,6 @@ fastcall void __kprobes do_general_prote
  		put_cpu();
  		return;
  	}
 -	put_cpu();
  
- 	current->thread.error_code = error_code;
- 	current->thread.trap_no = 13;
-@@ -683,17 +758,31 @@ fastcall void __kprobes do_general_prote
+ 	if (regs->eflags & VM_MASK)
+ 		goto gp_in_vm86;
+@@ -683,6 +683,22 @@ fastcall void __kprobes do_general_prote
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -501,13 +498,18 @@
 +		return;
 +
 +	if (print_fatal_signals) {
-+		printk("#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id());
-+		printk(" exec_limit: %08lx, user_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, current->mm->context.user_cs.a, current->mm->context.user_cs.b);
++		printk("#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
++			error_code/8, regs->eip, smp_processor_id());
++		printk(" exec_limit: %08lx, user_cs: %08lx/%08lx.\n",
++			current->mm->context.exec_limit,
++			current->mm->context.user_cs.a,
++			current->mm->context.user_cs.b);
 +	}
 +
  	current->thread.error_code = error_code;
  	current->thread.trap_no = 13;
  	force_sig(SIGSEGV, current);
+@@ -705,11 +705,13 @@ fastcall void __kprobes do_general_prote
  	return;
  
  gp_in_vm86:
@@ -519,8 +521,8 @@
  gp_in_kernel:
 +	put_cpu();
  	if (!fixup_exception(regs)) {
- 		if (notify_die(DIE_GPF, "general protection fault", regs,
- 				error_code, 13, SIGSEGV) == NOTIFY_STOP)
+ 		current->thread.error_code = error_code;
+ 		current->thread.trap_no = 13;
 Index: linux-2.6/arch/i386/mm/init.c
 ===================================================================
 --- linux-2.6.orig/arch/i386/mm/init.c
@@ -661,21 +663,19 @@
  
  #include "../../../fs/binfmt_elf.c" 
  
-Index: linux-2.6/arch/x86_64/ia32/syscall32.c
-===================================================================
---- linux-2.6.orig/arch/x86_64/ia32/syscall32.c
-+++ linux-2.6/arch/x86_64/ia32/syscall32.c
-@@ -42,7 +42,9 @@ static struct vm_operations_struct sysca
+--- linux-2.6.21.noarch/arch/x86_64/ia32/syscall32.c~	2007-05-27 22:35:41.000000000 -0400
++++ linux-2.6.21.noarch/arch/x86_64/ia32/syscall32.c	2007-05-27 22:36:00.000000000 -0400
+@@ -25,7 +25,9 @@ static int use_sysenter = -1;
  struct linux_binprm;
  
  /* Setup a VMA at program startup for the vsyscall page */
 -int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
 +int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
-+			  unsigned long start_code,
-+			  unsigned long interp_map_address)
++		unsigned long start_code,
++		unsigned long interp_map_address)
  {
- 	int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
- 	struct vm_area_struct *vma;
+ 	struct mm_struct *mm = current->mm;
+ 	int ret;
 Index: linux-2.6/arch/x86_64/kernel/process.c
 ===================================================================
 --- linux-2.6.orig/arch/x86_64/kernel/process.c
@@ -892,10 +892,8 @@
  }
  
  /*
-Index: linux-2.6/fs/binfmt_elf.c
-===================================================================
---- linux-2.6.orig/fs/binfmt_elf.c
-+++ linux-2.6/fs/binfmt_elf.c
+--- linux-2.6.21.noarch/fs/binfmt_elf.c~	2007-05-27 22:36:34.000000000 -0400
++++ linux-2.6.21.noarch/fs/binfmt_elf.c	2007-05-27 22:36:45.000000000 -0400
 @@ -45,7 +45,7 @@
  
  static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
@@ -903,8 +901,8 @@
 -static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
 +static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
  
- #ifndef elf_addr_t
- #define elf_addr_t unsigned long
+ /*
+  * If we don't support core dumping, then supply a NULL so we
 @@ -83,7 +83,7 @@ static struct linux_binfmt elf_format = 
  		.min_coredump	= ELF_EXEC_PAGESIZE
  };
@@ -1065,9 +1063,9 @@
  	for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++)
  		if (elf_ppnt->p_type == PT_GNU_STACK) {
  			if (elf_ppnt->p_flags & PF_X)
-@@ -710,6 +759,11 @@ static int load_elf_binary(struct linux_
+@@ -767,6 +767,11 @@ static int load_elf_binary(struct linux_
+ 			break;
  		}
- 	have_pt_gnu_stack = (i < loc->elf_ex.e_phnum);
  
 +	if (current->personality == PER_LINUX && (exec_shield & 2)) {
 +		executable_stack = EXSTACK_DISABLE_X;
@@ -1077,7 +1075,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT;
-@@ -762,6 +816,15 @@ static int load_elf_binary(struct linux_
+@@ -824,6 +824,15 @@ static int load_elf_binary(struct linux_
  	if (retval)
  		goto out_free_dentry;
  
@@ -1093,7 +1091,7 @@
  	/* Discard our unneeded old files struct */
  	if (files) {
  		put_files_struct(files);
-@@ -779,7 +842,8 @@ static int load_elf_binary(struct linux_
+@@ -850,7 +850,8 @@ static int load_elf_binary(struct linux_
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter);
@@ -1103,14 +1101,14 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -800,9 +864,8 @@ static int load_elf_binary(struct linux_
+@@ -872,9 +872,8 @@ static int load_elf_binary(struct linux_
  	current->mm->start_stack = bprm->p;
  
  	/* Now we do a little grungy work by mmaping the ELF image into
 -	   the correct location in memory.  At this point, we assume that
 -	   the image should be loaded at fixed address, not at a variable
 -	   address. */
-+	   the correct location in memory.
++	 * the correct location in memory.
 +	 */
  	for(i = 0, elf_ppnt = elf_phdata;
  	    i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
@@ -1182,21 +1180,19 @@
  	if (current->personality & MMAP_PAGE_ZERO) {
  		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,
  		   and some applications "depend" upon this behavior.
-Index: linux-2.6/fs/proc/array.c
-===================================================================
---- linux-2.6.orig/fs/proc/array.c
-+++ linux-2.6/fs/proc/array.c
-@@ -403,8 +403,12 @@ static int do_task_stat(struct task_stru
+--- linux-2.6.21.noarch/fs/proc/array.c~	2007-05-27 22:43:03.000000000 -0400
++++ linux-2.6.21.noarch/fs/proc/array.c	2007-05-27 22:44:00.000000000 -0400
+@@ -395,8 +395,12 @@ static int do_task_stat(struct task_stru
+ 	}
  	rcu_read_unlock();
- 	mutex_unlock(&tty_mutex);
  
 -	if (!whole || num_threads<2)
 -		wchan = get_wchan(task);
 +	if (!whole || num_threads<2) {
 +		wchan = 0;
 +		if (current->uid == task->uid || current->euid == task->uid ||
-+				capable(CAP_SYS_NICE))
-+			wchan = get_wchan(task);
++			capable(CAP_SYS_NICE))
++				wchan = get_wchan(task);
 +	}
  	if (!whole) {
  		min_flt = task->min_flt;
@@ -1493,13 +1489,11 @@
 +#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
 +
  #endif /* _SPARC_PGALLOC_H */
-Index: linux-2.6/include/asm-sparc64/pgalloc.h
-===================================================================
---- linux-2.6.orig/include/asm-sparc64/pgalloc.h
-+++ linux-2.6/include/asm-sparc64/pgalloc.h
-@@ -68,4 +68,8 @@ static inline void pte_free(struct page 
- 
- #define check_pgt_cache()	do { } while (0)
+--- linux-2.6.21.noarch/include/asm-sparc64/pgalloc.h~	2007-05-27 22:44:38.000000000 -0400
++++ linux-2.6.21.noarch/include/asm-sparc64/pgalloc.h	2007-05-27 22:45:10.000000000 -0400
+@@ -70,4 +70,8 @@ static inline void check_pgt_cache(void)
+ 	quicklist_trim(0, NULL, 25, 16);
+ }
  
 +#define arch_add_exec_range(mm, limit)		do { ; } while (0)
 +#define arch_flush_exec_range(mm)		do { ; } while (0)
@@ -1524,18 +1518,15 @@
  #define pmd_populate_kernel(mm, pmd, pte) \
  		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
  #define pud_populate(mm, pud, pmd) \
-Index: linux-2.6/include/linux/mm.h
-===================================================================
---- linux-2.6.orig/include/linux/mm.h
-+++ linux-2.6/include/linux/mm.h
-@@ -994,7 +994,14 @@
- extern void exit_mmap(struct mm_struct *);
- extern int may_expand_vm(struct mm_struct *mm, unsigned long npages);
+--- linux-2.6.21.noarch/include/linux/mm.h~	2007-05-27 22:45:45.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/mm.h	2007-05-27 22:46:21.000000000 -0400
+@@ -1063,7 +1063,13 @@ extern int install_special_mapping(struc
+ 				   unsigned long addr, unsigned long len,
+ 				   unsigned long flags, struct page **pages);
  
 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
 +extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int);
 +
-+
 +static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr,
 +		unsigned long len, unsigned long pgoff, unsigned long flags)
 +{
@@ -1544,15 +1535,6 @@
  
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
-@@ -1046,7 +1053,7 @@
- 			  struct file *filp,
- 			  pgoff_t offset,
- 			  unsigned long size);
--void handle_ra_miss(struct address_space *mapping, 
-+void handle_ra_miss(struct address_space *mapping,
- 		    struct file_ra_state *ra, pgoff_t offset);
- unsigned long max_sane_readahead(unsigned long nr);
- 
 Index: linux-2.6/include/linux/resource.h
 ===================================================================
 --- linux-2.6.orig/include/linux/resource.h

linux-2.6-modsign-verify.patch:

Index: linux-2.6-modsign-verify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-modsign-verify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-modsign-verify.patch	13 Feb 2007 19:36:12 -0000	1.1
+++ linux-2.6-modsign-verify.patch	28 May 2007 03:29:08 -0000	1.2
@@ -472,14 +472,14 @@
 index dbce132..9d5787d 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -44,6 +44,7 @@ #include <asm/uaccess.h>
+@@ -45,6 +45,7 @@
  #include <asm/semaphore.h>
  #include <asm/cacheflush.h>
  #include <linux/license.h>
 +#include "module-verify.h"
  
- #if 0
- #define DEBUGP printk
+ extern int module_sysfs_initialized;
+ 
 @@ -1591,8 +1592,10 @@ static struct module *load_module(void _
  		goto free_hdr;
  	}

linux-2.6-obsolete-oss-warning.patch:

Index: linux-2.6-obsolete-oss-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-obsolete-oss-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-obsolete-oss-warning.patch	18 Aug 2005 18:28:13 -0000	1.1
+++ linux-2.6-obsolete-oss-warning.patch	28 May 2007 03:29:08 -0000	1.2
@@ -1,18 +1,16 @@
-
-diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/core/oss/pcm_oss.c linux-10000/sound/core/oss/pcm_oss.c
---- linux-3022/sound/core/oss/pcm_oss.c
-+++ linux-10000/sound/core/oss/pcm_oss.c
-@@ -1815,6 +1815,13 @@ static int snd_pcm_oss_open(struct inode
- 	snd_pcm_oss_setup_t *psetup = NULL, *csetup = NULL;
+--- linux-2.6.21.noarch/sound/core/oss/pcm_oss.c~	2007-05-27 23:18:57.000000000 -0400
++++ linux-2.6.21.noarch/sound/core/oss/pcm_oss.c	2007-05-27 23:19:39.000000000 -0400
+@@ -2306,6 +2306,13 @@ static int snd_pcm_oss_open(struct inode
+ 	struct snd_pcm_oss_setup setup[2];
  	int nonblock;
  	wait_queue_t wait;
 +	static char printed_comm[16];
 +
 +	if (strncmp(printed_comm, current->comm, 16)) {
 +		printk(KERN_DEBUG "application %s uses obsolete OSS audio interface\n",
-+		       current->comm);
++			current->comm);
 +		memcpy(printed_comm, current->comm, 16);
 +	}
  
- 	snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO);
- 	device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ?
+ 	pcm = snd_lookup_oss_minor_data(iminor(inode),
+ 					SNDRV_OSS_DEVICE_TYPE_PCM);

linux-2.6-raid-autorun.patch:

Index: linux-2.6-raid-autorun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-raid-autorun.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-raid-autorun.patch	28 May 2007 01:22:43 -0000	1.2
+++ linux-2.6-raid-autorun.patch	28 May 2007 03:29:08 -0000	1.3
@@ -19,11 +19,11 @@
  COMPATIBLE_IOCTL(STOP_ARRAY)
  COMPATIBLE_IOCTL(STOP_ARRAY_RO)
  COMPATIBLE_IOCTL(RESTART_ARRAY_RW)
---- vanilla/drivers/md/md.c.md	2006-11-29 16:57:37.000000000 -0500
-+++ vanilla/drivers/md/md.c	2007-01-23 16:12:28.000000000 -0500
-@@ -3486,6 +3486,67 @@
- 	printk(KERN_INFO "md: ... autorun DONE.\n");
+--- linux-2.6.21.noarch/drivers/md/md.c~	2007-05-27 23:14:53.000000000 -0400
++++ linux-2.6.21.noarch/drivers/md/md.c	2007-05-27 23:16:00.000000000 -0400
+@@ -3637,6 +3637,64 @@ static void autorun_devices(int part)
  }
+ #endif /* !MODULE */
  
 +/*
 + * import RAID devices based on one partition
@@ -41,7 +41,6 @@
 +	if (IS_ERR(start_rdev))
 +		return err;
 +
-+
 +	/* NOTE: this can only work for 0.90.0 superblocks */
 +	sb = (mdp_super_t*)page_address(start_rdev->sb_page);
 +	if (sb->major_version != 0 ||
@@ -82,10 +81,8 @@
 +	 */
 +	autorun_devices(0);
 +	return 0;
-+
 +}
 +
-+
  static int get_version(void __user * arg)
  {
  	mdu_version_t ver;

linux-2.6-sleepon.patch:

Index: linux-2.6-sleepon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-sleepon.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-sleepon.patch	4 Jul 2006 21:03:12 -0000	1.3
+++ linux-2.6-sleepon.patch	28 May 2007 03:29:08 -0000	1.4
@@ -43,12 +43,13 @@
  
  	PIOaddr = dev->base_addr;
  	ti = (struct tok_info *) dev->priv;
-@@ -862,13 +864,18 @@ static int tok_init_card(struct net_devi
- 	current->state=TASK_UNINTERRUPTIBLE;
- 	schedule_timeout(TR_RST_TIME); /* wait 50ms */
+@@ -857,13 +857,20 @@ static int tok_init_card(struct net_devi
+ 
+ 	schedule_timeout_uninterruptible(TR_RST_TIME); /* wait 50ms */
  
 +	add_wait_queue(&ti->wait_for_reset, &__wait);
 +	set_current_state(TASK_UNINTERRUPTIBLE);
++
  	outb(0, PIOaddr + ADAPTRESETREL);
  #ifdef ENABLE_PAGING
  	if (ti->page_mask)
@@ -57,6 +58,7 @@
  	writeb(INT_ENABLE, ti->mmio + ACA_OFFSET + ACA_SET + ISRP_EVEN);
 -	i = sleep_on_timeout(&ti->wait_for_reset, 4 * HZ);
 +	#warning pci posting bug
++
 +	i = schedule_timeout(4 * HZ);
 +	current->state = TASK_RUNNING;
 +	remove_wait_queue(&ti->wait_for_reset, &__wait);

linux-2.6-unexport-symbols.patch:

Index: linux-2.6-unexport-symbols.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-unexport-symbols.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-unexport-symbols.patch	27 Jun 2006 00:39:13 -0000	1.2
+++ linux-2.6-unexport-symbols.patch	28 May 2007 03:29:08 -0000	1.3
@@ -1,14 +1,13 @@
 No external modules should be touching these symbols.
 If they are, they are broken.
 
-diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/open.c linux-10000/fs/open.c
---- linux-3022/fs/open.c
-+++ linux-10000/fs/open.c
-@@ -976,7 +976,6 @@ out_error:
- 	fd = error;
- 	goto out;
+--- linux-2.6.21.noarch/fs/open.c~	2007-05-27 23:20:25.000000000 -0400
++++ linux-2.6.21.noarch/fs/open.c	2007-05-27 23:20:32.000000000 -0400
+@@ -987,7 +987,6 @@ asmlinkage long sys_open(const char __us
+ 	prevent_tail_call(ret);
+ 	return ret;
  }
 -EXPORT_SYMBOL_GPL(sys_open);
  
- #ifndef __alpha__
- 
+ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
+ 			   int mode)

linux-2.6-vm-silence-atomic-alloc-failures.patch:

Index: linux-2.6-vm-silence-atomic-alloc-failures.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-vm-silence-atomic-alloc-failures.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-vm-silence-atomic-alloc-failures.patch	12 Jan 2006 23:52:50 -0000	1.2
+++ linux-2.6-vm-silence-atomic-alloc-failures.patch	28 May 2007 03:29:08 -0000	1.3
@@ -1,10 +1,10 @@
 Atomic failures aren't too interesting.
 
---- linux-2.6.15/include/linux/gfp.h~	2006-01-12 18:48:46.000000000 -0500
-+++ linux-2.6.15/include/linux/gfp.h	2006-01-12 18:48:57.000000000 -0500
+--- linux-2.6.21.noarch/include/linux/gfp.h~	2007-05-27 23:21:35.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/gfp.h	2007-05-27 23:21:51.000000000 -0400
 @@ -58,7 +58,7 @@ struct vm_area_struct;
- 			__GFP_NOMEMALLOC|__GFP_HARDWALL)
- 
+ /* This equals 0, but use constants in case they ever change */
+ #define GFP_NOWAIT	(GFP_ATOMIC & ~__GFP_HIGH)
  /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */
 -#define GFP_ATOMIC	(__GFP_HIGH)
 +#define GFP_ATOMIC	(__GFP_HIGH | __GFP_NOWARN)


--- linux-2.6-PT_LOAD-align.patch DELETED ---


--- linux-2.6-acpi-clear-fadt_cstate-control.patch DELETED ---


--- linux-2.6-module_version.patch DELETED ---


