Thu Feb 15 21:55:28 UTC 2007

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2000

Modified Files:
	.cvsignore Makefile kernel-2.6.spec 
	linux-2.6-compile-fixes.patch linux-2.6-debug-boot-delay.patch 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-debug-verbosify-bug.patch 
	linux-2.6-defaults-disable-split-ptlock.patch 
	linux-2.6-defaults-phys-start.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch linux-2.6-module_version.patch 
	linux-2.6-proc-self-maps-fix.patch 
	linux-2.6-sata-promise-pata-ports.patch 
	linux-2.6-silence-noise.patch 
	linux-2.6-softlockup-disable.patch sources upstream 
Added Files:
	linux-2.6.20.tar.bz2.sign 
Removed Files:
	linux-2.6.19.tar.bz2.sign patch-2.6.19.3.bz2.sign 
Log Message:
* Thu Feb 15 2007 Chuck Ebbert <cebbert at redhat.com>
- rebase to linux kernel 2.6.20

--- NEW FILE linux-2.6.20.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBFxi8uyGugalF9Dw4RAghxAJ9pyBUzS0PuQdZug8IEwcnmvPlHkgCglOjL
9LFRDT7JzcGjqcB4On00+jk=
=pNTd
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- .cvsignore	5 Feb 2007 21:02:14 -0000	1.431
+++ .cvsignore	15 Feb 2007 21:55:25 -0000	1.432
@@ -1,7 +1,5 @@
 clog
 kernel-2.6.*.config
 temp-*
-kernel-2.6.19
-linux-2.6.19.tar.bz2
-xen-3.0.3-11774.tar.bz2
-patch-2.6.19.3.bz2
+kernel-2.6.20
+linux-2.6.20.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile	6 Feb 2007 02:02:46 -0000	1.29
+++ Makefile	15 Feb 2007 21:55:25 -0000	1.30
@@ -55,6 +55,6 @@
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.19" make -f Makefile.config configs
+	@VERSION="2.6.20" make -f Makefile.config configs
 	@scripts/reconfig.sh
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2288
retrieving revision 1.2289
diff -u -r1.2288 -r1.2289
--- kernel-2.6.spec	10 Feb 2007 19:09:05 -0000	1.2288
+++ kernel-2.6.spec	15 Feb 2007 21:55:25 -0000	1.2289
@@ -8,7 +8,7 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 1
+%define includexen 0
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define builddoc 0
@@ -30,7 +30,7 @@
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 19
+%define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
@@ -379,7 +379,6 @@
 Patch1013: linux-2.6-debug-taint-vm.patch
 Patch1015: linux-2.6-debug-spinlock-taint.patch
 Patch1016: linux-2.6-debug-Wundef.patch
-Patch1017: linux-2.6-debug-disable-builtins.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
@@ -399,7 +398,6 @@
 Patch1070: linux-2.6-sleepon.patch
 
 # SCSI bits.
-Patch1101: linux-2.6-ips-softlockup.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
 
 # NFS bits.
@@ -416,8 +414,6 @@
 # GFS/DLM
 Patch1411: linux-2.6-gfs2-tux.patch
 Patch1412: linux-2.6-gfs2-locking-exports.patch
-Patch1413: linux-2.6-gfs2-update.patch
-Patch1414: linux-2.6-gfs2-update2.patch
 
 # NFS superblock sharing / CacheFS
 Patch1431: linux-2.6-cachefiles.patch
@@ -433,16 +429,13 @@
 Patch1650: linux-2.6-serial-460800.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1682: linux-2.6-xfs_attr2.patch
-Patch1683: linux-2.6-CIFS-null-terminator.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
-Patch1731: linux-2.6-cpufreq-unload-smi.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1750: linux-2.6-usb-storage-reboot.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
 Patch1771: linux-2.6-silence-noise.patch
 Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
-Patch1791: linux-2.6-drivers-8139too-poll.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -454,7 +447,6 @@
 Patch1910: linux-2.6-unexport-symbols.patch
 
 # VM bits.
-Patch2000: linux-2.6-vm-debug.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 
 # Tweak some defaults.
@@ -462,19 +454,13 @@
 Patch2101: linux-2.6-defaults-firmware-loader-timeout.patch
 Patch2102: linux-2.6-defaults-phys-start.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
-Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 
-Patch2300: linux-2.6-lockdep-fixes.patch
-
 # ACPI bits
 
-# Net driver fixes.
-Patch2500: linux-2.6-net-forcedeth-suspend.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.
@@ -813,7 +799,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-%patch1 -p1
+#%patch1 -p1
 #%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -853,9 +839,7 @@
 # Alleviate G5 thermal shutdown problems
 %patch310 -p1
 # Disable cache-inhibited 64KiB pages on POWER6
-%patch311 -p1
-# Flag RAID partitions with Mac partition tables for autorun
-%patch312 -p1
+#%patch311 -p1
 
 # S390
 
@@ -927,7 +911,6 @@
 %patch1013 -p1
 %patch1015 -p1
 %patch1016 -p1
-%patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1
 # Disable the 'quiet' boot switch for better bug reports.
@@ -963,8 +946,6 @@
 #
 # SCSI Bits.
 #
-# Fix softlockup with ips driver.
-%patch1101 -p1
 # fix cpqarray pci enable
 %patch1106 -p1
 
@@ -984,9 +965,6 @@
 # GFS2/DLM
 #%patch1411 -p1
 %patch1412 -p1
-# GFS2 update
-%patch1413 -p1
-%patch1414 -p1
 
 #nfs sharing / cachefs
 %patch1431 -p1
@@ -1008,14 +986,10 @@
 %patch1681 -p1
 # Fix attr2 corruption with btree data extents
 %patch1682 -p1
-# Fix CIFS null termination bug
-%patch1683 -p1
 # Align kernel data segment to page boundary.
 %patch1690 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
-# Don't load speedstep-smi on mobile pentium 4
-%patch1731 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
 %patch1740 -p1
 # USB storage not seen upon reboot
@@ -1026,8 +1000,6 @@
 %patch1771 -p1
 # qlogic firmware
 %patch1790 -p1
-# net driver 8139too polling lockup
-%patch1791 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
@@ -1040,8 +1012,6 @@
 #
 # VM related fixes.
 #
-# Reenable negative pagecount debugging even if CONFIG_DEBUG_VM is off.
-%patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
 
@@ -1055,8 +1025,6 @@
 
 # Use unicode VT's by default.
 %patch2103 -p1
-# Disable split page table lock
-%patch2104 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
 
@@ -1064,13 +1032,7 @@
 
 # SATA
 # PATA ports on Promise.
-%patch2200 -p1
-
-%patch2300 -p1
-
-# Network driver fixes.
-# suspend/resume for forcedeth
-%patch2500 -p1
+#%patch2200 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -1810,6 +1772,9 @@
 %endif
 
 %changelog
+* Thu Feb 15 2007 Chuck Ebbert <cebbert at redhat.com>
+- rebase to linux kernel 2.6.20
+
 * Sat Feb 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - add missing "provides" for debug-devel packages
 - clean up some other "provides" things

linux-2.6-compile-fixes.patch:
 linux-2.6.19.noarch/include/asm-powerpc/io.h       |    1 +
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c |    4 ++++
 2 files changed, 5 insertions(+)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-compile-fixes.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- linux-2.6-compile-fixes.patch	22 Sep 2006 22:43:07 -0000	1.62
+++ linux-2.6-compile-fixes.patch	15 Feb 2007 21:55:26 -0000	1.63
@@ -1,25 +1,73 @@
+#
+# Small compile fixes (For more involved fixes, please use a separate patch).
+#
+# Please add the errors from gcc before the diffs to save others having
+# to do a compile to figure out what your diff is fixing. Thanks.
+#
 
---- linux-2.6.17.noarch/Makefile~	2006-06-29 17:20:17.000000000 -0400
-+++ linux-2.6.17.noarch/Makefile	2006-06-29 17:20:38.000000000 -0400
-@@ -267,10 +267,6 @@ MAKEFLAGS += --include-dir=$(srctree)
- # We need some generic definitions
- include  $(srctree)/scripts/Kbuild.include
+
+#drivers/ieee1394/sbp2.c: In function 'sbp2_prep_command_orb_sg':
+#drivers/ieee1394/sbp2.c:1473: error: implicit declaration of function 'sg_dma_len'
+#drivers/ieee1394/sbp2.c:1474: error: implicit declaration of function 'sg_dma_address'
+#
+#Signed-off-by: Dave Jones <davej at redhat.com>
+#
+#--- linux-2.6.19.noarch/include/asm-ia64/scatterlist.h~	2006-12-12 12:35:24.000000000 -0500
+#+++ linux-2.6.19.noarch/include/asm-ia64/scatterlist.h	2006-12-12 12:35:47.000000000 -0500
+#@@ -25,4 +25,12 @@ struct scatterlist {
+#  */
+# #define ISA_DMA_THRESHOLD	0xffffffff
+# 
+#+/* These macros should be used after a pci_map_sg call has been done
+#+ * to get bus addresses of each of the SG entries and their lengths.
+#+ * You should only work with the number of sg entries pci_map_sg
+#+ * returns.
+#+ */
+#+#define sg_dma_address(sg)	((sg)->dma_address)
+#+#define sg_dma_len(sg)		((sg)->dma_length)
+#+
+# #endif /* _ASM_IA64_SCATTERLIST_H */
+
+
+drivers/net/smc-ultra.c: In function 'ultra_block_input':
+drivers/net/smc-ultra.c:458: error: implicit declaration of function 'eth_io_copy_and_sum'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.19.noarch/include/asm-powerpc/io.h~	2006-12-29 02:11:33.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-powerpc/io.h	2006-12-29 02:12:30.000000000 -0500
+@@ -729,6 +729,7 @@ static inline void * bus_to_virt(unsigne
+ }
  
--# Do not use make's built-in rules and variables
--# This increases performance and avoid hard-to-debug behavour
--MAKEFLAGS += -rR
--
- # Make variables (CC, etc...)
+ #define page_to_bus(page)	(page_to_phys(page) + PCI_DRAM_OFFSET)
++#define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
  
- AS		= $(CROSS_COMPILE)as
---- linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c~	2006-07-27 13:21:51.000000000 -0400
-+++ linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 13:22:03.000000000 -0400
-@@ -42,6 +42,7 @@ EXPORT_SYMBOL(__do_clear_user);
- EXPORT_SYMBOL(__strlen_user);
- EXPORT_SYMBOL(__strncpy_from_user);
- EXPORT_SYMBOL(__strnlen_user);
-+EXPORT_SYMBOL(copy_page);
+ #endif /* CONFIG_PPC32 */
  
- #define __KERNEL_SYSCALLS__
- #include <asm/unistd.h>
 
+--- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~	2006-11-29 21:57:37.000000000 +0000
++++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c	2006-12-13 16:53:11.000000000 +0000
+@@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock)
+ 	if (firmware_has_feature(FW_FEATURE_ISERIES))
+ 		HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
+ 			((u64)holder_cpu << 32) | yield_count);
++#ifdef CONFIG_PPC_PSERIES
+ 	else
+ 		plpar_hcall_norets(H_CONFER,
+ 			get_hard_smp_processor_id(holder_cpu), yield_count);
++#endif
+ }
+ 
+ /*
+@@ -72,9 +74,11 @@ void __rw_yield(raw_rwlock_t *rw)
+ 	if (firmware_has_feature(FW_FEATURE_ISERIES))
+ 		HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
+ 			((u64)holder_cpu << 32) | yield_count);
++#ifdef CONFIG_PPC_PSERIES
+ 	else
+ 		plpar_hcall_norets(H_CONFER,
+ 			get_hard_smp_processor_id(holder_cpu), yield_count);
++#endif
+ }
+ #endif
+ 

linux-2.6-debug-boot-delay.patch:
 init/calibrate.c                |    2 +-
 kernel/printk.c                 |   35 +++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug               |   18 ++++++++++++++++++
 linux-2.6.19.noarch/init/main.c |   24 ++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-boot-delay.patch	7 Feb 2006 22:27:14 -0000	1.3
+++ linux-2.6-debug-boot-delay.patch	15 Feb 2007 21:55:26 -0000	1.4
@@ -25,11 +25,11 @@
  lib/Kconfig.debug |   18 ++++++++++++++++++
  4 files changed, 77 insertions(+), 1 deletion(-)
 
---- linux-2615-work.orig/init/main.c
-+++ linux-2615-work/init/main.c
-@@ -557,6 +557,31 @@ static int __init initcall_debug_setup(c
+--- linux-2.6.19.noarch/init/main.c~	2006-12-12 09:32:35.000000000 -0500
++++ linux-2.6.19.noarch/init/main.c	2006-12-12 09:33:32.000000000 -0500
+@@ -685,6 +685,30 @@ static void __init do_initcalls(void)
+ 	flush_scheduled_work();
  }
- __setup("initcall_debug", initcall_debug_setup);
  
 +#ifdef CONFIG_BOOT_DELAY
 +
@@ -49,16 +49,15 @@
 +	printk_delay_msec = loops_per_msec;
 +	printk("boot_delay: %u, preset_lpj: %ld, lpj: %lu, CONFIG_HZ: %d, printk_delay_msec: %llu\n",
 +		boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
-+
 +	return 1;
 +}
 +__setup("boot_delay=", boot_delay_setup);
 +
 +#endif
 +
- struct task_struct *child_reaper = &init_task;
- 
- extern initcall_t __initcall_start[], __initcall_end[];
+ /*
+  * Ok, the machine is now initialized. None of the devices
+  * have been touched yet, but the CPU subsystem is up and
 --- linux-2615-work.orig/init/calibrate.c
 +++ linux-2615-work/init/calibrate.c
 @@ -10,7 +10,7 @@

linux-2.6-debug-taint-vm.patch:
 linux-2.6.15/mm/page_alloc.c                  |    4 ++--
 linux-2.6.16.noarch/mm/slab.c                 |    4 ++--
 linux-2.6.20.noarch/include/asm-generic/bug.h |    9 ++++++---
 linux-2000/kernel/panic.c                     |    1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-debug-taint-vm.patch	31 Jan 2007 15:26:15 -0000	1.9
+++ linux-2.6-debug-taint-vm.patch	15 Feb 2007 21:55:26 -0000	1.10
@@ -1,14 +1,18 @@
---- linux-2.6.16.noarch/include/asm-generic/bug.h~	2006-03-24 15:32:04.000000000 -0500
-+++ linux-2.6.16.noarch/include/asm-generic/bug.h	2006-03-24 15:33:29.000000000 -0500
-@@ -4,10 +4,14 @@
+--- linux-2.6.20.noarch/include/asm-generic/bug.h~	2007-02-12 16:18:21.000000000 -0500
++++ linux-2.6.20.noarch/include/asm-generic/bug.h	2007-02-12 16:19:57.000000000 -0500
+@@ -3,6 +3,10 @@
+ 
  #include <linux/compiler.h>
- #include <linux/config.h>
  
 +#ifndef __ASSEMBLY__
 +extern const char *print_tainted(void);
 +#endif
 +
  #ifdef CONFIG_BUG
+ 
+ #ifdef CONFIG_GENERIC_BUG
+@@ -22,7 +26,7 @@ struct bug_entry {
+ 
  #ifndef HAVE_ARCH_BUG
  #define BUG() do { \
 -	printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
@@ -16,14 +20,13 @@
  	panic("BUG!"); \
  } while (0)
  #endif
-@@ -23,8 +23,8 @@ extern const char *print_tainted(void);
+@@ -35,8 +39,7 @@ struct bug_entry {
  #define WARN_ON(condition) ({						\
  	typeof(condition) __ret_warn_on = (condition);			\
  	if (unlikely(__ret_warn_on)) {					\
--		printk("BUG: warning at %s:%d/%s()\n", __FILE__,	\
+-		printk("BUG: at %s:%d %s()\n", __FILE__,		\
 -			__LINE__, __FUNCTION__);			\
-+		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__,	\
-+			__LINE__, __FUNCTION__, print_tainted());			\
++		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
  		dump_stack();						\
  	}								\
  	unlikely(__ret_warn_on);					\

linux-2.6-debug-verbosify-bug.patch:
 bug.h |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

Index: linux-2.6-debug-verbosify-bug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-verbosify-bug.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-verbosify-bug.patch	31 Jan 2007 15:26:15 -0000	1.2
+++ linux-2.6-debug-verbosify-bug.patch	15 Feb 2007 21:55:26 -0000	1.3
@@ -69,9 +69,9 @@
 
 Printing out the failing condition as a string would make this more helpful IMHO.
 
---- linux-2.6.18.noarch/include/asm-generic/bug.h~	2006-10-30 00:09:01.000000000 -0500
-+++ linux-2.6.18.noarch/include/asm-generic/bug.h	2006-10-30 00:11:12.000000000 -0500
-@@ -16,14 +16,19 @@ extern const char *print_tainted(void);
+--- linux-2.6.20.noarch/include/asm-generic/bug.h~	2007-02-12 16:24:41.000000000 -0500
++++ linux-2.6.20.noarch/include/asm-generic/bug.h	2007-02-12 16:25:53.000000000 -0500
+@@ -32,14 +32,19 @@ struct bug_entry {
  #endif
  
  #ifndef HAVE_ARCH_BUG_ON
@@ -88,11 +88,11 @@
  #define WARN_ON(condition) ({						\
  	typeof(condition) __ret_warn_on = (condition);			\
  	if (unlikely(__ret_warn_on)) {					\
--		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__,	\
-+		printk("BUG: warning: (%s) at %s:%d/%s() (%s)\n", #condition, __FILE__,	\
- 			__LINE__, __FUNCTION__, print_tainted());			\
+-		printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \
++		printk("BUG: warning: (%s) at %s:%d/%s() (%s)\n", #condition, __FILE__, \
  		dump_stack();						\
  	}								\
+ 	unlikely(__ret_warn_on);					\
 @@ -58,8 +58,10 @@ extern const char *print_tainted(void);
  	typeof(condition) __ret_warn_once = (condition);	\
  								\

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-defaults-disable-split-ptlock.patch	31 Jan 2007 15:26:15 -0000	1.6
+++ linux-2.6-defaults-disable-split-ptlock.patch	15 Feb 2007 21:55:26 -0000	1.7
@@ -1,11 +1,10 @@
-diff -uNp linux-2.6.19.noarch/mm/Kconfig.orig linux-2.6.19.noarch/mm/Kconfig
---- linux-2.6.19.noarch/mm/Kconfig.orig	2006-12-23 21:32:06.000000000 +0100
-+++ linux-2.6.19.noarch/mm/Kconfig	2006-12-23 21:33:18.000000000 +0100
-@@ -139,6 +139,7 @@ config SPLIT_PTLOCK_CPUS
- 	int
+--- linux-2.6.17.noarch/mm/Kconfig.orig	2006-07-19 16:23:03.000000000 +0200
++++ linux-2.6.17.noarch/mm/Kconfig	2006-07-19 16:25:16.000000000 +0200
+@@ -135,6 +135,7 @@ config SPLIT_PTLOCK_CPUS
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
-+	default "4096" if !64BIT
  	default "4096" if X86_XEN || X86_64_XEN
++	default "4096" if !64BIT
  	default "4"
  
+ #

linux-2.6-defaults-phys-start.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-defaults-phys-start.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-phys-start.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-phys-start.patch	18 Jun 2006 04:45:03 -0000	1.1
+++ linux-2.6-defaults-phys-start.patch	15 Feb 2007 21:55:26 -0000	1.2
@@ -1,14 +1,14 @@
 
 http://www.lkml.org/lkml/2006/2/23/189
 
---- linux-2.6.16.noarch/arch/i386/Kconfig~	2006-04-04 15:30:43.000000000 -0500
-+++ linux-2.6.16.noarch/arch/i386/Kconfig	2006-04-04 15:30:55.000000000 -0500
-@@ -729,7 +729,7 @@ config CRASH_DUMP
- 	  Generate crash dump after being started by kexec.
+--- linux-2.6.20.noarch/arch/i386/Kconfig~	2007-02-12 16:32:20.000000000 -0500
++++ linux-2.6.20.noarch/arch/i386/Kconfig	2007-02-12 16:32:33.000000000 -0500
+@@ -778,7 +778,7 @@ config CRASH_DUMP
+ 	  For more details see Documentation/kdump/kdump.txt
  
  config PHYSICAL_START
 -	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 +	hex "Physical address where the kernel is loaded"
- 
- 	default "0x1000000" if CRASH_DUMP
  	default "0x100000"
+ 	help
+ 	  This gives the physical address where the kernel is loaded.

linux-2.6-devmem.patch:
 arch/i386/mm/init.c          |   19 +++++
 arch/ia64/mm/init.c          |    7 ++
 arch/powerpc/mm/mem.c        |   14 ++++
 arch/s390/mm/init.c          |    5 +
 arch/x86_64/mm/init.c        |   42 ++++++++++++
 drivers/char/mem.c           |  144 ++++++-------------------------------------
 fs/proc/kcore.c              |    2 
 include/asm-alpha/page.h     |    2 
 include/asm-arm/page.h       |    2 
 include/asm-arm26/page.h     |    2 
 include/asm-cris/page.h      |    2 
 include/asm-h8300/page.h     |    2 
 include/asm-i386/page.h      |    2 
 include/asm-ia64/page.h      |    1 
 include/asm-m68k/page.h      |    2 
 include/asm-m68knommu/page.h |    2 
 include/asm-mips/page.h      |    2 
 include/asm-parisc/page.h    |    2 
 include/asm-powerpc/page.h   |    2 
 include/asm-ppc/page.h       |    2 
 include/asm-s390/page.h      |    2 
 include/asm-sh/page.h        |    2 
 include/asm-sh64/page.h      |    2 
 include/asm-sparc/page.h     |    2 
 include/asm-sparc64/page.h   |    2 
 include/asm-um/page.h        |    1 
 include/asm-v850/page.h      |    2 
 include/asm-x86_64/page.h    |    4 +
 28 files changed, 152 insertions(+), 123 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-devmem.patch	31 Jan 2007 15:26:15 -0000	1.10
+++ linux-2.6-devmem.patch	15 Feb 2007 21:55:26 -0000	1.11
@@ -442,17 +442,18 @@
  #endif /* __ASSEMBLY__ */
  
  #ifdef __ASSEMBLY__
-diff -uNp linux-2.6.19.noarch/include/asm-ia64/page.h.orig linux-2.6.19.noarch/include/asm-ia64/page.h
---- linux-2.6.19.noarch/include/asm-ia64/page.h.orig	2006-12-23 21:24:24.000000000 +0100
-+++ linux-2.6.19.noarch/include/asm-ia64/page.h	2006-12-23 21:30:02.000000000 +0100
-@@ -277,5 +277,6 @@ extern struct address_space xen_ia64_for
+Index: linux-2.6/include/asm-ia64/page.h
+===================================================================
+--- linux-2.6.orig/include/asm-ia64/page.h
++++ linux-2.6/include/asm-ia64/page.h
+@@ -227,5 +227,6 @@ get_order (unsigned long size)
+ 					 (((current->personality & READ_IMPLIES_EXEC) != 0)	\
+ 					  ? VM_EXEC : 0))
  
- #endif /* CONFIG_XEN */
- #endif /* __ASSEMBLY__ */
 +#define devmem_is_allowed(x) 1
- #endif /* __KERNEL__ */
+ # endif /* __KERNEL__ */
  #endif /* _ASM_IA64_PAGE_H */
-
+Index: linux-2.6/include/asm-m68k/page.h
 ===================================================================
 --- linux-2.6.orig/include/asm-m68k/page.h
 +++ linux-2.6/include/asm-m68k/page.h

linux-2.6-execshield.patch:
 linux-2.6.19.noarch/drivers/char/random.c   |    8 +
 linux-2.6.19.noarch/include/asm-i386/desc.h |   14 ++
 linux-2.6.19.noarch/include/asm-i386/elf.h  |    6 +
 linux-2.6/arch/i386/kernel/cpu/common.c     |    7 +
 linux-2.6/arch/i386/kernel/process.c        |   59 ++++++++++++
 linux-2.6/arch/i386/kernel/smp.c            |    3 
 linux-2.6/arch/i386/kernel/sysenter.c       |    6 -
 linux-2.6/arch/i386/kernel/traps.c          |   93 +++++++++++++++++++
 linux-2.6/arch/i386/mm/init.c               |    6 +
 linux-2.6/arch/i386/mm/mmap.c               |    6 -
 linux-2.6/arch/i386/mm/pageattr.c           |    8 +
 linux-2.6/arch/ia64/ia32/binfmt_elf32.c     |    2 
 linux-2.6/arch/powerpc/kernel/vdso.c        |    3 
 linux-2.6/arch/x86_64/ia32/ia32_binfmt.c    |    6 -
 linux-2.6/arch/x86_64/ia32/syscall32.c      |    4 
 linux-2.6/arch/x86_64/kernel/process.c      |    6 -
 linux-2.6/arch/x86_64/kernel/setup64.c      |   40 --------
 linux-2.6/arch/x86_64/mm/fault.c            |    2 
 linux-2.6/arch/x86_64/mm/mmap.c             |   98 ++++++++++++++++----
 linux-2.6/fs/binfmt_elf.c                   |  131 ++++++++++++++++++++++------
 linux-2.6/fs/proc/array.c                   |    8 +
 linux-2.6/fs/proc/base.c                    |    8 -
 linux-2.6/fs/proc/task_mmu.c                |   29 +++++-
 linux-2.6/include/asm-i386/a.out.h          |    2 
 linux-2.6/include/asm-i386/mmu.h            |    4 
 linux-2.6/include/asm-i386/pgalloc.h        |    1 
 linux-2.6/include/asm-i386/processor.h      |    8 +
 linux-2.6/include/asm-ia64/pgalloc.h        |    4 
 linux-2.6/include/asm-powerpc/elf.h         |    3 
 linux-2.6/include/asm-powerpc/pgalloc.h     |    5 +
 linux-2.6/include/asm-ppc/pgalloc.h         |    5 +
 linux-2.6/include/asm-s390/pgalloc.h        |    4 
 linux-2.6/include/asm-sparc/pgalloc.h       |    4 
 linux-2.6/include/asm-sparc64/pgalloc.h     |    4 
 linux-2.6/include/asm-x86_64/pgalloc.h      |    7 +
 linux-2.6/include/linux/mm.h                |   11 +-
 linux-2.6/include/linux/resource.h          |    5 -
 linux-2.6/include/linux/sched.h             |    9 +
 linux-2.6/include/linux/sysctl.h            |    2 
 linux-2.6/kernel/signal.c                   |   33 +++++++
 linux-2.6/kernel/sysctl.c                   |   36 +++++++
 linux-2.6/mm/mmap.c                         |  105 ++++++++++++++++++++--
 linux-2.6/mm/mprotect.c                     |    6 +
 linux-2.6/mm/mremap.c                       |    4 
 44 files changed, 677 insertions(+), 138 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linux-2.6-execshield.patch	31 Jan 2007 15:26:15 -0000	1.27
+++ linux-2.6-execshield.patch	15 Feb 2007 21:55:26 -0000	1.28
@@ -146,12 +146,10 @@
 ===================================================================
 --- linux-2.6.orig/kernel/sysctl.c
 +++ linux-2.6/kernel/sysctl.c
-@@ -77,6 +77,28 @@ extern int sysctl_drop_caches;
+@@ -77,6 +77,26 @@
  extern int percpu_pagelist_fraction;
  extern int compat_log;
  
-+extern unsigned int vdso_enabled, vdso_populate;
-+
 +int exec_shield = (1<<0);
 +/* exec_shield is a bitmask:
 +          0: off; vdso at STACK_TOP, 1 page below TASK_SIZE
@@ -175,7 +173,7 @@
  /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
  static int maxolduid = 65535;
  static int minolduid;
-@@ -331,6 +353,40 @@ static ctl_table kern_table[] = {
+@@ -331,6 +351,22 @@
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -194,24 +192,6 @@
 +		.mode		= 0644,
 +		.proc_handler	= &proc_dointvec,
 +	},
-+#ifdef __i386__
-+	{
-+		.ctl_name	= KERN_VDSO,
-+		.procname	= "vdso",
-+		.data		= &vdso_enabled,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec,
-+	},
-+	{
-+		.ctl_name	= KERN_VDSO,
-+		.procname	= "vdso_populate",
-+		.data		= &vdso_populate,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec,
-+	},
-+#endif
 +	{
  		.ctl_name	= KERN_CORE_USES_PID,
  		.procname	= "core_uses_pid",
@@ -411,88 +391,6 @@
  
  	/*
  	 * Walk the list again, actually closing and freeing it,
-@@ -2094,3 +2183,81 @@ int may_expand_vm(struct mm_struct *mm, 
- 		return 0;
- 	return 1;
- }
-+
-+
-+static struct page *
-+special_mapping_nopage(struct vm_area_struct *vma,
-+		       unsigned long address, int *type)
-+{
-+	struct page **pages;
-+
-+	BUG_ON(address < vma->vm_start || address >= vma->vm_end);
-+
-+	address -= vma->vm_start;
-+	for (pages = vma->vm_private_data; address > 0 && *pages; ++pages)
-+		address -= PAGE_SIZE;
-+
-+	if (*pages) {
-+		get_page(*pages);
-+		return *pages;
-+	}
-+
-+	return NOPAGE_SIGBUS;
-+}
-+
-+static struct vm_operations_struct special_mapping_vmops = {
-+	.nopage	= special_mapping_nopage,
-+};
-+
-+unsigned int vdso_populate = 1;
-+
-+/*
-+ * Insert a new vma covering the given region, with the given flags and
-+ * protections.  Its pages are supplied by the given null-terminated array.
-+ * The region past the last page supplied will always produce SIGBUS.
-+ * The array pointer and the pages it points to are assumed to stay alive
-+ * for as long as this mapping might exist.
-+ */
-+int install_special_mapping(struct mm_struct *mm,
-+			    unsigned long addr, unsigned long len,
-+			    unsigned long vm_flags, pgprot_t pgprot,
-+			    struct page **pages)
-+{
-+	struct vm_area_struct *vma;
-+	int err;
-+
-+	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
-+	if (unlikely(vma == NULL))
-+		return -ENOMEM;
-+	memset(vma, 0, sizeof(*vma));
-+
-+	vma->vm_mm = mm;
-+	vma->vm_start = addr;
-+	vma->vm_end = addr + len;
-+
-+	vma->vm_flags = vm_flags;
-+	vma->vm_page_prot = pgprot;
-+
-+	vma->vm_ops = &special_mapping_vmops;
-+	vma->vm_private_data = pages;
-+
-+	insert_vm_struct(mm, vma);
-+	mm->total_vm += len >> PAGE_SHIFT;
-+
-+	if (!vdso_populate)
-+		return 0;
-+
-+	err = 0;
-+	while (*pages) {
-+		struct page *page = *pages++;
-+		get_page(page);
-+		err = install_page(mm, vma, addr, page, vma->vm_page_prot);
-+		if (err) {
-+			put_page(page);
-+			break;
-+		}
-+		addr += PAGE_SIZE;
-+	}
-+
-+	return err;
-+}
 Index: linux-2.6/arch/i386/kernel/traps.c
 ===================================================================
 --- linux-2.6.orig/arch/i386/kernel/traps.c
@@ -977,8 +875,8 @@
 -	mm->unmap_area = arch_unmap_area;
  }
 -
---- linux-2.6.19.noarch/drivers/char/random.c~	2006-12-18 13:04:12.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/char/random.c	2006-12-18 13:04:43.000000000 -0500
+--- linux-2.6.19.noarch/drivers/char/random.c~	2006-12-04 11:12:32.000000000 -0500
++++ linux-2.6.19.noarch/drivers/char/random.c	2006-12-04 11:18:10.000000000 -0500
 @@ -1635,13 +1635,19 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe
   */
  unsigned int get_random_int(void)
@@ -995,7 +893,7 @@
  	 * drain on it), and uses halfMD4Transform within the second. We
  	 * also mix it with jiffies and the PID:
  	 */
--	return secure_ip_id(current->pid + jiffies);
+-	return secure_ip_id((__force __be32)(current->pid + jiffies));
 +	return secure_ip_id((__force __be32)(current->pid + jiffies  + (int)val));
  }
  
@@ -1149,7 +1047,7 @@
  
  out_close:
  	kfree(elf_phdata);
-@@ -587,12 +587,12 @@ static int load_elf_binary(struct linux_
+@@ -586,12 +586,12 @@ static int load_elf_binary(struct linux_
  	int elf_exec_fileno;
  	int retval, i;
  	unsigned int size;
@@ -1159,8 +1057,8 @@
  	unsigned long reloc_func_desc = 0;
  	char passed_fileno[6];
  	struct files_struct *files;
--	int have_pt_gnu_stack, executable_stack = EXSTACK_DEFAULT;
-+	int have_pt_gnu_stack, executable_stack;
+-	int executable_stack = EXSTACK_DEFAULT;
++	int executable_stack;
  	unsigned long def_flags = 0;
  	struct {
  		struct elfhdr elf_ex;
@@ -1290,16 +1188,6 @@
  	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.
-@@ -1178,6 +1252,9 @@ static int maydump(struct vm_area_struct
- 	if (vma->vm_flags & (VM_IO | VM_RESERVED))
- 		return 0;
- 
-+	if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO.  */
-+		return 1;
-+
- 	/* Dump shared memory only if mapped from an anonymous file. */
- 	if (vma->vm_flags & VM_SHARED)
- 		return vma->vm_file->f_dentry->d_inode->i_nlink == 0;
 Index: linux-2.6/fs/proc/array.c
 ===================================================================
 --- linux-2.6.orig/fs/proc/array.c
@@ -1436,11 +1324,9 @@
  
  #endif
  
-Index: linux-2.6/include/asm-i386/desc.h
-===================================================================
---- linux-2.6.orig/include/asm-i386/desc.h
-+++ linux-2.6/include/asm-i386/desc.h
-@@ -193,6 +193,20 @@ static inline unsigned long get_desc_bas
+--- 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
+@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
  	return base;
  }
  
@@ -1458,23 +1344,23 @@
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +
- #endif /* !__ASSEMBLY__ */
+ #else /* __ASSEMBLY__ */
  
- #endif
+ /*
 Index: linux-2.6/include/asm-i386/elf.h
 ===================================================================
---- linux-2.6.orig/include/asm-i386/elf.h
-+++ linux-2.6/include/asm-i386/elf.h
-@@ -159,7 +159,8 @@ extern void __kernel_vsyscall;
+--- linux-2.6.19.noarch/include/asm-i386/elf.h~	2007-01-29 11:28:35.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-i386/elf.h	2007-01-29 11:32:29.000000000 -0500
+@@ -157,7 +157,8 @@ extern void __kernel_vsyscall;
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
  struct linux_binprm;
  extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 -                                       int executable_stack);
 +                                       int executable_stack, unsigned long start_code,
 +                                       unsigned long interp_map_address);
+ #endif
  
  extern unsigned int vdso_enabled;
- 
 @@ -215,4 +216,7 @@ do {									      \
  
  #endif
@@ -1503,22 +1389,6 @@
  	void *vdso;
  } mm_context_t;
  
-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
-@@ -119,6 +119,11 @@ extern int page_is_ram(unsigned long pag
- #endif
- #define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)
- 
-+/*
-+ * Under exec-shield we don't use the generic fixmap gate area.
-+ * The vDSO ("gate area") has a normal vma found the normal ways.
-+ */
-+#define __HAVE_ARCH_GATE_AREA	1
- 
- #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
- #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
 Index: linux-2.6/include/asm-i386/pgalloc.h
 ===================================================================
 --- linux-2.6.orig/include/asm-i386/pgalloc.h
@@ -1680,7 +1550,7 @@
 ===================================================================
 --- linux-2.6.orig/include/linux/mm.h
 +++ linux-2.6/include/linux/mm.h
-@@ -994,7 +994,19 @@ extern struct vm_area_struct *copy_vma(s
+@@ -994,7 +994,14 @@
  extern void exit_mmap(struct mm_struct *);
  extern int may_expand_vm(struct mm_struct *mm, unsigned long npages);
  
@@ -1693,15 +1563,10 @@
 +{
 +	return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0);
 +}
-+
-+extern int install_special_mapping(struct mm_struct *mm,
-+				   unsigned long addr, unsigned long len,
-+				   unsigned long vm_flags, pgprot_t pgprot,
-+				   struct page **pages);
  
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
-@@ -1046,7 +1058,7 @@ unsigned long page_cache_readahead(struc
+@@ -1046,7 +1053,7 @@
  			  struct file *filp,
  			  pgoff_t offset,
  			  unsigned long size);
@@ -1765,13 +1630,12 @@
 ===================================================================
 --- linux-2.6.orig/include/linux/sysctl.h
 +++ linux-2.6/include/linux/sysctl.h
-@@ -100,6 +100,9 @@ enum
+@@ -100,6 +100,8 @@ enum
  
  	KERN_CAP_BSET=14,	/* int: capability bounding set */
  	KERN_PANIC=15,		/* int: panic timeout */
 +	KERN_EXEC_SHIELD=1000,	/* int: exec-shield enabled (0/1/2) */
 +	KERN_PRINT_FATAL=1001,	/* int: print fatal signals (0/1/2) */
-+	KERN_VDSO=1002,		/* int: VDSO enabled (0/1) */
  	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
  
  	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
@@ -1826,33 +1690,6 @@
  		if (sig_kernel_coredump(signr)) {
  			/*
  			 * If it was able to dump core, this kills all
-Index: linux-2.6/mm/fremap.c
-===================================================================
---- linux-2.6.orig/mm/fremap.c
-+++ linux-2.6/mm/fremap.c
-@@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s
- 	 * caller about it.
- 	 */
- 	err = -EINVAL;
--	inode = vma->vm_file->f_mapping->host;
--	size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
--	if (!page->mapping || page->index >= size)
--		goto unlock;
--	err = -ENOMEM;
--	if (page_mapcount(page) > INT_MAX/2)
--		goto unlock;
-+	if (vma->vm_file) {
-+		inode = vma->vm_file->f_mapping->host;
-+		size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-+		if (!page->mapping || page->index >= size)
-+			goto unlock;
-+		err = -ENOMEM;
-+		if (page_mapcount(page) > INT_MAX/2)
-+			goto unlock;
-+	}
- 
- 	if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
- 		inc_mm_counter(mm, file_rss);
 Index: linux-2.6/mm/mprotect.c
 ===================================================================
 --- linux-2.6.orig/mm/mprotect.c

linux-2.6-module_version.patch:
 linux-1720/drivers/block/DAC960.c   |    1 +
 linux-1720/drivers/block/cpqarray.c |    1 +
 linux-1720/drivers/net/b44.c        |    1 +
 linux-1720/drivers/net/ns83820.c    |    1 +
 linux-1720/drivers/scsi/gdth.c      |    1 +
 linux-2.6.13/drivers/block/cciss.c  |    1 +
 6 files changed, 6 insertions(+)

Index: linux-2.6-module_version.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-module_version.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-module_version.patch	16 Feb 2006 20:37:27 -0000	1.2
+++ linux-2.6-module_version.patch	15 Feb 2007 21:55:26 -0000	1.3
@@ -27,17 +27,6 @@
  
  MODULE_LICENSE("GPL");
 +MODULE_VERSION(DAC960_DriverVersion);
-diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/message/fusion/mptbase.c linux-1720/drivers/message/fusion/mptbase.c
---- linux-1700/drivers/message/fusion/mptbase.c
-+++ linux-1720/drivers/message/fusion/mptbase.c
-@@ -119,6 +119,7 @@
- MODULE_AUTHOR(MODULEAUTHOR);
- MODULE_DESCRIPTION(my_NAME);
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(MPT_LINUX_VERSION_COMMON);
- 
- /*
-  *  cmd line parameters
 diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/b44.c linux-1720/drivers/net/b44.c
 --- linux-1700/drivers/net/b44.c
 +++ linux-1720/drivers/net/b44.c

linux-2.6-proc-self-maps-fix.patch:
 linux-2.6.19.noarch/kernel/ptrace.c |    2 +-
 linux-2.6/fs/proc/base.c            |   20 ++++++++++++++++++++
 linux-2.6/fs/proc/internal.h        |    2 ++
 linux-2.6/fs/proc/task_mmu.c        |    3 +--
 4 files changed, 24 insertions(+), 3 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-proc-self-maps-fix.patch	31 Jan 2007 18:55:52 -0000	1.6
+++ linux-2.6-proc-self-maps-fix.patch	15 Feb 2007 21:55:26 -0000	1.7
@@ -1,13 +1,13 @@
 
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165351
 
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index a3a3eec..3f262cd 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -408,6 +408,26 @@ static int proc_task_root_link(struct in
- 	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
- 	 security_ptrace(current,task) == 0))
+Index: linux-2.6/fs/proc/base.c
+===================================================================
+--- linux-2.6.orig/fs/proc/base.c
++++ linux-2.6/fs/proc/base.c
+@@ -190,6 +190,26 @@ static int proc_root_link(struct inode *
+ 	return result;
+ }
  
 +struct mm_struct *mm_for_maps(struct task_struct *task)
 +{
@@ -18,7 +18,7 @@
 +	task_lock(task);
 +	if (task->mm != mm)
 +		goto out;
-+	if (task->mm != current->mm && tracehook_allow_access_process_vm(task))
++	if (task->mm != current->mm && __ptrace_may_attach(task) < 0)
 +		goto out;
 +	task_unlock(task);
 +	return mm;
@@ -32,10 +32,10 @@
  static int proc_pid_environ(struct task_struct *task, char * buffer)
  {
  	int res = 0;
-diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index 0502f17..cd172ce 100644
---- a/fs/proc/internal.h
-+++ b/fs/proc/internal.h
+Index: linux-2.6/fs/proc/internal.h
+===================================================================
+--- linux-2.6.orig/fs/proc/internal.h
++++ linux-2.6/fs/proc/internal.h
 @@ -16,6 +16,8 @@ struct vmalloc_info {
  	unsigned long	largest_chunk;
  };
@@ -45,9 +45,11 @@
  #ifdef CONFIG_MMU
  #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
  extern void get_vmalloc_info(struct vmalloc_info *vmi);
---- linux-2.6.17.noarch/fs/proc/task_mmu.c~	2006-06-26 19:16:06.064089000 -0400
-+++ linux-2.6.17.noarch/fs/proc/task_mmu.c	2006-06-26 19:19:02.178798000 -0400
-@@ -344,12 +344,11 @@ static void *m_start(struct seq_file *m,
+Index: linux-2.6/fs/proc/task_mmu.c
+===================================================================
+--- linux-2.6.orig/fs/proc/task_mmu.c
++++ linux-2.6/fs/proc/task_mmu.c
+@@ -348,12 +348,11 @@ static void *m_start(struct seq_file *m,
  	if (!priv->task)
  		return NULL;
  
@@ -61,54 +63,6 @@
  
  	/* Start with last addr hint */
  	if (last_addr && (vma = find_vma(mm, last_addr))) {
-
-
-
-diff -urN linux-2.6.18.x86_64/fs/proc/base.c foo/fs/proc/base.c
---- linux-2.6.18.x86_64/fs/proc/base.c	2006-09-29 07:30:57.000000000 -0400
-+++ foo/fs/proc/base.c	2006-09-29 08:06:52.000000000 -0400
-@@ -415,7 +415,7 @@
- 	task_lock(task);
- 	if (task->mm != mm)
- 		goto out;
--	if (task->mm != current->mm && tracehook_allow_access_process_vm(task))
-+	if (task->mm != current->mm && __ptrace_may_attach(task) < 0)
- 		goto out;
- 	task_unlock(task);
- 	return mm;
-diff -urN linux-2.6.18.x86_64/include/linux/ptrace.h foo/include/linux/ptrace.h
---- linux-2.6.18.x86_64/include/linux/ptrace.h	2006-09-29 07:30:56.000000000 -0400
-+++ foo/include/linux/ptrace.h	2006-09-29 08:05:09.000000000 -0400
-@@ -57,6 +57,7 @@
- 
- 
- extern int ptrace_may_attach(struct task_struct *task);
-+extern int __ptrace_may_attach(struct task_struct *task);
- 
- 
- #ifdef CONFIG_PTRACE
-diff -urN linux-2.6.18.x86_64/kernel/ptrace.c foo/kernel/ptrace.c
---- linux-2.6.18.x86_64/kernel/ptrace.c	2006-09-29 07:30:56.000000000 -0400
-+++ foo/kernel/ptrace.c	2006-09-29 08:04:23.000000000 -0400
-@@ -32,7 +32,7 @@
- 
- //#define PTRACE_DEBUG
- 
--static int may_attach(struct task_struct *task)
-+int __ptrace_may_attach(struct task_struct *task)
- {
- 	/* May we inspect the given task?
- 	 * This check is used both for attaching with ptrace
-@@ -66,7 +66,7 @@
- {
- 	int err;
- 	task_lock(task);
--	err = may_attach(task);
-+	err = __ptrace_may_attach(task);
- 	task_unlock(task);
- 	return !err;
- }
-
 --- linux-2.6.19.noarch/kernel/ptrace.c~	2007-01-31 13:55:04.000000000 -0500
 +++ linux-2.6.19.noarch/kernel/ptrace.c	2007-01-31 13:55:11.000000000 -0500
 @@ -193,7 +193,7 @@ repeat:

linux-2.6-sata-promise-pata-ports.patch:
 drivers/scsi/libata-core.c  |    1 +
 drivers/scsi/sata_promise.c |   43 +++++++++++++++++++++++++++++++++++++++----
 include/linux/libata.h      |    1 +
 3 files changed, 41 insertions(+), 4 deletions(-)

Index: linux-2.6-sata-promise-pata-ports.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-sata-promise-pata-ports.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-sata-promise-pata-ports.patch	31 Jan 2007 15:26:15 -0000	1.4
+++ linux-2.6-sata-promise-pata-ports.patch	15 Feb 2007 21:55:26 -0000	1.5
@@ -1,159 +1,134 @@
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 915a55a..d0ab733 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -5298,13 +5298,13 @@ void ata_port_init(struct ata_port *ap, 
- 		ap->pio_mask = ent->pinfo2->pio_mask;
- 		ap->mwdma_mask = ent->pinfo2->mwdma_mask;
- 		ap->udma_mask = ent->pinfo2->udma_mask;
--		ap->flags |= ent->pinfo2->flags;
-+		ap->flags |= ent->pinfo2->flags | ent->_port_flags[port_no];
- 		ap->ops = ent->pinfo2->port_ops;
- 	} else {
- 		ap->pio_mask = ent->pio_mask;
- 		ap->mwdma_mask = ent->mwdma_mask;
- 		ap->udma_mask = ent->udma_mask;
--		ap->flags |= ent->port_flags;
-+		ap->flags |= ent->port_flags | ent->_port_flags[port_no];
- 		ap->ops = ent->port_ops;
- 	}
- 	ap->hw_sata_spd_limit = UINT_MAX;
-diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
-index 72eda51..543e6a4 100644
---- a/drivers/ata/sata_promise.c
-+++ b/drivers/ata/sata_promise.c
-@@ -175,7 +175,7 @@ static const struct ata_port_info pdc_po
+This will update the following files:
+
+ drivers/scsi/libata-core.c
+ include/linux/libata.h
+ drivers/scsi/sata_promise.c
+
+through these ChangeSets:
+
+  o [libata sata_promise] support PATA ports on SATA controllers
+
+diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
+--- a/drivers/scsi/libata-core.c	2006-02-08 11:34:51.000000000 -0700
++++ b/drivers/scsi/libata-core.c	2006-02-08 11:37:11.000000000 -0700
+@@ -4423,6 +4423,7 @@
+ 	ap->mwdma_mask = ent->mwdma_mask;
+ 	ap->udma_mask = ent->udma_mask;
+ 	ap->flags |= ent->host_flags;
++	ap->flags |= ent->port_flags[port_no];	/* pata fix */
+ 	ap->ops = ent->port_ops;
+ 	ap->cbl = ATA_CBL_NONE;
+ 	ap->active_tag = ATA_TAG_POISON;
+diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
+--- a/drivers/scsi/sata_promise.c	2006-02-08 10:08:08.000000000 -0700
++++ b/drivers/scsi/sata_promise.c	2006-02-08 11:26:47.000000000 -0700
+@@ -172,7 +172,7 @@
  	/* board_2037x */
  	{
  		.sht		= &pdc_ata_sht,
--		.flags		= PDC_COMMON_FLAGS | ATA_FLAG_SATA,
-+		.flags		= PDC_COMMON_FLAGS,
+-		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,
++		.host_flags	= PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */,	/* pata fix */
  		.pio_mask	= 0x1f, /* pio0-4 */
  		.mwdma_mask	= 0x07, /* mwdma0-2 */
  		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
-@@ -355,23 +355,27 @@ static void pdc_reset_port(struct ata_po
+@@ -363,8 +363,16 @@ static void pdc_reset_port(struct ata_po
+ 
  static void pdc_sata_phy_reset(struct ata_port *ap)
  {
- 	pdc_reset_port(ap);
+-	pdc_reset_port(ap);
 -	sata_phy_reset(ap);
-+	if (ap->flags & ATA_FLAG_SATA)
-+		sata_phy_reset(ap);
-+	else
-+		pdc_pata_phy_reset(ap);
++	/*    pdc_reset_port(ap); */  /* pata fix */
++	/*    sata_phy_reset(ap); */  /* pata fix */
++	/* if no sata flag, test for pata drive */      /* pata fix */
++	if (ap->flags & ATA_FLAG_SATA)  /* pata fix */
++	{                               /* pata fix */
++		pdc_reset_port(ap);     /* pata fix */
++		sata_phy_reset(ap);     /* pata fix */
++	}                               /* pata fix */
++	else                            /* pata fix */
++		pdc_pata_phy_reset(ap); /* pata fix */
  }
  
  static void pdc_pata_cbl_detect(struct ata_port *ap)
- {
- 	u8 tmp;
--	void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
-+	void __iomem *mmio =
-+		(void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
+@@ -383,6 +391,12 @@ static void pdc_pata_cbl_detect(struct a
  
- 	tmp = readb(mmio);
--
-+	
- 	if (tmp & 0x01) {
- 		ap->cbl = ATA_CBL_PATA40;
- 		ap->udma_mask &= ATA_UDMA_MASK_40C;
- 	} else
- 		ap->cbl = ATA_CBL_PATA80;
- }
--
-+		
  static void pdc_pata_phy_reset(struct ata_port *ap)
  {
- 	pdc_pata_cbl_detect(ap);
-@@ -384,6 +388,20 @@ static u32 pdc_sata_scr_read (struct ata
- {
- 	if (sc_reg > SCR_CONTROL)
- 		return 0xffffffffU;
-+	if (ap->flags & ATA_FLAG_SLAVE_POSS)
-+	{
-+		switch (sc_reg) {
-+			case SCR_STATUS:
-+				return 0x113;
-+			case SCR_CONTROL:
-+				return 0x300;
-+			case SCR_ERROR:
-+			case SCR_ACTIVE:
-+			default:
-+				return 0xffffffffU;
-+		}
-+	}
++	u8 tmp;                                         /* pata fix */
++	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata fix */
++	tmp = readb(mmio);                              /* pata fix */
++	if (tmp & 0x01)                                 /* pata fix */
++		ap->udma_mask &= ATA_UDMA_MASK_40C;     /* pata fix */
 +
- 	return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
- }
- 
-@@ -391,7 +409,7 @@ static u32 pdc_sata_scr_read (struct ata
- static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
- 			       u32 val)
- {
--	if (sc_reg > SCR_CONTROL)
-+	if ((sc_reg > SCR_CONTROL) || (ap->flags & ATA_FLAG_SLAVE_POSS))
- 		return;
- 	writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
- }
-@@ -679,6 +697,7 @@ static int pdc_ata_init_one (struct pci_
+ 	pdc_pata_cbl_detect(ap);
+ 	pdc_reset_port(ap);
+ 	ata_port_probe(ap);
+@@ -673,6 +692,7 @@
  	unsigned int board_idx = (unsigned int) ent->driver_data;
  	int pci_dev_busy = 0;
  	int rc;
-+	u8 tmp;
++	u8 tmp;		/* pata fix */
  
  	if (!printed_version++)
  		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
-@@ -743,6 +762,9 @@ static int pdc_ata_init_one (struct pci_
+@@ -741,6 +761,9 @@
  	probe_ent->port[0].scr_addr = base + 0x400;
  	probe_ent->port[1].scr_addr = base + 0x500;
  
-+	probe_ent->_port_flags[0] = ATA_FLAG_SATA;
-+	probe_ent->_port_flags[1] = ATA_FLAG_SATA;
++	probe_ent->port_flags[0] = ATA_FLAG_SATA;	/* pata fix */
++	probe_ent->port_flags[1] = ATA_FLAG_SATA;	/* pata fix */
 +	
  	/* notice 4-port boards */
  	switch (board_idx) {
- 	case board_40518:
-@@ -757,13 +779,27 @@ static int pdc_ata_init_one (struct pci_
+ 	case board_20319:
+@@ -755,13 +778,27 @@
  
  		probe_ent->port[2].scr_addr = base + 0x600;
  		probe_ent->port[3].scr_addr = base + 0x700;
-+	
-+		probe_ent->_port_flags[2] = ATA_FLAG_SATA;
-+		probe_ent->_port_flags[3] = ATA_FLAG_SATA;
++
++		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
++		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
  		break;
- 	case board_2057x:
- 		/* Override hotplug offset for SATAII150 */
- 		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
- 		/* Fall through */
+	case board_2057x:
+		/* Override hotplug offset for SATAII150 */
+		hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+		/* Fall through */
  	case board_2037x:
-+		/* Some boards have also PATA port */
- 		probe_ent->n_ports = 2;
-+		probe_ent->_port_flags[0] = ATA_FLAG_SATA;
-+		probe_ent->_port_flags[1] = ATA_FLAG_SATA;
-+		tmp = readb(mmio_base + PDC_FLASH_CTL+1);
-+		if (!(tmp & 0x80))
-+		{
-+			probe_ent->n_ports = 3;
-+			pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
-+			probe_ent->_port_flags[2] = ATA_FLAG_SLAVE_POSS;
-+			printk(KERN_INFO DRV_NAME " PATA port found\n");
-+		}
+-		probe_ent->n_ports = 2;
++/*		probe_ent->n_ports = 2; */			/* pata fix */
++		/* Some boards have also PATA port */		/* pata fix */
++		tmp = readb(mmio_base + PDC_FLASH_CTL+1);	/* pata fix */
++		if (!(tmp & 0x80))				/* pata fix */
++		{						/* pata fix */
++			probe_ent->n_ports = 3;			/* pata fix */
++			pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);	/* pata fix */
++			probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS;		/* pata fix */
++			printk(KERN_INFO DRV_NAME " PATA port found\n");	/* pata fix */
++		}						/* pata fix */
++		else						/* pata fix */
++       			probe_ent->n_ports = 2;			/* pata fix */
  		break;
  	case board_20771:
  		probe_ent->n_ports = 2;
-diff --git a/include/linux/libata.h b/include/linux/libata.h
-index abd2deb..aa8c822 100644
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -377,6 +377,7 @@ struct ata_probe_ent {
+@@ -774,6 +811,9 @@
+ 
+ 		probe_ent->port[2].scr_addr = base + 0x600;
+ 		probe_ent->port[3].scr_addr = base + 0x700;
++
++		probe_ent->port_flags[2] = ATA_FLAG_SATA;	/* pata fix */
++		probe_ent->port_flags[3] = ATA_FLAG_SATA;	/* pata fix */
+ 		break;
+ 	default:
+ 		BUG();
+diff -Nru a/include/linux/libata.h b/include/linux/libata.h
+--- a/include/linux/libata.h	2006-02-08 11:40:54.000000000 -0700
++++ b/include/linux/libata.h	2006-02-08 11:45:02.000000000 -0700
+@@ -281,6 +281,7 @@
+ 	unsigned long		irq;
  	unsigned int		irq_flags;
- 	unsigned long		port_flags;
- 	unsigned long		_host_flags;
-+	unsigned long		_port_flags[ATA_MAX_PORTS];
+ 	unsigned long		host_flags;
++	unsigned long		port_flags[ATA_MAX_PORTS];	/* pata fix */
+	unsigned long		host_set_flags;
  	void __iomem		*mmio_base;
  	void			*private_data;
- 
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
+ };

linux-2.6-silence-noise.patch:
 linux-2.6.18.noarch/arch/x86_64/mm/init.c      |    4 ----
 linux-2.6.18.noarch/arch/x86_64/pci/mmconfig.c |    4 ++--
 linux-2.6.18.noarch/drivers/pci/setup-res.c    |    4 ++--
 linux-2.6.19.noarch/arch/i386/pci/i386.c       |    4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-silence-noise.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-silence-noise.patch	17 Oct 2006 21:18:54 -0000	1.1
+++ linux-2.6-silence-noise.patch	15 Feb 2007 21:55:26 -0000	1.2
@@ -12,17 +12,6 @@
  		return;
  	}
  
---- linux-2.6.18.noarch/arch/i386/pci/i386.c~	2006-10-16 13:45:57.000000000 -0400
-+++ linux-2.6.18.noarch/arch/i386/pci/i386.c	2006-10-16 13:46:09.000000000 -0400
-@@ -110,7 +110,7 @@ static void __init pcibios_allocate_bus_
- 					continue;
- 				pr = pci_find_parent_resource(dev, r);
- 				if (!r->start || !pr || request_resource(pr, r) < 0) {
--					printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
-+					printk(KERN_DEBUG "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
- 					/* Something is wrong with the region.
- 					   Invalidate the resource to prevent child
- 					   resource allocations in this range. */
 --- 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
 @@ -337,10 +337,6 @@ static void __init find_early_table_spac
@@ -57,3 +46,23 @@
  				"#%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
+@@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_
+ 				pr = pci_find_parent_resource(dev, r);
+ 				if (!r->start || !pr ||
+ 				    request_resource(pr, r) < 0) {
+-					printk(KERN_ERR "PCI: Cannot allocate "
++					printk(KERN_DEBUG "PCI: Cannot allocate "
+ 						"resource region %d "
+ 						"of bridge %s\n",
+ 						idx, pci_name(dev));
+@@ -155,7 +155,7 @@ static void __init pcibios_allocate_reso
+ 				    r->start, r->end, r->flags, disabled, pass);
+ 				pr = pci_find_parent_resource(dev, r);
+ 				if (!pr || request_resource(pr, r) < 0) {
+-					printk(KERN_ERR "PCI: Cannot allocate "
++					printk(KERN_DEBUG "PCI: Cannot allocate "
+ 						"resource region %d "
+ 						"of device %s\n",
+ 						idx, pci_name(dev));

linux-2.6-softlockup-disable.patch:
 main.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: linux-2.6-softlockup-disable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-softlockup-disable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-softlockup-disable.patch	6 Mar 2006 07:49:29 -0000	1.2
+++ linux-2.6-softlockup-disable.patch	15 Feb 2007 21:55:26 -0000	1.3
@@ -1,6 +1,6 @@
 --- linux-2.6.15.noarch/init/main.c~	2006-03-05 00:45:51.000000000 -0500
 +++ linux-2.6.15.noarch/init/main.c	2006-03-05 00:49:41.000000000 -0500
-@@ -640,6 +640,15 @@ static void __init do_basic_setup(void)
+@@ -732,6 +732,15 @@ static void __init do_basic_setup(void)
  	do_initcalls();
  }
  
@@ -13,7 +13,7 @@
 +}
 +__setup("nosoftlockup", nosoftlockup_setup);
 +
- static void do_pre_smp_initcalls(void)
+ static void __init do_pre_smp_initcalls(void)
  {
  	extern int spawn_ksoftirqd(void);
 @@ -649,7 +657,8 @@ static void do_pre_smp_initcalls(void)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- sources	5 Feb 2007 21:02:15 -0000	1.371
+++ sources	15 Feb 2007 21:55:26 -0000	1.372
@@ -1,3 +1 @@
-443c265b57e87eadc0c677c3acc37e20  linux-2.6.19.tar.bz2
-a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
-ef8491f189893c250a61cea825de025c  patch-2.6.19.3.bz2
+34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- upstream	5 Feb 2007 21:02:15 -0000	1.335
+++ upstream	15 Feb 2007 21:55:26 -0000	1.336
@@ -1,2 +1 @@
-linux-2.6.19.tar.bz2
-patch-2.6.19.3.bz2
+linux-2.6.20.tar.bz2


--- linux-2.6.19.tar.bz2.sign DELETED ---


--- patch-2.6.19.3.bz2.sign DELETED ---


