rpms/kernel/devel linux-2.6-e1000-corrupt-eeprom-checksum.patch, NONE, 1.1 kernel.spec, 1.219, 1.220 linux-2.6-crash-driver.patch, 1.8, 1.9 linux-2.6-debug-nmi-timeout.patch, 1.2, 1.3 linux-2.6-defaults-nonmi.patch, 1.1, 1.2 linux-2.6-devmem.patch, 1.18, 1.19 linux-2.6-execshield.patch, 1.73, 1.74 linux-2.6-highres-timers.patch, 1.16, 1.17 linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch, 1.2, 1.3 linux-2.6-silence-noise.patch, 1.9, 1.10

Dave Jones (davej) fedora-extras-commits at redhat.com
Mon Oct 15 18:36:57 UTC 2007


Author: davej

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

Modified Files:
	kernel.spec linux-2.6-crash-driver.patch 
	linux-2.6-debug-nmi-timeout.patch 
	linux-2.6-defaults-nonmi.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch linux-2.6-highres-timers.patch 
	linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch 
	linux-2.6-silence-noise.patch 
Added Files:
	linux-2.6-e1000-corrupt-eeprom-checksum.patch 
Log Message:
* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
- Work around E1000 corrupt EEPROM problem.


linux-2.6-e1000-corrupt-eeprom-checksum.patch:

--- NEW FILE linux-2.6-e1000-corrupt-eeprom-checksum.patch ---
http://www.thinkwiki.org/wiki/Problem_with_e1000:_EEPROM_Checksum_Is_Not_Valid

--- linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c~	2007-10-15 14:29:07.000000000 -0400
+++ linux-2.6.23.noarch/drivers/net/e1000/e1000_main.c	2007-10-15 14:31:11.000000000 -0400
@@ -1003,14 +1003,18 @@ e1000_probe(struct pci_dev *pdev,
 		goto err_eeprom;
 	}
 
-	/* before reading the EEPROM, reset the controller to
-	 * put the device in a known good starting state */
-
-	e1000_reset_hw(&adapter->hw);
-
-	/* make sure the EEPROM is good */
-
 	if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+		/* before reading the EEPROM, reset the controller to
+		 * put the device in a known good starting state */
+		e1000_reset_hw(&adapter->hw);
+
+		/* make sure the EEPROM is good */
+
+		if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+			DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
+			goto err_eeprom;
+		}
+
 		DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
 		goto err_eeprom;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kernel.spec	12 Oct 2007 22:37:24 -0000	1.219
+++ kernel.spec	15 Oct 2007 18:36:20 -0000	1.220
@@ -92,9 +92,6 @@
 # Only build the xen kernel (--with xenonly):
 %define with_xenonly   %{?_with_xenonly:      1} %{?!_with_xenonly:      0}
 
-# Whether or not to gpg sign modules
-%define with_modsign   %{?_without_modsign:   0} %{?!_without_modsign:   1}
-
 # Whether or not to do C=1 builds with sparse
 %define usesparse 0
 %if "%fedora" >= "7"
@@ -264,11 +261,6 @@
 %define all_arch_configs kernel-%{version}-*.config
 %endif
 
-# don't sign modules on these platforms
-%ifarch s390x sparc64 ppc alpha
-%define with_modsign 0
-%endif
-
 # sparse blows up on ppc64
 %ifarch ppc64 ppc alpha sparc64
 %define usesparse 0
@@ -346,7 +338,6 @@
 %endif
 
 %if %{nopatches}
-%define with_modsign 0
 # XXX temporary until last vdso patches are upstream
 %define vdso_arches %{nil}
 %endif
@@ -464,9 +455,6 @@
 #
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
-%if %{with_modsign}
-BuildRequires: gnupg
-%endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 %if %{usesparse}
 BuildRequires: sparse >= 0.3
@@ -592,17 +580,9 @@
 Patch136: linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 Patch137: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 Patch138: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
-Patch140: linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
 
 Patch150: linux-2.6-build-nonintconfig.patch
 Patch160: linux-2.6-execshield.patch
-Patch170: linux-2.6-modsign-mpilib.patch
-Patch180: linux-2.6-modsign-crypto.patch
-Patch190: linux-2.6-modsign-include.patch
-Patch200: linux-2.6-modsign-verify.patch
-Patch210: linux-2.6-modsign-ksign.patch
-Patch220: linux-2.6-modsign-core.patch
-Patch230: linux-2.6-modsign-script.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
 Patch270: linux-2.6-debug-taint-vm.patch
@@ -686,6 +666,8 @@
 Patch1801: nouveau-drm.patch
 # Fix lockdep bug in firewire.
 Patch1900: linux-2.6-firewire-lockdep.patch
+# Work around E1000 corrupt EEPROM problem.
+Patch2000: linux-2.6-e1000-corrupt-eeprom-checksum.patch
 
 %endif
 
@@ -976,36 +958,36 @@
 %if !%{nopatches}
 
 # patch-2.6.23-hrt1.patch
-ApplyPatch linux-2.6-highres-timers.patch
+#ApplyPatch linux-2.6-highres-timers.patch
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-tracehook.patch
+#ApplyPatch linux-2.6-utrace-tracehook.patch
 # Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-tracehook-ia64.patch
-ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch
-ApplyPatch linux-2.6-utrace-tracehook-s390.patch
-ApplyPatch linux-2.6-utrace-tracehook-um.patch
-ApplyPatch linux-2.6-utrace-tracehook-avr32.patch
+#ApplyPatch linux-2.6-utrace-tracehook-ia64.patch
+#ApplyPatch linux-2.6-utrace-tracehook-sparc64.patch
+#ApplyPatch linux-2.6-utrace-tracehook-s390.patch
+#ApplyPatch linux-2.6-utrace-tracehook-um.patch
+#ApplyPatch linux-2.6-utrace-tracehook-avr32.patch
 # Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-regset.patch
+#ApplyPatch linux-2.6-utrace-regset.patch
 # Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-regset-ia64.patch
-ApplyPatch linux-2.6-utrace-regset-sparc64.patch
-ApplyPatch linux-2.6-utrace-regset-s390.patch
-ApplyPatch linux-2.6-utrace-regset-avr32.patch
+#ApplyPatch linux-2.6-utrace-regset-ia64.patch
+#ApplyPatch linux-2.6-utrace-regset-sparc64.patch
+#ApplyPatch linux-2.6-utrace-regset-s390.patch
+#ApplyPatch linux-2.6-utrace-regset-avr32.patch
 # Core patch has no machine dependencies.
-ApplyPatch linux-2.6-utrace-core.patch
+#ApplyPatch linux-2.6-utrace-core.patch
 # Main patch includes i386, x86_64, powerpc.
-ApplyPatch linux-2.6-utrace-ptrace-compat.patch
+#ApplyPatch linux-2.6-utrace-ptrace-compat.patch
 # Additional arch work by other contributors.
-ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
-ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
+#ApplyPatch linux-2.6-utrace-ptrace-compat-ia64.patch
+#ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
+#ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
+#ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
 
 # setuid /proc/self/maps fix. (dependent on utrace)
-ApplyPatch linux-2.6-proc-self-maps-fix.patch
+#ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-mm-git.patch
@@ -1018,13 +1000,10 @@
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
 ApplyPatch linux-2.6-x86-tune-generic.patch
-# Suppress APIC errors on UP x86-64.
-#ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
-# debug early boot
-ApplyPatch linux-2.6-x86-debug-boot.patch
+
 # shorter i386 oops reports (scheduled for 2.6.24)
-ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
-# fix e820 detection
+#ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
+
 
 #
 # PowerPC
@@ -1036,9 +1015,9 @@
 # Fix up ibmvscsi for combined pSeries/iSeries build
 ApplyPatch linux-2.6-ibmvscsi-schizo.patch
 # Move pmac_zilog to its newly-registered device number
-ApplyPatch linux-2.6-pmac-zilog.patch
+#ApplyPatch linux-2.6-pmac-zilog.patch
 # PlayStation support
-ApplyPatch linux-2.6-ps3-gelic-wireless.patch
+#ApplyPatch linux-2.6-ps3-gelic-wireless.patch
 ApplyPatch linux-2.6-ps3-storage-alias.patch
 ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
 #ApplyPatch linux-2.6-powerpc-spu-vicinity.patch
@@ -1047,24 +1026,11 @@
 ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
 ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
-# pegasos IDE
-ApplyPatch linux-2.6-ppc-pegasos-via-ata-legacy-irq.patch
 
 # Exec shield
 ApplyPatch linux-2.6-execshield.patch
 
 #
-# GPG signed kernel modules
-#
-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
-
-#
 # bugfixes to drivers and filesystems
 #
 
@@ -1149,18 +1115,16 @@
 ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
 
 # wireless patches headed for 2.6.23
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches staged for 2.6.24
 #ApplyPatch linux-2.6-wireless-pending.patch
-# late-breaking iwlwifi fixes (will be rolled into wireless-pending patch)
-ApplyPatch linux-2.6-iwlwifi-fixes.patch
 # fix scanning for hidden SSID w/ NetworkManager
 ApplyPatch linux-2.6-mac80211-nm-hidden-ssid.patch
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
-ApplyPatch linux-2.6-ath5k.patch
-ApplyPatch linux-2.6-zd1211rw-mac80211.patch
-ApplyPatch linux-2.6-mac80211-extras.patch
+#ApplyPatch linux-2.6-ath5k.patch
+#ApplyPatch linux-2.6-zd1211rw-mac80211.patch
+#ApplyPatch linux-2.6-mac80211-extras.patch
 
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1168,18 +1132,6 @@
 # debug the SSB driver
 ApplyPatch linux-2.6-drivers-ssb-debug-revision.patch
 
-# latest Intel driver for ich9
-ApplyPatch linux-2.6-netdev-e1000e-01.patch
-ApplyPatch linux-2.6-netdev-e1000e-02.patch
-ApplyPatch linux-2.6-netdev-e1000e-03.patch
-ApplyPatch linux-2.6-netdev-e1000e-04.patch
-ApplyPatch linux-2.6-netdev-e1000e-05.patch
-ApplyPatch linux-2.6-netdev-e1000e-06.patch
-ApplyPatch linux-2.6-netdev-e1000e-07.patch
-ApplyPatch linux-2.6-netdev-e1000e-08.patch
-ApplyPatch linux-2.6-netdev-e1000e-09.patch
-ApplyPatch linux-2.6-netdev-e1000e-10.patch
-
 # ACPI/PM patches
 # fix EC init
 ApplyPatch linux-2.6-acpi-git-ec-init-fixes.patch
@@ -1219,12 +1171,12 @@
 ApplyPatch linux-2.6-add-mmf_dump_elf_headers.patch
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 ApplyPatch linux-2.6-add-sys-module-name-notes.patch
-ApplyPatch linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
-ApplyPatch linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
-ApplyPatch linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
-ApplyPatch linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
+#ApplyPatch linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
+#ApplyPatch linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
+#ApplyPatch linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
+#ApplyPatch linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
 ApplyPatch linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
-ApplyPatch linux-2.6-powerpc-lparmap-g.patch
+#ApplyPatch linux-2.6-powerpc-lparmap-g.patch
 
 #
 # The multi-lun patch fixes #242254, but won't be in 2.6.23.
@@ -1235,6 +1187,7 @@
 ApplyPatch linux-2.6-lirc.patch
 
 ApplyPatch linux-2.6-firewire-lockdep.patch
+ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
 
@@ -1298,16 +1251,6 @@
 %define sparse_mflags	C=1
 %endif
 
-#
-# Create gpg keys for signing the modules
-#
-%if %{with_modsign}
-gpg --homedir . --batch --gen-key %{SOURCE11}
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
-make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
-linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
-%endif
-
 %if %{fancy_debuginfo}
 # This override tweaks the kernel makefiles so that we run debugedit on an
 # object before embedding it.  When we later run find-debuginfo.sh, it will
@@ -1557,28 +1500,6 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
-%if %{with_modsign}
-# gpg sign the modules
-gcc $RPM_OPT_FLAGS -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c
-
-# We do this on the installed, stripped .ko files in $RPM_BUILD_ROOT
-# rather than as we are building them.  The __arch_install_post macro
-# comes after __debug_install_post, which is what runs find-debuginfo.sh.
-# This is necessary because the debugedit changes to the build ID bits
-# change the contents of the .ko that go into the signature.  A signature
-# made before debugedit is no longer correct for the .ko contents we'll
-# have in the end.
-%define __arch_install_post \
-find $RPM_BUILD_ROOT/lib/modules -name '*.ko' |\
-(cd %{_builddir}/%{buildsubdir}/linux-%{kversion}.%{_target_cpu}\
-while read i\
-do\
-  GNUPGHOME=.. sh ./scripts/modsign/modsign.sh $i Red\
-  mv -f $i.signed $i\
-done)\
-%{nil}
-%endif
-
 ###
 ### Special hacks for debuginfo subpackages.
 ###
@@ -1829,6 +1750,9 @@
 
 
 %changelog
+* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
+- Work around E1000 corrupt EEPROM problem.
+
 * Fri Oct 12 2007 Dave Jones <davej at redhat.com>
 - 2.6.23-git2
 

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-crash-driver.patch	25 Jul 2007 18:20:14 -0000	1.8
+++ linux-2.6-crash-driver.patch	15 Oct 2007 18:36:20 -0000	1.9
@@ -1,6 +1,6 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/i386/mm/init.c linux-1060/arch/i386/mm/init.c
---- linux-1050/arch/i386/mm/init.c
-+++ linux-1060/arch/i386/mm/init.c
+--- linux-1050/arch/x86/mm/init_32.c
++++ linux-1060/arch/x86/mm/init_32.c
 @@ -248,6 +248,8 @@ int devmem_is_allowed(unsigned long page
     return 0;
  }
@@ -24,8 +24,8 @@
  # ifdef CONFIG_SMP
  #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/x86_64/mm/init.c linux-1060/arch/x86_64/mm/init.c
---- linux-1050/arch/x86_64/mm/init.c
-+++ linux-1060/arch/x86_64/mm/init.c
+--- linux-1050/arch/x86/mm/init_64.c
++++ linux-1060/arch/x86/mm/init_64.c
 @@ -6,5 +6,6 @@
   */
  
@@ -197,8 +197,8 @@
  clean-files := consolemap_deftbl.c defkeymap.c
  
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h
---- linux-1050/include/asm-i386/crash.h
-+++ linux-1060/include/asm-i386/crash.h
+--- linux-1050/include/asm-x86/crash.h
++++ linux-1060/include/asm-x86/crash.h
 @@ -0,0 +1,75 @@
 +#ifndef _ASM_I386_CRASH_H
 +#define _ASM_I386_CRASH_H
@@ -370,8 +370,8 @@
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-x86_64/crash.h linux-1060/include/asm-x86_64/crash.h
---- linux-1050/include/asm-x86_64/crash.h
-+++ linux-1060/include/asm-x86_64/crash.h
+--- linux-1050/include/asm-x86/crash.h
++++ linux-1060/include/asm-x86/crash.h
 @@ -0,0 +1,75 @@
 +#ifndef _ASM_X86_64_CRASH_H
 +#define _ASM_X86_64_CRASH_H

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-nmi-timeout.patch	6 Jul 2007 21:13:02 -0000	1.2
+++ linux-2.6-debug-nmi-timeout.patch	15 Oct 2007 18:36:20 -0000	1.3
@@ -1,5 +1,5 @@
---- linux-2.6.20.noarch/arch/i386/kernel/nmi.c~	2007-04-13 15:52:37.000000000 -0400
-+++ linux-2.6.20.noarch/arch/i386/kernel/nmi.c	2007-04-13 15:53:06.000000000 -0400
+--- 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
  		 * wait a few IRQs (5 seconds) before doing the oops ...
  		 */
@@ -9,8 +9,8 @@
  			/*
  			 * die_nmi will return ONLY if NOTIFY_STOP happens..
  			 */
---- linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c~	2007-04-13 15:53:09.000000000 -0400
-+++ linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c	2007-04-13 15:53:29.000000000 -0400
+--- 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 ...
  		 */

linux-2.6-defaults-nonmi.patch:

Index: linux-2.6-defaults-nonmi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-nonmi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-nonmi.patch	11 Jan 2007 18:27:12 -0000	1.1
+++ linux-2.6-defaults-nonmi.patch	15 Oct 2007 18:36:20 -0000	1.2
@@ -1,7 +1,7 @@
 From: Arjan van de Ven <arjan at linux.intel.com>
 
---- linux-2.6.19/arch/i386/kernel/nmi.c.org	2007-01-07 10:40:52.000000000 -0800
-+++ linux-2.6.19/arch/i386/kernel/nmi.c	2007-01-07 10:42:41.000000000 -0800
+--- linux-2.6.19/arch/x86/kernel/nmi_32.c.org	2007-01-07 10:40:52.000000000 -0800
++++ linux-2.6.19/arch/x86/kernel/nmi_32.c	2007-01-07 10:42:41.000000000 -0800
 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned long, evn
   */
  atomic_t nmi_active = ATOMIC_INIT(0);		/* oprofile uses this */
@@ -11,8 +11,8 @@
  static unsigned int nmi_hz = HZ;
  
  struct nmi_watchdog_ctlblk {
---- linux-2.6.19/arch/x86_64/kernel/nmi.c.org	2007-01-07 10:42:55.000000000 -0800
-+++ linux-2.6.19/arch/x86_64/kernel/nmi.c	2007-01-07 10:42:58.000000000 -0800
+--- linux-2.6.19/arch/x86/kernel/nmi_64.c.org	2007-01-07 10:42:55.000000000 -0800
++++ linux-2.6.19/arch/x86/kernel/nmi_64.c	2007-01-07 10:42:58.000000000 -0800
 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned, evntsel_
  atomic_t nmi_active = ATOMIC_INIT(0);		/* oprofile uses this */
  int panic_on_timeout;

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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-devmem.patch	2 Aug 2007 23:37:31 -0000	1.18
+++ linux-2.6-devmem.patch	15 Oct 2007 18:36:20 -0000	1.19
@@ -1,7 +1,7 @@
 Index: linux-2.6/arch/i386/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/i386/mm/init.c
-+++ linux-2.6/arch/i386/mm/init.c
+--- linux-2.6.orig/arch/x86/mm/init_32.c
++++ linux-2.6/arch/x86/mm/init_32.c
 @@ -233,6 +233,25 @@ int page_is_ram(unsigned long pagenr)
  	return 0;
  }
@@ -94,8 +94,8 @@
  	unsigned long codesize, reservedpages, datasize, initsize;
 Index: linux-2.6/arch/x86_64/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/mm/init.c
-+++ linux-2.6/arch/x86_64/mm/init.c
+--- linux-2.6.orig/arch/x86/mm/init_64.c
++++ linux-2.6/arch/x86/mm/init_64.c
 @@ -452,6 +452,28 @@ void __init clear_kernel_mapping(unsigne
  	__flush_tlb_all();
  } 
@@ -415,8 +415,8 @@
  #endif /* _H8300_PAGE_H */
 Index: linux-2.6/include/asm-i386/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-i386/page.h
-+++ linux-2.6/include/asm-i386/page.h
+--- linux-2.6.orig/include/asm-x86/page_32.h
++++ linux-2.6/include/asm-x86/page_32.h
 @@ -108,6 +108,8 @@ extern int sysctl_legacy_va_layout;
  
  extern int page_is_ram(unsigned long pagenr);
@@ -600,8 +600,8 @@
  #endif /* __V850_PAGE_H__ */
 Index: linux-2.6/include/asm-x86_64/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-x86_64/page.h
-+++ linux-2.6/include/asm-x86_64/page.h
+--- linux-2.6.orig/include/asm-x86/page_64.h
++++ linux-2.6/include/asm-x86/page_64.h
 @@ -138,6 +138,10 @@ typedef struct { unsigned long pgprot; }
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -628,8 +628,8 @@
  }
  
  static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
---- linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c.orig	2007-06-04 15:50:52.000000000 -0400
-+++ linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c	2007-06-04 15:52:14.000000000 -0400
+--- linux-2.6.20.noarch/arch/x86/kernel/machine_kexec_64.c.orig	2007-06-04 15:50:52.000000000 -0400
++++ linux-2.6.20.noarch/arch/x86/kernel/machine_kexec_64.c	2007-06-04 15:52:14.000000000 -0400
 @@ -236,10 +236,12 @@
   * Useful for holding code to do something appropriate
   * after a kernel panic.

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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- linux-2.6-execshield.patch	22 Sep 2007 11:45:40 -0000	1.73
+++ linux-2.6-execshield.patch	15 Oct 2007 18:36:21 -0000	1.74
@@ -1,7 +1,7 @@
 Index: linux-2.6/arch/i386/kernel/cpu/common.c
 ===================================================================
---- linux-2.6.orig/arch/i386/kernel/cpu/common.c
-+++ linux-2.6/arch/i386/kernel/cpu/common.c
+--- linux-2.6.orig/arch/x86/kernel/cpu/common.c
++++ linux-2.6/arch/x86/kernel/cpu/common.c
 @@ -437,6 +437,13 @@ void __cpuinit identify_cpu(struct cpuin
  	if (disable_pse)
  		clear_bit(X86_FEATURE_PSE, c->x86_capability);
@@ -16,8 +16,8 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
---- 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
+--- linux-2.6.21.noarch/arch/x86/kernel/process_32.c~	2007-05-27 22:27:45.000000000 -0400
++++ linux-2.6.21.noarch/arch/x86/kernel/process_32.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 */
  
@@ -89,8 +89,8 @@
 +		current->mm->brk = new_brk;
 +}
 +
---- linux-2.6.22.noarch/arch/i386/kernel/smp.c~	2007-07-20 13:48:03.000000000 -0400
-+++ linux-2.6.22.noarch/arch/i386/kernel/smp.c	2007-07-20 13:48:08.000000000 -0400
+--- linux-2.6.22.noarch/arch/x86/kernel/smp_32.c~	2007-07-20 13:48:03.000000000 -0400
++++ linux-2.6.22.noarch/arch/x86/kernel/smp_32.c	2007-07-20 13:48:08.000000000 -0400
 @@ -22,6 +22,7 @@
  
  #include <asm/mtrr.h>
@@ -108,8 +108,8 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.22.noarch/arch/i386/kernel/sysenter.c~	2007-07-31 14:20:04.000000000 -0400
-+++ linux-2.6.22.noarch/arch/i386/kernel/sysenter.c	2007-07-31 14:20:11.000000000 -0400
+--- linux-2.6.22.noarch/arch/x86/kernel/sysenter_32.c~	2007-07-31 14:20:04.000000000 -0400
++++ linux-2.6.22.noarch/arch/x86/kernel/sysenter_32.c	2007-07-31 14:20:11.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/elf.h>
@@ -365,8 +365,8 @@
  
  	/*
  	 * Walk the list again, actually closing and freeing it,
---- linux-2.6.22.noarch/arch/i386/kernel/traps.c~	2007-07-20 13:50:07.000000000 -0400
-+++ linux-2.6.22.noarch/arch/i386/kernel/traps.c	2007-07-20 13:52:09.000000000 -0400
+--- linux-2.6.22.noarch/arch/x86/kernel/traps_32.c~	2007-07-20 13:50:07.000000000 -0400
++++ linux-2.6.22.noarch/arch/x86/kernel/traps_32.c	2007-07-20 13:52:09.000000000 -0400
 @@ -573,7 +573,88 @@ 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)
@@ -512,8 +512,8 @@
  		current->thread.trap_no = 13;
 Index: linux-2.6/arch/i386/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/i386/mm/init.c
-+++ linux-2.6/arch/i386/mm/init.c
+--- linux-2.6.orig/arch/x86/mm/init_32.c
++++ linux-2.6/arch/x86/mm/init_32.c
 @@ -433,7 +433,7 @@ u64 __supported_pte_mask __read_mostly =
   * Control non executable mappings.
   *
@@ -545,8 +545,8 @@
  
 Index: linux-2.6/arch/i386/mm/mmap.c
 ===================================================================
---- linux-2.6.orig/arch/i386/mm/mmap.c
-+++ linux-2.6/arch/i386/mm/mmap.c
+--- linux-2.6.orig/arch/x86/mm/mmap_32.c
++++ linux-2.6/arch/x86/mm/mmap_32.c
 @@ -62,15 +62,17 @@ void arch_pick_mmap_layout(struct mm_str
  	 * Fall back to the standard layout if the personality
  	 * bit is set, or if the expected stack growth is unlimited:
@@ -569,8 +569,8 @@
  }
 Index: linux-2.6/arch/i386/mm/pageattr.c
 ===================================================================
---- linux-2.6.orig/arch/i386/mm/pageattr.c
-+++ linux-2.6/arch/i386/mm/pageattr.c
+--- linux-2.6.orig/arch/x86/mm/pageattr_32.c
++++ linux-2.6/arch/x86/mm/pageattr_32.c
 @@ -8,6 +8,8 @@
  #include <linux/highmem.h>
  #include <linux/module.h>
@@ -596,8 +596,8 @@
  		return -EINVAL;
 Index: linux-2.6/arch/x86_64/ia32/ia32_binfmt.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/ia32/ia32_binfmt.c
-+++ linux-2.6/arch/x86_64/ia32/ia32_binfmt.c
+--- linux-2.6.orig/arch/x86/ia32/ia32_binfmt.c
++++ linux-2.6/arch/x86/ia32/ia32_binfmt.c
 @@ -251,8 +251,6 @@ elf_core_copy_task_xfpregs(struct task_s
  #define elf_check_arch(x) \
  	((x)->e_machine == EM_386)
@@ -618,8 +618,8 @@
  /* Override some function names */
 Index: linux-2.6/arch/x86_64/kernel/process.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/kernel/process.c
-+++ linux-2.6/arch/x86_64/kernel/process.c
+--- linux-2.6.orig/arch/x86/kernel/process_64.c
++++ linux-2.6/arch/x86/kernel/process_64.c
 @@ -686,12 +686,6 @@ void set_personality_64bit(void)
  
  	/* Make sure to be in 64bit mode */
@@ -635,8 +635,8 @@
  asmlinkage long sys_fork(struct pt_regs *regs)
 Index: linux-2.6/arch/x86_64/kernel/setup64.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/kernel/setup64.c
-+++ linux-2.6/arch/x86_64/kernel/setup64.c
+--- linux-2.6.orig/arch/x86/kernel/setup64.c
++++ linux-2.6/arch/x86/kernel/setup64.c
 @@ -40,46 +40,6 @@ unsigned long __supported_pte_mask __rea
  EXPORT_SYMBOL(__supported_pte_mask);
  static int do_not_nx __cpuinitdata = 0;
@@ -686,8 +686,8 @@
   * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
 Index: linux-2.6/arch/x86_64/mm/fault.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/mm/fault.c
-+++ linux-2.6/arch/x86_64/mm/fault.c
+--- linux-2.6.orig/arch/x86/mm/fault_64.c
++++ linux-2.6/arch/x86/mm/fault_64.c
 @@ -108,7 +108,7 @@ static noinline int is_prefetch(struct p
  	instr = (unsigned char __user *)convert_rip_to_linear(current, regs);
  	max_instr = instr + 15;
@@ -699,8 +699,8 @@
  	while (scan_more && instr < max_instr) { 
 Index: linux-2.6/arch/x86_64/mm/mmap.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/mm/mmap.c
-+++ linux-2.6/arch/x86_64/mm/mmap.c
+--- linux-2.6.orig/arch/x86/mm/mmap_64.c
++++ linux-2.6/arch/x86/mm/mmap_64.c
 @@ -1,29 +1,88 @@
 -/* Copyright 2005 Andi Kleen, SuSE Labs.
 - * Licensed under GPL, v.2
@@ -1049,8 +1049,8 @@
  
  	/*
  	 * Print the dentry name for named mappings, and a
---- linux-2.6.22.noarch/include/asm-i386/a.out.h~	2007-07-20 14:10:41.000000000 -0400
-+++ linux-2.6.22.noarch/include/asm-i386/a.out.h	2007-07-20 14:10:52.000000000 -0400
+--- linux-2.6.22.noarch/include/asm-x86/a.out_32.h~	2007-07-20 14:10:41.000000000 -0400
++++ linux-2.6.22.noarch/include/asm-x86/a.out_32.h	2007-07-20 14:10:52.000000000 -0400
 @@ -19,7 +19,7 @@ struct exec
  
  #ifdef __KERNEL__
@@ -1060,8 +1060,8 @@
  #define STACK_TOP_MAX	STACK_TOP
  
  #endif
---- linux-2.6.19.noarch/include/asm-i386/desc.h~	2006-12-08 06:52:55.000000000 -0500
-+++ linux-2.6.19.noarch/include/asm-i386/desc.h	2006-12-08 06:53:14.000000000 -0500
+--- linux-2.6.19.noarch/include/asm-x86/desc_32.h~	2006-12-08 06:52:55.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-x86/desc_32.h	2006-12-08 06:53:14.000000000 -0500
 @@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
  	return base;
  }
@@ -1083,8 +1083,8 @@
  #else /* __ASSEMBLY__ */
  
  /*
---- linux-2.6.21.noarch/include/asm-i386/elf.h~	2007-05-27 18:54:47.000000000 -0400
-+++ linux-2.6.21.noarch/include/asm-i386/elf.h	2007-05-27 18:55:11.000000000 -0400
+--- linux-2.6.21.noarch/include/asm-x86/elf_32.h~	2007-05-27 18:54:47.000000000 -0400
++++ linux-2.6.21.noarch/include/asm-x86/elf_32.h	2007-05-27 18:55:11.000000000 -0400
 @@ -215,4 +216,7 @@ do {									      \
  
  #endif
@@ -1095,8 +1095,8 @@
  #endif
 Index: linux-2.6/include/asm-i386/mmu.h
 ===================================================================
---- linux-2.6.orig/include/asm-i386/mmu.h
-+++ linux-2.6/include/asm-i386/mmu.h
+--- linux-2.6.orig/include/asm-x86/mmu_32.h
++++ linux-2.6/include/asm-x86/mmu_32.h
 @@ -7,11 +7,15 @@
   * we put the segment information here.
   *
@@ -1115,8 +1115,8 @@
  
 Index: linux-2.6/include/asm-i386/processor.h
 ===================================================================
---- linux-2.6.orig/include/asm-i386/processor.h
-+++ linux-2.6/include/asm-i386/processor.h
+--- linux-2.6.orig/include/asm-x86/processor_32.h
++++ linux-2.6/include/asm-x86/processor_32.h
 @@ -326,7 +326,10 @@ extern int bootloader_type;
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
@@ -1224,8 +1224,8 @@
  #endif /* _SPARC64_PGALLOC_H */
 Index: linux-2.6/include/asm-x86_64/pgalloc.h
 ===================================================================
---- linux-2.6.orig/include/asm-x86_64/pgalloc.h
-+++ linux-2.6/include/asm-x86_64/pgalloc.h
+--- linux-2.6.orig/include/asm-x86/pgalloc_64.h
++++ linux-2.6/include/asm-x86/pgalloc_64.h
 @@ -6,6 +6,13 @@
  #include <linux/threads.h>
  #include <linux/mm.h>

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-highres-timers.patch	10 Oct 2007 19:50:38 -0000	1.16
+++ linux-2.6-highres-timers.patch	15 Oct 2007 18:36:21 -0000	1.17
@@ -4056,7 +4056,7 @@
   * Restart the idle tick when the CPU is woken up from idle
 Index: linux-2.6.23/arch/x86_64/kernel/hpet.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/hpet.c	2007-10-10 09:43:05.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/hpet_64.c	2007-10-10 09:43:05.000000000 +0200
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,493 +0,0 @@
 -#include <linux/kernel.h>
@@ -4554,8 +4554,8 @@
 -__setup("nohpet", nohpet_setup);
 Index: linux-2.6.23/arch/x86_64/kernel/time.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/time.c	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/time.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/time_64.c	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/time_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -28,11 +28,12 @@
  #include <linux/cpu.h>
  #include <linux/kallsyms.h>
@@ -4784,8 +4784,8 @@
 -device_initcall(time_init_device);
 Index: linux-2.6.23/arch/x86_64/kernel/tsc.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/tsc.c	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/tsc.c	2007-10-10 09:43:06.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/tsc_64.c	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/tsc_64.c	2007-10-10 09:43:06.000000000 +0200
 @@ -6,7 +6,9 @@
  #include <linux/time.h>
  #include <linux/acpi.h>
@@ -4893,8 +4893,8 @@
   * over all CPUs.
 Index: linux-2.6.23/include/asm-i386/tsc.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-i386/tsc.h	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/tsc.h	2007-10-10 09:43:06.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/tsc.h	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/include/asm-x86/tsc.h	2007-10-10 09:43:06.000000000 +0200
 @@ -72,4 +72,8 @@ int check_tsc_unstable(void);
  extern void check_tsc_sync_source(int cpu);
  extern void check_tsc_sync_target(void);
@@ -4906,8 +4906,8 @@
  #endif
 Index: linux-2.6.23/arch/i386/kernel/hpet.c
 ===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/hpet.c	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/hpet.c	2007-10-10 09:43:09.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/hpet_32.c	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/hpet_32.c	2007-10-10 09:43:09.000000000 +0200
 @@ -1,5 +1,6 @@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
@@ -5291,8 +5291,8 @@
  
 Index: linux-2.6.23/arch/i386/kernel/i8253.c
 ===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/i8253.c	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/i8253.c	2007-10-10 09:43:07.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/i8253_32.c	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/i8253_32.c	2007-10-10 09:43:07.000000000 +0200
 @@ -13,7 +13,6 @@
  #include <asm/delay.h>
  #include <asm/i8253.h>
@@ -5317,8 +5317,8 @@
 +#endif
 Index: linux-2.6.23/include/asm-i386/i8253.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-i386/i8253.h	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/i8253.h	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/i8253_32.h	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/include/asm-x86/i8253_32.h	2007-10-10 09:43:08.000000000 +0200
 @@ -1,8 +1,6 @@
  #ifndef __ASM_I8253_H__
  #define __ASM_I8253_H__
@@ -5330,8 +5330,8 @@
  #define PIT_CH0			0x40
 Index: linux-2.6.23/include/asm-x86_64/i8253.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/i8253.h	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/i8253.h	2007-10-10 09:43:07.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/i8253_64.h	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/include/asm-x86/i8253_64.h	2007-10-10 09:43:07.000000000 +0200
 @@ -1,6 +1,2 @@
 -#ifndef __ASM_I8253_H__
 -#define __ASM_I8253_H__
@@ -5343,8 +5343,8 @@
 +#include <asm/8253pit.h>
 Index: linux-2.6.23/arch/x86_64/kernel/apic.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/apic.c	2007-10-10 09:43:05.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/apic.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/apic_64.c	2007-10-10 09:43:05.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/apic_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/sysdev.h>
  #include <linux/module.h>
@@ -5819,8 +5819,8 @@
 -
 Index: linux-2.6.23/arch/x86_64/kernel/process.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/process.c	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/process.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/process_64.c	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/process_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/notifier.h>
  #include <linux/kprobes.h>
@@ -5848,30 +5848,30 @@
  		preempt_disable();
 Index: linux-2.6.23/arch/x86_64/kernel/Makefile
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/Makefile	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/Makefile	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/Makefile_64	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/Makefile_64	2007-10-10 09:43:08.000000000 +0200
 @@ -9,7 +9,7 @@ obj-y	:= process.o signal.o entry.o trap
- 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
- 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
- 		pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
+ 		x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
+ 		setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
+ 		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc_64.o bugs_64.o \
 -		perfctr-watchdog.o
 +		perfctr-watchdog.o i8253.o
  
  obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
- obj-$(CONFIG_X86_MCE)		+= mce.o therm_throt.o
+ obj-$(CONFIG_X86_MCE)		+= mce_64.o therm_throt.o
 @@ -48,6 +48,8 @@ obj-y				+= pcspeaker.o
  
- CFLAGS_vsyscall.o		:= $(PROFILING) -g0
+ CFLAGS_vsyscall_64.o		:= $(PROFILING) -g0
  
 +i8253-y				+= ../../i386/kernel/i8253.o
 +hpet-y				+= ../../i386/kernel/hpet.o
- therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
+ therm_throt-y                   += cpu/mcheck/therm_throt.o
  bootflag-y			+= ../../i386/kernel/bootflag.o
  cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-Index: linux-2.6.23/arch/x86_64/kernel/i8259.c
+Index: linux-2.6.23/arch/x86/kernel/i8259.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/i8259.c	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/i8259.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/i8259_64.c	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/i8259_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
  	}
  }
@@ -5934,8 +5934,8 @@
  }
 Index: linux-2.6.23/arch/x86_64/kernel/smpboot.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/smpboot.c	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/smpboot.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/smpboot_64.c	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/smpboot_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
  	local_irq_disable();
  	Dprintk("Stack at about %p\n",&cpuid);
@@ -5956,8 +5956,8 @@
  	 * this cpu
 Index: linux-2.6.23/include/asm-x86_64/hpet.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/hpet.h	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/hpet.h	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/hpet_64.h	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/include/asm-x86/hpet_64.h	2007-10-10 09:43:08.000000000 +0200
 @@ -1,18 +1,2 @@
 -#ifndef _ASM_X8664_HPET_H
 -#define _ASM_X8664_HPET_H 1
@@ -5979,8 +5979,8 @@
 -#endif
 Index: linux-2.6.23/include/asm-x86_64/apic.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/apic.h	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/apic.h	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/apic_64.h	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/include/asm-x86/apic_64.h	2007-10-10 09:43:08.000000000 +0200
 @@ -19,7 +19,7 @@
  extern int apic_verbosity;
  extern int apic_runs_main_timer;
@@ -6012,8 +6012,8 @@
  extern unsigned boot_cpu_id;
 Index: linux-2.6.23/include/asm-x86_64/proto.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/proto.h	2007-10-10 09:43:04.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/proto.h	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/proto.h	2007-10-10 09:43:04.000000000 +0200
++++ linux-2.6.23/include/asm-x86/proto.h	2007-10-10 09:43:08.000000000 +0200
 @@ -51,9 +51,6 @@ extern void reserve_bootmem_generic(unsi
  
  extern void load_gs_index(unsigned gs);
@@ -6068,8 +6068,8 @@
  
 Index: linux-2.6.23/include/asm-i386/hpet.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-i386/hpet.h	2007-10-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/include/asm-i386/hpet.h	2007-10-10 09:43:09.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/hpet_32.h	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/include/asm-x86/hpet_32.h	2007-10-10 09:43:09.000000000 +0200
 @@ -64,8 +64,11 @@
  
  /* hpet memory map physical address */
@@ -6092,8 +6092,8 @@
  #endif /* _I386_HPET_H */
 Index: linux-2.6.23/include/asm-x86_64/vsyscall.h
 ===================================================================
---- linux-2.6.23.orig/include/asm-x86_64/vsyscall.h	2007-10-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/include/asm-x86_64/vsyscall.h	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/include/asm-x86/vsyscall.h	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/include/asm-x86/vsyscall.h	2007-10-10 09:43:08.000000000 +0200
 @@ -29,9 +29,6 @@ enum vsyscall_num {
  #define VGETCPU_RDTSCP	1
  #define VGETCPU_LSL	2
@@ -6106,8 +6106,8 @@
  
 Index: linux-2.6.23/arch/x86_64/kernel/setup.c
 ===================================================================
---- linux-2.6.23.orig/arch/x86_64/kernel/setup.c	2007-10-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/arch/x86_64/kernel/setup.c	2007-10-10 09:43:08.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/setup_64.c	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/setup_64.c	2007-10-10 09:43:08.000000000 +0200
 @@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct
  #endif
  }
@@ -6180,8 +6180,8 @@
  	return ret;
 Index: linux-2.6.23/arch/i386/kernel/quirks.c
 ===================================================================
---- linux-2.6.23.orig/arch/i386/kernel/quirks.c	2007-10-10 09:43:03.000000000 +0200
-+++ linux-2.6.23/arch/i386/kernel/quirks.c	2007-10-10 09:43:09.000000000 +0200
+--- linux-2.6.23.orig/arch/x86/kernel/quirks.c	2007-10-10 09:43:03.000000000 +0200
++++ linux-2.6.23/arch/x86/kernel/quirks.c	2007-10-10 09:43:09.000000000 +0200
 @@ -4,6 +4,8 @@
  #include <linux/pci.h>
  #include <linux/irq.h>

linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch:

Index: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	9 Aug 2007 22:32:09 -0000	1.2
+++ linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch	15 Oct 2007 18:36:21 -0000	1.3
@@ -27,42 +27,42 @@
  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
  
 +vdso_install:
-+	$(Q)$(MAKE) $(build)=arch/i386/kernel vdso_install
++	$(Q)$(MAKE) $(build)=arch/x86/kernel vdso_install
 +
  archclean:
- 	$(Q)$(MAKE) $(clean)=arch/i386/boot
+ 	$(Q)$(MAKE) $(clean)=arch/x86/boot
  
-diff -puN arch/i386/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk arch/i386/kernel/Makefile
---- a/arch/i386/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk
-+++ a/arch/i386/kernel/Makefile
-@@ -52,7 +52,8 @@ obj-$(CONFIG_SCx200)		+= scx200.o
+diff -puN arch/x86/kernel/Makefile~i386-vdso-install-unstripped-copies-on-disk arch/x86/kernel/Makefile
+--- a/arch/x86/kernel/Makefile_32~i386-vdso-install-unstripped-copies-on-disk
++++ a/arch/x86/kernel/Makefile_32
+@@ -52,7 +52,8 @@ obj-$(CONFIG_SCx200)		+= scx200_32.o
  # We must build both images before we can assemble it.
  # Note: kbuild does not track this dependency due to usage of .incbin
- $(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
+ $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
 -targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
 +targets += $(foreach F,$(addprefix vsyscall-,int80 sysenter),\
 +		     $F.o $F.so $F.so.dbg)
- targets += vsyscall-note.o vsyscall.lds
+ targets += vsyscall-note_32.o vsyscall_32.lds
  
  # The DSO images are built using a special linker script.
 @@ -62,16 +63,32 @@ quiet_cmd_syscall = SYSCALL $@
  
- export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
+ export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
  
 -vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
 +vsyscall-flags = -shared -Wl,-soname=linux-gate.so.1 \
  		 $(call ld-option, -Wl$(comma)--hash-style=sysv)
--SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
--SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
+-SYSCFLAGS_vsyscall-sysenter_32.so	= $(vsyscall-flags)
+-SYSCFLAGS_vsyscall-int80_32.so	= $(vsyscall-flags)
 +SYSCFLAGS_vsyscall-sysenter.so.dbg	= $(vsyscall-flags)
 +SYSCFLAGS_vsyscall-int80.so.dbg		= $(vsyscall-flags)
  
--$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
--$(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
--		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
+-$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \
+-$(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
+-		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE
 +$(obj)/vsyscall-int80.so.dbg $(obj)/vsyscall-sysenter.so.dbg: \
 +$(obj)/vsyscall-%.so.dbg: $(src)/vsyscall.lds \
-+		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
++		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE
  	$(call if_changed,syscall)
  
 +$(obj)/%.so: OBJCOPYFLAGS := -S

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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-silence-noise.patch	13 Jul 2007 19:58:04 -0000	1.9
+++ linux-2.6-silence-noise.patch	15 Oct 2007 18:36:21 -0000	1.10
@@ -1,5 +1,5 @@
---- linux-2.6.18.noarch/arch/x86_64/mm/init.c~	2006-10-16 17:09:56.000000000 -0400
-+++ linux-2.6.18.noarch/arch/x86_64/mm/init.c	2006-10-16 17:10:09.000000000 -0400
+--- 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;
@@ -32,8 +32,8 @@
  				"#%d:%llx@%llx for %s\n",
  			res->flags & IORESOURCE_IO ? "I/O" : "mem",
  			resno, (unsigned long long)(res->end - res->start + 1),
---- linux-2.6.19.noarch/arch/i386/pci/i386.c~	2006-12-04 11:21:32.000000000 -0500
-+++ linux-2.6.19.noarch/arch/i386/pci/i386.c	2006-12-04 11:22:10.000000000 -0500
+--- linux-2.6.19.noarch/arch/x86/pci/i386.c~	2006-12-04 11:21:32.000000000 -0500
++++ linux-2.6.19.noarch/arch/x86/pci/i386.c	2006-12-04 11:22:10.000000000 -0500
 @@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_
  				pr = pci_find_parent_resource(dev, r);
  				if (!r->start || !pr ||




More information about the fedora-extras-commits mailing list