Tue Jul 15 13:52:12 UTC 2008

Author: davej

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

Modified Files:
	.cvsignore Makefile config-debug config-generic config-nodebug 
	config-powerpc-generic config-powerpc32-generic config-s390x 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic config-xen-generic kernel.spec 
	linux-2.6-debug-nmi-timeout.patch linux-2.6-execshield.patch 
	linux-2.6-silence-noise.patch sources upstream 
Added Files:
	patch-2.6.26-git1.bz2.sign 
Removed Files:
	linux-2.6-alsa-kill-annoying-messages.patch 
	linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch 
	linux-2.6-selinux-deffered-context-mapping-no-sleep.patch 
	linux-2.6-selinux-deffered-context-mapping.patch 
	linux-2.6-selinux-ecryptfs-support.patch 
	linux-2.6-selinux-generic-ioctl.patch 
	linux-2.6-selinux-get-invalid-xattrs.patch 
	linux-2.6-selinux-new-proc-checks.patch 
	linux-2.6-silence-x86-decompressor.patch 
Log Message:
2.6.26-git1

--- NEW FILE patch-2.6.26-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIfEuvyGugalF9Dw4RAna2AJ9Snvx8HlVvChelBaP7oan2JNsazgCdGAym
yjS3lA2fsNlLVPxAaReaM30=
=/gOg
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -r1.865 -r1.866
--- .cvsignore	14 Jul 2008 17:25:55 -0000	1.865
+++ .cvsignore	15 Jul 2008 13:51:23 -0000	1.866
@@ -4,3 +4,4 @@
 temp-*
 kernel-2.6.26
 linux-2.6.26.tar.bz2
+patch-2.6.26-git1.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile	14 Jun 2008 08:05:27 -0000	1.74
+++ Makefile	15 Jul 2008 13:51:23 -0000	1.75
@@ -48,7 +48,6 @@
 	@perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLEEP_IN_IRQ is not set/CONFIG_DEBUG_SLEEP_IN_IRQ=y/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug
@@ -63,6 +62,9 @@
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_SND_DEBUG_VERBOSE is not set/CONFIG_SND_DEBUG_VERBOSE=y/' config-nodebug
+	# just in case we're going from extremedebug -> debug
+	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 
@@ -95,6 +97,7 @@
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_X86_PTDUMP=y/# CONFIG_X86_PTDUMP is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_SND_DEBUG_VERBOSE=y/# CONFIG_SND_DEBUG_VERBOSE is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-debug	14 Jun 2008 08:05:27 -0000	1.14
+++ config-debug	15 Jul 2008 13:51:23 -0000	1.15
@@ -1,6 +1,7 @@
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DEBUG_DETECT=y
+CONFIG_SND_DEBUG_VERBOSE=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
 CONFIG_DEBUG_MUTEXES=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- config-generic	15 Jul 2008 05:50:39 -0000	1.127
+++ config-generic	15 Jul 2008 13:51:23 -0000	1.128
@@ -14,6 +14,7 @@
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
 #
 # General setup
 #
@@ -344,6 +345,7 @@
 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_TC86C001 is not set
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_INTEGRITY=y
 
 
 #
@@ -1253,7 +1255,7 @@
 #
 # Wireless LAN
 #
-CONFIG_WLAN_PRE80211=y
+# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
@@ -1274,6 +1276,7 @@
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_MAC80211_DEBUG is not set
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+# CONFIG_MAC80211_DEBUG is not set
 
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
@@ -2433,6 +2436,8 @@
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
 
+CONFIG_SND_DRIVERS=y
+
 #
 # ISA devices
 #
@@ -2442,6 +2447,7 @@
 #
 # PCI devices
 #
+CONFIG_SND_PCI=y
 CONFIG_SND_ADLIB=m
 CONFIG_SND_ALI5451=m
 CONFIG_SND_ALS300=m
@@ -2518,6 +2524,7 @@
 #
 # ALSA USB devices
 #
+CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
@@ -2526,6 +2533,7 @@
 #
 # PCMCIA devices
 #
+# CONFIG_SND_PCMCIA is not set
 # CONFIG_SND_VXPOCKET is not set
 
 #
@@ -3158,6 +3166,10 @@
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
@@ -3177,6 +3189,9 @@
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 
+# Random number generation
+CONFIG_CRYPTO_PRNG=m
+
 #
 # Library routines
 #
@@ -3437,6 +3452,13 @@
 CONFIG_UTRACE=y
 CONFIG_UTRACE_PTRACE=y
 
+CONFIG_FTRACE=y
+CONFIG_IRQSOFF_TRACER=y
+CONFIG_SCHED_TRACER=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+
 CONFIG_KPROBES=y
 
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
@@ -3549,3 +3571,4 @@
 # MT9V022_PCA9536_SWITCH is not set
 
 CONFIG_THERMAL_HWMON=y
+


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-nodebug	14 Jun 2008 08:05:27 -0000	1.16
+++ config-nodebug	15 Jul 2008 13:51:23 -0000	1.17
@@ -1,6 +1,7 @@
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_DEBUG_DETECT=y
+CONFIG_SND_DEBUG_VERBOSE=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
 CONFIG_DEBUG_MUTEXES=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-powerpc-generic	23 May 2008 22:27:32 -0000	1.18
+++ config-powerpc-generic	15 Jul 2008 13:51:23 -0000	1.19
@@ -219,3 +219,5 @@
 
 CONFIG_DMADEVICES=y
 # CONFIG_FSL_DMA is not set
+
+CONFIG_SND_PPC=y


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-powerpc32-generic	25 Jun 2008 19:58:31 -0000	1.14
+++ config-powerpc32-generic	15 Jul 2008 13:51:23 -0000	1.15
@@ -242,7 +242,6 @@
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 
-# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
 
 # CONFIG_IWLWIFI is not set
@@ -278,3 +277,7 @@
 
 # PPC gets sad with debug alloc (bz 448598)
 # CONFIG_DEBUG_PAGEALLOC is not set
+
+CONFIG_SND_ISA=y
+CONFIG_CRYPTO_DEV_TALITOS=m
+


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-s390x	23 May 2008 22:27:32 -0000	1.6
+++ config-s390x	15 Jul 2008 13:51:23 -0000	1.7
@@ -118,7 +118,6 @@
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_WIRELESS_EXT is not set
-# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
@@ -209,3 +208,6 @@
 CONFIG_KVM=m
 CONFIG_S390_GUEST=y
 
+
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_CHSC_SCH=m


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-sparc64-generic	16 May 2008 21:06:38 -0000	1.16
+++ config-sparc64-generic	15 Jul 2008 13:51:23 -0000	1.17
@@ -188,3 +188,4 @@
 
 CONFIG_NUMA=y
 
+CONFIG_SND_SPARC=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- config-x86-generic	23 Jun 2008 20:46:06 -0000	1.37
+++ config-x86-generic	15 Jul 2008 13:51:23 -0000	1.38
@@ -288,6 +288,7 @@
 
 CONFIG_SCHED_MC=y
 
+CONFIG_SND_ISA=y
 CONFIG_SND_ES18XX=m
 
 CONFIG_TCG_INFINEON=m
@@ -313,6 +314,7 @@
 CONFIG_W83697HF_WDT=m
 
 CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
 
 CONFIG_RELOCATABLE=y
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -376,3 +378,14 @@
 
 CONFIG_NONPROMISC_DEVMEM=y
 
+# CONFIG_MEMTEST is not set
+# CONFIG_MAXSMP is not set
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_SYSPROF_TRACER=y
+
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_MMIOTRACE is not set
+
+# CONFIG_DEBUG_PER_CPU_MAPS is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- config-x86_64-generic	9 Jul 2008 04:54:02 -0000	1.37
+++ config-x86_64-generic	15 Jul 2008 13:51:23 -0000	1.38
@@ -258,6 +258,7 @@
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
 
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
@@ -278,3 +279,14 @@
 
 CONFIG_DIRECT_GBPAGES=y
 
+# CONFIG_MEMTEST is not set
+CONFIG_AMD_IOMMU=y
+# CONFIG_MAXSMP is not set
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_SYSPROF_TRACER=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_MMIOTRACE is not set
+
+CONFIG_X86_MPPARSE=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-xen-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-xen-generic	17 May 2008 16:46:58 -0000	1.4
+++ config-xen-generic	15 Jul 2008 13:51:23 -0000	1.5
@@ -71,3 +71,4 @@
 CONFIG_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_FBDEV_FRONTEND=m
 
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- kernel.spec	15 Jul 2008 05:50:39 -0000	1.764
+++ kernel.spec	15 Jul 2008 13:51:23 -0000	1.765
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 1
+%define released_kernel 0
 
 # Versions of various parts
 
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 9
+%define rcrev 0
 # The git snapshot level
-%define gitrev 12
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -603,8 +603,6 @@
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
-Patch410: linux-2.6-alsa-kill-annoying-messages.patch
-Patch411: linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch440: linux-2.6-net-8139-pio-modparam.patch
@@ -612,7 +610,6 @@
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
-Patch520: linux-2.6-silence-x86-decompressor.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
@@ -627,7 +624,6 @@
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
 # SELinux patches, will go upstream in .27
-Patch800: linux-2.6-selinux-deffered-context-mapping.patch
 Patch801: linux-2.6-selinux-deffered-context-mapping-no-sleep.patch
 Patch802: linux-2.6-selinux-generic-ioctl.patch
 Patch803: linux-2.6-selinux-new-proc-checks.patch
@@ -1017,9 +1013,9 @@
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-ptrace-cleanup.patch
-ApplyPatch linux-2.6-tracehook.patch
-ApplyPatch linux-2.6-utrace.patch
+#ApplyPatch linux-2.6-ptrace-cleanup.patch
+#ApplyPatch linux-2.6-tracehook.patch
+#ApplyPatch linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1101,12 +1097,6 @@
 #ApplyPatch linux-2.6-scsi-mpt-vmware-fix.patch
 
 # ALSA
-#
-ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
-# In upstream alsa. Resolves issues with glitch-free pulseaudio on hda-intel.
-# See: https://tango.0pointer.de/pipermail/pulseaudio-discuss/2008-May/001837.html
-#      http://mailman.alsa-project.org/pipermail/alsa-devel/2008-May/007856.html
-ApplyPatch linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1129,14 +1119,11 @@
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
-# Make the real mode boot decompressor understand and honor 'quiet'
-ApplyPatch linux-2.6-silence-x86-decompressor.patch
-
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
 
 # Fix the SELinux mprotect checks on executable mappings
-#eApplyPatch linux-2.6-selinux-mprotect-checks.patch
+#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
 #ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
 
@@ -1149,15 +1136,6 @@
 # wake up links that have been put to sleep by BIOS (#436099)
 ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch
 
-# Allow selinux to defer validation of contexts, aka: rpm can write illegal labels
-ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch
-ApplyPatch linux-2.6-selinux-deffered-context-mapping-no-sleep.patch
-ApplyPatch linux-2.6-selinux-generic-ioctl.patch
-#ApplyPatch linux-2.6-selinux-new-proc-checks.patch
-ApplyPatch linux-2.6-selinux-get-invalid-xattrs.patch
-# Broken, see BZ 452438
-#ApplyPatch linux-2.6-selinux-ecryptfs-support.patch
-
 # wireless patches headed for 2.6.26
 #ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.27
@@ -1816,6 +1794,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Jul 15 2008 Dave Jones <davej at redhat.com>
+- 2.6.26-git1
+
 * Mon Jul 14 2008 David Woodhouse <David.Woodhouse at intel.com>
 - Add kernel-firmware subpackage
 

linux-2.6-debug-nmi-timeout.patch:

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-nmi-timeout.patch	15 Oct 2007 18:36:20 -0000	1.3
+++ linux-2.6-debug-nmi-timeout.patch	15 Jul 2008 13:51:23 -0000	1.4
@@ -1,25 +1,14 @@
---- linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c~	2007-04-13 15:52:37.000000000 -0400
-+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_32.c	2007-04-13 15:53:06.000000000 -0400
-@@ -1044,7 +1044,7 @@ __kprobes int nmi_watchdog_tick(struct p
+--- linux-2.6.26.noarch/arch/x86/kernel/nmi.c~	2008-07-14 20:31:14.000000000 -0400
++++ linux-2.6.26.noarch/arch/x86/kernel/nmi.c	2008-07-14 20:31:38.000000000 -0400
+@@ -416,7 +416,7 @@ nmi_watchdog_tick(struct pt_regs *regs, 
  		 * wait a few IRQs (5 seconds) before doing the oops ...
  		 */
- 		alert_counter[cpu]++;
--		if (alert_counter[cpu] == 5*nmi_hz)
-+		if (alert_counter[cpu] == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz)
+ 		local_inc(&__get_cpu_var(alert_counter));
+-		if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
++		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
  			/*
  			 * die_nmi will return ONLY if NOTIFY_STOP happens..
  			 */
---- linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c~	2007-04-13 15:53:09.000000000 -0400
-+++ linux-2.6.20.noarch/arch/x86/kernel/nmi_64.c	2007-04-13 15:53:29.000000000 -0400
-@@ -923,7 +923,7 @@ int __kprobes nmi_watchdog_tick(struct p
- 		 * wait a few IRQs (5 seconds) before doing the oops ...
- 		 */
- 		local_inc(&__get_cpu_var(alert_counter));
--		if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz)
-+		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz)
- 			die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs,
- 				panic_on_timeout);
- 	} else {
 --- linux-2.6.21.noarch/lib/Kconfig.debug~	2007-07-06 17:05:46.000000000 -0400
 +++ linux-2.6.21.noarch/lib/Kconfig.debug	2007-07-06 17:06:07.000000000 -0400
 @@ -126,6 +126,14 @@ config SCHEDSTATS

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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- linux-2.6-execshield.patch	20 May 2008 15:26:45 -0000	1.89
+++ linux-2.6-execshield.patch	15 Jul 2008 13:51:23 -0000	1.90
@@ -99,11 +99,11 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.25.noarch/arch/x86/kernel/traps_32.c~	2008-05-16 13:43:36.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/traps_32.c	2008-05-16 13:48:08.000000000 -0400
-@@ -602,13 +602,97 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
- DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
- DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
+--- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
++++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
+@@ -596,7 +596,90 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+ DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
+ DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
 -DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 +
@@ -191,8 +191,9 @@
 +	}
 +}
  
- void __kprobes do_general_protection(struct pt_regs *regs, long error_code)
- {
+ void __kprobes
+ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re
  	struct thread_struct *thread;
  	struct tss_struct *tss;
  	int cpu;
@@ -200,15 +201,7 @@
  
  	cpu = get_cpu();
  	tss = &per_cpu(init_tss, cpu);
-@@ -641,7 +725,6 @@ void __kprobes do_general_protection(str
- 
- 		return;
- 	}
--	put_cpu();
- 
- 	if (regs->flags & X86_VM_MASK)
- 		goto gp_in_vm86;
-@@ -634,6 +718,22 @@ void __kprobes do_general_protection(struct pt_regs * regs,
+@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -228,10 +221,11 @@
 +			current->mm->context.user_cs.b);
 +	}
 +
- 	current->thread.error_code = error_code;
- 	current->thread.trap_no = 13;
- 	if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) &&
-@@ -650,11 +750,13 @@ void __kprobes do_general_protection(struct pt_regs * regs,
++
+ 	tsk->thread.error_code = error_code;
+ 	tsk->thread.trap_no = 13;
+ 
+@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re
  	return;
  
  gp_in_vm86:
@@ -242,9 +236,9 @@
  
  gp_in_kernel:
 +	put_cpu();
- 	if (!fixup_exception(regs)) {
- 		current->thread.error_code = error_code;
- 		current->thread.trap_no = 13;
+ 	if (fixup_exception(regs))
+ 		return;
+ 
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
 index 8106bba..23932be 100644
 --- a/arch/x86/mm/init_32.c
@@ -279,17 +273,16 @@
  
  	return 0;
  }
-@@ -527,6 +525,10 @@ void __init paging_init(void)
+@@ -782,6 +782,9 @@ unsigned long __init_refok init_memory_m
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
  #endif
 +	if (exec_shield)
 +		printk(KERN_INFO "Using x86 segment limits to approximate "
 +			"NX protection\n");
-+
- 	pagetable_init();
  
- 	load_cr3(swapper_pg_dir);
+ 	/* Enable PSE if available */
+ 	if (cpu_has_pse)
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
 index 56fe712..ec932ae 100644
 --- a/arch/x86/mm/mmap.c
@@ -767,7 +760,7 @@
  }
 +EXPORT_SYMBOL(get_unmapped_area_prot);
 +
-+#define SHLIB_BASE             0x00110000
++#define SHLIB_BASE	0x00110000
 +
 +unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-silence-noise.patch	3 Jul 2008 04:21:56 -0000	1.16
+++ linux-2.6-silence-noise.patch	15 Jul 2008 13:51:23 -0000	1.17
@@ -1,17 +1,3 @@
---- linux-2.6.18.noarch/arch/x86/mm/init_64.c~	2006-10-16 17:09:56.000000000 -0400
-+++ linux-2.6.18.noarch/arch/x86/mm/init_64.c	2006-10-16 17:10:09.000000000 -0400
-@@ -337,10 +337,6 @@ static void __init find_early_table_spac
- 
- 	table_start >>= PAGE_SHIFT;
- 	table_end = table_start;
--
--	early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n",
--		end, table_start << PAGE_SHIFT,
--		(table_start << PAGE_SHIFT) + tables);
- }
- 
- /* Setup the direct mapping of the physical memory at PAGE_OFFSET.
- 
 --- linux-2.6.18.noarch/drivers/pci/setup-res.c~	2006-10-17 17:15:34.000000000 -0400
 +++ linux-2.6.18.noarch/drivers/pci/setup-res.c	2006-10-17 17:15:56.000000000 -0400
 @@ -148,7 +148,7 @@ int pci_assign_resource(struct pci_dev *
@@ -88,60 +74,4 @@
  	mutex_lock(&dpm_list_mtx);
  	if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
  		if (dev->parent->power.sleeping)
-From fc4c74c4d0ccc7b57fcc841e88b63fd729f45115 Mon Sep 17 00:00:00 2001
-From: Jeremy Katz <katzj at redhat.com>
-Date: Tue, 1 Jul 2008 17:32:41 -0400
-Subject: [PATCH] Make loading padlock modules quieter when hardware isn't available
-
-When loading aes or sha256 via the module aliases, the padlock modules
-also try to get loaded.  Make the error message for them not being
-present only be a NOTICE rather than an ERROR so that use of 'quiet'
-will suppress the messages
-
-Signed-off-by: Jeremy Katz <katzj at redhat.com>
----
- drivers/crypto/padlock-aes.c |    4 ++--
- drivers/crypto/padlock-sha.c |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
-index bb30eb9..54a2a16 100644
---- a/drivers/crypto/padlock-aes.c
-+++ b/drivers/crypto/padlock-aes.c
-@@ -385,12 +385,12 @@ static int __init padlock_init(void)
- 	int ret;
- 
- 	if (!cpu_has_xcrypt) {
--		printk(KERN_ERR PFX "VIA PadLock not detected.\n");
-+		printk(KERN_NOTICE PFX "VIA PadLock not detected.\n");
- 		return -ENODEV;
- 	}
- 
- 	if (!cpu_has_xcrypt_enabled) {
--		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
-+		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
- 		return -ENODEV;
- 	}
- 
-diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
-index c666b4e..40d5680 100644
---- a/drivers/crypto/padlock-sha.c
-+++ b/drivers/crypto/padlock-sha.c
-@@ -254,12 +254,12 @@ static int __init padlock_init(void)
- 	int rc = -ENODEV;
- 
- 	if (!cpu_has_phe) {
--		printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n");
-+		printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n");
- 		return -ENODEV;
- 	}
- 
- 	if (!cpu_has_phe_enabled) {
--		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
-+		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
- 		return -ENODEV;
- 	}
- 
--- 
-1.5.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- sources	14 Jul 2008 00:33:14 -0000	1.825
+++ sources	15 Jul 2008 13:51:23 -0000	1.826
@@ -1 +1,2 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
+a17d5eb7dbf3c47cc776e4b50f2df9cf  patch-2.6.26-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- upstream	14 Jul 2008 00:33:14 -0000	1.743
+++ upstream	15 Jul 2008 13:51:23 -0000	1.744
@@ -1 +1,2 @@
 linux-2.6.26.tar.bz2
+patch-2.6.26-git1.bz2


--- linux-2.6-alsa-kill-annoying-messages.patch DELETED ---


--- linux-2.6-hda-intel-fix-dma-position-inaccuracy.patch DELETED ---


--- linux-2.6-selinux-deffered-context-mapping-no-sleep.patch DELETED ---


--- linux-2.6-selinux-deffered-context-mapping.patch DELETED ---


--- linux-2.6-selinux-ecryptfs-support.patch DELETED ---


--- linux-2.6-selinux-generic-ioctl.patch DELETED ---


--- linux-2.6-selinux-get-invalid-xattrs.patch DELETED ---


--- linux-2.6-selinux-new-proc-checks.patch DELETED ---


--- linux-2.6-silence-x86-decompressor.patch DELETED ---


