[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/kernel/FC-3 linux-2.4.0-nonintconfig.patch, 1.13, 1.14 linux-2.4.0-test11-vidfail.patch, 1.5, 1.6 linux-2.6.0-compile.patch, 1.143, 1.144 linux-2.6.0-must_check.patch, 1.18, 1.19 linux-2.6.0-sleepon.patch, 1.11, 1.12 linux-2.6.1-s390-compile.patch, 1.12, 1.13 linux-2.6.10-compile-fixes.patch, 1.2, 1.3 linux-2.6.10-crashdump-common.patch, 1.5, 1.6 linux-2.6.10-diskdump.patch, 1.3, 1.4 linux-2.6.10-netdump.patch, 1.3, 1.4 linux-2.6.10-periodic-slab-debug.patch, 1.2, 1.3 linux-2.6.10-ppc-headerabuse.patch, 1.1, 1.2 linux-2.6.10-revert-module-invalidparam.patch, 1.1, 1.2 linux-2.6.10-x86-tune-p4.patch, 1.1, 1.2 linux-2.6.11-compile-fixes.patch, 1.1, 1.2 linux-2.6.11-tux.patch, 1.1, 1.2 linux-2.6.11-vm-taint.patch, 1.1, 1.2 linux-2.6.2-ppc64-build.patch, 1.9, 1.10 linux-2.6.3-crash-driver.patch, 1.3, 1.4 linux-2.6.3-ia64-build.patch, 1.1, 1.2 linux-2.6.3-printopen.patch, 1.1, 1.2 linux-2.6.3-sparc-addbzimage.patch, 1.1, 1.2 linux-2.6.4-stackusage.patch, 1.5, 1.6 linux-2.6.7-modsign-core.patch, 1.7, 1.8 linux-2.6.! 7-modsign-crypto.patch, 1.4, 1.5 linux-2.6.7-modsign-include.patch, 1.1, 1.2 linux-2.6.7-modsign-ksign.patch, 1.12, 1.13 linux-2.6.7-modsign-mpilib.patch, 1.2, 1.3 linux-2.6.7-modsign-script.patch, 1.6, 1.7 linux-2.6.8-lockd-racewarn2.patch, 1.1, 1.2 linux-2.6.8-netconsole.patch, 1.4, 1.5 linux-2.6.9-NFSD-non-null-getxattr.patch, 1.2, 1.3 linux-2.6.9-ieee80211.patch, 1.4, 1.5 linux-2.6.9-lockd-block-nosleep.patch, 1.1, 1.2 linux-2.6.9-lockd-reclaims.patch, 1.1, 1.2 linux-2.6.9-module_version.patch, 1.6, 1.7 linux-2.6.9-net-tr-irqlock-fix.patch, 1.3, 1.4 linux-2.6.9-s390-autoraid.patch, 1.1, 1.2 linux-2.6.9-s390-zfcp_port-fix.patch, 1.1, 1.2 linux-2.6.9-scsi-advansys-enabler.patch, 1.1, 1.2 linux-2.6.9-scsi-megaraid-legacy.patch, 1.1, 1.2 linux-2.6.9-spinlock-debug-panic.patch, 1.4, 1.5 linux-2.6.9-vm-oomkiller-debugging.patch, 1.2, 1.3
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/kernel/FC-3 linux-2.4.0-nonintconfig.patch, 1.13, 1.14 linux-2.4.0-test11-vidfail.patch, 1.5, 1.6 linux-2.6.0-compile.patch, 1.143, 1.144 linux-2.6.0-must_check.patch, 1.18, 1.19 linux-2.6.0-sleepon.patch, 1.11, 1.12 linux-2.6.1-s390-compile.patch, 1.12, 1.13 linux-2.6.10-compile-fixes.patch, 1.2, 1.3 linux-2.6.10-crashdump-common.patch, 1.5, 1.6 linux-2.6.10-diskdump.patch, 1.3, 1.4 linux-2.6.10-netdump.patch, 1.3, 1.4 linux-2.6.10-periodic-slab-debug.patch, 1.2, 1.3 linux-2.6.10-ppc-headerabuse.patch, 1.1, 1.2 linux-2.6.10-revert-module-invalidparam.patch, 1.1, 1.2 linux-2.6.10-x86-tune-p4.patch, 1.1, 1.2 linux-2.6.11-compile-fixes.patch, 1.1, 1.2 linux-2.6.11-tux.patch, 1.1, 1.2 linux-2.6.11-vm-taint.patch, 1.1, 1.2 linux-2.6.2-ppc64-build.patch, 1.9, 1.10 linux-2.6.3-crash-driver.patch, 1.3, 1.4 linux-2.6.3-ia64-build.patch, 1.1, 1.2 linux-2.6.3-printopen.patch, 1.1, 1.2 linux-2.6.3-sparc-addbzimage.patch, 1.1, 1.2 linux-2.6.4-stackusage.patch, 1.5, 1.6 linux-2.6.7-modsign-core.patch, 1.7, 1.8 linux-2.6.! 7-modsign-crypto.patch, 1.4, 1.5 linux-2.6.7-modsign-include.patch, 1.1, 1.2 linux-2.6.7-modsign-ksign.patch, 1.12, 1.13 linux-2.6.7-modsign-mpilib.patch, 1.2, 1.3 linux-2.6.7-modsign-script.patch, 1.6, 1.7 linux-2.6.8-lockd-racewarn2.patch, 1.1, 1.2 linux-2.6.8-netconsole.patch, 1.4, 1.5 linux-2.6.9-NFSD-non-null-getxattr.patch, 1.2, 1.3 linux-2.6.9-ieee80211.patch, 1.4, 1.5 linux-2.6.9-lockd-block-nosleep.patch, 1.1, 1.2 linux-2.6.9-lockd-reclaims.patch, 1.1, 1.2 linux-2.6.9-module_version.patch, 1.6, 1.7 linux-2.6.9-net-tr-irqlock-fix.patch, 1.3, 1.4 linux-2.6.9-s390-autoraid.patch, 1.1, 1.2 linux-2.6.9-s390-zfcp_port-fix.patch, 1.1, 1.2 linux-2.6.9-scsi-advansys-enabler.patch, 1.1, 1.2 linux-2.6.9-scsi-megaraid-legacy.patch, 1.1, 1.2 linux-2.6.9-spinlock-debug-panic.patch, 1.4, 1.5 linux-2.6.9-vm-oomkiller-debugging.patch, 1.2, 1.3
- Date: Wed, 13 Jul 2005 00:18:47 -0400
Author: davej
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28936
Modified Files:
linux-2.4.0-nonintconfig.patch
linux-2.4.0-test11-vidfail.patch linux-2.6.0-compile.patch
linux-2.6.0-must_check.patch linux-2.6.0-sleepon.patch
linux-2.6.1-s390-compile.patch
linux-2.6.10-compile-fixes.patch
linux-2.6.10-crashdump-common.patch
linux-2.6.10-diskdump.patch linux-2.6.10-netdump.patch
linux-2.6.10-periodic-slab-debug.patch
linux-2.6.10-ppc-headerabuse.patch
linux-2.6.10-revert-module-invalidparam.patch
linux-2.6.10-x86-tune-p4.patch
linux-2.6.11-compile-fixes.patch linux-2.6.11-tux.patch
linux-2.6.11-vm-taint.patch linux-2.6.2-ppc64-build.patch
linux-2.6.3-crash-driver.patch linux-2.6.3-ia64-build.patch
linux-2.6.3-printopen.patch linux-2.6.3-sparc-addbzimage.patch
linux-2.6.4-stackusage.patch linux-2.6.7-modsign-core.patch
linux-2.6.7-modsign-crypto.patch
linux-2.6.7-modsign-include.patch
linux-2.6.7-modsign-ksign.patch
linux-2.6.7-modsign-mpilib.patch
linux-2.6.7-modsign-script.patch
linux-2.6.8-lockd-racewarn2.patch linux-2.6.8-netconsole.patch
linux-2.6.9-NFSD-non-null-getxattr.patch
linux-2.6.9-ieee80211.patch
linux-2.6.9-lockd-block-nosleep.patch
linux-2.6.9-lockd-reclaims.patch
linux-2.6.9-module_version.patch
linux-2.6.9-net-tr-irqlock-fix.patch
linux-2.6.9-s390-autoraid.patch
linux-2.6.9-s390-zfcp_port-fix.patch
linux-2.6.9-scsi-advansys-enabler.patch
linux-2.6.9-scsi-megaraid-legacy.patch
linux-2.6.9-spinlock-debug-panic.patch
linux-2.6.9-vm-oomkiller-debugging.patch
Log Message:
Update patches from scratch/ (2.6.12 rebase)
linux-2.4.0-nonintconfig.patch:
linux-2.6.12/scripts/kconfig/confdata.c | 4 ++--
linux-800/scripts/kconfig/Makefile | 4 ++++
linux-800/scripts/kconfig/conf.c | 26 +++++++++++++++++++++++---
3 files changed, 29 insertions(+), 5 deletions(-)
Index: linux-2.4.0-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.4.0-nonintconfig.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.4.0-nonintconfig.patch 4 Jan 2005 05:39:48 -0000 1.13
+++ linux-2.4.0-nonintconfig.patch 13 Jul 2005 04:18:41 -0000 1.14
@@ -1,6 +1,6 @@
-diff -urNp linux-1/scripts/kconfig/conf.c linux-500/scripts/kconfig/conf.c
---- linux-1/scripts/kconfig/conf.c
-+++ linux-500/scripts/kconfig/conf.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/conf.c linux-800/scripts/kconfig/conf.c
+--- linux-600/scripts/kconfig/conf.c
++++ linux-800/scripts/kconfig/conf.c
@@ -20,6 +20,7 @@ enum {
ask_all,
ask_new,
@@ -9,7 +9,7 @@
set_default,
set_yes,
set_mod,
-@@ -37,6 +37,8 @@ static struct menu *rootEntry;
+@@ -36,6 +37,8 @@ static struct menu *rootEntry;
static char nohelp_text[] = "Sorry, no help available for this option yet.\n";
@@ -32,8 +32,8 @@
printf("%s\n", def);
return;
@@ -337,6 +346,10 @@ static int conf_choice(struct menu *menu
- printf("?");
- printf("]: ");
+ printf("?");
+ printf("]: ");
switch (input_mode) {
+ case dont_ask:
+ cnt = def;
@@ -72,22 +72,23 @@
conf_read(NULL);
break;
default:
-@@ -574,10 +594,10 @@ int main(int ac, char **av)
+@@ -594,10 +594,10 @@ int main(int ac, char **av)
do {
conf_cnt = 0;
check_conf(&rootmenu);
- } while (conf_cnt);
+ } while ((conf_cnt) && (input_mode != dont_ask));
if (conf_write(NULL)) {
- fprintf(stderr, "\n*** Error during writing of the kernel configuration.\n\n");
+ fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
return 1;
}
- return 0;
+ return return_value;
}
---- linux-2.6.3/scripts/kconfig/Makefile.orig 2004-02-25 16:59:55.934625904 +0100
-+++ linux-2.6.3/scripts/kconfig/Makefile 2004-02-25 17:02:37.076128672 +0100
-@@ -23,6 +23,10 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/Makefile linux-800/scripts/kconfig/Makefile
+--- linux-600/scripts/kconfig/Makefile
++++ linux-800/scripts/kconfig/Makefile
+@@ -23,6 +23,10 @@ oldconfig: $(obj)/conf
silentoldconfig: $(obj)/conf
$< -s arch/$(ARCH)/Kconfig
@@ -98,4 +99,23 @@
.PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig
randconfig: $(obj)/conf
-
+--- linux-2.6.12/scripts/kconfig/confdata.c~ 2005-06-22 13:17:13.000000000 -0400
++++ linux-2.6.12/scripts/kconfig/confdata.c 2005-06-22 13:17:23.000000000 -0400
+@@ -129,7 +129,7 @@ int conf_read(const char *name)
+ continue;
+ sym = sym_find(line + 9);
+ if (!sym) {
+- fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 9);
++ //fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 9);
+ break;
+ }
+ switch (sym->type) {
+@@ -154,7 +154,7 @@ int conf_read(const char *name)
+ *p2 = 0;
+ sym = sym_find(line + 7);
+ if (!sym) {
+- fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7);
++ //fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7);
+ break;
+ }
+ switch (sym->type) {
linux-2.4.0-test11-vidfail.patch:
video.S | 4 ++++
1 files changed, 4 insertions(+)
Index: linux-2.4.0-test11-vidfail.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.4.0-test11-vidfail.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.4.0-test11-vidfail.patch 9 Sep 2004 13:05:21 -0000 1.5
+++ linux-2.4.0-test11-vidfail.patch 13 Jul 2005 04:18:41 -0000 1.6
@@ -1,6 +1,6 @@
-diff -urNp linux-1000/arch/i386/boot/video.S linux-1010/arch/i386/boot/video.S
---- linux-1000/arch/i386/boot/video.S 2001-07-05 20:28:16.000000000 +0200
-+++ linux-1010/arch/i386/boot/video.S
+diff -urNp --exclude-from=/home/davej/.exclude linux-910/arch/i386/boot/video.S linux-1000/arch/i386/boot/video.S
+--- linux-910/arch/i386/boot/video.S
++++ linux-1000/arch/i386/boot/video.S
@@ -126,8 +126,12 @@ video: pushw %ds # We use different seg
call mode_set # Set the mode
jc vid1
linux-2.6.0-compile.patch:
linux-10000/arch/i386/Makefile | 4 ++--
linux-10000/arch/i386/kernel/Makefile | 6 +++---
linux-10000/arch/i386/kernel/nmi.c | 2 +-
linux-10000/arch/ppc64/Makefile | 2 +-
linux-10000/arch/ppc64/boot/Makefile | 3 +++
linux-10000/arch/x86_64/ia32/sys_ia32.c | 1 -
linux-10000/arch/x86_64/mm/init.c | 2 --
linux-10000/drivers/acpi/ec.c | 2 +-
linux-10000/drivers/md/raid5.c | 2 ++
linux-10000/drivers/net/3c59x.c | 2 +-
linux-10000/drivers/net/acenic.c | 2 +-
linux-10000/drivers/pci/search.c | 2 +-
linux-10000/drivers/usb/storage/scsiglue.c | 2 +-
linux-10000/fs/open.c | 1 -
linux-10000/fs/proc/generic.c | 2 +-
linux-10000/include/linux/config.h | 4 +++-
linux-10000/include/linux/delay.h | 17 ++++++++---------
linux-10000/include/linux/gfp.h | 2 +-
linux-10000/include/linux/namei.h | 2 +-
linux-10000/init/Kconfig | 2 +-
linux-10000/init/main.c | 3 ++-
linux-10000/kernel/pid.c | 2 +-
linux-10000/scripts/reference_discarded.pl | 3 ++-
linux-10000/scripts/reference_init.pl | 1 +
linux-10000/sound/core/oss/pcm_oss.c | 7 +++++++
linux-10000/sound/pci/intel8x0.c | 18 ++++++++++++++++++
linux-2.6.11/drivers/scsi/ide-scsi.c | 7 ++++++-
linux-2.6.11/drivers/usb/storage/usb.c | 2 +-
linux-2.6.12/drivers/acpi/pci_irq.c | 2 +-
29 files changed, 71 insertions(+), 36 deletions(-)
Index: linux-2.6.0-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.0-compile.patch,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- linux-2.6.0-compile.patch 6 Mar 2005 22:35:14 -0000 1.143
+++ linux-2.6.0-compile.patch 13 Jul 2005 04:18:41 -0000 1.144
@@ -1,45 +1,58 @@
-diff -urNp linux-1130/arch/i386/kernel/Makefile linux-10000/arch/i386/kernel/Makefile
---- linux-1130/arch/i386/kernel/Makefile
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/Makefile linux-10000/arch/i386/kernel/Makefile
+--- linux-3022/arch/i386/kernel/Makefile
+++ linux-10000/arch/i386/kernel/Makefile
-@@ -33,7 +33,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o
+@@ -33,7 +33,7 @@ obj-$(CONFIG_HPET_TIMER) += time_hpet.o
+ obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
- obj-$(CONFIG_X86_STD_RESOURCES) += std_resources.o
-EXTRA_AFLAGS := -traditional
+EXTRA_AFLAGS := -traditional -m32
obj-$(CONFIG_SCx200) += scx200.o
-@@ -48,7 +48,7 @@ quiet_cmd_syscall = SYSCALL $@
- cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
- -Wl,-T,$(filter-out FORCE,$^) -o $@
+@@ -51,7 +51,7 @@ quiet_cmd_syscall = SYSCALL $@
+
+ export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
-vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
+vsyscall-flags = -m32 -shared -s -Wl,-soname=linux-gate.so.1
SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags)
SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags)
-@@ -63,6 +63,6 @@ extra-y += vsyscall-syms.o
+@@ -67,7 +67,7 @@ extra-y += vsyscall-syms.o
$(obj)/built-in.o: $(obj)/vsyscall-syms.o
$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
-SYSCFLAGS_vsyscall-syms.o = -r
+SYSCFLAGS_vsyscall-syms.o = -m32 -r
- $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE
+ $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
+ $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
$(call if_changed,syscall)
-diff -urNp linux-1130/arch/i386/Makefile linux-10000/arch/i386/Makefile
---- linux-1130/arch/i386/Makefile
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/nmi.c linux-10000/arch/i386/kernel/nmi.c
+--- linux-3022/arch/i386/kernel/nmi.c
++++ linux-10000/arch/i386/kernel/nmi.c
+@@ -491,7 +491,7 @@ void nmi_watchdog_tick (struct pt_regs *
+ * wait a few IRQs (5 seconds) before doing the oops ...
+ */
+ alert_counter[cpu]++;
+- if (alert_counter[cpu] == 5*nmi_hz)
++ if (alert_counter[cpu] == 30*nmi_hz)
+ die_nmi(regs, "NMI Watchdog detected LOCKUP");
+ } else {
+ last_irq_sums[cpu] = sum;
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile
+--- linux-3022/arch/i386/Makefile
+++ linux-10000/arch/i386/Makefile
-@@ -19,7 +19,7 @@ LDFLAGS := -m elf_i386
- OBJCOPYFLAGS := -O binary -R .note -R .comment -S
+@@ -22,7 +22,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .c
LDFLAGS_vmlinux :=
+ CHECKFLAGS += -D__i386__
-CFLAGS += -pipe -msoft-float
+CFLAGS += -pipe -msoft-float -m32 -fno-builtin-sprintf -fno-builtin-log2 -fno-builtin-puts
# prevent gcc from keeping the stack 16 byte aligned
- CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,)
-@@ -111,7 +111,7 @@ drivers-$(CONFIG_OPROFILE) += arch/i386
+ CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
+@@ -118,7 +118,7 @@ drivers-$(CONFIG_OPROFILE) += arch/i386
drivers-$(CONFIG_PM) += arch/i386/power/
CFLAGS += $(mflags-y)
@@ -48,19 +61,55 @@
boot := arch/i386/boot
-diff -urNp linux-1130/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c
---- linux-1130/arch/x86_64/ia32/sys_ia32.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/boot/Makefile linux-10000/arch/ppc64/boot/Makefile
+--- linux-3022/arch/ppc64/boot/Makefile
++++ linux-10000/arch/ppc64/boot/Makefile
+@@ -98,6 +98,9 @@ $(obj)/zImage: obj-boot += $(call obj-se
+ $(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE
+ $(call if_changed,addnote)
+
++$(obj)/zImage.stub: $(obj-boot) FORCE
++ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot)
++
+ $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))
+ $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE
+ $(call if_changed,addnote)
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/Makefile linux-10000/arch/ppc64/Makefile
+--- linux-3022/arch/ppc64/Makefile
++++ linux-10000/arch/ppc64/Makefile
+@@ -82,7 +82,7 @@ boot := arch/ppc64/boot
+ bzImage: vmlinux
+ cp vmlinux arch/ppc64/boot/bzImage
+
+-boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
++boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub
+ boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
+ boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
+ $(boottarget-y): vmlinux
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c
+--- linux-3022/arch/x86_64/ia32/sys_ia32.c
+++ linux-10000/arch/x86_64/ia32/sys_ia32.c
-@@ -1355,4 +1355,3 @@ static int __init ia32_init (void)
+@@ -1048,4 +1048,3 @@ static int __init ia32_init (void)
__initcall(ia32_init);
extern unsigned long ia32_sys_call_table[];
-EXPORT_SYMBOL(ia32_sys_call_table);
- if (ei->type == E820_RAM) {
-diff -urNp linux-1130/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c
---- linux-1130/drivers/acpi/ec.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/mm/init.c linux-10000/arch/x86_64/mm/init.c
+--- linux-3022/arch/x86_64/mm/init.c
++++ linux-10000/arch/x86_64/mm/init.c
+@@ -461,8 +461,6 @@ void __init mem_init(void)
+ int tmp;
+
+ #ifdef CONFIG_SWIOTLB
+- if (swiotlb_force)
+- swiotlb = 1;
+ if (!iommu_aperture &&
+ (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
+ swiotlb = 1;
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c
+--- linux-3022/drivers/acpi/ec.c
+++ linux-10000/drivers/acpi/ec.c
-@@ -600,7 +600,7 @@ acpi_ec_add (
+@@ -640,7 +640,7 @@ acpi_ec_add (
acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler);
@@ -69,8 +118,33 @@
}
/* Get GPE bit assignment (EC events). */
---- linux-2.6.9/drivers/net/acenic.c~ 2004-12-24 01:59:02.420451656 -0500
-+++ linux-2.6.9/drivers/net/acenic.c 2004-12-24 01:59:20.755664280 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/md/raid5.c linux-10000/drivers/md/raid5.c
+--- linux-3022/drivers/md/raid5.c
++++ linux-10000/drivers/md/raid5.c
+@@ -1352,6 +1352,8 @@ static void raid5_unplug_device(request_
+ raid5_conf_t *conf = mddev_to_conf(mddev);
+ unsigned long flags;
+
++ if (!conf) return;
++
+ spin_lock_irqsave(&conf->device_lock, flags);
+
+ if (blk_remove_plug(q))
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/3c59x.c linux-10000/drivers/net/3c59x.c
+--- linux-3022/drivers/net/3c59x.c
++++ linux-10000/drivers/net/3c59x.c
+@@ -1836,7 +1836,7 @@ vortex_timer(unsigned long data)
+ struct net_device *dev = (struct net_device *)data;
+ struct vortex_private *vp = netdev_priv(dev);
+ long ioaddr = dev->base_addr;
+- int next_tick = 60*HZ;
++ int next_tick = 10*HZ;
+ int ok = 0;
+ int media_status, mii_status, old_window;
+
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/acenic.c linux-10000/drivers/net/acenic.c
+--- linux-3022/drivers/net/acenic.c
++++ linux-10000/drivers/net/acenic.c
@@ -443,7 +443,7 @@ MODULE_PARM_DESC(max_rx_desc, "AceNIC/3C
MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/RX descriptors (range 0-63)");
@@ -80,10 +154,10 @@
"acenic.c: v0.92 08/05/2002 Jes Sorensen, linux-acenic SunSITE dk\n"
" http://home.cern.ch/~jes/gige/acenic.html\n";;
-diff -urNp linux-1130/drivers/pci/search.c linux-10000/drivers/pci/search.c
---- linux-1130/drivers/pci/search.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/pci/search.c linux-10000/drivers/pci/search.c
+--- linux-3022/drivers/pci/search.c
+++ linux-10000/drivers/pci/search.c
-@@ -164,7 +164,7 @@ pci_find_subsys(unsigned int vendor, uns
+@@ -166,7 +166,7 @@ static struct pci_dev * pci_find_subsys(
struct list_head *n;
struct pci_dev *dev;
@@ -92,10 +166,33 @@
spin_lock(&pci_bus_lock);
n = from ? from->global_list.next : pci_devices.next;
-diff -urNp linux-1130/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c
---- linux-1130/drivers/usb/storage/scsiglue.c
+--- linux-2.6.11/drivers/scsi/ide-scsi.c~ 2005-03-22 19:21:13.000000000 -0500
++++ linux-2.6.11/drivers/scsi/ide-scsi.c 2005-03-22 19:21:51.000000000 -0500
+@@ -764,6 +764,8 @@ static ide_driver_t idescsi_driver = {
+ .drives = LIST_HEAD_INIT(idescsi_driver.drives),
+ };
+
++static int ide_scsi_warned;
++
+ static int idescsi_ide_open(struct inode *inode, struct file *filp)
+ {
+ struct gendisk *disk = inode->i_bdev->bd_disk;
+@@ -776,7 +778,10 @@ static int idescsi_ide_open(struct inode
+ drive = scsi->drive;
+
+ drive->usage++;
+-
++ if (!ide_scsi_warned++) {
++ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n");
++ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n");
++ }
+ return 0;
+ }
+
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c
+--- linux-3022/drivers/usb/storage/scsiglue.c
+++ linux-10000/drivers/usb/storage/scsiglue.c
-@@ -398,7 +398,7 @@ struct scsi_host_template usb_stor_host_
+@@ -469,7 +469,7 @@ struct scsi_host_template usb_stor_host_
.sg_tablesize = SG_ALL,
/* limit the total size of a transfer to 120 KB */
@@ -104,10 +201,22 @@
/* merge commands... this seems to help performance, but
* periodically someone should test to see which setting is more
-diff -urNp linux-1130/fs/open.c linux-10000/fs/open.c
---- linux-1130/fs/open.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/usb.c linux-10000/drivers/usb/storage/usb.c
+--- linux-2.6.11/drivers/usb/storage/usb.c~ 2005-04-05 02:15:13.000000000 -0400
++++ linux-2.6.11/drivers/usb/storage/usb.c 2005-04-05 02:15:36.000000000 -0400
+@@ -293,7 +293,7 @@ static int usb_stor_control_thread(void
+ * so get rid of all our resources.
+ */
+ daemonize("usb-storage");
+- current->flags |= PF_NOFREEZE;
++ current->flags |= PF_NOFREEZE|PF_MEMALLOC;
+ unlock_kernel();
+
+ /* acquire a reference to the host, so it won't be deallocated
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/open.c linux-10000/fs/open.c
+--- linux-3022/fs/open.c
+++ linux-10000/fs/open.c
-@@ -967,7 +967,6 @@ out_error:
+@@ -976,7 +976,6 @@ out_error:
fd = error;
goto out;
}
@@ -115,10 +224,10 @@
#ifndef __alpha__
-diff -urNp linux-1130/fs/proc/generic.c linux-10000/fs/proc/generic.c
---- linux-1130/fs/proc/generic.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/proc/generic.c linux-10000/fs/proc/generic.c
+--- linux-3022/fs/proc/generic.c
+++ linux-10000/fs/proc/generic.c
-@@ -675,7 +675,7 @@ void remove_proc_entry(const char *name,
+@@ -690,7 +690,7 @@ void remove_proc_entry(const char *name,
parent->nlink--;
proc_kill_inodes(de);
de->nlink = 0;
@@ -127,8 +236,8 @@
if (!atomic_read(&de->count))
free_proc_entry(de);
else {
-diff -urNp linux-1130/include/linux/config.h linux-10000/include/linux/config.h
---- linux-1130/include/linux/config.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/config.h linux-10000/include/linux/config.h
+--- linux-3022/include/linux/config.h
+++ linux-10000/include/linux/config.h
@@ -2,5 +2,7 @@
#define _LINUX_CONFIG_H
@@ -139,8 +248,8 @@
+#error including kernel header in userspace; use the glibc headers instead!
+#endif
#endif
-diff -urNp linux-1130/include/linux/delay.h linux-10000/include/linux/delay.h
---- linux-1130/include/linux/delay.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/delay.h linux-10000/include/linux/delay.h
+--- linux-3022/include/linux/delay.h
+++ linux-10000/include/linux/delay.h
@@ -10,7 +10,7 @@
extern unsigned long loops_per_jiffy;
@@ -173,10 +282,10 @@
#ifndef ndelay
#define ndelay(x) udelay(((x)+999)/1000)
-diff -urNp linux-1130/include/linux/gfp.h linux-10000/include/linux/gfp.h
---- linux-1130/include/linux/gfp.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/gfp.h linux-10000/include/linux/gfp.h
+--- linux-3022/include/linux/gfp.h
+++ linux-10000/include/linux/gfp.h
-@@ -46,7 +46,7 @@ struct vm_area_struct;
+@@ -47,7 +47,7 @@ struct vm_area_struct;
__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \
__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP)
@@ -185,70 +294,42 @@
#define GFP_NOIO (__GFP_WAIT)
#define GFP_NOFS (__GFP_WAIT | __GFP_IO)
#define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS)
-diff -urNp linux-1130/init/Kconfig linux-10000/init/Kconfig
---- linux-1130/init/Kconfig
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/namei.h linux-10000/include/linux/namei.h
+--- linux-3022/include/linux/namei.h
++++ linux-10000/include/linux/namei.h
+@@ -10,7 +10,7 @@ struct open_intent {
+ int create_mode;
+ };
+
+-enum { MAX_NESTED_LINKS = 5 };
++enum { MAX_NESTED_LINKS = 8 };
+
+ struct nameidata {
+ struct dentry *dentry;
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/init/Kconfig linux-10000/init/Kconfig
+--- linux-3022/init/Kconfig
+++ linux-10000/init/Kconfig
-@@ -264,7 +264,7 @@ config EPOLL
- source "drivers/block/Kconfig.iosched"
+@@ -291,7 +291,7 @@ config EPOLL
+ support for epoll family of system calls.
config CC_OPTIMIZE_FOR_SIZE
- bool "Optimize for size" if EMBEDDED
+ bool "Optimize for size"
default y if ARM || H8300
- default n
help
---- linux-2.6.6/drivers/net/3c59x.c~ 2004-06-11 17:44:15.678397999 +0200
-+++ linux-2.6.6/drivers/net/3c59x.c 2004-06-11 17:44:15.679397880 +0200
-@@ -1789,7 +1789,7 @@
- struct net_device *dev = (struct net_device *)data;
- struct vortex_private *vp = netdev_priv(dev);
- long ioaddr = dev->base_addr;
-- int next_tick = 60*HZ;
-+ int next_tick = 10*HZ;
- int ok = 0;
- int media_status, mii_status, old_window;
-
-diff -purN linux-2.6.7/scripts/reference_discarded.pl linux/scripts/reference_discarded.pl
---- linux-2.6.7/scripts/reference_discarded.pl 2004-06-16 07:19:22.000000000 +0200
-+++ linux/scripts/reference_discarded.pl 2004-06-17 15:06:31.554823071 +0200
-@@ -106,4 +106,4 @@ foreach $object (keys(%object)) {
- }
- # printf("Done\n");
-
--exit(0);
-+exit($errorcount);
-diff -purN linux-2.6.7/scripts/reference_init.pl linux/scripts/reference_init.pl
---- linux-2.6.7/scripts/reference_init.pl 2004-06-16 07:19:43.000000000 +0200
-+++ linux/scripts/reference_init.pl 2004-06-17 15:06:10.230376584 +0200
-@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) {
- if (($line =~ /\.init$/ || $line =~ /\.init\./) &&
- ($from !~ /\.init$/ &&
- $from !~ /\.init\./ &&
-+ $from !~ /\.eh_frame$/ &&
- $from !~ /\.stab$/ &&
- $from !~ /\.rodata$/ &&
- $from !~ /\.text\.lock$/ &&
---- linux-2.6.7/drivers/usb/host/ehci-hcd.c~ 2004-06-20 12:05:24.653760319 +0200
-+++ linux-2.6.7/drivers/usb/host/ehci-hcd.c 2004-06-20 12:05:24.653760319 +0200
-@@ -344,6 +344,7 @@
- dbg_hcc_params (ehci, "reset");
-
- #ifdef CONFIG_PCI
-+ writel(0, &ehci->regs->intr_enable);
- /* EHCI 0.96 and later may have "extended capabilities" */
- if (hcd->self.controller->bus == &pci_bus_type)
- temp = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params));
---- linux-2.6.7/init/main.c.acpi 2004-06-28 11:31:10.000000000 -0700
-+++ linux-2.6.7/init/main.c 2004-07-01 13:18:09.556088191 -0700
-@@ -665,7 +665,6 @@ static int init(void * unused)
+ Enabling this option will pass "-Os" instead of "-O2" to gcc
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/init/main.c linux-10000/init/main.c
+--- linux-3022/init/main.c
++++ linux-10000/init/main.c
+@@ -657,7 +657,6 @@ static int init(void * unused)
fixup_cpu_present_map();
smp_init();
- sched_init_smp();
- /*
- * Do this before initcalls, because some drivers want to access
-@@ -675,6 +674,8 @@ static int init(void * unused)
+ cpuset_init_smp();
+
+@@ -669,6 +668,8 @@ static int init(void * unused)
do_basic_setup();
@@ -257,31 +338,50 @@
/*
* check if there is an early userspace init. If yes, let it do all
* the work
---- linux-2.6.7/kernel/pid.c~ 2004-07-13 10:09:45.303329314 +0200
-+++ linux-2.6.7/kernel/pid.c 2004-07-13 10:09:45.303329314 +0200
-@@ -273,7 +273,7 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/kernel/pid.c linux-10000/kernel/pid.c
+--- linux-3022/kernel/pid.c
++++ linux-10000/kernel/pid.c
+@@ -257,7 +257,7 @@ void __init pidhash_init(void)
int i, j, pidhash_size;
- unsigned long megabytes = max_pfn >> (20 - PAGE_SHIFT);
+ unsigned long megabytes = nr_kernel_pages >> (20 - PAGE_SHIFT);
- pidhash_shift = max(4, fls(megabytes * 4));
+ pidhash_shift = max(10, fls(megabytes * 4));
pidhash_shift = min(12, pidhash_shift);
pidhash_size = 1 << pidhash_shift;
---- linux-2.6.7/include/linux/namei.h~ 2004-07-29 13:24:31.255858922 +0200
-+++ linux-2.6.7/include/linux/namei.h 2004-07-29 13:24:31.256858801 +0200
-@@ -10,7 +10,7 @@
- int create_mode;
- };
-
--enum { MAX_NESTED_LINKS = 5 };
-+enum { MAX_NESTED_LINKS = 8 };
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_discarded.pl linux-10000/scripts/reference_discarded.pl
+--- linux-3022/scripts/reference_discarded.pl
++++ linux-10000/scripts/reference_discarded.pl
+@@ -88,6 +88,7 @@ foreach $object (keys(%object)) {
+ ($from !~ /\.text\.exit$/ &&
+ $from !~ /\.exit\.text$/ &&
+ $from !~ /\.data\.exit$/ &&
++ $from !~ /\.opd$/ &&
+ $from !~ /\.exit\.data$/ &&
+ $from !~ /\.altinstructions$/ &&
+ $from !~ /\.pdr$/ &&
+@@ -107,4 +108,4 @@ foreach $object (keys(%object)) {
+ }
+ # printf("Done\n");
- struct nameidata {
- struct dentry *dentry;
---- linux-2.6.7/sound/core/oss/pcm_oss.c.orig 2004-08-04 11:21:32.364458304 -0400
-+++ linux-2.6.7/sound/core/oss/pcm_oss.c 2004-08-04 13:09:08.118034584 -0400
-@@ -1807,6 +1807,13 @@ static int snd_pcm_oss_open(struct inode
+-exit(0);
++exit($errorcount);
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_init.pl linux-10000/scripts/reference_init.pl
+--- linux-3022/scripts/reference_init.pl
++++ linux-10000/scripts/reference_init.pl
+@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) {
+ if (($line =~ /\.init$/ || $line =~ /\.init\./) &&
+ ($from !~ /\.init$/ &&
+ $from !~ /\.init\./ &&
++ $from !~ /\.eh_frame$/ &&
+ $from !~ /\.stab$/ &&
+ $from !~ /\.rodata$/ &&
+ $from !~ /\.text\.lock$/ &&
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/core/oss/pcm_oss.c linux-10000/sound/core/oss/pcm_oss.c
+--- linux-3022/sound/core/oss/pcm_oss.c
++++ linux-10000/sound/core/oss/pcm_oss.c
+@@ -1815,6 +1815,13 @@ static int snd_pcm_oss_open(struct inode
snd_pcm_oss_setup_t *psetup = NULL, *csetup = NULL;
int nonblock;
wait_queue_t wait;
@@ -295,29 +395,10 @@
snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO);
device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ?
---- linux-2.6.7/drivers/scsi/ide-scsi.c~ 2004-08-09 21:30:24.480420957 +0200
-+++ linux-2.6.7/drivers/scsi/ide-scsi.c 2004-08-09 21:30:24.480420957 +0200
-@@ -717,10 +717,16 @@
- .drives = LIST_HEAD_INIT(idescsi_driver.drives),
- };
-
-+static int ide_scsi_warned;
-+
- static int idescsi_ide_open(struct inode *inode, struct file *filp)
- {
- ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
- drive->usage++;
-+ if (!ide_scsi_warned++) {
-+ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n");
-+ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n");
-+ }
- return 0;
- }
-
-diff -urNp linux-2.6.8.orig/sound/pci/intel8x0.c linux-2.6.8/sound/pci/intel8x0.c
---- linux-2.6.8.orig/sound/pci/intel8x0.c 2004-08-14 01:37:15.000000000 -0400
-+++ linux-2.6.8/sound/pci/intel8x0.c 2004-08-16 10:45:22.018793582 -0400
-@@ -1823,6 +1823,24 @@ static struct ac97_quirk ac97_quirks[] _
+diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/pci/intel8x0.c linux-10000/sound/pci/intel8x0.c
+--- linux-3022/sound/pci/intel8x0.c
++++ linux-10000/sound/pci/intel8x0.c
+@@ -1948,6 +1948,24 @@ static struct ac97_quirk ac97_quirks[] _
.type = AC97_TUNE_HP_ONLY
},
#endif
@@ -342,80 +423,14 @@
{ } /* terminator */
};
---- linux-2.6.8/scripts/reference_discarded.pl~ 2004-08-18 17:37:24.469640739 +0200
-+++ linux-2.6.8/scripts/reference_discarded.pl 2004-08-18 17:37:24.469640739 +0200
-@@ -88,6 +88,7 @@
- ($from !~ /\.text\.exit$/ &&
- $from !~ /\.exit\.text$/ &&
- $from !~ /\.data\.exit$/ &&
-+ $from !~ /\.opd$/ &&
- $from !~ /\.exit\.data$/ &&
- $from !~ /\.altinstructions$/ &&
- $from !~ /\.debug_info$/ &&
---- linux-2.6.8-rc4-mm1/drivers/usb/storage/usb.c 2004-08-16 12:13:06.000000000 -0700
-+++ linux-2.6.8-rc4-mm1-ub/drivers/usb/storage/usb.c 2004-08-18 23:48:09.335107648 -0700
-@@ -285,7 +285,7 @@ static int usb_stor_control_thread(void
- */
- daemonize("usb-storage");
-
-- current->flags |= PF_NOFREEZE;
-+ current->flags |= PF_NOFREEZE|PF_MEMALLOC;
-
- unlock_kernel();
-
---- linux-2.6.8/arch/i386/kernel/nmi.c~ 2004-08-27 12:43:10.995416336 +0200
-+++ linux-2.6.8/arch/i386/kernel/nmi.c 2004-08-27 12:43:10.995416336 +0200
-@@ -481,7 +481,7 @@
- * wait a few IRQs (5 seconds) before doing the oops ...
- */
- alert_counter[cpu]++;
-- if (alert_counter[cpu] == 5*nmi_hz)
-+ if (alert_counter[cpu] == 30*nmi_hz)
- die_nmi(regs, "NMI Watchdog detected LOCKUP");
- } else {
- last_irq_sums[cpu] = sum;
---- linux-2.6.8/arch/x86_64/mm/init.c~ 2004-08-27 13:34:47.565301620 +0200
-+++ linux-2.6.8/arch/x86_64/mm/init.c 2004-08-27 13:34:47.565301620 +0200
-@@ -434,8 +434,6 @@
- int tmp;
-
- #ifdef CONFIG_SWIOTLB
-- if (swiotlb_force)
-- swiotlb = 1;
- if (!iommu_aperture &&
- (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
- swiotlb = 1;
---- linux-2.6.9/arch/ppc64/Makefile~ 2004-12-24 02:09:42.912082128 -0500
-+++ linux-2.6.9/arch/ppc64/Makefile 2004-12-24 02:10:02.289136368 -0500
-@@ -57,7 +57,7 @@ boot := arch/ppc64/boot
- bzImage: vmlinux
- cp vmlinux arch/ppc64/boot/bzImage
-
--boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
-+boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub
- boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
- boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
- $(boottarget-y): vmlinux
---- linux-2.6.8/arch/ppc64/boot/Makefile~ 2004-10-12 14:57:52.746516104 -0400
-+++ linux-2.6.8/arch/ppc64/boot/Makefile 2004-10-12 14:59:06.726269472 -0400
-@@ -113,6 +113,9 @@ $(obj)/zImage: obj-boot += $(call obj-se
- $(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE
- $(call if_changed,addnote)
-
-+$(obj)/zImage.stub: $(obj-boot) FORCE
-+ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot)
-+
- $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))
- $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE
- $(call if_changed,addnote)
---- linux-2.6.9/drivers/md/raid5.c~ 2004-10-29 00:16:42.000000000 -0400
-+++ linux-2.6.9/drivers/md/raid5.c 2004-10-29 00:17:11.000000000 -0400
-@@ -1329,6 +1329,8 @@ static void raid5_unplug_device(request_
- raid5_conf_t *conf = mddev_to_conf(mddev);
- unsigned long flags;
-
-+ if (!conf) return;
-+
- spin_lock_irqsave(&conf->device_lock, flags);
-
- if (blk_remove_plug(q))
+--- linux-2.6.12/drivers/acpi/pci_irq.c~ 2005-07-05 15:09:07.000000000 -0400
++++ linux-2.6.12/drivers/acpi/pci_irq.c 2005-07-05 15:09:43.000000000 -0400
+@@ -433,7 +433,7 @@ acpi_pci_irq_enable (
+ printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",
+ pci_name(dev), ('A' + pin));
+ /* Interrupt Line values above 0xF are forbidden */
+- if (dev->irq >= 0 && (dev->irq <= 0xF)) {
++ if (dev->irq > 0 && (dev->irq <= 0xF)) {
+ printk(" - using IRQ %d\n", dev->irq);
+ acpi_register_gsi(dev->irq, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
+ return_VALUE(0);
linux-2.6.0-must_check.patch:
pci.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
Index: linux-2.6.0-must_check.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.0-must_check.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6.0-must_check.patch 4 Jan 2005 05:39:48 -0000 1.18
+++ linux-2.6.0-must_check.patch 13 Jul 2005 04:18:41 -0000 1.19
@@ -1,15 +1,53 @@
-diff -urNp linux-520/include/linux/pci.h linux-530/include/linux/pci.h
---- linux-520/include/linux/pci.h
-+++ linux-530/include/linux/pci.h
-@@ -726,9 +726,9 @@ int pci_enable_device_bars(struct pci_de
+--- linux-2.6.11/include/linux/pci.h~ 2005-05-09 16:53:25.000000000 -0400
++++ linux-2.6.11/include/linux/pci.h 2005-05-09 16:53:59.000000000 -0400
+@@ -810,8 +810,8 @@ void pci_set_master(struct pci_dev *dev)
#define HAVE_PCI_SET_MWI
int pci_set_mwi(struct pci_dev *dev);
void pci_clear_mwi(struct pci_dev *dev);
-int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
-+int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
- int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask);
-int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
++int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
+int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
int pci_assign_resource(struct pci_dev *dev, int i);
+ /* ROM control related routines */
+--- linux-2.6.11/include/linux/pci.h~ 2005-05-18 02:39:59.000000000 -0400
++++ linux-2.6.11/include/linux/pci.h 2005-05-18 02:45:17.000000000 -0400
+@@ -803,29 +803,29 @@ static inline int pci_write_config_dword
+ return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val);
+ }
+
+-int pci_enable_device(struct pci_dev *dev);
+-int pci_enable_device_bars(struct pci_dev *dev, int mask);
++int __must_check pci_enable_device(struct pci_dev *dev);
++int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+ void pci_disable_device(struct pci_dev *dev);
+ void pci_set_master(struct pci_dev *dev);
+ #define HAVE_PCI_SET_MWI
+-int pci_set_mwi(struct pci_dev *dev);
++int __must_check pci_set_mwi(struct pci_dev *dev);
+ void pci_clear_mwi(struct pci_dev *dev);
+ int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
+ int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
+ int pci_assign_resource(struct pci_dev *dev, int i);
+
+ /* ROM control related routines */
+-void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size);
+-void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size);
++void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
++void __iomem __must_check *pci_map_rom_copy(struct pci_dev *pdev, size_t *size);
+ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
+ void pci_remove_rom(struct pci_dev *pdev);
+
/* Power management related routines */
+ int pci_save_state(struct pci_dev *dev);
+ int pci_restore_state(struct pci_dev *dev);
+-int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
+-pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
+-int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);
++int __must_check pci_set_power_state(struct pci_dev *dev, pci_power_t state);
++pci_power_t __must_check pci_choose_state(struct pci_dev *dev, pm_message_t state);
++int __must_check pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);
+
+ /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
+ void pci_bus_assign_resources(struct pci_bus *bus);
linux-2.6.0-sleepon.patch:
drivers/block/DAC960.c | 12 +++++++++++-
drivers/net/tokenring/ibmtr.c | 9 ++++++++-
fs/lockd/clntlock.c | 1 +
include/linux/wait.h | 6 +++---
kernel/sched.c | 28 +++++++++++++++-------------
net/sunrpc/clnt.c | 9 ++++++++-
6 files changed, 46 insertions(+), 19 deletions(-)
Index: linux-2.6.0-sleepon.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.0-sleepon.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6.0-sleepon.patch 4 Jan 2005 05:39:48 -0000 1.11
+++ linux-2.6.0-sleepon.patch 13 Jul 2005 04:18:41 -0000 1.12
@@ -1,7 +1,7 @@
-diff -urNp linux-1050/drivers/block/DAC960.c linux-1070/drivers/block/DAC960.c
---- linux-1050/drivers/block/DAC960.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/drivers/block/DAC960.c linux-1070/drivers/block/DAC960.c
+--- linux-1060/drivers/block/DAC960.c
+++ linux-1070/drivers/block/DAC960.c
-@@ -6125,6 +6125,9 @@ static boolean DAC960_V2_ExecuteUserComm
+@@ -6132,6 +6132,9 @@ static boolean DAC960_V2_ExecuteUserComm
unsigned long flags;
unsigned char Channel, TargetID, LogicalDriveNumber;
unsigned short LogicalDeviceNumber;
@@ -11,7 +11,7 @@
spin_lock_irqsave(&Controller->queue_lock, flags);
while ((Command = DAC960_AllocateCommand(Controller)) == NULL)
-@@ -6307,11 +6310,18 @@ static boolean DAC960_V2_ExecuteUserComm
+@@ -6314,11 +6317,18 @@ static boolean DAC960_V2_ExecuteUserComm
.SegmentByteCount =
CommandMailbox->ControllerInfo.DataTransferSize;
DAC960_ExecuteCommand(Command);
@@ -31,10 +31,10 @@
DAC960_UserCritical("Discovery Completed\n", Controller);
}
}
-diff -urNp linux-1050/drivers/net/tokenring/ibmtr.c linux-1070/drivers/net/tokenring/ibmtr.c
---- linux-1050/drivers/net/tokenring/ibmtr.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/drivers/net/tokenring/ibmtr.c linux-1070/drivers/net/tokenring/ibmtr.c
+--- linux-1060/drivers/net/tokenring/ibmtr.c
+++ linux-1070/drivers/net/tokenring/ibmtr.c
-@@ -848,6 +848,8 @@ static int tok_init_card(struct net_devi
+@@ -850,6 +850,8 @@ static int tok_init_card(struct net_devi
struct tok_info *ti;
short PIOaddr;
unsigned long i;
@@ -43,7 +43,7 @@
PIOaddr = dev->base_addr;
ti = (struct tok_info *) dev->priv;
-@@ -860,13 +862,18 @@ static int tok_init_card(struct net_devi
+@@ -862,13 +864,18 @@ static int tok_init_card(struct net_devi
current->state=TASK_UNINTERRUPTIBLE;
schedule_timeout(TR_RST_TIME); /* wait 50ms */
@@ -63,8 +63,8 @@
return i? 0 : -EAGAIN;
}
-diff -urNp linux-1050/fs/lockd/clntlock.c linux-1070/fs/lockd/clntlock.c
---- linux-1050/fs/lockd/clntlock.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/fs/lockd/clntlock.c linux-1070/fs/lockd/clntlock.c
+--- linux-1060/fs/lockd/clntlock.c
+++ linux-1070/fs/lockd/clntlock.c
@@ -70,6 +70,7 @@ nlmclnt_block(struct nlm_host *host, str
* nlmclnt_lock for an explanation.
@@ -74,10 +74,27 @@
for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
if (*head == &block) {
-diff -urNp linux-1050/kernel/sched.c linux-1070/kernel/sched.c
---- linux-1050/kernel/sched.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/include/linux/wait.h linux-1070/include/linux/wait.h
+--- linux-1060/include/linux/wait.h
++++ linux-1070/include/linux/wait.h
+@@ -364,10 +364,10 @@ static inline void remove_wait_queue_loc
+ * They are racy. DO NOT use them, use the wait_event* interfaces above.
+ * We plan to remove these interfaces during 2.7.
+ */
+-extern void FASTCALL(sleep_on(wait_queue_head_t *q));
+-extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
++extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q));
++extern long __deprecated FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
+ signed long timeout));
+-extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
++extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
+ extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q,
+ signed long timeout));
+
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/kernel/sched.c linux-1070/kernel/sched.c
+--- linux-1060/kernel/sched.c
+++ linux-1070/kernel/sched.c
-@@ -1907,10 +1907,21 @@ EXPORT_SYMBOL(wait_for_completion);
+@@ -3118,10 +3118,21 @@ EXPORT_SYMBOL(wait_for_completion_interr
__remove_wait_queue(q, &wait); \
spin_unlock_irqrestore(&q->lock, flags);
@@ -99,7 +116,7 @@
current->state = TASK_INTERRUPTIBLE;
SLEEP_ON_HEAD
-@@ -1924,6 +1935,8 @@ long interruptible_sleep_on_timeout(wait
+@@ -3135,6 +3146,8 @@ long fastcall __sched interruptible_slee
{
SLEEP_ON_VAR
@@ -108,7 +125,7 @@
current->state = TASK_INTERRUPTIBLE;
SLEEP_ON_HEAD
-@@ -1935,23 +1948,12 @@ long interruptible_sleep_on_timeout(wait
+@@ -3146,23 +3159,12 @@ long fastcall __sched interruptible_slee
EXPORT_SYMBOL(interruptible_sleep_on_timeout);
@@ -134,10 +151,10 @@
current->state = TASK_UNINTERRUPTIBLE;
SLEEP_ON_HEAD
-diff -urNp linux-1050/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c
---- linux-1050/net/sunrpc/clnt.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1060/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c
+--- linux-1060/net/sunrpc/clnt.c
+++ linux-1070/net/sunrpc/clnt.c
-@@ -214,17 +214,24 @@ out_no_clnt:
+@@ -223,17 +223,24 @@ out_no_clnt:
int
rpc_shutdown_client(struct rpc_clnt *clnt)
{
@@ -163,43 +180,3 @@
if (atomic_read(&clnt->cl_users) < 0) {
printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n",
---- linux-2.6.3/drivers/char/lp.c~ 2004-03-08 12:37:55.518102800 +0100
-+++ linux-2.6.3/drivers/char/lp.c 2004-03-08 12:37:55.518102800 +0100
-@@ -225,8 +225,8 @@
-
- polling = lp_table[minor].dev->port->irq == PARPORT_IRQ_NONE;
- if (polling) lp_release_parport (&lp_table[minor]);
-- interruptible_sleep_on_timeout (&lp_table[minor].waitq,
-- LP_TIMEOUT_POLLED);
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ schedule_timeout(LP_TIMEOUT_POLLED);
- if (polling) lp_claim_parport_or_block (&lp_table[minor]);
- else parport_yield_blocking (lp_table[minor].dev);
- }
-diff -urNp linux-1130/include/linux/wait.h linux-10000/include/linux/wait.h
---- linux-1130/include/linux/wait.h
-+++ linux-10000/include/linux/wait.h
-@@ -225,10 +225,10 @@ static inline void remove_wait_queue_loc
- * They are racy. DO NOT use them, use the wait_event* interfaces above.
- * We plan to remove these interfaces during 2.7.
- */
--extern void FASTCALL(sleep_on(wait_queue_head_t *q));
-+extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q));
- extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
- signed long timeout));
--extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
-+extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
- extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q,
- signed long timeout));
-
---- linux-2.6.8/include/linux/wait.h~ 2004-08-31 12:32:39.246305996 +0200
-+++ linux-2.6.8/include/linux/wait.h 2004-08-31 12:32:39.246305996 +0200
-@@ -253,7 +253,7 @@
- * We plan to remove these interfaces during 2.7.
- */
- extern void __deprecated FASTCALL(sleep_on(wait_queue_head_t *q));
--extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
-+extern long __deprecated FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
- signed long timeout));
- extern void __deprecated FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
- extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q,
linux-2.6.1-s390-compile.patch:
arch/s390/Makefile | 5 +++++
drivers/s390/cio/qdio.c | 12 +++++++++---
drivers/s390/cio/qdio.h | 2 ++
drivers/s390/net/qeth_main.c | 4 ++++
4 files changed, 20 insertions(+), 3 deletions(-)
Index: linux-2.6.1-s390-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.1-s390-compile.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6.1-s390-compile.patch 4 Jan 2005 05:39:48 -0000 1.12
+++ linux-2.6.1-s390-compile.patch 13 Jul 2005 04:18:41 -0000 1.13
@@ -1,7 +1,7 @@
-diff -ur -X dontdiff linux-2.6.1-1.153/arch/s390/Makefile linux-2.6.1-1.153.z1/arch/s390/Makefile
---- linux-2.6.1-1.153/arch/s390/Makefile 2004-01-09 01:59:10.000000000 -0500
-+++ linux-2.6.1-1.153.z1/arch/s390/Makefile 2004-01-30 14:41:22.000000000 -0500
-@@ -52,6 +52,11 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-400/arch/s390/Makefile linux-500/arch/s390/Makefile
+--- linux-400/arch/s390/Makefile
++++ linux-500/arch/s390/Makefile
+@@ -91,6 +91,11 @@ boot := arch/$(ARCH)/boot
all: image
@@ -13,10 +13,10 @@
install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
-diff -ur -X dontdiff linux-2.6.5-1.345/drivers/s390/cio/qdio.c linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.c
---- linux-2.6.5-1.345/drivers/s390/cio/qdio.c 2004-05-18 14:14:44.000000000 -0400
-+++ linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.c 2004-05-26 22:07:37.000000000 -0400
-@@ -1301,7 +1301,7 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/cio/qdio.c linux-500/drivers/s390/cio/qdio.c
+--- linux-400/drivers/s390/cio/qdio.c
++++ linux-500/drivers/s390/cio/qdio.c
+@@ -1352,7 +1352,7 @@ next:
}
kfree(irq_ptr->qdr);
@@ -25,7 +25,7 @@
}
static void
-@@ -2565,6 +2565,8 @@
+@@ -2608,6 +2608,8 @@ qdio_initialize(struct qdio_initialize *
int
qdio_allocate(struct qdio_initialize *init_data)
{
@@ -34,7 +34,7 @@
struct qdio_irq *irq_ptr;
char dbf_text[15];
-@@ -2586,17 +2588,21 @@
+@@ -2629,17 +2631,21 @@ qdio_allocate(struct qdio_initialize *in
qdio_allocate_do_dbf(init_data);
/* create irq */
@@ -58,10 +58,10 @@
init_MUTEX(&irq_ptr->setting_up_sema);
-diff -ur -X dontdiff linux-2.6.5-1.345/drivers/s390/cio/qdio.h linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.h
---- linux-2.6.5-1.345/drivers/s390/cio/qdio.h 2004-04-03 22:36:26.000000000 -0500
-+++ linux-2.6.5-1.345.z4/drivers/s390/cio/qdio.h 2004-05-26 22:02:43.000000000 -0400
-@@ -644,5 +644,7 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/cio/qdio.h linux-500/drivers/s390/cio/qdio.h
+--- linux-400/drivers/s390/cio/qdio.h
++++ linux-500/drivers/s390/cio/qdio.h
+@@ -644,5 +644,7 @@ struct qdio_irq {
struct qdio_q *input_qs[QDIO_MAX_QUEUES_PER_IRQ];
struct qdio_q *output_qs[QDIO_MAX_QUEUES_PER_IRQ];
struct semaphore setting_up_sema;
@@ -69,20 +69,18 @@
+ char *actual_alloc;
};
#endif
-Very minimal fix to have qeth working without IPv6
-
-diff -urN -X dontdiff linux-2.6.7-1.459/drivers/s390/net/qeth_main.c linux-2.6.7-1.459.z1/drivers/s390/net/qeth_main.c
---- linux-2.6.7-1.459/drivers/s390/net/qeth_main.c 2004-06-16 01:19:23.000000000 -0400
-+++ linux-2.6.7-1.459.z1/drivers/s390/net/qeth_main.c 2004-06-28 23:45:23.373535525 -0400
-@@ -4673,6 +4673,7 @@
- in_dev_put(in_dev);
+diff -urNp --exclude-from=/home/davej/.exclude linux-400/drivers/s390/net/qeth_main.c linux-500/drivers/s390/net/qeth_main.c
+--- linux-400/drivers/s390/net/qeth_main.c
++++ linux-500/drivers/s390/net/qeth_main.c
+@@ -4942,6 +4942,7 @@ out:
+ rcu_read_unlock();
}
+#ifdef CONFIG_QETH_IPV6
static void
qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid)
{
-@@ -4699,6 +4700,9 @@
+@@ -4968,6 +4969,9 @@ qeth_free_vlan_addresses6(struct qeth_ca
}
in6_dev_put(in6_dev);
}
@@ -91,4 +89,4 @@
+#endif
static void
- qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+ qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
linux-2.6.10-compile-fixes.patch:
arch/ppc/Makefile | 1 +
arch/ppc/kernel/head.S | 2 +-
arch/ppc/kernel/misc.S | 2 +-
arch/ppc/mm/hashtable.S | 4 ++--
arch/ppc/platforms/pmac_sleep.S | 2 +-
arch/ppc64/Makefile | 2 +-
arch/ppc64/boot/main.c | 1 +
crypto/Makefile | 2 ++
drivers/md/Makefile | 2 ++
include/asm-ppc/ppc_asm.h | 2 +-
include/linux/config.h | 2 +-
scripts/kconfig/Makefile | 2 +-
scripts/reference_discarded.pl | 1 +
sound/core/oss/Makefile | 1 +
14 files changed, 17 insertions(+), 9 deletions(-)
Index: linux-2.6.10-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-compile-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.10-compile-fixes.patch 17 May 2005 23:50:40 -0000 1.2
+++ linux-2.6.10-compile-fixes.patch 13 Jul 2005 04:18:41 -0000 1.3
@@ -1,7 +1,31 @@
-diff -urNp linux-1130/arch/ppc/Makefile linux-10000/arch/ppc/Makefile
---- linux-1130/arch/ppc/Makefile
-+++ linux-10000/arch/ppc/Makefile
-@@ -54,6 +54,7 @@ AFLAGS_vmlinux.lds.o := -Upowerpc
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/head.S linux-10001/arch/ppc/kernel/head.S
+--- linux-10000/arch/ppc/kernel/head.S
++++ linux-10001/arch/ppc/kernel/head.S
+@@ -1512,7 +1512,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
+ flush_tlbs:
+ lis r10, 0x40
+ 1: addic. r10, r10, -0x1000
+- tlbie r10
++ tlbie r10,0
+ blt 1b
+ sync
+ blr
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/misc.S linux-10001/arch/ppc/kernel/misc.S
+--- linux-10000/arch/ppc/kernel/misc.S
++++ linux-10001/arch/ppc/kernel/misc.S
+@@ -565,7 +565,7 @@ _GLOBAL(_tlbie)
+ SYNC_601
+ isync
+ #else /* CONFIG_SMP */
+- tlbie r3
++ tlbie r3,0
+ sync
+ #endif /* CONFIG_SMP */
+ #endif /* ! CONFIG_40x */
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/Makefile linux-10001/arch/ppc/Makefile
+--- linux-10000/arch/ppc/Makefile
++++ linux-10001/arch/ppc/Makefile
+@@ -78,6 +78,7 @@ CPPFLAGS_vmlinux.lds := -Upowerpc
# All the instructions talk about "make bzImage".
bzImage: zImage
@@ -9,63 +33,42 @@
boot := arch/$(ARCH)/boot
-diff -urNp linux-1130/scripts/kconfig/Makefile linux-10000/scripts/kconfig/Makefile
---- linux-1130/scripts/kconfig/Makefile
-+++ linux-10000/scripts/kconfig/Makefile
-@@ -118,7 +118,7 @@ QTLIBPATH = $(QTDIR)/lib
-
- # QT needs some extra effort...
- $(obj)/.tmp_qtcheck:
-- @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
-+ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt* /usr/lib64/qt* ; do \
- if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
- done; \
- if [ -z "$$DIR" ]; then \
-diff -urNp linux-1130/sound/core/oss/Makefile linux-10000/sound/core/oss/Makefile
---- linux-1130/sound/core/oss/Makefile
-+++ linux-10000/sound/core/oss/Makefile
-@@ -3,6 +3,7 @@
- # Copyright (c) 1999 by Jaroslav Kysela <perex suse cz>
- #
-
-+CFLAGS_pcm_plugin.o += -g0
- snd-mixer-oss-objs := mixer_oss.o
-
- snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
-
---- linux-2.6.6/drivers/md/Makefile~ 2004-06-11 12:03:17.099216018 +0200
-+++ linux-2.6.6/drivers/md/Makefile 2004-06-11 12:03:17.099216018 +0200
-@@ -10,6 +10,8 @@ raid6-objs := raid6main.o raid6algos.o r
- raid6mmx.o raid6sse1.o raid6sse2.o
- host-progs := mktables
-
-+CFLAGS_raid6int8.o += -O2
-+
- # Note: link order is important. All raid personalities
- # and xor.o must come before md.o, as they each initialise
- # themselves, and md.o may use the personalities when it
---- linux-2.6.8/crypto/Makefile~ 2004-08-18 15:41:44.562809502 +0200
-+++ linux-2.6.8/crypto/Makefile 2004-08-18 15:41:44.562809502 +0200
-@@ -32,3 +32,5 @@
-
- obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/
- obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
-+
-+CFLAGS_twofish.o += -fno-schedule-insns
-
---- linux-2.6.8/arch/ppc64/Makefile~ 2004-09-02 17:25:26.731269075 +0200
-+++ linux-2.6.8/arch/ppc64/Makefile 2004-09-02 17:25:26.731269075 +0200
-@@ -37,7 +37,7 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/mm/hashtable.S linux-10001/arch/ppc/mm/hashtable.S
+--- linux-10000/arch/ppc/mm/hashtable.S
++++ linux-10001/arch/ppc/mm/hashtable.S
+@@ -375,7 +375,7 @@ _GLOBAL(hash_page_patch_A)
+ */
+ andi. r6,r6,_PAGE_HASHPTE
+ beq+ 10f /* no PTE: go look for an empty slot */
+- tlbie r4
++ tlbie r4,0
- # Enable unit-at-a-time mode when possible. It shrinks the
- # kernel considerably.
--CFLAGS += $(call cc-option,-funit-at-a-time)
-+CFLAGS += $(call cc-option,-fno-unit-at-a-time)
+ addis r4,r7,htab_hash_searches ha
+ lwz r6,htab_hash_searches l(r4)
+@@ -616,7 +616,7 @@ _GLOBAL(flush_hash_patch_B)
+ 3: li r0,0
+ STPTE r0,0(r12) /* invalidate entry */
+ 4: sync
+- tlbie r4 /* in hw tlb too */
++ tlbie r4,0 /* in hw tlb too */
+ sync
- head-y := arch/ppc64/kernel/head.o
+ 8: ble cr1,9f /* if all ptes checked */
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/platforms/pmac_sleep.S linux-10001/arch/ppc/platforms/pmac_sleep.S
+--- linux-10000/arch/ppc/platforms/pmac_sleep.S
++++ linux-10001/arch/ppc/platforms/pmac_sleep.S
+@@ -340,7 +340,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
+ /* Flush all TLBs */
+ lis r4,0x1000
+ 1: addic. r4,r4,-0x1000
+- tlbie r4
++ tlbie r4, 0
+ blt 1b
+ sync
---- linux-2.6.8/arch/ppc64/boot/main.c.netboot 2004-09-09 23:04:31.412027568 -0400
-+++ linux-2.6.8/arch/ppc64/boot/main.c 2004-09-09 23:04:39.576786336 -0400
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/boot/main.c linux-10001/arch/ppc64/boot/main.c
+--- linux-10000/arch/ppc64/boot/main.c
++++ linux-10001/arch/ppc64/boot/main.c
@@ -8,6 +8,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
@@ -74,19 +77,42 @@
#include "ppc32-types.h"
#include "zlib.h"
#include <linux/elf.h>
---- linux-2.6.8/include/linux/config.h.netboot 2004-09-09 23:04:49.190324856 -0400
-+++ linux-2.6.8/include/linux/config.h 2004-09-09 23:05:13.045698288 -0400
-@@ -2,7 +2,7 @@
- #define _LINUX_CONFIG_H
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/Makefile linux-10001/arch/ppc64/Makefile
+--- linux-10000/arch/ppc64/Makefile
++++ linux-10001/arch/ppc64/Makefile
+@@ -68,7 +68,7 @@ endif
- #include <linux/autoconf.h>
--#ifndef __KERNEL__
-+#if !defined (__KERNEL__) && !defined(__KERNGLUE__)
- #error including kernel header in userspace; use the glibc headers instead!
- #endif
- #endif
---- linux-2.6.8/include/asm-ppc/ppc_asm.h~ 2004-08-14 06:36:14.000000000 +0100
-+++ linux-2.6.8/include/asm-ppc/ppc_asm.h 2004-10-07 17:44:45.321291752 +0100
+ # Enable unit-at-a-time mode when possible. It shrinks the
+ # kernel considerably.
+-CFLAGS += $(call cc-option,-funit-at-a-time)
++CFLAGS += $(call cc-option,-fno-unit-at-a-time)
+
+ head-y := arch/ppc64/kernel/head.o
+
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/crypto/Makefile linux-10001/crypto/Makefile
+--- linux-10000/crypto/Makefile
++++ linux-10001/crypto/Makefile
+@@ -35,3 +35,5 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
+
+ obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/
+ obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
++
++CFLAGS_twofish.o += -fno-schedule-insns
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/drivers/md/Makefile linux-10001/drivers/md/Makefile
+--- linux-10000/drivers/md/Makefile
++++ linux-10001/drivers/md/Makefile
+@@ -15,6 +15,8 @@ raid6-objs := raid6main.o raid6algos.o r
+ raid6mmx.o raid6sse1.o raid6sse2.o
+ hostprogs-y := mktables
+
++CFLAGS_raid6int8.o += -O2
++
+ # Note: link order is important. All raid personalities
+ # and xor.o must come before md.o, as they each initialise
+ # themselves, and md.o may use the personalities when it
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/asm-ppc/ppc_asm.h linux-10001/include/asm-ppc/ppc_asm.h
+--- linux-10000/include/asm-ppc/ppc_asm.h
++++ linux-10001/include/asm-ppc/ppc_asm.h
@@ -116,7 +116,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
li r4,1024; \
mtctr r4; \
@@ -96,154 +122,33 @@
addi r4,r4,0x1000; \
bdnz 0b
#endif
---- linux-2.6.8/arch/ppc/platforms/pmac_sleep.S~ 2004-08-14 06:36:16.000000000 +0100
-+++ linux-2.6.8/arch/ppc/platforms/pmac_sleep.S 2004-10-07 17:47:29.867276960 +0100
-@@ -339,7 +339,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
- /* Flush all TLBs */
- lis r4,0x1000
- 1: addic. r4,r4,-0x1000
-- tlbie r4
-+ tlbie r4, 0
- blt 1b
- sync
-
---- linux-2.6.8/arch/ppc/mm/hashtable.S~ 2004-08-14 06:37:39.000000000 +0100
-+++ linux-2.6.8/arch/ppc/mm/hashtable.S 2004-10-07 17:48:17.797990384 +0100
-@@ -375,7 +375,7 @@ _GLOBAL(hash_page_patch_A)
- */
- andi. r6,r6,_PAGE_HASHPTE
- beq+ 10f /* no PTE: go look for an empty slot */
-- tlbie r4
-+ tlbie r4,0
-
- addis r4,r7,htab_hash_searches ha
- lwz r6,htab_hash_searches l(r4)
-@@ -616,7 +616,7 @@ _GLOBAL(flush_hash_patch_B)
- 3: li r0,0
- STPTE r0,0(r12) /* invalidate entry */
- 4: sync
-- tlbie r4 /* in hw tlb too */
-+ tlbie r4,0 /* in hw tlb too */
- sync
-
- 8: ble cr1,9f /* if all ptes checked */
-
-
---- linux-2.6.8/arch/ppc/kernel/misc.S~ 2004-10-11 17:24:47.654242928 -0400
-+++ linux-2.6.8/arch/ppc/kernel/misc.S 2004-10-11 17:24:59.787398408 -0400
-@@ -565,7 +565,7 @@ _GLOBAL(_tlbie)
- SYNC_601
- isync
- #else /* CONFIG_SMP */
-- tlbie r3
-+ tlbie r3,0
- sync
- #endif /* CONFIG_SMP */
- #endif /* ! CONFIG_40x */
---- linux-2.6.8/arch/ppc/kernel/head.S~ 2004-10-11 18:07:27.809040240 -0400
-+++ linux-2.6.8/arch/ppc/kernel/head.S 2004-10-11 18:07:36.999643056 -0400
-@@ -1512,7 +1512,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
- flush_tlbs:
- lis r10, 0x40
- 1: addic. r10, r10, -0x1000
-- tlbie r10
-+ tlbie r10,0
- blt 1b
- sync
- blr
---- linux-2.6.8/arch/ppc64/boot/zImage.lds~ 2004-10-12 16:42:38.870879944 -0400
-+++ linux-2.6.8/arch/ppc64/boot/zImage.lds 2004-10-12 16:42:49.191311000 -0400
-@@ -1,4 +1,4 @@
--OUTPUT_ARCH(powerpc)
-+OUTPUT_ARCH(powerpc:common)
- SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
- /* Do we need any of these for elf?
- __DYNAMIC = 0; */
---- linux-2.6.10/include/asm-ppc64/paca.h~ 2005-03-01 08:48:20.000000000 +0000
-+++ linux-2.6.10/include/asm-ppc64/paca.h 2005-03-01 08:54:47.662044104 +0000
-@@ -22,7 +22,6 @@
- #include <asm/iSeries/ItLpRegSave.h>
- #include <asm/mmu.h>
-
--extern struct paca_struct paca[];
- register struct paca_struct *local_paca asm("r13");
- #define get_paca() local_paca
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/linux/config.h linux-10001/include/linux/config.h
+--- linux-10000/include/linux/config.h
++++ linux-10001/include/linux/config.h
+@@ -2,7 +2,7 @@
+ #define _LINUX_CONFIG_H
-@@ -115,4 +114,6 @@
+ #include <linux/autoconf.h>
+-#ifndef __KERNEL__
++#if !defined (__KERNEL__) && !defined(__KERNGLUE__)
+ #error including kernel header in userspace; use the glibc headers instead!
+ #endif
#endif
- };
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/kconfig/Makefile linux-10001/scripts/kconfig/Makefile
+--- linux-10000/scripts/kconfig/Makefile
++++ linux-10001/scripts/kconfig/Makefile
+@@ -126,7 +126,7 @@ QTLIBPATH = $(QTDIR)/lib
-+extern struct paca_struct paca[];
-+
- #endif /* _PPC64_PACA_H */
---- linux-2.6.10-ppc/arch/ppc/syslib/open_pic_defs.h~ 2005-03-01 09:20:34.000000000 +0000
-+++ linux-2.6.10-ppc/arch/ppc/syslib/open_pic_defs.h 2005-03-01 09:39:22.776010608 +0000
-@@ -172,8 +172,6 @@ struct OpenPIC {
- OpenPIC_Processor Processor[OPENPIC_MAX_PROCESSORS];
- };
-
--extern volatile struct OpenPIC __iomem *OpenPIC;
--
-
- /*
- * Current Task Priority Register
---- linux-2.6.10-ppc/include/asm-ppc/prom.h~ 2004-12-24 21:35:23.000000000 +0000
-+++ linux-2.6.10-ppc/include/asm-ppc/prom.h 2005-03-01 09:36:01.350016664 +0000
-@@ -13,9 +13,6 @@
- typedef void *phandle;
- typedef void *ihandle;
-
--extern char *prom_display_paths[];
--extern unsigned int prom_num_displays;
--
- struct address_range {
- unsigned int space;
- unsigned int address;
---- linux-2.6.10-ppc/arch/ppc/kernel/time.c~ 2005-03-01 09:20:34.000000000 +0000
-+++ linux-2.6.10-ppc/arch/ppc/kernel/time.c 2005-03-01 09:53:47.293085192 +0000
-@@ -89,7 +89,7 @@ unsigned long tb_to_ns_scale;
-
- extern unsigned long wall_jiffies;
-
--static long time_offset;
-+static long rtc_time_offset;
-
- DEFINE_SPINLOCK(rtc_lock);
-
-@@ -172,7 +172,7 @@ void timer_interrupt(struct pt_regs * re
- xtime.tv_sec - last_rtc_update >= 659 &&
- abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
- jiffies - wall_jiffies == 1) {
-- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0)
-+ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + rtc_time_offset) == 0)
- last_rtc_update = xtime.tv_sec+1;
- else
- /* Try again one minute later */
-@@ -289,7 +289,7 @@ void __init time_init(void)
- unsigned old_stamp, stamp, elapsed;
-
- if (ppc_md.time_init != NULL)
-- time_offset = ppc_md.time_init();
-+ rtc_time_offset = ppc_md.time_init();
-
- if (__USE_RTC()) {
- /* 601 processor: dec counts down by 128 every 128ns */
-@@ -334,10 +334,10 @@ void __init time_init(void)
- set_dec(tb_ticks_per_jiffy);
-
- /* If platform provided a timezone (pmac), we correct the time */
-- if (time_offset) {
-- sys_tz.tz_minuteswest = -time_offset / 60;
-+ if (rtc_time_offset) {
-+ sys_tz.tz_minuteswest = -rtc_time_offset / 60;
- sys_tz.tz_dsttime = 0;
-- xtime.tv_sec -= time_offset;
-+ xtime.tv_sec -= rtc_time_offset;
- }
- set_normalized_timespec(&wall_to_monotonic,
- -xtime.tv_sec, -xtime.tv_nsec);
---- linux-2.6.10/scripts/reference_discarded.pl~ 2005-03-01 09:20:50.000000000 +0000
-+++ linux-2.6.10/scripts/reference_discarded.pl 2005-03-01 10:13:00.424105232 +0000
+ # QT needs some extra effort...
+ $(obj)/.tmp_qtcheck:
+- @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
++ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt* /usr/lib64/qt* ; do \
+ if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
+ done; \
+ if [ -z "$$DIR" ]; then \
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/reference_discarded.pl linux-10001/scripts/reference_discarded.pl
+--- linux-10000/scripts/reference_discarded.pl
++++ linux-10001/scripts/reference_discarded.pl
@@ -96,6 +96,7 @@ foreach $object (keys(%object)) {
$from !~ /\.debug_aranges$/ &&
$from !~ /\.debug_ranges$/ &&
@@ -252,4 +157,14 @@
$from !~ /\.debug_frame$/ &&
$from !~ /\.exitcall\.exit$/ &&
$from !~ /\.eh_frame$/ &&
+diff -urNp --exclude-from=/home/davej/.exclude linux-10000/sound/core/oss/Makefile linux-10001/sound/core/oss/Makefile
+--- linux-10000/sound/core/oss/Makefile
++++ linux-10001/sound/core/oss/Makefile
+@@ -3,6 +3,7 @@
+ # Copyright (c) 1999 by Jaroslav Kysela <perex suse cz>
+ #
++CFLAGS_pcm_plugin.o += -g0
+ snd-mixer-oss-objs := mixer_oss.o
+
+ snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
linux-2.6.10-crashdump-common.patch:
Documentation/sysrq.txt | 8 +
arch/i386/kernel/nmi.c | 1
arch/i386/kernel/process.c | 2
arch/i386/kernel/smp.c | 47 +++++--
arch/i386/kernel/traps.c | 3
arch/i386/mm/init.c | 47 +++++++
arch/i386/mm/pgtable.c | 3
arch/ia64/kernel/process.c | 30 ++++
arch/ia64/kernel/smp.c | 52 +++++---
arch/ia64/kernel/traps.c | 6
arch/ia64/mm/contig.c | 3
arch/ia64/mm/discontig.c | 3
arch/ia64/mm/init.c | 90 +++++++++++++-
arch/ppc64/kernel/process.c | 1
arch/ppc64/kernel/smp.c | 51 +++++---
arch/ppc64/kernel/traps.c | 3
arch/ppc64/mm/init.c | 29 ++++
arch/s390/kernel/traps.c | 6
arch/x86_64/kernel/process.c | 2
arch/x86_64/kernel/smp.c | 50 +++++---
arch/x86_64/kernel/traps.c | 6
arch/x86_64/mm/fault.c | 1
arch/x86_64/mm/init.c | 33 +++++
drivers/char/sysrq.c | 13 +-
include/asm-generic/crashdump.h | 47 +++++++
include/asm-i386/crashdump.h | 123 ++++++++++++++++++++
include/asm-i386/kmap_types.h | 4
include/asm-ia64/crashdump.h | 72 +++++++++++
include/asm-ppc64/crashdump.h | 61 +++++++++
include/asm-x86_64/crashdump.h | 86 +++++++++++++
include/linux/kernel.h | 18 ++
kernel/Makefile | 2
kernel/dump.c | 246 ++++++++++++++++++++++++++++++++++++++++
kernel/panic.c | 2
kernel/printk.c | 20 +++
kernel/sched.c | 2
36 files changed, 1094 insertions(+), 79 deletions(-)
Index: linux-2.6.10-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-crashdump-common.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6.10-crashdump-common.patch 6 Mar 2005 22:35:14 -0000 1.5
+++ linux-2.6.10-crashdump-common.patch 13 Jul 2005 04:18:41 -0000 1.6
@@ -1,40 +1,15 @@
-diff -uprN linux-2.6.10.orig/Documentation/sysrq.txt linux-2.6.10.crashdumpcommon/Documentation/sysrq.txt
---- linux-2.6.10.orig/Documentation/sysrq.txt 2004-12-24 16:34:45.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/Documentation/sysrq.txt 2005-01-18 11:56:34.000000000 -0500
-@@ -53,6 +53,10 @@ On all - write a character to /proc/sys
- 'b' - Will immediately reboot the system without syncing or unmounting
- your disks.
-
-+'c' - Intentionally crash the system without syncing or unmounting
-+ your disks. This is most useful if the NETDUMP client package
-+ and/or the DISKDUMP package have been installed.
-+
- 'o' - Will shut your system off (if configured and supported).
-
- 's' - Will attempt to sync all mounted filesystems.
-@@ -101,6 +105,10 @@ useful when you want to exit a program t
- re'B'oot is good when you're unable to shut down. But you should also 'S'ync
- and 'U'mount first.
-
-+'C'rash immediately crashes your system. This is most useful if the machine
-+has been configured as a NETDUMP client because an OOPS report is generated
-+and a kernel crash dump is sent to the NETDUMP server.
-+
- 'S'ync is great when your system is locked up, it allows you to sync your
- disks and will certainly lessen the chance of data loss and fscking. Note
- that the sync hasn't taken place until you see the "OK" and "Done" appear
-diff -uprN linux-2.6.10.orig/arch/i386/kernel/nmi.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/nmi.c
---- linux-2.6.10.orig/arch/i386/kernel/nmi.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/nmi.c 2005-01-18 11:56:34.000000000 -0500
-@@ -564,3 +564,4 @@ EXPORT_SYMBOL(reserve_lapic_nmi);
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/nmi.c linux-1500/arch/i386/kernel/nmi.c
+--- linux-1400/arch/i386/kernel/nmi.c
++++ linux-1500/arch/i386/kernel/nmi.c
+@@ -568,3 +568,4 @@ EXPORT_SYMBOL(reserve_lapic_nmi);
EXPORT_SYMBOL(release_lapic_nmi);
EXPORT_SYMBOL(disable_timer_nmi_watchdog);
EXPORT_SYMBOL(enable_timer_nmi_watchdog);
+EXPORT_SYMBOL_GPL(touch_nmi_watchdog);
-diff -uprN linux-2.6.10.orig/arch/i386/kernel/process.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/process.c
---- linux-2.6.10.orig/arch/i386/kernel/process.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/process.c 2005-01-18 11:56:34.000000000 -0500
-@@ -277,6 +277,8 @@ void show_regs(struct pt_regs * regs)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/process.c linux-1500/arch/i386/kernel/process.c
+--- linux-1400/arch/i386/kernel/process.c
++++ linux-1500/arch/i386/kernel/process.c
+@@ -276,6 +276,8 @@ void show_regs(struct pt_regs * regs)
show_trace(NULL, ®s->esp);
}
@@ -43,10 +18,10 @@
/*
* This gets run with %ebx containing the
* function to call, and %edx containing
-diff -uprN linux-2.6.10.orig/arch/i386/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/smp.c
---- linux-2.6.10.orig/arch/i386/kernel/smp.c 2004-12-24 16:33:52.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/smp.c 2005-01-18 12:17:09.000000000 -0500
-@@ -505,7 +505,10 @@ int smp_call_function (void (*func) (voi
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/smp.c linux-1500/arch/i386/kernel/smp.c
+--- linux-1400/arch/i386/kernel/smp.c
++++ linux-1500/arch/i386/kernel/smp.c
+@@ -508,7 +508,10 @@ int smp_call_function (void (*func) (voi
* <func> The function to run. This must be fast and non-blocking.
* <info> An arbitrary pointer to pass to the function.
* <nonatomic> currently unused.
@@ -58,7 +33,7 @@
* [RETURNS] 0 on success, else a negative status code. Does not return until
* remote CPUs are nearly ready to execute <<func>> or are or have executed.
*
-@@ -513,35 +516,49 @@ int smp_call_function (void (*func) (voi
+@@ -516,35 +519,49 @@ int smp_call_function (void (*func) (voi
* hardware interrupt handler or from a bottom half handler.
*/
{
@@ -122,9 +97,9 @@
cpu_relax();
spin_unlock(&call_lock);
-diff -uprN linux-2.6.10.orig/arch/i386/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/i386/kernel/traps.c
---- linux-2.6.10.orig/arch/i386/kernel/traps.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/kernel/traps.c linux-1500/arch/i386/kernel/traps.c
+--- linux-1400/arch/i386/kernel/traps.c
++++ linux-1500/arch/i386/kernel/traps.c
@@ -334,6 +334,7 @@ void die(const char * str, struct pt_reg
printk("\n");
notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV);
@@ -140,11 +115,11 @@
+ if (netdump_func)
+ netdump_func = NULL;
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(5 * HZ);
-diff -uprN linux-2.6.10.orig/arch/i386/mm/init.c linux-2.6.10.crashdumpcommon/arch/i386/mm/init.c
---- linux-2.6.10.orig/arch/i386/mm/init.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/mm/init.c 2005-01-18 11:56:34.000000000 -0500
+ ssleep(5);
+ panic("Fatal exception");
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/mm/init.c linux-1500/arch/i386/mm/init.c
+--- linux-1400/arch/i386/mm/init.c
++++ linux-1500/arch/i386/mm/init.c
@@ -229,6 +229,53 @@ static inline int page_is_ram(unsigned l
return 0;
}
@@ -199,9 +174,9 @@
/*
* devmem_is_allowed() checks to see if /dev/mem access to a certain address is
* valid. The argument is a physical page number.
-diff -uprN linux-2.6.10.orig/arch/i386/mm/pgtable.c linux-2.6.10.crashdumpcommon/arch/i386/mm/pgtable.c
---- linux-2.6.10.orig/arch/i386/mm/pgtable.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/i386/mm/pgtable.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/i386/mm/pgtable.c linux-1500/arch/i386/mm/pgtable.c
+--- linux-1400/arch/i386/mm/pgtable.c
++++ linux-1500/arch/i386/mm/pgtable.c
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
@@ -219,18 +194,18 @@
/*
* Associate a virtual page frame with a given physical page frame
* and protection flags for that frame.
-diff -uprN linux-2.6.10.orig/arch/ia64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/process.c
---- linux-2.6.10.orig/arch/ia64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/process.c linux-1500/arch/ia64/kernel/process.c
+--- linux-1400/arch/ia64/kernel/process.c
++++ linux-1500/arch/ia64/kernel/process.c
@@ -39,6 +39,7 @@
#include <asm/uaccess.h>
#include <asm/unwind.h>
#include <asm/user.h>
+#include <asm/diskdump.h>
- #ifdef CONFIG_PERFMON
- # include <asm/perfmon.h>
-@@ -150,6 +151,8 @@ show_regs (struct pt_regs *regs)
+ #include "entry.h"
+
+@@ -152,6 +153,8 @@ show_regs (struct pt_regs *regs)
show_stack(NULL, NULL);
}
@@ -239,7 +214,7 @@
void
do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
{
-@@ -576,11 +579,13 @@ do_dump_task_fpu (struct task_struct *ta
+@@ -578,11 +581,13 @@ do_dump_task_fpu (struct task_struct *ta
}
void
@@ -254,7 +229,7 @@
void
do_dump_fpu (struct unw_frame_info *info, void *arg)
{
-@@ -593,7 +598,7 @@ dump_task_regs(struct task_struct *task,
+@@ -595,7 +600,7 @@ dump_task_regs(struct task_struct *task,
struct unw_frame_info tcore_info;
if (current == task) {
@@ -263,7 +238,7 @@
} else {
memset(&tcore_info, 0, sizeof(tcore_info));
unw_init_from_blocked_task(&tcore_info, task);
-@@ -605,7 +610,7 @@ dump_task_regs(struct task_struct *task,
+@@ -607,7 +612,7 @@ dump_task_regs(struct task_struct *task,
void
ia64_elf_core_copy_regs (struct pt_regs *pt, elf_gregset_t dst)
{
@@ -272,7 +247,7 @@
}
int
-@@ -796,3 +801,22 @@ machine_power_off (void)
+@@ -798,3 +803,22 @@ machine_power_off (void)
}
EXPORT_SYMBOL(machine_power_off);
@@ -295,9 +270,9 @@
+}
+
+EXPORT_SYMBOL_GPL(ia64_start_dump);
-diff -uprN linux-2.6.10.orig/arch/ia64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/smp.c
---- linux-2.6.10.orig/arch/ia64/kernel/smp.c 2004-12-24 16:35:40.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/smp.c 2005-01-19 13:26:15.155435784 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/smp.c linux-1500/arch/ia64/kernel/smp.c
+--- linux-1400/arch/ia64/kernel/smp.c
++++ linux-1500/arch/ia64/kernel/smp.c
@@ -62,7 +62,7 @@ struct call_data_struct {
atomic_t finished;
};
@@ -307,7 +282,7 @@
#define IPI_CALL_FUNC 0
#define IPI_CPU_STOP 1
-@@ -313,7 +313,10 @@ EXPORT_SYMBOL(smp_call_function_single);
+@@ -312,7 +312,10 @@ EXPORT_SYMBOL(smp_call_function_single);
* <func> The function to run. This must be fast and non-blocking.
* <info> An arbitrary pointer to pass to the function.
* <nonatomic> currently unused.
@@ -319,7 +294,7 @@
* [RETURNS] 0 on success, else a negative status code.
*
* Does not return until remote CPUs are nearly ready to execute <func> or are or have
-@@ -325,36 +328,51 @@ EXPORT_SYMBOL(smp_call_function_single);
+@@ -324,36 +327,51 @@ EXPORT_SYMBOL(smp_call_function_single);
int
smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait)
{
@@ -386,9 +361,9 @@
spin_unlock(&call_lock);
return 0;
-diff -uprN linux-2.6.10.orig/arch/ia64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/ia64/kernel/traps.c
---- linux-2.6.10.orig/arch/ia64/kernel/traps.c 2004-12-24 16:35:39.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/kernel/traps.c linux-1500/arch/ia64/kernel/traps.c
+--- linux-1400/arch/ia64/kernel/traps.c
++++ linux-1500/arch/ia64/kernel/traps.c
@@ -92,6 +92,12 @@ die (const char *str, struct pt_regs *re
} else
printk(KERN_ERR "Recursive die() failure, output suppressed\n");
@@ -402,9 +377,9 @@
bust_spinlocks(0);
die.lock_owner = -1;
spin_unlock_irq(&die.lock);
-diff -uprN linux-2.6.10.orig/arch/ia64/mm/contig.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/contig.c
---- linux-2.6.10.orig/arch/ia64/mm/contig.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/contig.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/contig.c linux-1500/arch/ia64/mm/contig.c
+--- linux-1400/arch/ia64/mm/contig.c
++++ linux-1500/arch/ia64/mm/contig.c
@@ -19,6 +19,7 @@
#include <linux/efi.h>
#include <linux/mm.h>
@@ -413,7 +388,7 @@
#include <asm/meminit.h>
#include <asm/pgalloc.h>
-@@ -63,6 +64,8 @@ show_mem (void)
+@@ -64,6 +65,8 @@ show_mem (void)
printk("%ld pages in page table cache\n", pgtable_cache_size);
}
@@ -422,10 +397,10 @@
/* physical address where the bootmem map is located */
unsigned long bootmap_start;
-diff -uprN linux-2.6.10.orig/arch/ia64/mm/discontig.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/discontig.c
---- linux-2.6.10.orig/arch/ia64/mm/discontig.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/discontig.c 2005-01-18 12:30:09.000000000 -0500
-@@ -17,6 +17,7 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/discontig.c linux-1500/arch/ia64/mm/discontig.c
+--- linux-1400/arch/ia64/mm/discontig.c
++++ linux-1500/arch/ia64/mm/discontig.c
+@@ -21,6 +21,7 @@
#include <linux/acpi.h>
#include <linux/efi.h>
#include <linux/nodemask.h>
@@ -433,7 +408,7 @@
#include <asm/pgalloc.h>
#include <asm/tlb.h>
#include <asm/meminit.h>
-@@ -557,6 +558,8 @@ void show_mem(void)
+@@ -586,6 +587,8 @@ void show_mem(void)
printk("%d free buffer pages\n", nr_free_buffer_pages());
}
@@ -442,9 +417,9 @@
/**
* call_pernode_memory - use SRAT to call callback functions with node info
* @start: physical start of range
-diff -uprN linux-2.6.10.orig/arch/ia64/mm/init.c linux-2.6.10.crashdumpcommon/arch/ia64/mm/init.c
---- linux-2.6.10.orig/arch/ia64/mm/init.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ia64/mm/init.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ia64/mm/init.c linux-1500/arch/ia64/mm/init.c
+--- linux-1400/arch/ia64/mm/init.c
++++ linux-1500/arch/ia64/mm/init.c
@@ -230,12 +230,94 @@ free_initrd_mem (unsigned long start, un
}
}
@@ -544,10 +519,10 @@
/*
* This installs a clean page in the kernel's page table.
-diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/process.c
---- linux-2.6.10.orig/arch/ppc64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500
-@@ -246,6 +246,7 @@ static void show_instructions(struct pt_
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/process.c linux-1500/arch/ppc64/kernel/process.c
+--- linux-1400/arch/ppc64/kernel/process.c
++++ linux-1500/arch/ppc64/kernel/process.c
+@@ -264,6 +264,7 @@ static void show_instructions(struct pt_
printk("\n");
}
@@ -555,10 +530,10 @@
void show_regs(struct pt_regs * regs)
{
-diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/smp.c
---- linux-2.6.10.orig/arch/ppc64/kernel/smp.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/smp.c 2005-01-18 11:56:34.000000000 -0500
-@@ -223,7 +223,10 @@ static struct call_data_struct {
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/smp.c linux-1500/arch/ppc64/kernel/smp.c
+--- linux-1400/arch/ppc64/kernel/smp.c
++++ linux-1500/arch/ppc64/kernel/smp.c
+@@ -222,7 +222,10 @@ static struct call_data_struct {
* <func> The function to run. This must be fast and non-blocking.
* <info> An arbitrary pointer to pass to the function.
* <nonatomic> currently unused.
@@ -570,7 +545,7 @@
* [RETURNS] 0 on success, else a negative status code. Does not return until
* remote CPUs are nearly ready to execute <<func>> or are or have executed.
*
-@@ -233,21 +236,32 @@ static struct call_data_struct {
+@@ -232,21 +235,32 @@ static struct call_data_struct {
int smp_call_function (void (*func) (void *info), void *info, int nonatomic,
int wait)
{
@@ -612,13 +587,13 @@
/* Must grab online cpu count with preempt disabled, otherwise
* it can change. */
cpus = num_online_cpus() - 1;
-@@ -256,34 +270,35 @@ int smp_call_function (void (*func) (voi
+@@ -269,34 +269,35 @@ int smp_call_function (void (*func) (voi
goto out;
}
- call_data = &data;
+ call_data = data;
- wmb();
+ smp_wmb();
/* Send a message to all other CPUs and wait for them to respond */
smp_ops->message_pass(MSG_ALL_BUT_SELF, PPC_MSG_CALL_FUNCTION);
@@ -629,11 +604,10 @@
HMT_low();
if (--timeout == 0) {
printk("smp_call_function on cpu %d: other cpus not "
-- "responding (%d)\n", smp_processor_id(),
+ "responding (%d)\n", smp_processor_id(),
- atomic_read(&data.started));
- debugger(NULL);
-+ "responding (%d)\n", smp_processor_id(),
-+ atomic_read(&data->started));
++ atomic_read(&data->started));
+ if (wait >= 0)
+ debugger(NULL);
goto out;
@@ -657,10 +631,10 @@
debugger(NULL);
goto out;
}
-diff -uprN linux-2.6.10.orig/arch/ppc64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/traps.c
---- linux-2.6.10.orig/arch/ppc64/kernel/traps.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ppc64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500
-@@ -129,6 +129,7 @@ int die(const char *str, struct pt_regs
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/kernel/traps.c linux-1500/arch/ppc64/kernel/traps.c
+--- linux-1400/arch/ppc64/kernel/traps.c
++++ linux-1500/arch/ppc64/kernel/traps.c
+@@ -131,6 +131,7 @@ int die(const char *str, struct pt_regs
printk("\n");
print_modules();
show_regs(regs);
@@ -668,19 +642,19 @@
bust_spinlocks(0);
spin_unlock_irq(&die_lock);
-@@ -136,6 +137,8 @@ int die(const char *str, struct pt_regs
+@@ -138,6 +139,8 @@ int die(const char *str, struct pt_regs
panic("Fatal exception in interrupt");
if (panic_on_oops) {
+ if (netdump_func)
+ netdump_func = NULL;
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(5 * HZ);
-diff -uprN linux-2.6.10.orig/arch/ppc64/mm/init.c linux-2.6.10.crashdumpcommon/arch/ppc64/mm/init.c
---- linux-2.6.10.orig/arch/ppc64/mm/init.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/ppc64/mm/init.c 2005-01-18 11:56:34.000000000 -0500
-@@ -113,6 +113,7 @@ void show_mem(void)
+ ssleep(5);
+ panic("Fatal exception");
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/ppc64/mm/init.c linux-1500/arch/ppc64/mm/init.c
+--- linux-1400/arch/ppc64/mm/init.c
++++ linux-1500/arch/ppc64/mm/init.c
+@@ -115,6 +115,7 @@ void show_mem(void)
printk("%ld pages shared\n", shared);
printk("%ld pages swap cached\n", cached);
}
@@ -688,7 +662,7 @@
#ifdef CONFIG_PPC_ISERIES
-@@ -589,6 +590,34 @@ int page_is_ram(unsigned long pfn)
+@@ -597,6 +598,34 @@ int page_is_ram(unsigned long pfn)
}
EXPORT_SYMBOL(page_is_ram);
@@ -723,9 +697,9 @@
/*
* Initialize the bootmem system and give it all the memory we
* have available.
-diff -uprN linux-2.6.10.orig/arch/s390/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/s390/kernel/traps.c
---- linux-2.6.10.orig/arch/s390/kernel/traps.c 2004-12-24 16:34:30.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/s390/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/s390/kernel/traps.c linux-1500/arch/s390/kernel/traps.c
+--- linux-1400/arch/s390/kernel/traps.c
++++ linux-1500/arch/s390/kernel/traps.c
@@ -285,12 +285,16 @@ void die(const char * str, struct pt_reg
bust_spinlocks(1);
printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
@@ -744,10 +718,10 @@
do_exit(SIGSEGV);
}
-diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/process.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/process.c
---- linux-2.6.10.orig/arch/x86_64/kernel/process.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/process.c 2005-01-18 11:56:34.000000000 -0500
-@@ -274,6 +274,8 @@ void show_regs(struct pt_regs *regs)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/process.c linux-1500/arch/x86_64/kernel/process.c
+--- linux-1400/arch/x86_64/kernel/process.c
++++ linux-1500/arch/x86_64/kernel/process.c
+@@ -275,6 +275,8 @@ void show_regs(struct pt_regs *regs)
show_trace(®s->rsp);
}
@@ -756,9 +730,9 @@
/*
* Free current thread data structures etc..
*/
-diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/smp.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/smp.c
---- linux-2.6.10.orig/arch/x86_64/kernel/smp.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/smp.c 2005-01-19 13:26:43.795081896 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/smp.c linux-1500/arch/x86_64/kernel/smp.c
+--- linux-1400/arch/x86_64/kernel/smp.c
++++ linux-1500/arch/x86_64/kernel/smp.c
@@ -288,33 +288,47 @@ static struct call_data_struct * call_da
static void __smp_call_function (void (*func) (void *info), void *info,
int nonatomic, int wait)
@@ -835,13 +809,13 @@
*
* Returns 0 on success, else a negative status code. Does not return until
* remote CPUs are nearly ready to execute func or are or have executed.
-diff -uprN linux-2.6.10.orig/arch/x86_64/kernel/traps.c linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/traps.c
---- linux-2.6.10.orig/arch/x86_64/kernel/traps.c 2005-01-18 13:11:56.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/x86_64/kernel/traps.c 2005-01-18 11:56:34.000000000 -0500
-@@ -349,8 +349,11 @@ void oops_end(void)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/kernel/traps.c linux-1500/arch/x86_64/kernel/traps.c
+--- linux-1400/arch/x86_64/kernel/traps.c
++++ linux-1500/arch/x86_64/kernel/traps.c
+@@ -348,8 +348,11 @@ void oops_end(void)
+ die_owner = -1;
bust_spinlocks(0);
spin_unlock(&die_lock);
- local_irq_enable(); /* make sure back scroll still works */
- if (panic_on_oops)
+ if (panic_on_oops) {
+ if (netdump_func)
@@ -859,9 +833,9 @@
oops_end();
do_exit(SIGSEGV);
}
-diff -uprN linux-2.6.10.orig/arch/x86_64/mm/fault.c linux-2.6.10.crashdumpcommon/arch/x86_64/mm/fault.c
---- linux-2.6.10.orig/arch/x86_64/mm/fault.c 2005-01-18 13:12:02.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/x86_64/mm/fault.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/mm/fault.c linux-1500/arch/x86_64/mm/fault.c
+--- linux-1400/arch/x86_64/mm/fault.c
++++ linux-1500/arch/x86_64/mm/fault.c
@@ -541,6 +541,7 @@ no_context:
__die("Oops", regs, error_code);
/* Executive summary in case the body of the oops scrolled away */
@@ -870,9 +844,9 @@
oops_end();
do_exit(SIGKILL);
-diff -uprN linux-2.6.10.orig/arch/x86_64/mm/init.c linux-2.6.10.crashdumpcommon/arch/x86_64/mm/init.c
---- linux-2.6.10.orig/arch/x86_64/mm/init.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/arch/x86_64/mm/init.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/arch/x86_64/mm/init.c linux-1500/arch/x86_64/mm/init.c
+--- linux-1400/arch/x86_64/mm/init.c
++++ linux-1500/arch/x86_64/mm/init.c
@@ -23,6 +23,7 @@
#include <linux/pagemap.h>
#include <linux/bootmem.h>
@@ -926,7 +900,7 @@
/*
* devmem_is_allowed() checks to see if /dev/mem access to a certain address is
* valid. The argument is a physical page number.
-@@ -574,6 +606,7 @@ int kern_addr_valid(unsigned long addr)
+@@ -576,6 +608,7 @@ int kern_addr_valid(unsigned long addr)
return 0;
return pfn_valid(pte_pfn(*pte));
}
@@ -934,11 +908,36 @@
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>
-diff -uprN linux-2.6.10.orig/drivers/char/sysrq.c linux-2.6.10.crashdumpcommon/drivers/char/sysrq.c
---- linux-2.6.10.orig/drivers/char/sysrq.c 2005-01-18 13:11:57.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/drivers/char/sysrq.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/Documentation/sysrq.txt linux-1500/Documentation/sysrq.txt
+--- linux-1400/Documentation/sysrq.txt
++++ linux-1500/Documentation/sysrq.txt
+@@ -72,6 +72,10 @@ On all - write a character to /proc/sys
+ 'b' - Will immediately reboot the system without syncing or unmounting
+ your disks.
+
++'c' - Intentionally crash the system without syncing or unmounting
++ your disks. This is most useful if the NETDUMP client package
++ and/or the DISKDUMP package have been installed.
++
+ 'o' - Will shut your system off (if configured and supported).
+
+ 's' - Will attempt to sync all mounted filesystems.
+@@ -120,6 +124,10 @@ useful when you want to exit a program t
+ re'B'oot is good when you're unable to shut down. But you should also 'S'ync
+ and 'U'mount first.
+
++'C'rash immediately crashes your system. This is most useful if the machine
++has been configured as a NETDUMP client because an OOPS report is generated
++and a kernel crash dump is sent to the NETDUMP server.
++
+ 'S'ync is great when your system is locked up, it allows you to sync your
+ disks and will certainly lessen the chance of data loss and fscking. Note
+ that the sync hasn't taken place until you see the "OK" and "Done" appear
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/drivers/char/sysrq.c linux-1500/drivers/char/sysrq.c
+--- linux-1400/drivers/char/sysrq.c
++++ linux-1500/drivers/char/sysrq.c
@@ -108,6 +108,17 @@ static struct sysrq_key_op sysrq_reboot_
- .action_msg = "Resetting",
+ .enable_mask = SYSRQ_ENABLE_BOOT,
};
+/* crash sysrq handler */
@@ -955,7 +954,7 @@
static void sysrq_handle_sync(int key, struct pt_regs *pt_regs,
struct tty_struct *tty)
{
-@@ -246,7 +257,7 @@ static struct sysrq_key_op *sysrq_key_ta
+@@ -254,7 +265,7 @@ static struct sysrq_key_op *sysrq_key_ta
it is handled specially on the sparc
and will never arrive */
/* b */ &sysrq_reboot_op,
@@ -964,9 +963,9 @@
/* d */ NULL,
/* e */ &sysrq_term_op,
/* f */ NULL,
-diff -uprN linux-2.6.10.orig/include/asm-generic/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-generic/crashdump.h
---- linux-2.6.10.orig/include/asm-generic/crashdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-generic/crashdump.h 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-generic/crashdump.h linux-1500/include/asm-generic/crashdump.h
+--- linux-1400/include/asm-generic/crashdump.h
++++ linux-1500/include/asm-generic/crashdump.h
@@ -0,0 +1,47 @@
+#ifndef _ASM_GENERIC_CRASHDUMP_H_
+#define _ASM_GENERIC_CRASHDUMP_H_
@@ -1015,9 +1014,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_GENERIC_CRASHDUMP_H */
-diff -uprN linux-2.6.10.orig/include/asm-i386/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-i386/crashdump.h
---- linux-2.6.10.orig/include/asm-i386/crashdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-i386/crashdump.h 2005-01-18 14:48:16.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-i386/crashdump.h linux-1500/include/asm-i386/crashdump.h
+--- linux-1400/include/asm-i386/crashdump.h
++++ linux-1500/include/asm-i386/crashdump.h
@@ -0,0 +1,123 @@
+#ifndef _ASM_I386_CRASHDUMP_H
+#define _ASM_I386_CRASHDUMP_H
@@ -1142,9 +1141,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_I386_CRASHDUMP_H */
-diff -uprN linux-2.6.10.orig/include/asm-i386/kmap_types.h linux-2.6.10.crashdumpcommon/include/asm-i386/kmap_types.h
---- linux-2.6.10.orig/include/asm-i386/kmap_types.h 2004-12-24 16:35:23.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-i386/kmap_types.h 2005-01-18 12:31:16.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-i386/kmap_types.h linux-1500/include/asm-i386/kmap_types.h
+--- linux-1400/include/asm-i386/kmap_types.h
++++ linux-1500/include/asm-i386/kmap_types.h
@@ -23,7 +23,9 @@ D(9) KM_IRQ0,
D(10) KM_IRQ1,
D(11) KM_SOFTIRQ0,
@@ -1156,9 +1155,9 @@
};
#undef D
-diff -uprN linux-2.6.10.orig/include/asm-ia64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-ia64/crashdump.h
---- linux-2.6.10.orig/include/asm-ia64/crashdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-ia64/crashdump.h 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-ia64/crashdump.h linux-1500/include/asm-ia64/crashdump.h
+--- linux-1400/include/asm-ia64/crashdump.h
++++ linux-1500/include/asm-ia64/crashdump.h
@@ -0,0 +1,72 @@
+#ifndef _ASM_IA64_CRASHDUMP_H
+#define _ASM_IA64_CRASHDUMP_H
@@ -1232,9 +1231,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_IA64_CRASHDUMP_H */
-diff -uprN linux-2.6.10.orig/include/asm-ppc64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-ppc64/crashdump.h
---- linux-2.6.10.orig/include/asm-ppc64/crashdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-ppc64/crashdump.h 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-ppc64/crashdump.h linux-1500/include/asm-ppc64/crashdump.h
+--- linux-1400/include/asm-ppc64/crashdump.h
++++ linux-1500/include/asm-ppc64/crashdump.h
@@ -0,0 +1,61 @@
+#ifndef _ASM_PPC64_CRASHDUMP_H
+#define _ASM_PPC64_CRASHDUMP_H
@@ -1297,9 +1296,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_PPC64_CRASHDUMP_H */
-diff -uprN linux-2.6.10.orig/include/asm-x86_64/crashdump.h linux-2.6.10.crashdumpcommon/include/asm-x86_64/crashdump.h
---- linux-2.6.10.orig/include/asm-x86_64/crashdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/asm-x86_64/crashdump.h 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/asm-x86_64/crashdump.h linux-1500/include/asm-x86_64/crashdump.h
+--- linux-1400/include/asm-x86_64/crashdump.h
++++ linux-1500/include/asm-x86_64/crashdump.h
@@ -0,0 +1,86 @@
+/*
+ * include/asm-x86_64/crashdump.h
@@ -1387,10 +1386,10 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_X86_64_CRASHDUMP_H */
-diff -uprN linux-2.6.10.orig/include/linux/kernel.h linux-2.6.10.crashdumpcommon/include/linux/kernel.h
---- linux-2.6.10.orig/include/linux/kernel.h 2005-01-18 13:12:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/include/linux/kernel.h 2005-01-18 11:56:34.000000000 -0500
-@@ -142,6 +142,17 @@ extern int tainted;
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/include/linux/kernel.h linux-1500/include/linux/kernel.h
+--- linux-1400/include/linux/kernel.h
++++ linux-1500/include/linux/kernel.h
+@@ -152,6 +152,17 @@ extern int tainted;
extern const char *print_tainted(void);
extern void add_taint(unsigned);
@@ -1408,7 +1407,7 @@
/* Values used for system_state */
extern enum system_states {
SYSTEM_BOOTING,
-@@ -149,6 +160,7 @@ extern enum system_states {
+@@ -159,6 +170,7 @@ extern enum system_states {
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
@@ -1416,7 +1415,7 @@
} system_state;
#define TAINT_PROPRIETARY_MODULE (1<<0)
-@@ -171,6 +183,12 @@ extern void dump_stack(void);
+@@ -181,6 +193,12 @@ extern void dump_stack(void);
#define pr_info(fmt,arg...) \
printk(KERN_INFO fmt,##arg)
@@ -1429,21 +1428,9 @@
/*
* Display an IP address in readable format.
*/
-diff -uprN linux-2.6.10.orig/kernel/Makefile linux-2.6.10.crashdumpcommon/kernel/Makefile
---- linux-2.6.10.orig/kernel/Makefile 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/kernel/Makefile 2005-01-18 11:57:35.000000000 -0500
-@@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o
- sysctl.o capability.o ptrace.o timer.o user.o \
- signal.o sys.o kmod.o workqueue.o pid.o \
- rcupdate.o intermodule.o extable.o params.o posix-timers.o \
-- kthread.o wait.o kfifo.o sys_ni.o
-+ kthread.o wait.o kfifo.o sys_ni.o dump.o
-
- obj-$(CONFIG_FUTEX) += futex.o
- obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
-diff -uprN linux-2.6.10.orig/kernel/dump.c linux-2.6.10.crashdumpcommon/kernel/dump.c
---- linux-2.6.10.orig/kernel/dump.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/kernel/dump.c 2005-01-18 11:56:34.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/dump.c linux-1500/kernel/dump.c
+--- linux-1400/kernel/dump.c
++++ linux-1500/kernel/dump.c
@@ -0,0 +1,246 @@
+/*
+ * linux/kernel/dump.c
@@ -1691,10 +1678,22 @@
+ if (netdump_func)
+ netdump_func(regs);
+}
-diff -uprN linux-2.6.10.orig/kernel/panic.c linux-2.6.10.crashdumpcommon/kernel/panic.c
---- linux-2.6.10.orig/kernel/panic.c 2004-12-24 16:35:29.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/kernel/panic.c 2005-01-18 11:56:34.000000000 -0500
-@@ -69,6 +69,8 @@ NORET_TYPE void panic(const char * fmt,
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/Makefile linux-1500/kernel/Makefile
+--- linux-1400/kernel/Makefile
++++ linux-1500/kernel/Makefile
+@@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o
+ sysctl.o capability.o ptrace.o timer.o user.o \
+ signal.o sys.o kmod.o workqueue.o pid.o \
+ rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o
++ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o
+
+ obj-$(CONFIG_FUTEX) += futex.o
+ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/panic.c linux-1500/kernel/panic.c
+--- linux-1400/kernel/panic.c
++++ linux-1500/kernel/panic.c
+@@ -68,6 +68,8 @@ NORET_TYPE void panic(const char * fmt,
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
@@ -1703,10 +1702,10 @@
bust_spinlocks(0);
#ifdef CONFIG_SMP
-diff -uprN linux-2.6.10.orig/kernel/printk.c linux-2.6.10.crashdumpcommon/kernel/printk.c
---- linux-2.6.10.orig/kernel/printk.c 2005-01-18 13:12:00.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/kernel/printk.c 2005-01-18 11:56:34.000000000 -0500
-@@ -384,6 +384,20 @@ asmlinkage long sys_syslog(int type, cha
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/printk.c linux-1500/kernel/printk.c
+--- linux-1400/kernel/printk.c
++++ linux-1500/kernel/printk.c
+@@ -386,6 +386,20 @@ asmlinkage long sys_syslog(int type, cha
}
/*
@@ -1727,7 +1726,7 @@
* Call the console drivers on a range of log_buf
*/
static void __call_console_drivers(unsigned long start, unsigned long end)
-@@ -541,6 +555,12 @@ asmlinkage int vprintk(const char *fmt,
+@@ -559,6 +573,12 @@ asmlinkage int vprintk(const char *fmt,
/* Emit the output into the temporary buffer */
printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
@@ -1740,10 +1739,10 @@
/*
* Copy the output into log_buf. If the caller didn't provide
* appropriate log level tags, we insert them here
-diff -uprN linux-2.6.10.orig/kernel/sched.c linux-2.6.10.crashdumpcommon/kernel/sched.c
---- linux-2.6.10.orig/kernel/sched.c 2005-01-18 13:12:04.000000000 -0500
-+++ linux-2.6.10.crashdumpcommon/kernel/sched.c 2005-01-18 11:56:34.000000000 -0500
-@@ -3894,6 +3894,8 @@ void show_state(void)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1400/kernel/sched.c linux-1500/kernel/sched.c
+--- linux-1400/kernel/sched.c
++++ linux-1500/kernel/sched.c
+@@ -4004,6 +4004,8 @@ void show_state(void)
read_unlock(&tasklist_lock);
}
linux-2.6.10-diskdump.patch:
drivers/block/Kconfig | 5
drivers/block/Makefile | 1
drivers/block/diskdump.c | 1121 +++++++++++++++++++++++++++++++++++++++++
include/asm-generic/diskdump.h | 13
include/asm-i386/diskdump.h | 55 ++
include/asm-ia64/diskdump.h | 63 ++
include/asm-ppc/diskdump.h | 6
include/asm-ppc64/diskdump.h | 55 ++
include/asm-s390/diskdump.h | 6
include/asm-x86_64/diskdump.h | 44 +
include/linux/diskdump.h | 186 ++++++
include/linux/interrupt.h | 4
include/linux/timer.h | 3
include/linux/workqueue.h | 3
kernel/softirq.c | 32 +
kernel/timer.c | 43 +
kernel/workqueue.c | 34 +
17 files changed, 1670 insertions(+), 4 deletions(-)
Index: linux-2.6.10-diskdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-diskdump.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.10-diskdump.patch 6 Mar 2005 22:35:14 -0000 1.3
+++ linux-2.6.10-diskdump.patch 13 Jul 2005 04:18:41 -0000 1.4
@@ -1,29 +1,6 @@
-diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/Kconfig linux-2.6.10/drivers/block/Kconfig
---- linux-2.6.10.netdump/drivers/block/Kconfig 2005-01-18 15:39:00.000000000 -0500
-+++ linux-2.6.10/drivers/block/Kconfig 2005-01-18 17:08:17.848875016 -0500
-@@ -495,6 +495,11 @@ config CDROM_PKTCDVD_WCACHE
- this option is dangerous unless the CD-RW media is known good, as we
- don't do deferred write error handling yet.
-
-+config DISKDUMP
-+ tristate "Disk dump support"
-+ ---help---
-+ Disk dump support.
-+
- source "drivers/s390/block/Kconfig"
-
- source "drivers/block/Kconfig.iosched"
-diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/Makefile linux-2.6.10/drivers/block/Makefile
---- linux-2.6.10.netdump/drivers/block/Makefile 2004-12-24 16:35:24.000000000 -0500
-+++ linux-2.6.10/drivers/block/Makefile 2005-01-18 17:08:17.849874864 -0500
-@@ -45,3 +45,4 @@ obj-$(CONFIG_VIODASD) += viodasd.o
- obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
- obj-$(CONFIG_BLK_DEV_UB) += ub.o
-
-+obj-$(CONFIG_DISKDUMP) += diskdump.o
-diff --exclude=configs -uprN linux-2.6.10.netdump/drivers/block/diskdump.c linux-2.6.10/drivers/block/diskdump.c
---- linux-2.6.10.netdump/drivers/block/diskdump.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/drivers/block/diskdump.c 2005-01-18 17:08:17.852874408 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/diskdump.c linux-1503/drivers/block/diskdump.c
+--- linux-1502/drivers/block/diskdump.c
++++ linux-1503/drivers/block/diskdump.c
@@ -0,0 +1,1121 @@
+/*
+ * linux/drivers/block/diskdump.c
@@ -1146,9 +1123,32 @@
+module_exit(cleanup_diskdump);
+
+MODULE_LICENSE("GPL");
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-generic/diskdump.h linux-2.6.10/include/asm-generic/diskdump.h
---- linux-2.6.10.netdump/include/asm-generic/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-generic/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/Kconfig linux-1503/drivers/block/Kconfig
+--- linux-1502/drivers/block/Kconfig
++++ linux-1503/drivers/block/Kconfig
+@@ -495,6 +495,11 @@ config CDROM_PKTCDVD_WCACHE
+ this option is dangerous unless the CD-RW media is known good, as we
+ don't do deferred write error handling yet.
+
++config DISKDUMP
++ tristate "Disk dump support"
++ ---help---
++ Disk dump support.
++
+ source "drivers/s390/block/Kconfig"
+
+ source "drivers/block/Kconfig.iosched"
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/drivers/block/Makefile linux-1503/drivers/block/Makefile
+--- linux-1502/drivers/block/Makefile
++++ linux-1503/drivers/block/Makefile
+@@ -45,3 +45,4 @@ obj-$(CONFIG_VIODASD) += viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+ obj-$(CONFIG_BLK_DEV_UB) += ub.o
+
++obj-$(CONFIG_DISKDUMP) += diskdump.o
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-generic/diskdump.h linux-1503/include/asm-generic/diskdump.h
+--- linux-1502/include/asm-generic/diskdump.h
++++ linux-1503/include/asm-generic/diskdump.h
@@ -0,0 +1,13 @@
+#ifndef _ASM_GENERIC_DISKDUMP_H_
+#define _ASM_GENERIC_DISKDUMP_H_
@@ -1163,9 +1163,9 @@
+#define write_sub_header() 1
+
+#endif /* _ASM_GENERIC_DISKDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-i386/diskdump.h linux-2.6.10/include/asm-i386/diskdump.h
---- linux-2.6.10.netdump/include/asm-i386/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-i386/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-i386/diskdump.h linux-1503/include/asm-i386/diskdump.h
+--- linux-1502/include/asm-i386/diskdump.h
++++ linux-1503/include/asm-i386/diskdump.h
@@ -0,0 +1,55 @@
+#ifndef _ASM_I386_DISKDUMP_H
+#define _ASM_I386_DISKDUMP_H
@@ -1222,9 +1222,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_I386_DISKDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ia64/diskdump.h linux-2.6.10/include/asm-ia64/diskdump.h
---- linux-2.6.10.netdump/include/asm-ia64/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-ia64/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ia64/diskdump.h linux-1503/include/asm-ia64/diskdump.h
+--- linux-1502/include/asm-ia64/diskdump.h
++++ linux-1503/include/asm-ia64/diskdump.h
@@ -0,0 +1,63 @@
+#ifndef _ASM_IA64_DISKDUMP_H
+#define _ASM_IA64_DISKDUMP_H
@@ -1289,9 +1289,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_IA64_DISKDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ppc/diskdump.h linux-2.6.10/include/asm-ppc/diskdump.h
---- linux-2.6.10.netdump/include/asm-ppc/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-ppc/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ppc/diskdump.h linux-1503/include/asm-ppc/diskdump.h
+--- linux-1502/include/asm-ppc/diskdump.h
++++ linux-1503/include/asm-ppc/diskdump.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_PPC64_DISKDUMP_H_
+#define _ASM_PPC64_DISKDUMP_H_
@@ -1299,9 +1299,9 @@
+#include <asm-generic/diskdump.h>
+
+#endif /* _ASM_PPC64_DISKDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-ppc64/diskdump.h linux-2.6.10/include/asm-ppc64/diskdump.h
---- linux-2.6.10.netdump/include/asm-ppc64/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-ppc64/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-ppc64/diskdump.h linux-1503/include/asm-ppc64/diskdump.h
+--- linux-1502/include/asm-ppc64/diskdump.h
++++ linux-1503/include/asm-ppc64/diskdump.h
@@ -0,0 +1,55 @@
+#ifndef _ASM_PPC64_DISKDUMP_H_
+#define _ASM_PPC64_DISKDUMP_H_
@@ -1358,9 +1358,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_PPC64_DISKDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-s390/diskdump.h linux-2.6.10/include/asm-s390/diskdump.h
---- linux-2.6.10.netdump/include/asm-s390/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-s390/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-s390/diskdump.h linux-1503/include/asm-s390/diskdump.h
+--- linux-1502/include/asm-s390/diskdump.h
++++ linux-1503/include/asm-s390/diskdump.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_S390_DISKDUMP_H_
+#define _ASM_S390_DISKDUMP_H_
@@ -1368,9 +1368,9 @@
+#include <asm-generic/diskdump.h>
+
+#endif /* _ASM_S390_DISKDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/asm-x86_64/diskdump.h linux-2.6.10/include/asm-x86_64/diskdump.h
---- linux-2.6.10.netdump/include/asm-x86_64/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-x86_64/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/asm-x86_64/diskdump.h linux-1503/include/asm-x86_64/diskdump.h
+--- linux-1502/include/asm-x86_64/diskdump.h
++++ linux-1503/include/asm-x86_64/diskdump.h
@@ -0,0 +1,44 @@
+/*
+ * include/asm-x86_64/diskdump.h
@@ -1416,9 +1416,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_X86_64_DISKDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/diskdump.h linux-2.6.10/include/linux/diskdump.h
---- linux-2.6.10.netdump/include/linux/diskdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/linux/diskdump.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/diskdump.h linux-1503/include/linux/diskdump.h
+--- linux-1502/include/linux/diskdump.h
++++ linux-1503/include/linux/diskdump.h
@@ -0,0 +1,186 @@
+#ifndef _LINUX_DISKDUMP_H
+#define _LINUX_DISKDUMP_H
@@ -1606,9 +1606,9 @@
+
+
+#endif /* _LINUX_DISKDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/interrupt.h linux-2.6.10/include/linux/interrupt.h
---- linux-2.6.10.netdump/include/linux/interrupt.h 2005-01-18 15:38:58.000000000 -0500
-+++ linux-2.6.10/include/linux/interrupt.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/interrupt.h linux-1503/include/linux/interrupt.h
+--- linux-1502/include/linux/interrupt.h
++++ linux-1503/include/linux/interrupt.h
@@ -286,4 +286,8 @@ extern int probe_irq_off(unsigned long);
extern unsigned int probe_irq_mask(unsigned long); /* returns mask of ISA interrupts */
#endif
@@ -1618,9 +1618,9 @@
+extern void dump_run_tasklet(void);
+
#endif
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/timer.h linux-2.6.10/include/linux/timer.h
---- linux-2.6.10.netdump/include/linux/timer.h 2004-12-24 16:35:23.000000000 -0500
-+++ linux-2.6.10/include/linux/timer.h 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/timer.h linux-1503/include/linux/timer.h
+--- linux-1502/include/linux/timer.h
++++ linux-1503/include/linux/timer.h
@@ -99,4 +99,7 @@ extern void init_timers(void);
extern void run_local_timers(void);
extern void it_real_fn(unsigned long);
@@ -1629,10 +1629,10 @@
+extern void dump_run_timers(void);
+
#endif
-diff --exclude=configs -uprN linux-2.6.10.netdump/include/linux/workqueue.h linux-2.6.10/include/linux/workqueue.h
---- linux-2.6.10.netdump/include/linux/workqueue.h 2004-12-24 16:35:23.000000000 -0500
-+++ linux-2.6.10/include/linux/workqueue.h 2005-01-18 17:08:17.000000000 -0500
-@@ -86,4 +86,7 @@ static inline int cancel_delayed_work(st
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/include/linux/workqueue.h linux-1503/include/linux/workqueue.h
+--- linux-1502/include/linux/workqueue.h
++++ linux-1503/include/linux/workqueue.h
+@@ -87,4 +87,7 @@ static inline int cancel_delayed_work(st
return ret;
}
@@ -1640,9 +1640,9 @@
+extern void dump_run_workqueue(void);
+
#endif
-diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/softirq.c linux-2.6.10/kernel/softirq.c
---- linux-2.6.10.netdump/kernel/softirq.c 2005-01-18 15:38:58.000000000 -0500
-+++ linux-2.6.10/kernel/softirq.c 2005-01-18 17:08:17.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/softirq.c linux-1503/kernel/softirq.c
+--- linux-1502/kernel/softirq.c
++++ linux-1503/kernel/softirq.c
@@ -341,6 +341,38 @@ void tasklet_kill(struct tasklet_struct
EXPORT_SYMBOL(tasklet_kill);
@@ -1682,11 +1682,11 @@
void __init softirq_init(void)
{
open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL);
-diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/timer.c linux-2.6.10/kernel/timer.c
---- linux-2.6.10.netdump/kernel/timer.c 2005-01-18 15:38:58.000000000 -0500
-+++ linux-2.6.10/kernel/timer.c 2005-01-18 17:16:26.000000000 -0500
-@@ -32,6 +32,8 @@
- #include <linux/jiffies.h>
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/timer.c linux-1503/kernel/timer.c
+--- linux-1502/kernel/timer.c
++++ linux-1503/kernel/timer.c
+@@ -33,6 +33,8 @@
+ #include <linux/posix-timers.h>
#include <linux/cpu.h>
#include <linux/syscalls.h>
+#include <linux/delay.h>
@@ -1694,7 +1694,7 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -434,8 +436,9 @@ static int cascade(tvec_base_t *base, tv
+@@ -436,8 +438,9 @@ static int cascade(tvec_base_t *base, tv
static inline void __run_timers(tvec_base_t *base)
{
struct timer_list *timer;
@@ -1705,7 +1705,7 @@
while (time_after_eq(jiffies, base->timer_jiffies)) {
struct list_head work_list = LIST_HEAD_INIT(work_list);
struct list_head *head = &work_list;
-@@ -464,7 +467,7 @@ repeat:
+@@ -466,7 +469,7 @@ repeat:
set_running_timer(base, timer);
smp_wmb();
timer->base = NULL;
@@ -1714,7 +1714,7 @@
{
u32 preempt_count = preempt_count();
fn(data);
-@@ -478,7 +481,7 @@ repeat:
+@@ -480,7 +483,7 @@ repeat:
}
}
set_running_timer(base, NULL);
@@ -1723,7 +1723,7 @@
}
#ifdef CONFIG_NO_IDLE_HZ
-@@ -1075,6 +1078,12 @@ fastcall signed long __sched schedule_ti
+@@ -1080,6 +1083,12 @@ fastcall signed long __sched schedule_ti
struct timer_list timer;
unsigned long expire;
@@ -1736,7 +1736,7 @@
switch (timeout)
{
case MAX_SCHEDULE_TIMEOUT:
-@@ -1277,7 +1286,7 @@ asmlinkage long sys_sysinfo(struct sysin
+@@ -1282,7 +1291,7 @@ asmlinkage long sys_sysinfo(struct sysin
return 0;
}
@@ -1745,7 +1745,7 @@
{
int j;
tvec_base_t *base;
-@@ -1296,6 +1305,27 @@ static void __devinit init_timers_cpu(in
+@@ -1301,6 +1310,27 @@ static void __devinit init_timers_cpu(in
base->timer_jiffies = jiffies;
}
@@ -1773,7 +1773,7 @@
#ifdef CONFIG_HOTPLUG_CPU
static int migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
{
-@@ -1580,6 +1610,11 @@ void msleep(unsigned int msecs)
+@@ -1585,6 +1615,11 @@ void msleep(unsigned int msecs)
{
unsigned long timeout = msecs_to_jiffies(msecs) + 1;
@@ -1785,10 +1785,10 @@
while (timeout) {
set_current_state(TASK_UNINTERRUPTIBLE);
timeout = schedule_timeout(timeout);
-diff --exclude=configs -uprN linux-2.6.10.netdump/kernel/workqueue.c linux-2.6.10/kernel/workqueue.c
---- linux-2.6.10.netdump/kernel/workqueue.c 2005-01-18 15:38:58.000000000 -0500
-+++ linux-2.6.10/kernel/workqueue.c 2005-01-18 17:08:17.000000000 -0500
-@@ -444,6 +444,37 @@ int current_is_keventd(void)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1502/kernel/workqueue.c linux-1503/kernel/workqueue.c
+--- linux-1502/kernel/workqueue.c
++++ linux-1503/kernel/workqueue.c
+@@ -468,6 +468,37 @@ int current_is_keventd(void)
}
@@ -1826,7 +1826,7 @@
#ifdef CONFIG_HOTPLUG_CPU
/* Take the work from this (downed) CPU. */
static void take_over_work(struct workqueue_struct *wq, unsigned int cpu)
-@@ -527,3 +558,6 @@ EXPORT_SYMBOL(schedule_work);
+@@ -553,3 +584,6 @@ EXPORT_SYMBOL(schedule_work);
EXPORT_SYMBOL(schedule_delayed_work);
EXPORT_SYMBOL(schedule_delayed_work_on);
EXPORT_SYMBOL(flush_scheduled_work);
linux-2.6.10-netdump.patch:
linux-1501/drivers/net/Kconfig | 7
linux-1501/drivers/net/Makefile | 1
linux-1501/drivers/net/netdump.c | 550 +++++++++++++++++++++++++++++++
linux-1501/drivers/net/netdump.h | 90 +++++
linux-1501/include/asm-generic/netdump.h | 48 ++
linux-1501/include/asm-i386/netdump.h | 79 ++++
linux-1501/include/asm-ia64/netdump.h | 82 ++++
linux-1501/include/asm-ppc64/netdump.h | 79 ++++
linux-1501/include/asm-s390/netdump.h | 6
linux-1501/include/asm-x86_64/netdump.h | 79 ++++
linux-1501/include/linux/netdevice.h | 8
linux-2.6.11/include/linux/netpoll.h | 4
linux-2.6.11/net/core/netpoll.c | 20 +
13 files changed, 1042 insertions(+), 11 deletions(-)
Index: linux-2.6.10-netdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-netdump.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.10-netdump.patch 31 Jan 2005 20:07:11 -0000 1.3
+++ linux-2.6.10-netdump.patch 13 Jul 2005 04:18:41 -0000 1.4
@@ -1,7 +1,7 @@
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/Kconfig linux-2.6.10/drivers/net/Kconfig
---- linux-2.6.10.crashdumpcommon/drivers/net/Kconfig 2005-01-18 11:37:42.000000000 -0500
-+++ linux-2.6.10/drivers/net/Kconfig 2005-01-18 15:39:49.777824472 -0500
-@@ -2591,3 +2591,10 @@ config NETCONSOLE
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/Kconfig linux-1501/drivers/net/Kconfig
+--- linux-1500/drivers/net/Kconfig
++++ linux-1501/drivers/net/Kconfig
+@@ -2556,3 +2556,10 @@ config NETCONSOLE
If you want to log kernel messages over the network, enable this.
See <file:Documentation/networking/netconsole.txt> for details.
@@ -12,17 +12,17 @@
+ Enable this option if you have a netdump server and you would like
+ to collect kernel crash dumps.
+
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/Makefile linux-2.6.10/drivers/net/Makefile
---- linux-2.6.10.crashdumpcommon/drivers/net/Makefile 2005-01-18 11:37:27.000000000 -0500
-+++ linux-2.6.10/drivers/net/Makefile 2005-01-18 15:39:49.779824168 -0500
-@@ -197,3 +197,4 @@ obj-$(CONFIG_IRDA) += irda/
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/Makefile linux-1501/drivers/net/Makefile
+--- linux-1500/drivers/net/Makefile
++++ linux-1501/drivers/net/Makefile
+@@ -195,3 +195,4 @@ obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NETCONSOLE) += netconsole.o
+obj-$(CONFIG_NETDUMP) += netdump.o
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/netdump.c linux-2.6.10/drivers/net/netdump.c
---- linux-2.6.10.crashdumpcommon/drivers/net/netdump.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/drivers/net/netdump.c 2005-01-18 15:39:49.792822192 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/netdump.c linux-1501/drivers/net/netdump.c
+--- linux-1500/drivers/net/netdump.c
++++ linux-1501/drivers/net/netdump.c
@@ -0,0 +1,550 @@
+/*
+ * linux/drivers/net/netdump.c
@@ -574,9 +574,9 @@
+
+module_init(init_netdump);
+module_exit(cleanup_netdump);
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/drivers/net/netdump.h linux-2.6.10/drivers/net/netdump.h
---- linux-2.6.10.crashdumpcommon/drivers/net/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/drivers/net/netdump.h 2005-01-18 15:39:49.781823864 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/drivers/net/netdump.h linux-1501/drivers/net/netdump.h
+--- linux-1500/drivers/net/netdump.h
++++ linux-1501/drivers/net/netdump.h
@@ -0,0 +1,90 @@
+/*
+ * linux/drivers/net/netdump.h
@@ -668,9 +668,9 @@
+ unsigned long __ms=(n); \
+ while (__ms--) udelay(1000); \
+ })
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-generic/netdump.h linux-2.6.10/include/asm-generic/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-generic/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-generic/netdump.h 2005-01-18 15:39:49.782823712 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-generic/netdump.h linux-1501/include/asm-generic/netdump.h
+--- linux-1500/include/asm-generic/netdump.h
++++ linux-1501/include/asm-generic/netdump.h
@@ -0,0 +1,48 @@
+#ifndef _ASM_GENERIC_NETDUMP_H_
+#define _ASM_GENERIC_NETDUMP_H_
@@ -720,9 +720,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_GENERIC_NETDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-i386/netdump.h linux-2.6.10/include/asm-i386/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-i386/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-i386/netdump.h 2005-01-18 15:39:49.783823560 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-i386/netdump.h linux-1501/include/asm-i386/netdump.h
+--- linux-1500/include/asm-i386/netdump.h
++++ linux-1501/include/asm-i386/netdump.h
@@ -0,0 +1,79 @@
+#ifndef _ASM_I386_NETDUMP_H_
+#define _ASM_I386_NETDUMP_H_
@@ -803,9 +803,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_I386_NETDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-ia64/netdump.h linux-2.6.10/include/asm-ia64/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-ia64/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-ia64/netdump.h 2005-01-18 15:39:49.784823408 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-ia64/netdump.h linux-1501/include/asm-ia64/netdump.h
+--- linux-1500/include/asm-ia64/netdump.h
++++ linux-1501/include/asm-ia64/netdump.h
@@ -0,0 +1,82 @@
+#ifndef _ASM_IA64_NETDUMP_H_
+#define _ASM_IA64_NETDUMP_H_
@@ -889,9 +889,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_IA64_NETDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-ppc64/netdump.h linux-2.6.10/include/asm-ppc64/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-ppc64/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-ppc64/netdump.h 2005-01-18 15:39:49.784823408 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-ppc64/netdump.h linux-1501/include/asm-ppc64/netdump.h
+--- linux-1500/include/asm-ppc64/netdump.h
++++ linux-1501/include/asm-ppc64/netdump.h
@@ -0,0 +1,79 @@
+#ifndef _ASM_PPC64_NETDUMP_H_
+#define _ASM_PPC64_NETDUMP_H_
@@ -972,9 +972,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_PPC64_NETDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-s390/netdump.h linux-2.6.10/include/asm-s390/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-s390/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-s390/netdump.h 2005-01-18 15:39:49.785823256 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-s390/netdump.h linux-1501/include/asm-s390/netdump.h
+--- linux-1500/include/asm-s390/netdump.h
++++ linux-1501/include/asm-s390/netdump.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_S390_NETDUMP_H_
+#define _ASM_S390_NETDUMP_H_
@@ -982,9 +982,9 @@
+#include <asm-generic/netdump.h>
+
+#endif /* _ASM_S390_NETDUMP_H_ */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/asm-x86_64/netdump.h linux-2.6.10/include/asm-x86_64/netdump.h
---- linux-2.6.10.crashdumpcommon/include/asm-x86_64/netdump.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.10/include/asm-x86_64/netdump.h 2005-01-18 15:39:49.783823560 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/asm-x86_64/netdump.h linux-1501/include/asm-x86_64/netdump.h
+--- linux-1500/include/asm-x86_64/netdump.h
++++ linux-1501/include/asm-x86_64/netdump.h
@@ -0,0 +1,79 @@
+#ifndef _ASM_X86_64_NETDUMP_H_
+#define _ASM_X86_64_NETDUMP_H_
@@ -1065,10 +1065,10 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_X86_64_NETDUMP_H */
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/linux/netdevice.h linux-2.6.10/include/linux/netdevice.h
---- linux-2.6.10.crashdumpcommon/include/linux/netdevice.h 2005-01-18 11:37:42.000000000 -0500
-+++ linux-2.6.10/include/linux/netdevice.h 2005-01-18 15:39:49.786823104 -0500
-@@ -609,20 +609,12 @@ static inline void netif_start_queue(str
+diff -urNp --exclude-from=/home/davej/.exclude linux-1500/include/linux/netdevice.h linux-1501/include/linux/netdevice.h
+--- linux-1500/include/linux/netdevice.h
++++ linux-1501/include/linux/netdevice.h
+@@ -605,20 +605,12 @@ static inline void netif_start_queue(str
static inline void netif_wake_queue(struct net_device *dev)
{
@@ -1089,35 +1089,34 @@
set_bit(__LINK_STATE_XOFF, &dev->state);
}
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/include/linux/netpoll.h linux-2.6.10/include/linux/netpoll.h
---- linux-2.6.10.crashdumpcommon/include/linux/netpoll.h 2005-01-18 11:37:42.000000000 -0500
-+++ linux-2.6.10/include/linux/netpoll.h 2005-01-18 15:39:49.788822800 -0500
-@@ -16,7 +16,8 @@ struct netpoll;
- struct netpoll {
+--- linux-2.6.11/include/linux/netpoll.h~ 2005-04-05 01:33:26.000000000 -0400
++++ linux-2.6.11/include/linux/netpoll.h 2005-04-05 01:34:49.000000000 -0400
+@@ -17,7 +17,8 @@ struct netpoll {
struct net_device *dev;
char dev_name[16], *name;
+ int rx_flags;
- void (*rx_hook)(struct netpoll *, int, char *, int);
+ void (*rx_hook)(struct netpoll *, short, char *, int);
+ void (*dump_func)(struct pt_regs *);
+ void (*drop)(struct sk_buff *skb);
u32 local_ip, remote_ip;
u16 local_port, remote_port;
- unsigned char local_mac[6], remote_mac[6];
-@@ -31,6 +32,7 @@ int netpoll_trap(void);
- void netpoll_set_trap(int trap);
+@@ -35,6 +36,7 @@ void netpoll_set_trap(int trap);
void netpoll_cleanup(struct netpoll *np);
- int netpoll_rx(struct sk_buff *skb);
+ int __netpoll_rx(struct sk_buff *skb);
+ void netpoll_queue(struct sk_buff *skb);
+void netpoll_reset_locks(struct netpoll *np);
-
- #endif
-diff --exclude=configs -uprN linux-2.6.10.crashdumpcommon/net/core/netpoll.c linux-2.6.10/net/core/netpoll.c
---- linux-2.6.10.crashdumpcommon/net/core/netpoll.c 2005-01-18 11:37:42.000000000 -0500
-+++ linux-2.6.10/net/core/netpoll.c 2005-01-18 15:39:49.000000000 -0500
-@@ -19,9 +19,11 @@
- #include <linux/netpoll.h>
+ #ifdef CONFIG_NETPOLL
+ static inline int netpoll_rx(struct sk_buff *skb)
+--- linux-2.6.11/net/core/netpoll.c~ 2005-04-05 01:40:17.000000000 -0400
++++ linux-2.6.11/net/core/netpoll.c 2005-04-05 01:41:14.000000000 -0400
+@@ -20,10 +20,12 @@
#include <linux/sched.h>
+ #include <linux/delay.h>
#include <linux/rcupdate.h>
+#include <linux/nmi.h>
+ #include <linux/workqueue.h>
#include <net/tcp.h>
#include <net/udp.h>
#include <asm/unaligned.h>
@@ -1125,16 +1124,16 @@
/*
* We maintain a small pool of fully-sized skbs, to make sure the
-@@ -78,7 +78,7 @@ static int checksum_udp(struct sk_buff *
+@@ -130,7 +132,7 @@ static int checksum_udp(struct sk_buff *
*/
static void poll_napi(struct netpoll *np)
{
- int budget = 16;
+ int budget = netdump_mode ? 64 : 16;
- unsigned long flags;
- struct softnet_data *queue;
-@@ -138,6 +140,7 @@ static void zap_completion_queue(void)
+ if (test_bit(__LINK_STATE_RX_SCHED, &np->dev->state) &&
+ np->poll_owner != smp_processor_id() &&
+@@ -147,6 +149,7 @@ static void zap_completion_queue(void)
}
put_cpu_var(softnet_data);
@@ -1142,7 +1141,7 @@
}
static struct sk_buff * find_skb(struct netpoll *np, int len, int reserve)
-@@ -252,7 +255,7 @@ void netpoll_send_udp(struct netpoll *np
+@@ -261,7 +264,7 @@ void netpoll_send_udp(struct netpoll *np
iph->check = 0;
put_unaligned(htonl(np->local_ip), &(iph->saddr));
put_unaligned(htonl(np->remote_ip), &(iph->daddr));
@@ -1151,17 +1150,16 @@
eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
-@@ -368,6 +371,9 @@ int netpoll_rx(struct sk_buff *skb)
- struct list_head *p;
- unsigned long flags;
+@@ -436,6 +436,8 @@ int __netpoll_rx(struct sk_buff *skb)
-+ if (!(skb->dev->netpoll_rx & NETPOLL_RX_ENABLED))
+ if (!np->rx_hook)
+ goto out;
++ if (!(np->rx_flags & NETPOLL_RX_ENABLED))
+ return 1;
-+
if (skb->dev->type != ARPHRD_ETHER)
goto out;
-@@ -636,6 +642,9 @@ int netpoll_setup(struct netpoll *np)
+@@ -645,6 +651,9 @@ int netpoll_setup(struct netpoll *np)
spin_unlock_irqrestore(&rx_list_lock, flags);
}
@@ -1171,7 +1169,7 @@
return 0;
release:
dev_put(ndev);
-@@ -671,6 +680,13 @@ void netpoll_set_trap(int trap)
+@@ -680,6 +689,13 @@ void netpoll_set_trap(int trap)
atomic_dec(&trapped);
}
@@ -1185,8 +1183,8 @@
EXPORT_SYMBOL(netpoll_set_trap);
EXPORT_SYMBOL(netpoll_trap);
EXPORT_SYMBOL(netpoll_parse_options);
-@@ -678,3 +694,4 @@ EXPORT_SYMBOL(netpoll_setup);
- EXPORT_SYMBOL(netpoll_cleanup);
+@@ -748,3 +748,4 @@ EXPORT_SYMBOL(netpoll_cleanup);
EXPORT_SYMBOL(netpoll_send_udp);
EXPORT_SYMBOL(netpoll_poll);
+ EXPORT_SYMBOL(netpoll_queue);
+EXPORT_SYMBOL_GPL(netpoll_reset_locks);
linux-2.6.10-periodic-slab-debug.patch:
slab.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 5 deletions(-)
Index: linux-2.6.10-periodic-slab-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-periodic-slab-debug.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.10-periodic-slab-debug.patch 6 Mar 2005 22:35:14 -0000 1.2
+++ linux-2.6.10-periodic-slab-debug.patch 13 Jul 2005 04:18:41 -0000 1.3
@@ -1,24 +1,6 @@
-
-The redzone words are only checked during alloc and free - thus objects
-that are never/rarely freed are not checked at all.
-
-The attached patch adds a periodic scan over all objects and checks for
-wrong redzone data or corrupted bufctl lists.
-
-Most changes are under #ifdef DEBUG, the only exception is a trivial
-correction for the initial timeout calculation: divide the cachep address
-by L1_CACHE_BYTES before the mod - the low order bits are always 0.
-
-Signed-Off-By: Manfred Spraul <manfred colorfullife com>
-
-// $Header$
-// Kernel Version:
-// VERSION = 2
-// PATCHLEVEL = 6
-// SUBLEVEL = 11
-// EXTRAVERSION =-rc2
---- 2.6/mm/slab.c 2005-01-23 14:42:01.000000000 +0100
-+++ build-2.6/mm/slab.c 2005-01-23 16:47:46.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-1000/mm/slab.c linux-1010/mm/slab.c
+--- linux-1000/mm/slab.c
++++ linux-1010/mm/slab.c
@@ -189,7 +189,7 @@
*/
@@ -28,7 +10,7 @@
#define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2)
/* Max number of objs-per-slab for caches which use off-slab slabs.
-@@ -355,6 +355,7 @@
+@@ -355,6 +355,7 @@ struct kmem_cache_s {
#if DEBUG
int dbghead;
int reallen;
@@ -36,7 +18,7 @@
#endif
};
-@@ -370,6 +371,7 @@
+@@ -370,6 +371,7 @@ struct kmem_cache_s {
*/
#define REAPTIMEOUT_CPUC (2*HZ)
#define REAPTIMEOUT_LIST3 (4*HZ)
@@ -44,7 +26,7 @@
#if STATS
#define STATS_INC_ACTIVE(x) ((x)->num_active++)
-@@ -1447,7 +1449,11 @@
+@@ -1446,7 +1448,11 @@ next:
}
cachep->lists.next_reap = jiffies + REAPTIMEOUT_LIST3 +
@@ -57,7 +39,7 @@
/* Need the semaphore to access the chain. */
down(&cache_chain_sem);
-@@ -2044,7 +2050,7 @@
+@@ -2043,7 +2049,7 @@ retry:
slabp->inuse++;
next = slab_bufctl(slabp)[slabp->free];
#if DEBUG
@@ -66,7 +48,7 @@
#endif
slabp->free = next;
}
-@@ -2182,7 +2188,7 @@
+@@ -2181,7 +2187,7 @@ static void free_block(kmem_cache_t *cac
objnr = (objp - slabp->s_mem) / cachep->objsize;
check_slabp(cachep, slabp);
#if DEBUG
@@ -75,7 +57,7 @@
printk(KERN_ERR "slab: double free detected in cache '%s', objp %p.\n",
cachep->name, objp);
BUG();
-@@ -2410,7 +2416,7 @@
+@@ -2409,7 +2415,7 @@ got_slabp:
slabp->inuse++;
next = slab_bufctl(slabp)[slabp->free];
#if DEBUG
@@ -84,7 +66,7 @@
#endif
slabp->free = next;
check_slabp(cachep, slabp);
-@@ -2616,6 +2622,94 @@
+@@ -2615,6 +2621,94 @@ unsigned int kmem_cache_size(kmem_cache_
EXPORT_SYMBOL(kmem_cache_size);
@@ -179,7 +161,7 @@
struct ccupdate_struct {
kmem_cache_t *cachep;
struct array_cache *new[NR_CPUS];
-@@ -2799,6 +2893,12 @@
+@@ -2798,6 +2892,12 @@ static void cache_reap(void *unused)
drain_array_locked(searchp, ac_data(searchp), 0);
linux-2.6.10-ppc-headerabuse.patch:
setup.h | 5 +++++
1 files changed, 5 insertions(+)
Index: linux-2.6.10-ppc-headerabuse.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-ppc-headerabuse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.10-ppc-headerabuse.patch 6 Mar 2005 22:37:13 -0000 1.1
+++ linux-2.6.10-ppc-headerabuse.patch 13 Jul 2005 04:18:41 -0000 1.2
@@ -1,6 +1,6 @@
-===== include/asm-ppc/setup.h 1.4 vs edited =====
---- 1.4/include/asm-ppc/setup.h Thu Jun 24 09:55:46 2004
-+++ edited/include/asm-ppc/setup.h Tue Feb 8 10:33:55 2005
+diff -urNp --exclude-from=/home/davej/.exclude linux-300/include/asm-ppc/setup.h linux-302/include/asm-ppc/setup.h
+--- linux-300/include/asm-ppc/setup.h
++++ linux-302/include/asm-ppc/setup.h
@@ -2,12 +2,17 @@
#ifndef _PPC_SETUP_H
#define _PPC_SETUP_H
linux-2.6.10-revert-module-invalidparam.patch:
module.c | 2 --
1 files changed, 2 deletions(-)
Index: linux-2.6.10-revert-module-invalidparam.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-revert-module-invalidparam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.10-revert-module-invalidparam.patch 17 Jan 2005 06:11:07 -0000 1.1
+++ linux-2.6.10-revert-module-invalidparam.patch 13 Jul 2005 04:18:41 -0000 1.2
@@ -1,6 +1,7 @@
---- linux-2.6.10/kernel/module.c~ 2005-01-17 01:03:44.000000000 -0500
-+++ linux-2.6.10/kernel/module.c 2005-01-17 01:03:53.000000000 -0500
-@@ -1721,8 +1721,6 @@ static struct module *load_module(void _
+diff -urNp --exclude-from=/home/davej/.exclude linux-1503/kernel/module.c linux-1700/kernel/module.c
+--- linux-1503/kernel/module.c
++++ linux-1700/kernel/module.c
+@@ -1707,8 +1707,6 @@ static struct module *load_module(void _
/ sizeof(struct kernel_param),
NULL);
}
linux-2.6.10-x86-tune-p4.patch:
Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.10-x86-tune-p4.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.10-x86-tune-p4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.10-x86-tune-p4.patch 6 Mar 2005 22:37:13 -0000 1.1
+++ linux-2.6.10-x86-tune-p4.patch 13 Jul 2005 04:18:41 -0000 1.2
@@ -1,6 +1,7 @@
---- linux-2.6.10/arch/i386/Makefile~ 2004-12-25 00:20:36.930426112 -0500
-+++ linux-2.6.10/arch/i386/Makefile 2004-12-25 00:20:45.046192328 -0500
-@@ -31,7 +31,7 @@ cflags-$(CONFIG_M486) += -march=i486
+diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile
+--- linux-2.6.10/arch/i386/Makefile
++++ linux-2.6.10/arch/i386/Makefile
+@@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486
cflags-$(CONFIG_M586) += -march=i586
cflags-$(CONFIG_M586TSC) += -march=i586
cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586)
linux-2.6.11-compile-fixes.patch:
char/agp/hp-agp.c | 3 +--
firmware/pcdp.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6.11-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.11-compile-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.11-compile-fixes.patch 6 Mar 2005 22:37:13 -0000 1.1
+++ linux-2.6.11-compile-fixes.patch 13 Jul 2005 04:18:41 -0000 1.2
@@ -1,96 +1,47 @@
---- linux-2.6.10/include/linux/i2c.h~ 2005-02-28 18:09:24.000000000 -0500
-+++ linux-2.6.10/include/linux/i2c.h 2005-02-28 18:09:43.000000000 -0500
-@@ -55,7 +55,7 @@ extern int i2c_master_recv(struct i2c_cl
-
- /* Transfer num messages.
- */
--extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);
-+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num);
-
- /*
- * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor.
-@@ -194,7 +194,7 @@ struct i2c_algorithm {
- to NULL. If an adapter algorithm can do SMBus access, set
- smbus_xfer. If set to NULL, the SMBus protocol is simulated
- using common I2C messages */
-- int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[],
-+ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs,
- int num);
- int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
- unsigned short flags, char read_write,
-
---- linux-2.6.10/drivers/media/dvb/bt8xx/bt878.h~ 2005-03-01 01:47:57.000000000 -0500
-+++ linux-2.6.10/drivers/media/dvb/bt8xx/bt878.h 2005-03-01 01:48:12.000000000 -0500
-@@ -89,7 +89,6 @@
- #define BT878_RISC_SYNC_MASK (1 << 15)
-
- extern int bt878_num;
--extern struct bt878 bt878[BT878_MAX];
-
- struct bt878 {
- struct semaphore gpio_lock;
-@@ -124,6 +123,8 @@ struct bt878 {
- int shutdown;
- };
-
-+extern struct bt878 bt878[BT878_MAX];
-+
- void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
- u32 irq_err_ignore);
- void bt878_stop(struct bt878 *bt);
---- linux-2.6.10/drivers/media/video/bttvp.h~ 2005-03-01 02:12:59.000000000 -0500
-+++ linux-2.6.10/drivers/media/video/bttvp.h 2005-03-01 02:13:26.000000000 -0500
-@@ -230,7 +230,6 @@ extern int fini_bttv_i2c(struct bttv *bt
- /* our devices */
- #define BTTV_MAX 16
- extern unsigned int bttv_num;
--extern struct bttv bttvs[BTTV_MAX];
-
- #define BTTV_MAX_FBUF 0x208000
- #define VBIBUF_SIZE (2048*VBI_MAXLINES*2)
-@@ -378,6 +377,8 @@ struct bttv {
- struct bttv_fh init;
- };
-
-+extern struct bttv bttvs[BTTV_MAX];
-+
- /* private ioctls */
- #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
- #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
---- linux-2.6.10/include/linux/compiler-gcc+.h~ 2004-12-24 21:35:39.000000000 +0000
-+++ linux-2.6.10/include/linux/compiler-gcc+.h 2005-03-01 15:49:47.000000000 +0000
-@@ -13,4 +13,6 @@
- #define __attribute_used__ __attribute__((__used__))
- #define __attribute_pure__ __attribute__((pure))
- #define __attribute_const__ __attribute__((__const__))
-+#define noinline __attribute__((noinline))
- #define __must_check __attribute__((warn_unused_result))
-+#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
---- linux-2.6.10/init/Makefile~ 2005-03-02 09:15:30.000000000 +0000
-+++ linux-2.6.10/init/Makefile 2005-03-02 09:16:17.000000000 +0000
-@@ -2,6 +2,11 @@
- # Makefile for the linux kernel.
- #
-
-+# Work around GCC bug (http://bugzilla.redhat.com/150020)
-+ifeq ($(ARCH),ppc)
-+CFLAGS_initramfs.o := -O2
-+endif
-+
- obj-y := main.o version.o mounts.o initramfs.o
- obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
-
---- linux-2.6.11/include/linux/init.h~ 2005-03-03 19:53:01.000000000 -0500
-+++ linux-2.6.11/include/linux/init.h 2005-03-03 19:53:27.000000000 -0500
-@@ -46,11 +46,7 @@
- #define __exitdata __attribute__ ((__section__(".exit.data")))
- #define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
-
--#ifdef MODULE
--#define __exit __attribute__ ((__section__(".exit.text")))
--#else
- #define __exit __attribute_used__ __attribute__ ((__section__(".exit.text")))
--#endif
-
- /* For assembly routines */
- #define __INIT .section ".init.text","ax"
+--- linux-2.6.11/drivers/firmware/pcdp.c~ 2005-05-28 19:12:41.000000000 -0400
++++ linux-2.6.11/drivers/firmware/pcdp.c 2005-05-28 19:12:51.000000000 -0400
+@@ -15,6 +15,7 @@
+ #include <linux/console.h>
+ #include <linux/efi.h>
+ #include <linux/serial.h>
++#include <acpi/actypes.h>
+ #include "pcdp.h"
+
+ static int __init
+--- linux-2.6.11/drivers/char/agp/hp-agp.c~ 2005-05-28 19:13:50.000000000 -0400
++++ linux-2.6.11/drivers/char/agp/hp-agp.c 2005-05-28 19:14:14.000000000 -0400
+@@ -14,9 +14,8 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/agp_backend.h>
+-
++#include <acpi/acpixf.h>
+ #include <asm/acpi-ext.h>
+-
+ #include "agp.h"
+
+ #ifndef log2
+#--- linux-2.6.11/drivers/firmware/pcdp.h~ 2005-05-28 20:10:41.000000000 -0400
+#+++ linux-2.6.11/drivers/firmware/pcdp.h 2005-05-28 20:10:54.000000000 -0400
+#@@ -13,6 +13,10 @@
+# * published by the Free Software Foundation.
+# */
+#
+#+#include <acpi/actbl2.h>
+#+#include <acpi/platform/aclinux.h>
+#+#include <acpi/acconfig.h>
+#+
+# #define PCDP_CONSOLE 0
+# #define PCDP_DEBUG 1
+# #define PCDP_CONSOLE_OUTPUT 2
+#--- linux-2.6.11/include/linux/acpi.h~ 2005-05-28 22:37:06.000000000 -0400
+#+++ linux-2.6.11/include/linux/acpi.h 2005-05-28 22:37:26.000000000 -0400
+#@@ -25,6 +25,8 @@
+# #ifndef _LINUX_ACPI_H
+# #define _LINUX_ACPI_H
+#
+#+#include <linux/config.h>
+#+
+# #ifdef CONFIG_ACPI
+#
+# #ifndef _LINUX
linux-2.6.11-tux.patch:
linux-2.6.11/arch/i386/kernel/syscall_table.S | 10
linux-2.6.12/kernel/exit.c | 10
linux-2.6.12/net/tux/directory.c | 2
linux-2.6.12/net/tux/input.c | 2
linux-2.6.12/net/tux/proto_ftp.c | 2
linux-2.6.12/net/tux/proto_http.c | 2
linux-910/arch/alpha/kernel/systbls.S | 8
linux-910/arch/ia64/kernel/entry.S | 8
linux-910/arch/ia64/kernel/ia64_ksyms.c | 3
linux-910/arch/ppc64/kernel/misc.S | 20
linux-910/arch/x86_64/ia32/ia32entry.S | 10
linux-910/fs/dcache.c | 36
linux-910/fs/exec.c | 2
linux-910/fs/fcntl.c | 4
linux-910/fs/namei.c | 18
linux-910/fs/namespace.c | 2
linux-910/fs/open.c | 4
linux-910/fs/pipe.c | 2
linux-910/fs/read_write.c | 2
linux-910/include/asm-alpha/fcntl.h | 1
linux-910/include/asm-i386/fcntl.h | 1
linux-910/include/asm-i386/unistd.h | 5
linux-910/include/asm-ia64/fcntl.h | 1
linux-910/include/asm-ia64/unistd.h | 2
linux-910/include/asm-ppc/fcntl.h | 1
linux-910/include/asm-ppc64/fcntl.h | 1
linux-910/include/asm-s390/fcntl.h | 1
linux-910/include/asm-sparc/fcntl.h | 1
linux-910/include/asm-sparc64/fcntl.h | 1
linux-910/include/asm-x86_64/fcntl.h | 1
linux-910/include/asm-x86_64/unistd.h | 10
linux-910/include/linux/buffer_head.h | 1
linux-910/include/linux/dcache.h | 8
linux-910/include/linux/errno.h | 3
linux-910/include/linux/file.h | 2
linux-910/include/linux/fs.h | 7
linux-910/include/linux/kmod.h | 1
linux-910/include/linux/namei.h | 2
linux-910/include/linux/net.h | 1
linux-910/include/linux/sched.h | 5
linux-910/include/linux/skbuff.h | 2
linux-910/include/linux/socket.h | 5
linux-910/include/linux/sysctl.h | 50
linux-910/include/net/sock.h | 6
linux-910/include/net/tcp.h | 8
linux-910/include/net/tux.h | 802 +++++++++
linux-910/include/net/tux_u.h | 163 +
linux-910/kernel/fork.c | 1
linux-910/kernel/kmod.c | 25
linux-910/kernel/signal.c | 1
linux-910/mm/filemap.c | 19
linux-910/mm/truncate.c | 2
linux-910/net/Kconfig | 2
linux-910/net/Makefile | 1
linux-910/net/ipv4/tcp.c | 3
linux-910/net/ipv4/tcp_input.c | 1
linux-910/net/ipv4/tcp_ipv4.c | 5
linux-910/net/ipv4/tcp_minisocks.c | 3
linux-910/net/ipv4/tcp_output.c | 5
linux-910/net/socket.c | 139 +
linux-910/net/tux/Kconfig | 25
linux-910/net/tux/Makefile | 12
linux-910/net/tux/abuf.c | 190 ++
linux-910/net/tux/accept.c | 859 ++++++++++
linux-910/net/tux/cachemiss.c | 265 +++
linux-910/net/tux/cgi.c | 160 +
linux-910/net/tux/directory.c | 302 +++
linux-910/net/tux/extcgi.c | 329 +++
linux-910/net/tux/gzip.c | 40
linux-910/net/tux/input.c | 640 +++++++
linux-910/net/tux/logger.c | 836 +++++++++
linux-910/net/tux/main.c | 1413 ++++++++++++++++
linux-910/net/tux/mod.c | 262 +++
linux-910/net/tux/output.c | 352 ++++
linux-910/net/tux/parser.h | 102 +
linux-910/net/tux/postpone.c | 77
linux-910/net/tux/proc.c | 1149 +++++++++++++
linux-910/net/tux/proto_ftp.c | 1549 ++++++++++++++++++
linux-910/net/tux/proto_http.c | 2197 ++++++++++++++++++++++++++
linux-910/net/tux/redirect.c | 162 +
linux-910/net/tux/times.c | 392 ++++
linux-910/net/tux/userspace.c | 27
linux/net/tux/times.h | 26
83 files changed, 12735 insertions(+), 77 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6.11-tux.patch
Index: linux-2.6.11-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.11-tux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.11-tux.patch 6 Mar 2005 22:37:13 -0000 1.1
+++ linux-2.6.11-tux.patch 13 Jul 2005 04:18:41 -0000 1.2
@@ -1,2135 +1,2481 @@
---- linux/net/Kconfig.orig
-+++ linux/net/Kconfig
-@@ -653,6 +653,8 @@ source "net/irda/Kconfig"
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/alpha/kernel/systbls.S linux-910/arch/alpha/kernel/systbls.S
+--- linux-905/arch/alpha/kernel/systbls.S
++++ linux-910/arch/alpha/kernel/systbls.S
+@@ -240,7 +240,15 @@ sys_call_table:
+ .quad alpha_ni_syscall
+ .quad alpha_ni_syscall /* 220 */
+ .quad alpha_ni_syscall
++#ifdef CONFIG_TUX
++ .quad __sys_tux
++#else
++# ifdef CONFIG_TUX_MODULE
++ .quad sys_tux
++# else
+ .quad alpha_ni_syscall
++# endif
++#endif
+ .quad alpha_ni_syscall
+ .quad alpha_ni_syscall
+ .quad alpha_ni_syscall /* 225 */
+--- linux-2.6.11/arch/i386/kernel/syscall_table.S~ 2005-05-09 17:23:58.000000000 -0400
++++ linux-2.6.11/arch/i386/kernel/syscall_table.S 2005-05-09 17:24:32.000000000 -0400
+@@ -222,7 +222,15 @@ ENTRY(sys_call_table)
+ .long sys_madvise
+ .long sys_getdents64 /* 220 */
+ .long sys_fcntl64
+- .long sys_ni_syscall /* reserved for TUX */
++#ifdef CONFIG_TUX
++ .long __sys_tux
++#else
++# ifdef CONFIG_TUX_MODULE
++ .long sys_tux
++# else
++ .long sys_ni_syscall
++# endif
++#endif
+ .long sys_ni_syscall
+ .long sys_gettid
+ .long sys_readahead /* 225 */
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/entry.S linux-910/arch/ia64/kernel/entry.S
+--- linux-905/arch/ia64/kernel/entry.S
++++ linux-910/arch/ia64/kernel/entry.S
+@@ -1423,7 +1423,15 @@ sys_call_table:
+ data8 sys_syslog
+ data8 sys_setitimer
+ data8 sys_getitimer
++#ifdef CONFIG_TUX
++ data8 __sys_tux // 1120 /* was: ia64_oldstat */
++#else
++# ifdef CONFIG_TUX_MODULE
++ data8 sys_tux // 1120 /* was: ia64_oldstat */
++# else
+ data8 sys_ni_syscall // 1120 /* was: ia64_oldstat */
++# endif
++#endif
+ data8 sys_ni_syscall /* was: ia64_oldlstat */
+ data8 sys_ni_syscall /* was: ia64_oldfstat */
+ data8 sys_vhangup
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/ia64_ksyms.c linux-910/arch/ia64/kernel/ia64_ksyms.c
+--- linux-905/arch/ia64/kernel/ia64_ksyms.c
++++ linux-910/arch/ia64/kernel/ia64_ksyms.c
+@@ -58,8 +58,11 @@ EXPORT_SYMBOL(__strlen_user);
+ EXPORT_SYMBOL(__strncpy_from_user);
+ EXPORT_SYMBOL(__strnlen_user);
- source "net/bluetooth/Kconfig"
++#define __KERNEL_SYSCALLS__
+ #include <asm/unistd.h>
+ EXPORT_SYMBOL(__ia64_syscall);
++EXPORT_SYMBOL(sys_execve);
++EXPORT_SYMBOL(clone);
-+source "net/tux/Kconfig"
-+
- source "drivers/net/Kconfig"
+ /* from arch/ia64/lib */
+ extern void __divsi3(void);
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ppc64/kernel/misc.S linux-910/arch/ppc64/kernel/misc.S
+--- linux-905/arch/ppc64/kernel/misc.S
++++ linux-910/arch/ppc64/kernel/misc.S
+@@ -912,7 +912,15 @@ _GLOBAL(sys_call_table32)
+ .llong .compat_sys_sched_setaffinity
+ .llong .compat_sys_sched_getaffinity
+ .llong .sys_ni_syscall
+- .llong .sys_ni_syscall /* 225 - reserved for tux */
++#ifdef CONFIG_TUX
++ .llong .__sys_tux
++#else
++# ifdef CONFIG_TUX_MODULE
++ .llong .sys_tux
++# else
++ .llong .sys_ni_syscall
++# endif
++#endif
+ .llong .sys32_sendfile64
+ .llong .compat_sys_io_setup
+ .llong .sys_io_destroy
+@@ -1188,7 +1196,15 @@ _GLOBAL(sys_call_table)
+ .llong .sys_sched_setaffinity
+ .llong .sys_sched_getaffinity
+ .llong .sys_ni_syscall
+- .llong .sys_ni_syscall /* 225 - reserved for tux */
++#ifdef CONFIG_TUX
++ .llong .__sys_tux
++#else
++# ifdef CONFIG_TUX_MODULE
++ .llong .sys_tux
++# else
++ .llong .sys_ni_syscall
++# endif
++#endif
+ .llong .sys_ni_syscall /* 32bit only sendfile64 */
+ .llong .sys_io_setup
+ .llong .sys_io_destroy
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/x86_64/ia32/ia32entry.S linux-910/arch/x86_64/ia32/ia32entry.S
+--- linux-905/arch/x86_64/ia32/ia32entry.S
++++ linux-910/arch/x86_64/ia32/ia32entry.S
+@@ -528,7 +528,15 @@ ia32_sys_call_table:
+ .quad sys_madvise
+ .quad compat_sys_getdents64 /* 220 getdents64 */
+ .quad compat_sys_fcntl64
+- .quad quiet_ni_syscall /* tux */
++#ifdef CONFIG_TUX
++ .quad __sys_tux
++#else
++# ifdef CONFIG_TUX_MODULE
++ .quad sys_tux
++# else
++ .quad quiet_ni_syscall
++# endif
++#endif
+ .quad quiet_ni_syscall /* security */
+ .quad sys_gettid
+ .quad sys_readahead /* 225 */
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/dcache.c linux-910/fs/dcache.c
+--- linux-905/fs/dcache.c
++++ linux-910/fs/dcache.c
+@@ -84,6 +84,10 @@ static void d_free(struct dentry *dentry
+ {
+ if (dentry->d_op && dentry->d_op->d_release)
+ dentry->d_op->d_release(dentry);
++ if (dentry->d_extra_attributes) {
++ kfree(dentry->d_extra_attributes);
++ dentry->d_extra_attributes = NULL;
++ }
+ call_rcu(&dentry->d_rcu, d_callback);
+ }
- endmenu
---- linux/net/socket.c.orig
-+++ linux/net/socket.c
-@@ -68,6 +68,7 @@
- #include <linux/netdevice.h>
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
-+#include <net/tux.h>
- #include <linux/wanrouter.h>
- #include <linux/if_bridge.h>
- #include <linux/init.h>
-@@ -120,7 +121,7 @@ static ssize_t sock_sendpage(struct file
- * in the operation structures but are done directly via the socketcall() multiplexor.
- */
+@@ -746,6 +750,7 @@ struct dentry *d_alloc(struct dentry * p
+ dentry->d_sb = NULL;
+ dentry->d_op = NULL;
+ dentry->d_fsdata = NULL;
++ dentry->d_extra_attributes = NULL;
+ dentry->d_mounted = 0;
+ dentry->d_cookie = NULL;
+ INIT_HLIST_NODE(&dentry->d_hash);
+@@ -1311,6 +1316,16 @@ already_unhashed:
+ /* Unhash the target: dput() will then get rid of it */
+ __d_drop(target);
--static struct file_operations socket_file_ops = {
-+struct file_operations socket_file_ops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .aio_read = sock_aio_read,
-@@ -362,52 +363,63 @@ static struct dentry_operations sockfs_d
- * but we take care of internal coherence yet.
- */
++ /* flush any possible attributes */
++ if (dentry->d_extra_attributes) {
++ kfree(dentry->d_extra_attributes);
++ dentry->d_extra_attributes = NULL;
++ }
++ if (target->d_extra_attributes) {
++ kfree(target->d_extra_attributes);
[...25009 lines suppressed...]
-+#define O_ATOMICLOOKUP 02000000 /* do atomic file lookup */
-
- #define F_DUPFD 0 /* dup */
- #define F_GETFD 1 /* get close_on_exec */
---- linux/include/asm-sparc64/fcntl.h.orig
-+++ linux/include/asm-sparc64/fcntl.h
-@@ -20,6 +20,7 @@
- #define O_DIRECTORY 0x10000 /* must be a directory */
- #define O_NOFOLLOW 0x20000 /* don't follow links */
- #define O_LARGEFILE 0x40000
-+#define O_ATOMICLOOKUP 0x80000 /* do atomic file lookup */
- #define O_DIRECT 0x100000 /* direct disk access hint */
- #define O_NOATIME 0x200000
-
---- linux/include/asm-x86_64/fcntl.h.orig
-+++ linux/include/asm-x86_64/fcntl.h
-@@ -21,6 +21,7 @@
- #define O_DIRECTORY 0200000 /* must be a directory */
- #define O_NOFOLLOW 0400000 /* don't follow links */
- #define O_NOATIME 01000000
-+#define O_ATOMICLOOKUP 02000000 /* TUX */
-
- #define F_DUPFD 0 /* dup */
- #define F_GETFD 1 /* get close_on_exec */
---- linux/include/asm-x86_64/unistd.h.orig
-+++ linux/include/asm-x86_64/unistd.h
-@@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall)
- __SYSCALL(__NR_afs_syscall, sys_ni_syscall)
-
- #define __NR_tuxcall 184 /* reserved for tux */
--__SYSCALL(__NR_tuxcall, sys_ni_syscall)
-+#ifdef CONFIG_TUX
-+ __SYSCALL(__NR_tuxcall, __sys_tux)
-+#else
-+# ifdef CONFIG_TUX_MODULE
-+ __SYSCALL(__NR_tuxcall, sys_tux)
-+# else
-+ __SYSCALL(__NR_tuxcall, sys_ni_syscall)
-+# endif
-+#endif
-
- #define __NR_security 185
- __SYSCALL(__NR_security, sys_ni_syscall)
++ mday = make_num(str+5);
++ mon = make_month(str + 8);
++ year = 100 * make_num(str + 12) + make_num(str + 14);
++ hour = make_num(str + 17);
++ min = make_num(str + 20);
++ sec = make_num(str + 23);
++ }
++ else {
++ const char *s;
++ s = strchr(str, ',');
++ if (!s || (str_len - (s - str) < 24)) {
++ /* Wed Jun 9 01:29:59 1993 */
++
++ if (str_len < 24)
++ return -1;
++
++ mon = make_month(str+4);
++ mday = make_num(str+8);
++ hour = make_num(str+11);
++ min = make_num(str+14);
++ sec = make_num(str+17);
++ year = make_num(str+20)*100 + make_num(str+22);
++ }
++ else {
++ /* Thursday, 10-Jun-93 01:29:59 GMT */
++
++ mday = make_num(s + 2);
++ mon = make_month(s + 5);
++ year = make_num(s + 9) + 1900;
++ if (year < 1970)
++ year += 100;
++ hour = make_num(s + 12);
++ min = make_num(s + 15);
++ sec = make_num(s + 18);
++ }
++ }
++
++ if (sec < 0 || sec > 59)
++ return -1;
++ if (min < 0 || min > 59)
++ return -1;
++ if (hour < 0 || hour > 23)
++ return -1;
++ if (mday < 1 || mday > 31)
++ return -1;
++ if (mon < 1 || mon > 12)
++ return -1;
++ if (year < 1970 || year > 2020)
++ return -1;
++
++ return mktime(year, mon, mday, hour, min, sec);
++}
+diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/userspace.c linux-910/net/tux/userspace.c
+--- linux-905/net/tux/userspace.c
++++ linux-910/net/tux/userspace.c
+@@ -0,0 +1,27 @@
++/*
++ * TUX - Integrated Application Protocols Layer and Object Cache
++ *
++ * Copyright (C) 2000, 2001, Ingo Molnar <mingo redhat com>
++ *
++ * userspace.c: handle userspace-module requests
++ */
++
++#include <net/tux.h>
++
++/****************************************************************
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ ****************************************************************/
++
+--- linux/net/tux/times.h.orig
++++ linux/net/tux/times.h
+@@ -0,0 +1,26 @@
++static time_t TimeDays[10][13] = {
++ { 852073200, 854751600, 857170800, 859849200, 862441200, 865119600, 867711600, 870390000, 873068400, 875660400, 878338800, 880930800, 883609200 } ,
++ { 883609200, 886287600, 888706800, 891385200, 893977200, 896655600, 899247600, 901926000, 904604400, 907196400, 909874800, 912466800, 915145200 } ,
++ { 915145200, 917823600, 920242800, 922921200, 925513200, 928191600, 930783600, 933462000, 936140400, 938732400, 941410800, 944002800, 946681200 } ,
++ { 946681200, 949359600, 951865200, 954543600, 957135600, 959814000, 962406000, 965084400, 967762800, 970354800, 973033200, 975625200, 978303600 } ,
++ { 978303600, 980982000, 983401200, 986079600, 988671600, 991350000, 993942000, 996620400, 999298800, 1001890800, 1004569200, 1007161200, 1009839600 } ,
++ { 1009839600, 1012518000, 1014937200, 1017615600, 1020207600, 1022886000, 1025478000, 1028156400, 1030834800, 1033426800, 1036105200, 1038697200, 1041375600 } ,
++ { 1041375600, 1044054000, 1046473200, 1049151600, 1051743600, 1054422000, 1057014000, 1059692400, 1062370800, 1064962800, 1067641200, 1070233200, 1072911600 } ,
++ { 1072911600, 1075590000, 1078095600, 1080774000, 1083366000, 1086044400, 1088636400, 1091314800, 1093993200, 1096585200, 1099263600, 1101855600, 1104534000 } ,
++ { 1104534000, 1107212400, 1109631600, 1112310000, 1114902000, 1117580400, 1120172400, 1122850800, 1125529200, 1128121200, 1130799600, 1133391600, 1136070000 } ,
++ { 1136070000, 1138748400, 1141167600, 1143846000, 1146438000, 1149116400, 1151708400, 1154386800, 1157065200, 1159657200, 1162335600, 1164927600, 1167606000 }
++};
++static int WeekDays[10][13] = {
++ { 3, 6, 6, 2, 4, 0, 2, 5, 1, 3, 6, 1, 4 } ,
++ { 4, 0, 0, 3, 5, 1, 3, 6, 2, 4, 0, 2, 5 } ,
++ { 5, 1, 1, 4, 6, 2, 4, 0, 3, 5, 1, 3, 6 } ,
++ { 6, 2, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5, 1 } ,
++ { 1, 4, 4, 0, 2, 5, 0, 3, 6, 1, 4, 6, 2 } ,
++ { 2, 5, 5, 1, 3, 6, 1, 4, 0, 2, 5, 0, 3 } ,
++ { 3, 6, 6, 2, 4, 0, 2, 5, 1, 3, 6, 1, 4 } ,
++ { 4, 0, 1, 4, 6, 2, 4, 0, 3, 5, 1, 3, 6 } ,
++ { 6, 2, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4, 0 } ,
++ { 0, 3, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5, 1 }
++};
++#define TUX_YEAROFFSET 1997
++#define TUX_NUMYEARS 10
+
+--- linux-2.6.12/net/tux/input.c~ 2005-06-23 21:48:49.000000000 -0400
++++ linux-2.6.12/net/tux/input.c 2005-06-23 21:54:42.000000000 -0400
+@@ -114,7 +114,7 @@ struct dentry * tux_lookup (tux_req_t *r
+ const unsigned int flag, struct vfsmount **mnt)
+ {
+ struct dentry *dentry;
+- struct nameidata base;
++ struct nameidata base = {};
+
+ Dprintk("tux_lookup(%p, %s, %d, virtual: %d, host: %s (%d).)\n", req, filename, flag, req->virtual, req->host, req->host_len);
+
+--- linux-2.6.12/net/tux/directory.c~ 2005-06-23 21:54:53.000000000 -0400
++++ linux-2.6.12/net/tux/directory.c 2005-06-23 21:55:10.000000000 -0400
+@@ -80,7 +80,7 @@ static void do_dir_line (tux_req_t *req,
+ char string0[MAX_OBJECTNAME_LEN+200], *tmp;
+ int len, curroff, total, str_len = 0;
+ int err, flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+- struct nameidata base;
++ struct nameidata base={};
+ struct dentry *dentry = NULL;
+ struct inode *inode = NULL;
+ struct vfsmount *mnt = NULL;
+--- linux-2.6.12/net/tux/proto_ftp.c~ 2005-06-23 21:55:20.000000000 -0400
++++ linux-2.6.12/net/tux/proto_ftp.c 2005-06-23 21:55:30.000000000 -0400
+@@ -103,7 +103,7 @@ static void ftp_execute_command (tux_req
+ static void ftp_lookup_vhost (tux_req_t *req, int cachemiss)
+ {
+ struct dentry *dentry;
+- struct nameidata base;
++ struct nameidata base={};
+ struct vfsmount *mnt = NULL;
+ unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+ char ip[3+1+3+1+3+1+3 + 2];
+--- linux-2.6.12/net/tux/proto_http.c~ 2005-06-23 21:55:36.000000000 -0400
++++ linux-2.6.12/net/tux/proto_http.c 2005-06-23 21:55:47.000000000 -0400
+@@ -1556,7 +1556,7 @@ done:
+ static void http_lookup_vhost (tux_req_t *req, int cachemiss)
+ {
+ struct dentry *dentry;
+- struct nameidata base;
++ struct nameidata base={};
+ struct vfsmount *mnt = NULL;
+ unsigned int flag = cachemiss ? 0 : LOOKUP_ATOMIC;
+
linux-2.6.11-vm-taint.patch:
linux-2.6.11/include/asm-generic/bug.h | 8 ++++++--
linux-2000/kernel/panic.c | 1 +
linux-2000/mm/page_alloc.c | 4 ++--
linux-2000/mm/slab.c | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
Index: linux-2.6.11-vm-taint.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.11-vm-taint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.11-vm-taint.patch 6 Mar 2005 22:37:13 -0000 1.1
+++ linux-2.6.11-vm-taint.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,34 +1,14 @@
---- linux-2.6.10/mm/slab.c~ 2005-01-11 16:22:12.000000000 -0500
-+++ linux-2.6.10/mm/slab.c 2005-01-11 16:22:28.000000000 -0500
-@@ -1054,8 +1054,8 @@ static void check_poison_obj(kmem_cache_
- /* Mismatch ! */
- /* Print header */
- if (lines == 0) {
-- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n",
-- realobj, size);
-+ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n",
-+ print_tainted(), realobj, size);
- print_objinfo(cachep, objp, 0);
- }
- /* Hexdump the affected line */
---- linux-2.6.10/mm/page_alloc.c~ 2005-01-17 03:02:13.000000000 -0500
-+++ linux-2.6.10/mm/page_alloc.c 2005-01-17 03:02:59.000000000 -0500
-@@ -78,9 +78,9 @@ static void bad_page(const char *functio
- {
- printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n",
- function, current->comm, page);
-- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- (int)(2*sizeof(page_flags_t)), (unsigned long)page->flags,
-- page->mapping, page_mapcount(page), page_count(page));
-+ page->mapping, page_mapcount(page), page_count(page), print_tainted());
- printk(KERN_EMERG "Backtrace:\n");
- dump_stack();
- printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n");
---- 1/include/asm-generic/bug.h 2004-12-24 16:34:01.000000000 -0500
-+++ 2/include/asm-generic/bug.h 2005-02-23 16:52:07.000000000 -0500
-@@ -6,14 +6,14 @@
+--- linux-2.6.11/include/asm-generic/bug.h~ 2005-05-09 18:00:44.000000000 -0400
++++ linux-2.6.11/include/asm-generic/bug.h 2005-05-09 18:01:23.000000000 -0400
+@@ -4,10 +4,14 @@
+ #include <linux/compiler.h>
+ #include <linux/config.h>
++#ifndef __ASSEMBLY__
++extern const char *print_tainted(void);
++#endif
++
+ #ifdef CONFIG_BUG
#ifndef HAVE_ARCH_BUG
#define BUG() do { \
- printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
@@ -36,15 +16,7 @@
panic("BUG!"); \
} while (0)
#endif
-
- #ifndef HAVE_ARCH_PAGE_BUG
- #define PAGE_BUG(page) do { \
-- printk("page BUG for page at %p\n", page); \
-+ printk("page BUG for page at %p (%s)\n", page, print_tainted()); \
- BUG(); \
- } while (0)
- #endif
-@@ -25,7 +25,7 @@
+@@ -25,7 +29,7 @@
#ifndef HAVE_ARCH_WARN_ON
#define WARN_ON(condition) do { \
if (unlikely((condition)!=0)) { \
@@ -53,10 +25,10 @@
dump_stack(); \
} \
} while (0)
-
---- linux-2.6.10/kernel/panic.c~ 2005-02-25 19:01:03.000000000 -0500
-+++ linux-2.6.10/kernel/panic.c 2005-02-25 19:01:17.000000000 -0500
-@@ -152,6 +152,7 @@ const char *print_tainted(void)
+diff -urNp --exclude-from=/home/davej/.exclude linux-1740/kernel/panic.c linux-2000/kernel/panic.c
+--- linux-1740/kernel/panic.c
++++ linux-2000/kernel/panic.c
+@@ -151,6 +151,7 @@ const char *print_tainted(void)
snprintf(buf, sizeof(buf), "Not tainted");
return(buf);
}
@@ -64,16 +36,32 @@
void add_taint(unsigned flag)
{
---- linux-2.6.10/include/asm-generic/bug.h~ 2005-02-25 19:20:06.000000000 -0500
-+++ linux-2.6.10/include/asm-generic/bug.h 2005-02-25 19:20:26.000000000 -0500
-@@ -4,6 +4,10 @@
- #include <linux/compiler.h>
- #include <linux/config.h>
-
-+#ifndef __ASSEMBLY__
-+extern const char *print_tainted(void);
-+#endif
-+
- #ifndef HAVE_ARCH_BUG
- #define BUG() do { \
- printk("kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE__, print_tainted()); \
+diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/page_alloc.c linux-2000/mm/page_alloc.c
+--- linux-1740/mm/page_alloc.c
++++ linux-2000/mm/page_alloc.c
+@@ -97,9 +97,9 @@ static void bad_page(const char *functio
+ {
+ printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n",
+ function, current->comm, page);
+- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
++ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
+ (int)(2*sizeof(page_flags_t)), (unsigned long)page->flags,
+- page->mapping, page_mapcount(page), page_count(page));
++ page->mapping, page_mapcount(page), page_count(page), print_tainted());
+ printk(KERN_EMERG "Backtrace:\n");
+ dump_stack();
+ printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n");
+diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/slab.c linux-2000/mm/slab.c
+--- linux-1740/mm/slab.c
++++ linux-2000/mm/slab.c
+@@ -1053,8 +1053,8 @@ static void check_poison_obj(kmem_cache_
+ /* Mismatch ! */
+ /* Print header */
+ if (lines == 0) {
+- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n",
+- realobj, size);
++ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n",
++ print_tainted(), realobj, size);
+ print_objinfo(cachep, objp, 0);
+ }
+ /* Hexdump the affected line */
linux-2.6.2-ppc64-build.patch:
Makefile | 2 ++
1 files changed, 2 insertions(+)
Index: linux-2.6.2-ppc64-build.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.2-ppc64-build.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6.2-ppc64-build.patch 20 Sep 2004 09:17:42 -0000 1.9
+++ linux-2.6.2-ppc64-build.patch 13 Jul 2005 04:18:42 -0000 1.10
@@ -1,6 +1,7 @@
---- linux-2.6.1/arch/ppc64/Makefile.orig 2004-01-28 16:54:40.000000000 -0500
-+++ linux-2.6.1/arch/ppc64/Makefile 2004-01-28 16:54:35.000000000 -0500
-@@ -45,6 +45,8 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-212/arch/ppc64/Makefile linux-300/arch/ppc64/Makefile
+--- linux-2.6.1/arch/ppc64/Makefile
++++ linux-2.6.1/arch/ppc64/Makefile
+@@ -79,6 +79,8 @@ core-$(CONFIG_XMON) += arch/ppc64/xmon/
drivers-$(CONFIG_OPROFILE) += arch/ppc64/oprofile/
boot := arch/ppc64/boot
@@ -8,4 +9,4 @@
+ cp vmlinux arch/ppc64/boot/bzImage
boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
- boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
+ boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
linux-2.6.3-crash-driver.patch:
arch/i386/mm/init.c | 2
arch/ia64/kernel/ia64_ksyms.c | 3
arch/x86_64/mm/init.c | 3
drivers/char/Kconfig | 2
drivers/char/Makefile | 1
drivers/char/crash.c | 129 ++++++++++++++++++++++++++++++++++++++++++
include/asm-i386/crash.h | 75 ++++++++++++++++++++++++
include/asm-ia64/crash.h | 90 +++++++++++++++++++++++++++++
include/asm-x86_64/crash.h | 75 ++++++++++++++++++++++++
9 files changed, 380 insertions(+)
Index: linux-2.6.3-crash-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.3-crash-driver.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.3-crash-driver.patch 12 Oct 2004 17:32:32 -0000 1.3
+++ linux-2.6.3-crash-driver.patch 13 Jul 2005 04:18:42 -0000 1.4
@@ -1,30 +1,51 @@
-diff -urNp linux-2.6.3/drivers/char/Kconfig.orig linux-2.6.3/drivers/char/Kconfig
---- linux-2.6.3/drivers/char/Kconfig.orig 2004-03-03 13:59:21.000000000 -0500
-+++ linux-2.6.3/drivers/char/Kconfig 2004-03-03 14:00:56.000000000 -0500
-@@ -599,6 +599,8 @@ config PC9800_OLDLP_CONSOLE
- bool "Support for console on line printer"
- depends on PC9800_OLDLP
+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
+@@ -248,6 +248,8 @@ int devmem_is_allowed(unsigned long page
+ return 0;
+ }
-+config CRASH
-+ tristate "Crash Utility memory driver"
++EXPORT_SYMBOL_GPL(page_is_ram);
++
+ #ifdef CONFIG_HIGHMEM
+ pte_t *kmap_pte;
+ pgprot_t kmap_prot;
+diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/ia64/kernel/ia64_ksyms.c linux-1060/arch/ia64/kernel/ia64_ksyms.c
+--- linux-1050/arch/ia64/kernel/ia64_ksyms.c
++++ linux-1060/arch/ia64/kernel/ia64_ksyms.c
+@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+ #include <asm/unwind.h>
+ EXPORT_SYMBOL(unw_init_running);
- menu "Mice"
++#include <linux/efi.h>
++EXPORT_SYMBOL_GPL(efi_mem_type);
++
+ #ifdef ASM_SUPPORTED
+ # 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
+@@ -7,6 +7,7 @@
+ */
-diff -urNp linux-2.6.3/drivers/char/Makefile.orig linux-2.6.3/drivers/char/Makefile
---- linux-2.6.3/drivers/char/Makefile.orig 2004-03-03 11:12:28.000000000 -0500
-+++ linux-2.6.3/drivers/char/Makefile 2004-03-03 11:12:33.000000000 -0500
-@@ -84,6 +84,8 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/signal.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+@@ -417,6 +418,8 @@ int devmem_is_allowed(unsigned long page
+ }
- obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-+obj-$(CONFIG_CRASH) += crash.o
++EXPORT_SYMBOL_GPL(page_is_ram);
+
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
+ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
+ kcore_vsyscall;
-diff -urNp linux-2.6.3/drivers/char/crash.c.orig linux-2.6.3/drivers/char/crash.c
---- linux-2.6.3/drivers/char/crash.c.orig 2004-03-03 11:18:31.000000000 -0500
-+++ linux-2.6.3/drivers/char/crash.c 2004-03-03 11:18:47.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c
+--- linux-1050/drivers/char/crash.c
++++ linux-1060/drivers/char/crash.c
@@ -0,0 +1,129 @@
+/*
+ * linux/drivers/char/crash.c
@@ -71,16 +92,16 @@
+static loff_t
+crash_llseek(struct file * file, loff_t offset, int orig)
+{
-+ switch (orig) {
-+ case 0:
-+ file->f_pos = offset;
-+ return file->f_pos;
-+ case 1:
-+ file->f_pos += offset;
-+ return file->f_pos;
-+ default:
-+ return -EINVAL;
-+ }
++ switch (orig) {
++ case 0:
++ file->f_pos = offset;
++ return file->f_pos;
++ case 1:
++ file->f_pos += offset;
++ return file->f_pos;
++ default:
++ return -EINVAL;
++ }
+}
+
+/*
@@ -102,23 +123,23 @@
+
+ vaddr = map_virtual(offset, &page);
+ if (!vaddr)
-+ return -EFAULT;
++ return -EFAULT;
+
-+ if (copy_to_user(buf, vaddr, count)) {
++ if (copy_to_user(buf, vaddr, count)) {
+ unmap_virtual(page);
+ return -EFAULT;
+ }
+ unmap_virtual(page);
+
+ read = count;
-+ *poff += read;
-+ return read;
++ *poff += read;
++ return read;
+}
+
+static struct file_operations crash_fops = {
-+ owner: THIS_MODULE,
-+ llseek: crash_llseek,
-+ read: crash_read,
++ .owner = THIS_MODULE,
++ .llseek = crash_llseek,
++ .read = crash_read,
+};
+
+static struct miscdevice crash_dev = {
@@ -155,9 +176,32 @@
+module_exit(crash_cleanup_module);
+
+MODULE_LICENSE("GPL");
-diff -urNp linux-2.6.3/include/asm-i386/crash.h.orig linux-2.6.3/include/asm-i386/crash.h
---- linux-2.6.3/include/asm-i386/crash.h.orig 2004-03-03 14:29:03.000000000 -0500
-+++ linux-2.6.3/include/asm-i386/crash.h 2004-03-03 15:03:18.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Kconfig linux-1060/drivers/char/Kconfig
+--- linux-1050/drivers/char/Kconfig
++++ linux-1060/drivers/char/Kconfig
+@@ -441,6 +441,8 @@ config LEGACY_PTYS
+ security. This option enables these legacy devices; on most
+ systems, it is safe to say N.
+
++config CRASH
++ tristate "Crash Utility memory driver"
+
+ config LEGACY_PTY_COUNT
+ int "Maximum number of legacy PTY in use"
+diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Makefile linux-1060/drivers/char/Makefile
+--- linux-1050/drivers/char/Makefile
++++ linux-1060/drivers/char/Makefile
+@@ -88,6 +88,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/
+ obj-$(CONFIG_IPMI_HANDLER) += ipmi/
+
+ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
++obj-$(CONFIG_CRASH) += crash.o
+ obj-$(CONFIG_TCG_TPM) += tpm/
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.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
@@ -0,0 +1,75 @@
+#ifndef _ASM_I386_CRASH_H
+#define _ASM_I386_CRASH_H
@@ -198,12 +242,12 @@
+ unsigned long pfn;
+ void *vaddr;
+
-+ pfn = (unsigned long)(offset >> PAGE_SHIFT);
++ pfn = (unsigned long)(offset >> PAGE_SHIFT);
+
-+ if (!page_is_ram(pfn)) {
++ if (!page_is_ram(pfn)) {
+ printk(KERN_INFO
+ "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
-+ return NULL;
++ return NULL;
+ }
+
+ if (!pfn_valid(pfn)) {
@@ -234,22 +278,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_I386_CRASH_H */
-diff -urNp linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c.orig linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c
---- linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c.orig 2004-03-04 15:19:49.000000000 -0500
-+++ linux-2.6.3/arch/ia64/kernel/ia64_ksyms.c 2004-03-04 15:20:56.000000000 -0500
-@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
- #include <asm/unwind.h>
- EXPORT_SYMBOL(unw_init_running);
-
-+#include <linux/efi.h>
-+EXPORT_SYMBOL_GPL(efi_mem_type);
-+
- #ifdef ASM_SUPPORTED
- # ifdef CONFIG_SMP
- # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
-diff -urNp linux-2.6.3/include/asm-ia64/crash.h.orig linux-2.6.3/include/asm-ia64/crash.h
---- linux-2.6.3/include/asm-ia64/crash.h.orig 2004-03-04 15:17:45.000000000 -0500
-+++ linux-2.6.3/include/asm-ia64/crash.h 2004-03-04 15:17:32.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-ia64/crash.h linux-1060/include/asm-ia64/crash.h
+--- linux-1050/include/asm-ia64/crash.h
++++ linux-1060/include/asm-ia64/crash.h
@@ -0,0 +1,90 @@
+#ifndef _ASM_IA64_CRASH_H
+#define _ASM_IA64_CRASH_H
@@ -291,7 +322,7 @@
+ if (REGION_NUMBER(offset) == 5) {
+ char byte;
+
-+ if (__get_user(byte, (char *)offset) == 0)
++ if (__get_user(byte, (char *)offset) == 0)
+ return (void *)offset;
+ else
+ return NULL;
@@ -315,11 +346,11 @@
+
+ pfn = offset >> PAGE_SHIFT;
+
-+ if (!pfn_valid(pfn)) {
-+ printk(KERN_INFO
-+ "crash memory driver: invalid pfn: %lx )\n", pfn);
-+ return NULL;
-+ }
++ if (!pfn_valid(pfn)) {
++ printk(KERN_INFO
++ "crash memory driver: invalid pfn: %lx )\n", pfn);
++ return NULL;
++ }
+
+ page = pfn_to_page(pfn);
+
@@ -341,20 +372,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_IA64_CRASH_H */
---- linux-2.6.4/arch/i386/mm/init.c~ 2004-03-24 11:01:18.869200376 +0100
-+++ linux-2.6.4/arch/i386/mm/init.c 2004-03-24 11:01:18.870200224 +0100
-@@ -94,6 +94,8 @@
- return 0;
- }
-
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
- #ifdef CONFIG_HIGHMEM
- pte_t *kmap_pte;
- pgprot_t kmap_prot;
-
---- linux-2.6.7/include/asm-x86_64/crash.h.orig 2004-07-01 20:26:12.872610584 -0400
-+++ linux-2.6.7/include/asm-x86_64/crash.h 2004-07-01 20:25:08.256433736 -0400
+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
@@ -0,0 +1,75 @@
+#ifndef _ASM_X86_64_CRASH_H
+#define _ASM_X86_64_CRASH_H
@@ -395,12 +415,12 @@
+ unsigned long pfn;
+ void *vaddr;
+
-+ pfn = (unsigned long)(offset >> PAGE_SHIFT);
++ pfn = (unsigned long)(offset >> PAGE_SHIFT);
+
-+ if (!page_is_ram(pfn)) {
++ if (!page_is_ram(pfn)) {
+ printk(KERN_INFO
+ "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
-+ return NULL;
++ return NULL;
+ }
+
+ if (!pfn_valid(pfn)) {
@@ -431,22 +451,3 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_X86_64_CRASH_H */
---- linux-2.6.7/arch/x86_64/mm/init.c.orig 2004-07-02 17:57:15.734075376 -0400
-+++ linux-2.6.7/arch/x86_64/mm/init.c 2004-07-02 17:58:09.486903704 -0400
-@@ -7,6 +7,7 @@
- */
-
- #include <linux/config.h>
-+#include <linux/module.h>
- #include <linux/signal.h>
- #include <linux/sched.h>
- #include <linux/kernel.h>
-@@ -396,6 +397,8 @@
- return 0;
- }
-
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
- static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
- kcore_vsyscall;
-
linux-2.6.3-ia64-build.patch:
Kconfig | 3 ---
Makefile | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
Index: linux-2.6.3-ia64-build.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.3-ia64-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.3-ia64-build.patch 9 Sep 2004 14:08:48 -0000 1.1
+++ linux-2.6.3-ia64-build.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,49 +1,44 @@
---- linux-2.6.3/arch/ia64/Makefile.bak Mon Mar 8 11:06:25 2004
-+++ linux-2.6.3/arch/ia64/Makefile Mon Mar 8 11:06:29 2004
-@@ -73,6 +73,10 @@ boot := arch/ia64/hp/sim/boot
-
- all: compressed unwcheck
-
-+bzImage: compressed
-+ mkdir -p arch/ia64/boot
-+ cp vmlinux.gz arch/ia64/boot/bzImage
-+
- compressed: vmlinux.gz
-
- vmlinux.gz: vmlinux
---- linux-2.6.4/arch/ia64/Kconfig~ 2004-03-12 07:53:28.202957944 +0100
-+++ linux-2.6.4/arch/ia64/Kconfig 2004-03-12 07:53:28.202957944 +0100
-@@ -62,8 +62,6 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-302/arch/ia64/Kconfig linux-400/arch/ia64/Kconfig
+--- linux-302/arch/ia64/Kconfig
++++ linux-400/arch/ia64/Kconfig
+@@ -52,10 +52,7 @@ choice
config IA64_GENERIC
bool "generic"
- select NUMA
- select ACPI_NUMA
select VIRTUAL_MEM_MAP
- select DISCONTIGMEM
- help
---- linux-2.6.4/arch/ia64/Kconfig~ 2004-03-12 08:13:40.064726952 +0100
-+++ linux-2.6.4/arch/ia64/Kconfig 2004-03-12 08:13:40.064726952 +0100
-@@ -63,7 +63,6 @@
- config IA64_GENERIC
- bool "generic"
- select VIRTUAL_MEM_MAP
- select DISCONTIGMEM
help
This selects the system type of your hardware. A "generic" kernel
will run on any supported IA-64 system. However, if you configure
---- linux-2.6.4/include/asm-ia64/sn/pda.h~ 2004-03-12 09:01:47.302800048 +0100
-+++ linux-2.6.4/include/asm-ia64/sn/pda.h 2004-03-12 09:01:47.302800048 +0100
-@@ -9,11 +9,11 @@
- #define _ASM_IA64_SN_PDA_H
+diff -urNp --exclude-from=/home/davej/.exclude linux-302/arch/ia64/Makefile linux-400/arch/ia64/Makefile
+--- linux-302/arch/ia64/Makefile
++++ linux-400/arch/ia64/Makefile
+@@ -71,6 +71,10 @@ boot := arch/ia64/hp/sim/boot
- #include <linux/cache.h>
-+#include <linux/numa.h>
- #include <asm/percpu.h>
- #include <asm/system.h>
- #include <asm/sn/bte.h>
+ all: compressed unwcheck
--
- /*
- * CPU-specific data structure.
- *
++bzImage: compressed
++ mkdir -p arch/ia64/boot
++ cp vmlinux.gz arch/ia64/boot/bzImage
++
+ compressed: vmlinux.gz
+
+ vmlinux.gz: vmlinux
+#diff -urNp --exclude-from=/home/davej/.exclude linux-302/include/asm-ia64/sn/pda.h linux-400/include/asm-ia64/sn/pda.h
+#--- linux-302/include/asm-ia64/sn/pda.h
+#+++ linux-400/include/asm-ia64/sn/pda.h
+#@@ -9,11 +9,11 @@
+# #define _ASM_IA64_SN_PDA_H
+#
+# #include <linux/cache.h>
+#+#include <linux/numa.h>
+# #include <asm/percpu.h>
+# #include <asm/system.h>
+# #include <asm/sn/bte.h>
+#
+#-
+# /*
+# * CPU-specific data structure.
+# *
linux-2.6.3-printopen.patch:
fs/exec.c | 7 +++++++
fs/namei.c | 17 +++++++++++++++++
fs/open.c | 43 +++++++++++++++++++++++++++++++++++++++++++
include/linux/jiffies.h | 2 +-
4 files changed, 68 insertions(+), 1 deletion(-)
Index: linux-2.6.3-printopen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.3-printopen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.3-printopen.patch 9 Sep 2004 13:53:35 -0000 1.1
+++ linux-2.6.3-printopen.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,7 +1,24 @@
-diff -purN linux-2.6.3/fs/namei.c linux/fs/namei.c
---- linux-2.6.3/fs/namei.c 2004-03-04 17:13:55.100154000 +0100
-+++ linux/fs/namei.c 2004-03-04 17:17:24.510154000 +0100
-@@ -350,6 +350,15 @@ static struct dentry * real_lookup(struc
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/exec.c linux-2999/fs/exec.c
+--- linux-2100/fs/exec.c
++++ linux-2999/fs/exec.c
+@@ -1144,6 +1144,13 @@ int do_execve(char * filename,
+
+ sched_exec();
+
++ {
++ static unsigned long prev_jiffies;
++ if (jiffies < 600 * HZ)
++ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s exec'd %s\n", jiffies / HZ, jiffies % HZ, jiffies+(jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, current->comm, filename);
++ prev_jiffies = jiffies;
++ }
++
+ bprm->p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
+
+ bprm->file = file;
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/namei.c linux-2999/fs/namei.c
+--- linux-2100/fs/namei.c
++++ linux-2999/fs/namei.c
+@@ -392,6 +392,14 @@ static struct dentry * real_lookup(struc
{
struct dentry * result;
struct inode *dir = parent->d_inode;
@@ -9,110 +26,91 @@
+
+ if ((jiffies < 80 * HZ) && (jiffies > 45 * HZ))
+ printk(KERN_ERR "<%2d.%02d> [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ,
-+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-+ name->name);
++ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ, name->name);
+ prev_jiffies = jiffies;
+
+
down(&dir->i_sem);
/*
-diff -purN linux-2.6.3/fs/open.c linux/fs/open.c
---- linux-2.6.3/fs/open.c 2004-03-04 17:13:55.210154000 +0100
-+++ linux/fs/open.c 2004-03-04 17:18:15.220154000 +0100
-@@ -929,6 +929,7 @@ asmlinkage long sys_open(const char __us
+@@ -909,6 +917,15 @@ int fastcall link_path_walk(const char *
{
- char * tmp;
- int fd, error;
-+ static unsigned long prev_jiffies;
-
- #if BITS_PER_LONG != 32
- flags |= O_LARGEFILE;
-@@ -936,6 +937,12 @@ asmlinkage long sys_open(const char __us
- tmp = getname(filename);
- fd = PTR_ERR(tmp);
- if (!IS_ERR(tmp)) {
-+ if (jiffies < 80 * HZ)
-+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ,
-+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-+ tmp);
-+ prev_jiffies = jiffies;
+ struct nameidata save = *nd;
+ int result;
+
- fd = get_unused_fd();
- if (fd >= 0) {
- struct file *f = filp_open(tmp, flags, mode);
---- linux-2.6.3/include/linux/time.h~ 2004-03-04 19:53:03.489533000 +0100
-+++ linux-2.6.3/include/linux/time.h 2004-03-04 19:53:03.489533000 +0100
-@@ -41,7 +41,7 @@
- * Have the 32 bit jiffies value wrap 5 minutes after boot
- * so jiffies wrap bugs show up earlier.
- */
--#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
-+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ))
-
- /*
- * Change timeval to jiffies, trying to avoid the
-diff -purN linux-2.6.3/fs.org/open.c linux-2.6.3/fs/open.c
---- linux-2.6.3/fs.org/open.c 2004-03-05 09:57:02.055714000 +0100
-+++ linux-2.6.3/fs/open.c 2004-03-05 10:01:10.055714000 +0100
-@@ -929,7 +929,6 @@ asmlinkage long sys_open(const char __us
- {
- char * tmp;
- int fd, error;
-- static unsigned long prev_jiffies;
-
- #if BITS_PER_LONG != 32
- flags |= O_LARGEFILE;
-@@ -937,11 +936,6 @@ asmlinkage long sys_open(const char __us
- tmp = getname(filename);
- fd = PTR_ERR(tmp);
- if (!IS_ERR(tmp)) {
-- if (jiffies < 80 * HZ)
-- printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ,
-- (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-- tmp);
-- prev_jiffies = jiffies;
-
- fd = get_unused_fd();
- if (fd >= 0) {
-@@ -950,6 +944,18 @@ asmlinkage long sys_open(const char __us
++ //{
++ // static unsigned long prev_jiffies;
++ // if (jiffies < 600 * HZ)
++ // printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s link_path_walk()'d %s\n", jiffies / HZ, jiffies % HZ,
++ // (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
++ // current->comm, name);
++ // prev_jiffies = jiffies;
++ //}
+
+ /* make sure the stuff we saved doesn't go away */
+ dget(save.dentry);
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/fs/open.c linux-2999/fs/open.c
+--- linux-2100/fs/open.c
++++ linux-2999/fs/open.c
+@@ -952,6 +952,49 @@ asmlinkage long sys_open(const char __us
if (IS_ERR(f))
goto out_error;
fd_install(fd, f);
+ {
+ static unsigned long prev_jiffies;
-+ static char buf[4096];
++ static char buf[512];
++ static char buf2[256];
++ int len=0;
+ char *p;
-+ p = d_path(f->f_dentry, f->f_vfsmnt,
-+ buf, PAGE_SIZE - 1);
-+ if (jiffies < 180 * HZ)
-+ printk(KERN_ERR "[%2d.%02d] [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ,
-+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-+ p);
++ p = d_path(f->f_dentry, f->f_vfsmnt, buf, 1023);
++ if (jiffies < 600 * HZ) {
++ memset(buf, 0, 512);
++ memset(buf2, 0, 256);
++ len = sprintf(buf2+len, "[%2d.%02d] ", (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ);
++ len += sprintf(buf2+len, "[+%2d.%02d] ", jiffies / HZ, jiffies % HZ);
++ len += sprintf(buf2+len, "%s open()'d %s flags:[", current->comm, p);
++
++ if (flags & O_CREAT)
++ len+= sprintf(buf2+len, "%s", " O_CREAT");
++ if (flags & O_EXCL)
++ len+= sprintf(buf2+len, "%s", " O_EXCL");
++ if (flags & O_NOCTTY)
++ len+= sprintf(buf2+len, "%s", " O_NOCTTY");
++ if (flags & O_TRUNC)
++ len+= sprintf(buf2+len, "%s", " O_TRUNC");
++ if (flags & O_APPEND)
++ len+= sprintf(buf2+len, "%s", " O_APPEND");
++ if (flags & O_NONBLOCK)
++ len+= sprintf(buf2+len, "%s", " O_NONBLOCK");
++ if (flags & O_SYNC)
++ len+= sprintf(buf2+len, "%s", " O_SYNC");
++ if (flags & O_NOFOLLOW)
++ len+= sprintf(buf2+len, "%s", " O_NOFOLLOW");
++ if (flags & O_DIRECTORY)
++ len+= sprintf(buf2+len, "%s", " O_DIRECTORY");
++ if (flags & O_DIRECT)
++ len+= sprintf(buf2+len, "%s", " O_DIRECT");
++ if (flags & O_LARGEFILE)
++ len+= sprintf(buf2+len, "%s", " O_LARGEFILE");
++
++ sprintf(buf2+len, " ] mode: %o\n", mode);
++
++ printk (KERN_ERR "%s\n", buf2);
++ }
+ prev_jiffies = jiffies;
+ }
}
out:
putname(tmp);
---- linux-2.6.3/fs/exec.c~ 2004-03-05 11:12:37.702338000 +0100
-+++ linux-2.6.3/fs/exec.c 2004-03-05 11:12:37.702338000 +0100
-@@ -1118,6 +1118,19 @@
- retval = PTR_ERR(file);
- if (IS_ERR(file))
- return retval;
-+
-+ {
-+ static unsigned long prev_jiffies;
-+ static char buf[4096];
-+ char *p;
-+ p = d_path(file->f_dentry, file->f_vfsmnt, buf, PAGE_SIZE - 1);
-+ if (jiffies < 180 * HZ)
-+ printk(KERN_ERR "(%2d.%02d) [+%2d.%02d] %s\n", jiffies / HZ, jiffies % HZ,
-+ (jiffies-prev_jiffies)/HZ, (jiffies-prev_jiffies) % HZ,
-+ p);
-+ prev_jiffies = jiffies;
-+ }
-+
+diff -urNp --exclude-from=/home/davej/.exclude linux-2100/include/linux/jiffies.h linux-2999/include/linux/jiffies.h
+--- linux-2100/include/linux/jiffies.h
++++ linux-2999/include/linux/jiffies.h
+@@ -122,7 +122,7 @@ static inline u64 get_jiffies_64(void)
+ * Have the 32 bit jiffies value wrap 5 minutes after boot
+ * so jiffies wrap bugs show up earlier.
+ */
+-#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
++#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (0*HZ))
- bprm.p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
- memset(bprm.page, 0, MAX_ARG_PAGES*sizeof(bprm.page[0]));
+ /*
+ * Change timeval to jiffies, trying to avoid the
linux-2.6.3-sparc-addbzimage.patch:
sparc/Makefile | 3 +++
sparc64/Makefile | 3 +++
2 files changed, 6 insertions(+)
Index: linux-2.6.3-sparc-addbzimage.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.3-sparc-addbzimage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.3-sparc-addbzimage.patch 9 Sep 2004 13:53:35 -0000 1.1
+++ linux-2.6.3-sparc-addbzimage.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,6 +1,7 @@
---- linux-2.6.3/arch/sparc/Makefile.BAD 2004-03-07 10:16:47.000000000 -0500
-+++ linux-2.6.3/arch/sparc/Makefile 2004-03-07 10:20:48.000000000 -0500
-@@ -52,6 +52,9 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-503/arch/sparc/Makefile linux-600/arch/sparc/Makefile
+--- linux-503/arch/sparc/Makefile
++++ linux-600/arch/sparc/Makefile
+@@ -53,6 +53,9 @@ all: image
boot := arch/sparc/boot
@@ -10,9 +11,10 @@
image tftpboot.img: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
---- linux-2.6.3/arch/sparc64/Makefile.BAD 2004-03-07 10:17:45.000000000 -0500
-+++ linux-2.6.3/arch/sparc64/Makefile 2004-03-07 10:19:03.000000000 -0500
-@@ -68,6 +68,9 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-503/arch/sparc64/Makefile linux-600/arch/sparc64/Makefile
+--- linux-503/arch/sparc64/Makefile
++++ linux-600/arch/sparc64/Makefile
+@@ -69,6 +69,9 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
boot := arch/sparc64/boot
linux-2.6.4-stackusage.patch:
debug.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.4-stackusage.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.4-stackusage.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6.4-stackusage.patch 6 Mar 2005 22:35:14 -0000 1.5
+++ linux-2.6.4-stackusage.patch 13 Jul 2005 04:18:42 -0000 1.6
@@ -1,4 +1,4 @@
-diff -urNp linux-1010/fs/befs/debug.c linux-1020/fs/befs/debug.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-1010/fs/befs/debug.c linux-1020/fs/befs/debug.c
--- linux-1010/fs/befs/debug.c
+++ linux-1020/fs/befs/debug.c
@@ -23,7 +23,7 @@
@@ -10,5 +10,3 @@
void
befs_error(const struct super_block *sb, const char *fmt, ...)
-
-
linux-2.6.7-modsign-core.patch:
include/linux/module.h | 3
init/Kconfig | 16 +
kernel/Makefile | 3
kernel/module-verify-sig.c | 442 +++++++++++++++++++++++++++++++++++++++++++++
kernel/module-verify.c | 340 ++++++++++++++++++++++++++++++++++
kernel/module-verify.h | 37 +++
kernel/module.c | 19 +
7 files changed, 856 insertions(+), 4 deletions(-)
Index: linux-2.6.7-modsign-core.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-core.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6.7-modsign-core.patch 3 Dec 2004 06:55:27 -0000 1.7
+++ linux-2.6.7-modsign-core.patch 13 Jul 2005 04:18:42 -0000 1.8
@@ -1,7 +1,7 @@
-diff -uNrp linux-2.6.9-rc4-mm1/include/linux/module.h linux-2.6.9-rc4-mm1-modsign/include/linux/module.h
---- linux-2.6.9-rc4-mm1/include/linux/module.h 2004-10-12 21:52:21.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/linux/module.h 2004-10-13 17:18:41.000000000 +0100
-@@ -289,6 +289,9 @@ struct module
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/linux/module.h linux-900/include/linux/module.h
+--- linux-811/include/linux/module.h
++++ linux-900/include/linux/module.h
+@@ -277,6 +277,9 @@ struct module
/* Am I GPL-compatible */
int license_gplok;
@@ -11,10 +11,10 @@
#ifdef CONFIG_MODULE_UNLOAD
/* Reference counts */
-diff -uNrp linux-2.6.9-rc4-mm1/init/Kconfig linux-2.6.9-rc4-mm1-modsign/init/Kconfig
---- linux-2.6.9-rc4-mm1/init/Kconfig 2004-10-12 21:52:21.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/init/Kconfig 2004-10-13 17:57:49.000000000 +0100
-@@ -412,6 +412,22 @@ config MODULE_SRCVERSION_ALL
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/init/Kconfig linux-900/init/Kconfig
+--- linux-811/init/Kconfig
++++ linux-900/init/Kconfig
+@@ -434,6 +434,22 @@ config MODULE_SRCVERSION_ALL
the version). With this option, such a "srcversion" field
will be created for all modules. If unsure, say N.
@@ -37,9 +37,9 @@
config KMOD
bool "Automatic kernel module loading"
depends on MODULES
-diff -uNrp linux-2.6.9-rc4-mm1/kernel/Makefile linux-2.6.9-rc4-mm1-modsign/kernel/Makefile
---- linux-2.6.9-rc4-mm1/kernel/Makefile 2004-10-12 21:52:22.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/kernel/Makefile 2004-10-13 17:37:53.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/Makefile linux-900/kernel/Makefile
+--- linux-811/kernel/Makefile
++++ linux-900/kernel/Makefile
@@ -13,7 +13,8 @@ obj-$(CONFIG_FUTEX) += futex.o
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
obj-$(CONFIG_SMP) += cpu.o spinlock.o
@@ -50,9 +50,9 @@
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PM) += power/
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
-diff -uNrp linux-2.6.9-rc4-mm1/kernel/module.c linux-2.6.9-rc4-mm1-modsign/kernel/module.c
---- linux-2.6.9-rc4-mm1/kernel/module.c 2004-10-12 21:52:22.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/kernel/module.c 2004-10-13 21:26:30.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c
+--- linux-811/kernel/module.c
++++ linux-900/kernel/module.c
@@ -38,6 +38,7 @@
#include <asm/uaccess.h>
#include <asm/semaphore.h>
@@ -61,7 +61,7 @@
#if 0
#define DEBUGP printk
-@@ -1511,6 +1512,7 @@ static struct module *load_module(void _
+@@ -1413,6 +1414,7 @@ static struct module *load_module(void _
long err = 0;
void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
struct exception_table_entry *extable;
@@ -69,7 +69,7 @@
DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n",
umod, len, uargs);
-@@ -1536,8 +1538,13 @@ static struct module *load_module(void _
+@@ -1438,8 +1440,13 @@ static struct module *load_module(void _
goto free_hdr;
}
@@ -85,7 +85,7 @@
/* Convenience variables */
sechdrs = (void *)hdr + hdr->e_shoff;
-@@ -1575,6 +1582,7 @@ static struct module *load_module(void _
+@@ -1476,6 +1483,7 @@ static struct module *load_module(void _
goto free_hdr;
}
mod = (void *)sechdrs[modindex].sh_addr;
@@ -93,7 +93,7 @@
if (symindex == 0) {
printk(KERN_WARNING "%s: module has no symbols (stripped?)\n",
-@@ -2153,8 +2161,13 @@ void print_modules(void)
+@@ -2078,8 +2086,13 @@ void print_modules(void)
struct module *mod;
printk("Modules linked in:");
@@ -108,9 +108,9 @@
printk("\n");
}
-diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify.c linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.c
---- linux-2.6.9-rc4-mm1/kernel/module-verify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.c 2004-10-14 12:00:26.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.c linux-900/kernel/module-verify.c
+--- linux-811/kernel/module-verify.c
++++ linux-900/kernel/module-verify.c
@@ -0,0 +1,340 @@
+/* module-verify.c: module verifier
+ *
@@ -452,9 +452,9 @@
+ return -ELIBBAD;
+
+} /* end module_verify_elf() */
-diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify.h linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.h
---- linux-2.6.9-rc4-mm1/kernel/module-verify.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify.h 2004-10-13 21:46:17.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.h linux-900/kernel/module-verify.h
+--- linux-811/kernel/module-verify.h
++++ linux-900/kernel/module-verify.h
@@ -0,0 +1,37 @@
+/* module-verify.h: module verification definitions
+ *
@@ -493,9 +493,9 @@
+
+extern int module_verify(const Elf_Ehdr *hdr, size_t size);
+extern int module_verify_signature(struct module_verify_data *mvdata);
-diff -uNrp linux-2.6.9-rc4-mm1/kernel/module-verify-sig.c linux-2.6.9-rc4-mm1-modsign/kernel/module-verify-sig.c
---- linux-2.6.9-rc4-mm1/kernel/module-verify-sig.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/kernel/module-verify-sig.c 2004-10-13 21:52:06.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify-sig.c linux-900/kernel/module-verify-sig.c
+--- linux-811/kernel/module-verify-sig.c
++++ linux-900/kernel/module-verify-sig.c
@@ -0,0 +1,442 @@
+/* module-verify-sig.c: module signature checker
+ *
linux-2.6.7-modsign-crypto.patch:
crypto/Kconfig | 19 +++++++++++++++++++
crypto/Makefile | 3 +++
crypto/api.c | 16 ++++++++++++++--
include/linux/crypto.h | 4 ++++
4 files changed, 40 insertions(+), 2 deletions(-)
Index: linux-2.6.7-modsign-crypto.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-crypto.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.7-modsign-crypto.patch 6 Mar 2005 22:35:14 -0000 1.4
+++ linux-2.6.7-modsign-crypto.patch 13 Jul 2005 04:18:42 -0000 1.5
@@ -1,6 +1,6 @@
-diff -urNp linux-600/crypto/api.c linux-601/crypto/api.c
---- linux-600/crypto/api.c
-+++ linux-601/crypto/api.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/api.c linux-901/crypto/api.c
+--- linux-900/crypto/api.c
++++ linux-901/crypto/api.c
@@ -117,12 +117,19 @@ static void crypto_exit_ops(struct crypt
}
}
@@ -34,10 +34,11 @@
+
void crypto_free_tfm(struct crypto_tfm *tfm)
{
- crypto_exit_ops(tfm);
---- linux-2.6.10/crypto/Kconfig~ 2004-12-30 21:52:28.152504632 -0500
-+++ linux-2.6.10/crypto/Kconfig 2004-12-30 21:53:32.612705192 -0500
-@@ -274,6 +274,25 @@ config CRYPTO_TEST
+ struct crypto_alg *alg = tfm->__crt_alg;
+diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Kconfig linux-901/crypto/Kconfig
+--- linux-900/crypto/Kconfig
++++ linux-901/crypto/Kconfig
+@@ -287,6 +287,25 @@ config CRYPTO_TEST
help
Quick & dirty crypto test module.
@@ -63,20 +64,20 @@
source "drivers/crypto/Kconfig"
endmenu
-diff -urNp linux-600/crypto/Makefile linux-601/crypto/Makefile
---- linux-600/crypto/Makefile
-+++ linux-601/crypto/Makefile
-@@ -28,3 +28,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich
+diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Makefile linux-901/crypto/Makefile
+--- linux-900/crypto/Makefile
++++ linux-901/crypto/Makefile
+@@ -32,3 +32,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
+
+obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/
+obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
-diff -urNp linux-600/include/linux/crypto.h linux-601/include/linux/crypto.h
---- linux-600/include/linux/crypto.h
-+++ linux-601/include/linux/crypto.h
-@@ -202,10 +202,14 @@ struct crypto_tfm {
+diff -urNp --exclude-from=/home/davej/.exclude linux-900/include/linux/crypto.h linux-901/include/linux/crypto.h
+--- linux-900/include/linux/crypto.h
++++ linux-901/include/linux/crypto.h
+@@ -213,10 +213,14 @@ struct crypto_tfm {
* will then attempt to load a module of the same name or alias. A refcount
* is grabbed on the algorithm which is then associated with the new transform.
*
linux-2.6.7-modsign-include.patch:
asm-alpha/module.h | 3 +++
asm-arm/module.h | 5 +++++
asm-cris/module.h | 5 +++++
asm-h8300/module.h | 5 +++++
asm-i386/module.h | 5 +++++
asm-ia64/module.h | 5 +++++
asm-m32r/module.h | 5 +++++
asm-m68k/module.h | 5 +++++
asm-mips/module.h | 10 ++++++++++
asm-parisc/module.h | 8 ++++++++
asm-ppc/module.h | 5 +++++
asm-ppc64/module.h | 5 +++++
asm-s390/module.h | 3 +++
asm-sh/module.h | 5 +++++
asm-sparc/module.h | 5 +++++
asm-sparc64/module.h | 5 +++++
asm-um/module-i386.h | 4 ++++
asm-v850/module.h | 5 +++++
asm-x86_64/module.h | 5 +++++
19 files changed, 98 insertions(+)
Index: linux-2.6.7-modsign-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.7-modsign-include.patch 15 Oct 2004 00:15:45 -0000 1.1
+++ linux-2.6.7-modsign-include.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-alpha/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-alpha/module.h
---- linux-2.6.9-rc4-mm1/include/asm-alpha/module.h 2004-06-18 13:42:21.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-alpha/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-alpha/module.h linux-905/include/asm-alpha/module.h
+--- linux-904/include/asm-alpha/module.h
++++ linux-905/include/asm-alpha/module.h
@@ -6,6 +6,7 @@ struct mod_arch_specific
unsigned int gotsecindex;
};
@@ -18,9 +18,9 @@
#define ARCH_SHF_SMALL SHF_ALPHA_GPREL
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-arm/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-arm/module.h
---- linux-2.6.9-rc4-mm1/include/asm-arm/module.h 2004-06-18 13:42:20.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-arm/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-arm/module.h linux-905/include/asm-arm/module.h
+--- linux-904/include/asm-arm/module.h
++++ linux-905/include/asm-arm/module.h
@@ -6,9 +6,14 @@ struct mod_arch_specific
int foo;
};
@@ -36,9 +36,9 @@
/*
* Include the ARM architecture version.
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-cris/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-cris/module.h
---- linux-2.6.9-rc4-mm1/include/asm-cris/module.h 2004-06-18 13:42:22.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-cris/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-cris/module.h linux-905/include/asm-cris/module.h
+--- linux-904/include/asm-cris/module.h
++++ linux-905/include/asm-cris/module.h
@@ -3,7 +3,12 @@
/* cris is simple */
struct mod_arch_specific { };
@@ -52,9 +52,9 @@
+#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif /* _ASM_CRIS_MODULE_H */
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-h8300/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-h8300/module.h
---- linux-2.6.9-rc4-mm1/include/asm-h8300/module.h 2004-06-18 13:44:05.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-h8300/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-h8300/module.h linux-905/include/asm-h8300/module.h
+--- linux-904/include/asm-h8300/module.h
++++ linux-905/include/asm-h8300/module.h
@@ -4,9 +4,14 @@
* This file contains the H8/300 architecture specific module code.
*/
@@ -70,9 +70,9 @@
#define MODULE_SYMBOL_PREFIX "_"
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-i386/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-i386/module.h
---- linux-2.6.9-rc4-mm1/include/asm-i386/module.h 2004-06-18 13:42:21.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-i386/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-i386/module.h linux-905/include/asm-i386/module.h
+--- linux-904/include/asm-i386/module.h
++++ linux-905/include/asm-i386/module.h
@@ -6,9 +6,14 @@ struct mod_arch_specific
{
};
@@ -88,9 +88,9 @@
#ifdef CONFIG_M386
#define MODULE_PROC_FAMILY "386 "
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ia64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ia64/module.h
---- linux-2.6.9-rc4-mm1/include/asm-ia64/module.h 2004-06-18 13:42:14.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ia64/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ia64/module.h linux-905/include/asm-ia64/module.h
+--- linux-904/include/asm-ia64/module.h
++++ linux-905/include/asm-ia64/module.h
@@ -23,9 +23,14 @@ struct mod_arch_specific {
unsigned int next_got_entry; /* index of next available got entry */
};
@@ -106,9 +106,9 @@
#define MODULE_PROC_FAMILY "ia64"
#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-m32r/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-m32r/module.h
---- linux-2.6.9-rc4-mm1/include/asm-m32r/module.h 2004-10-12 21:48:43.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-m32r/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m32r/module.h linux-905/include/asm-m32r/module.h
+--- linux-904/include/asm-m32r/module.h
++++ linux-905/include/asm-m32r/module.h
@@ -5,9 +5,14 @@
struct mod_arch_specific { };
@@ -124,9 +124,9 @@
#endif /* _ASM_M32R_MODULE_H */
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-m68k/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-m68k/module.h
---- linux-2.6.9-rc4-mm1/include/asm-m68k/module.h 2004-06-18 13:42:17.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-m68k/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m68k/module.h linux-905/include/asm-m68k/module.h
+--- linux-904/include/asm-m68k/module.h
++++ linux-905/include/asm-m68k/module.h
@@ -1,7 +1,12 @@
#ifndef _ASM_M68K_MODULE_H
#define _ASM_M68K_MODULE_H
@@ -140,9 +140,9 @@
+#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif /* _ASM_M68K_MODULE_H */
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-mips/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-mips/module.h
---- linux-2.6.9-rc4-mm1/include/asm-mips/module.h 2004-09-16 12:06:18.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-mips/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-mips/module.h linux-905/include/asm-mips/module.h
+--- linux-904/include/asm-mips/module.h
++++ linux-905/include/asm-mips/module.h
@@ -27,17 +27,27 @@ typedef struct
#ifdef CONFIG_MIPS32
@@ -171,9 +171,9 @@
#endif
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-parisc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-parisc/module.h
---- linux-2.6.9-rc4-mm1/include/asm-parisc/module.h 2004-06-18 13:42:13.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-parisc/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h
+--- linux-904/include/asm-parisc/module.h
++++ linux-905/include/asm-parisc/module.h
@@ -4,17 +4,25 @@
* This file contains the parisc architecture specific module code.
*/
@@ -199,10 +199,10 @@
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif
- struct mod_arch_specific
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ppc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ppc/module.h
---- linux-2.6.9-rc4-mm1/include/asm-ppc/module.h 2004-06-18 13:42:17.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ppc/module.h 2004-10-13 17:20:14.000000000 +0100
+ struct unwind_table;
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ppc/module.h linux-905/include/asm-ppc/module.h
+--- linux-904/include/asm-ppc/module.h
++++ linux-905/include/asm-ppc/module.h
@@ -32,9 +32,14 @@ struct mod_arch_specific
extern struct bug_entry *module_find_bug(unsigned long bugaddr);
@@ -218,9 +218,9 @@
/* Make empty sections for module_frob_arch_sections to expand. */
#ifdef MODULE
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-ppc64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-ppc64/module.h
---- linux-2.6.9-rc4-mm1/include/asm-ppc64/module.h 2004-06-18 13:42:05.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-ppc64/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ppc64/module.h linux-905/include/asm-ppc64/module.h
+--- linux-904/include/asm-ppc64/module.h
++++ linux-905/include/asm-ppc64/module.h
@@ -20,9 +20,14 @@ struct mod_arch_specific
extern struct bug_entry *module_find_bug(unsigned long bugaddr);
@@ -236,9 +236,9 @@
/* Make empty section for module_frob_arch_sections to expand. */
#ifdef MODULE
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-s390/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-s390/module.h
---- linux-2.6.9-rc4-mm1/include/asm-s390/module.h 2004-06-18 13:42:22.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-s390/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-s390/module.h linux-905/include/asm-s390/module.h
+--- linux-904/include/asm-s390/module.h
++++ linux-905/include/asm-s390/module.h
@@ -29,14 +29,17 @@ struct mod_arch_specific
};
@@ -257,9 +257,9 @@
#define Elf_Rela ElfW(Rela)
#define Elf_Shdr ElfW(Shdr)
#define Elf_Sym ElfW(Sym)
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sh/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sh/module.h
---- linux-2.6.9-rc4-mm1/include/asm-sh/module.h 2004-06-18 13:42:24.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sh/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sh/module.h linux-905/include/asm-sh/module.h
+--- linux-904/include/asm-sh/module.h
++++ linux-905/include/asm-sh/module.h
@@ -9,9 +9,14 @@ struct mod_arch_specific {
/* Nothing to see here .. */
};
@@ -275,9 +275,9 @@
#ifdef CONFIG_CPU_LITTLE_ENDIAN
# ifdef CONFIG_CPU_SH2
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sparc/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sparc/module.h
---- linux-2.6.9-rc4-mm1/include/asm-sparc/module.h 2004-06-18 13:42:20.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sparc/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc/module.h linux-905/include/asm-sparc/module.h
+--- linux-904/include/asm-sparc/module.h
++++ linux-905/include/asm-sparc/module.h
@@ -1,7 +1,12 @@
#ifndef _ASM_SPARC_MODULE_H
#define _ASM_SPARC_MODULE_H
@@ -291,9 +291,9 @@
+#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif /* _ASM_SPARC_MODULE_H */
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-sparc64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-sparc64/module.h
---- linux-2.6.9-rc4-mm1/include/asm-sparc64/module.h 2004-06-18 13:42:23.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-sparc64/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc64/module.h linux-905/include/asm-sparc64/module.h
+--- linux-904/include/asm-sparc64/module.h
++++ linux-905/include/asm-sparc64/module.h
@@ -1,7 +1,12 @@
#ifndef _ASM_SPARC64_MODULE_H
#define _ASM_SPARC64_MODULE_H
@@ -307,9 +307,9 @@
+#define ELF_R_TYPE(X) ELF64_R_TYPE(X)
+#define ELF_R_SYM(X) ELF64_R_SYM(X)
#endif /* _ASM_SPARC64_MODULE_H */
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-um/module-i386.h linux-2.6.9-rc4-mm1-modsign/include/asm-um/module-i386.h
---- linux-2.6.9-rc4-mm1/include/asm-um/module-i386.h 2004-10-12 21:48:44.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-um/module-i386.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-um/module-i386.h linux-905/include/asm-um/module-i386.h
+--- linux-904/include/asm-um/module-i386.h
++++ linux-905/include/asm-um/module-i386.h
@@ -9,5 +9,9 @@ struct mod_arch_specific
#define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym
@@ -320,9 +320,9 @@
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-v850/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-v850/module.h
---- linux-2.6.9-rc4-mm1/include/asm-v850/module.h 2004-06-18 13:42:23.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-v850/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-v850/module.h linux-905/include/asm-v850/module.h
+--- linux-904/include/asm-v850/module.h
++++ linux-905/include/asm-v850/module.h
@@ -31,9 +31,14 @@ struct mod_arch_specific
unsigned int core_plt_section, init_plt_section;
};
@@ -338,9 +338,9 @@
/* Make empty sections for module_frob_arch_sections to expand. */
#ifdef MODULE
-diff -uNrp linux-2.6.9-rc4-mm1/include/asm-x86_64/module.h linux-2.6.9-rc4-mm1-modsign/include/asm-x86_64/module.h
---- linux-2.6.9-rc4-mm1/include/asm-x86_64/module.h 2004-06-18 13:42:14.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/include/asm-x86_64/module.h 2004-10-13 17:20:14.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-x86_64/module.h linux-905/include/asm-x86_64/module.h
+--- linux-904/include/asm-x86_64/module.h
++++ linux-905/include/asm-x86_64/module.h
@@ -3,8 +3,13 @@
struct mod_arch_specific {};
linux-2.6.7-modsign-ksign.patch:
crypto/digest.c | 8
crypto/signature/Makefile | 10
crypto/signature/dsa.c | 98 +++++
crypto/signature/key.h | 7
crypto/signature/ksign-keyring.c | 112 ++++++
crypto/signature/ksign-parse.c | 609 +++++++++++++++++++++++++++++++++++++
crypto/signature/ksign-publickey.c | 19 +
crypto/signature/ksign.c | 179 ++++++++++
crypto/signature/local.h | 163 +++++++++
include/linux/crypto.h | 10
include/linux/crypto/ksign.h | 22 +
11 files changed, 1237 insertions(+)
Index: linux-2.6.7-modsign-ksign.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-ksign.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6.7-modsign-ksign.patch 15 Oct 2004 00:15:27 -0000 1.12
+++ linux-2.6.7-modsign-ksign.patch 13 Jul 2005 04:18:42 -0000 1.13
@@ -1,6 +1,6 @@
-diff -urNp linux-601/crypto/digest.c linux-602/crypto/digest.c
---- linux-601/crypto/digest.c
-+++ linux-602/crypto/digest.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/digest.c linux-902/crypto/digest.c
+--- linux-901/crypto/digest.c
++++ linux-902/crypto/digest.c
@@ -52,6 +52,13 @@ static void update(struct crypto_tfm *tf
}
}
@@ -23,9 +23,9 @@
ops->dit_final = final;
ops->dit_digest = digest;
ops->dit_setkey = setkey;
-diff -urNp linux-601/crypto/signature/dsa.c linux-602/crypto/signature/dsa.c
---- linux-601/crypto/signature/dsa.c
-+++ linux-602/crypto/signature/dsa.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/dsa.c linux-902/crypto/signature/dsa.c
+--- linux-901/crypto/signature/dsa.c
++++ linux-902/crypto/signature/dsa.c
@@ -0,0 +1,98 @@
+/* dsa.c - DSA signature algorithm
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
@@ -125,9 +125,9 @@
+ mpi_free(v);
+ return rc;
+} /* end DSA_verify() */
-diff -urNp linux-601/crypto/signature/key.h linux-602/crypto/signature/key.h
---- linux-601/crypto/signature/key.h
-+++ linux-602/crypto/signature/key.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/key.h linux-902/crypto/signature/key.h
+--- linux-901/crypto/signature/key.h
++++ linux-902/crypto/signature/key.h
@@ -0,0 +1,7 @@
+const int ksign_def_public_key_size = 0;
+/* automatically generated by bin2hex */
@@ -136,9 +136,9 @@
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
-diff -urNp linux-601/crypto/signature/ksign.c linux-602/crypto/signature/ksign.c
---- linux-601/crypto/signature/ksign.c
-+++ linux-602/crypto/signature/ksign.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign.c linux-902/crypto/signature/ksign.c
+--- linux-901/crypto/signature/ksign.c
++++ linux-902/crypto/signature/ksign.c
@@ -0,0 +1,179 @@
+/* ksign.c: signature checker
+ *
@@ -319,9 +319,9 @@
+
+ return retval;
+} /* end ksign_verify_signature() */
-diff -urNp linux-601/crypto/signature/ksign-keyring.c linux-602/crypto/signature/ksign-keyring.c
---- linux-601/crypto/signature/ksign-keyring.c
-+++ linux-602/crypto/signature/ksign-keyring.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-keyring.c linux-902/crypto/signature/ksign-keyring.c
+--- linux-901/crypto/signature/ksign-keyring.c
++++ linux-902/crypto/signature/ksign-keyring.c
@@ -0,0 +1,112 @@
+/* ksign-keyring.c: public key cache
+ *
@@ -435,9 +435,9 @@
+
+ up_write(&keyring_sem);
+} /* end ksign_clear_keyring() */
-diff -urNp linux-601/crypto/signature/ksign-parse.c linux-602/crypto/signature/ksign-parse.c
---- linux-601/crypto/signature/ksign-parse.c
-+++ linux-602/crypto/signature/ksign-parse.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-parse.c linux-902/crypto/signature/ksign-parse.c
+--- linux-901/crypto/signature/ksign-parse.c
++++ linux-902/crypto/signature/ksign-parse.c
@@ -0,0 +1,609 @@
+/* parse-packet.c - read packets
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -888,7 +888,7 @@
+ }
+
+ for (i = 0; i < DSA_NSIG; i++) {
-+ size_t remaining = endp - datap;
++ unsigned remaining = endp - datap;
+ sig->data[i] = mpi_read_from_buffer(datap, &remaining);
+ datap += remaining;
+ }
@@ -1048,9 +1048,9 @@
+
+ return rc;
+} /* end ksign_parse_packets() */
-diff -urNp linux-601/crypto/signature/ksign-publickey.c linux-602/crypto/signature/ksign-publickey.c
---- linux-601/crypto/signature/ksign-publickey.c
-+++ linux-602/crypto/signature/ksign-publickey.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-publickey.c linux-902/crypto/signature/ksign-publickey.c
+--- linux-901/crypto/signature/ksign-publickey.c
++++ linux-902/crypto/signature/ksign-publickey.c
@@ -0,0 +1,19 @@
+#include "local.h"
+
@@ -1063,7 +1063,7 @@
+ printk("ksign: Installing public key data\n");
+
+ rc = ksign_load_keyring_from_buffer(ksign_def_public_key,
-+ sizeof(ksign_def_public_key));
++ ksign_def_public_key_size);
+ if (rc < 0)
+ printk("Unable to load default keyring: error=%d\n", -rc);
+
@@ -1071,9 +1071,9 @@
+}
+
+module_init(ksign_init)
-diff -urNp linux-601/crypto/signature/local.h linux-602/crypto/signature/local.h
---- linux-601/crypto/signature/local.h
-+++ linux-602/crypto/signature/local.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/local.h linux-902/crypto/signature/local.h
+--- linux-901/crypto/signature/local.h
++++ linux-902/crypto/signature/local.h
@@ -0,0 +1,163 @@
+/* local.h: kernel signature checker internal defs
+ *
@@ -1238,9 +1238,9 @@
+{
+ crypto_digest_update_kernel(sha1, s, n);
+}
-diff -urNp linux-601/crypto/signature/Makefile linux-602/crypto/signature/Makefile
---- linux-601/crypto/signature/Makefile
-+++ linux-602/crypto/signature/Makefile
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/Makefile linux-902/crypto/signature/Makefile
+--- linux-901/crypto/signature/Makefile
++++ linux-902/crypto/signature/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the signature checker
@@ -1252,9 +1252,9 @@
+ ksign-keyring.o \
+ ksign-publickey.o \
+ dsa.o
-diff -urNp linux-601/include/linux/crypto/ksign.h linux-602/include/linux/crypto/ksign.h
---- linux-601/include/linux/crypto/ksign.h
-+++ linux-602/include/linux/crypto/ksign.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto/ksign.h linux-902/include/linux/crypto/ksign.h
+--- linux-901/include/linux/crypto/ksign.h
++++ linux-902/include/linux/crypto/ksign.h
@@ -0,0 +1,22 @@
+/* ksign.h: in-kernel signature checker
+ *
@@ -1278,10 +1278,10 @@
+#endif
+
+#endif /* _LINUX_CRYPTO_KSIGN_H */
-diff -urNp linux-601/include/linux/crypto.h linux-602/include/linux/crypto.h
---- linux-601/include/linux/crypto.h
-+++ linux-602/include/linux/crypto.h
-@@ -156,6 +156,8 @@ struct digest_tfm {
+diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto.h linux-902/include/linux/crypto.h
+--- linux-901/include/linux/crypto.h
++++ linux-902/include/linux/crypto.h
+@@ -167,6 +167,8 @@ struct digest_tfm {
void (*dit_init)(struct crypto_tfm *tfm);
void (*dit_update)(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg);
@@ -1290,7 +1290,7 @@
void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
unsigned int nsg, u8 *out);
-@@ -276,6 +278,14 @@ static inline void crypto_digest_update(
+@@ -287,6 +289,14 @@ static inline void crypto_digest_update(
tfm->crt_digest.dit_update(tfm, sg, nsg);
}
@@ -1305,27 +1305,3 @@
static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
-diff -uNr linux-2.6.8/crypto/signature/ksign-parse.c.orig linux-2.6.8/crypto/signature/ksign-parse.c
---- linux-2.6.8/crypto/signature/ksign-parse.c.orig 2004-08-27 14:12:01.055869976 +0100
-+++ linux-2.6.8/crypto/signature/ksign-parse.c 2004-08-27 14:12:08.000000000 +0100
-@@ -447,7 +447,7 @@ static int ksign_parse_signature(const u
- }
-
- for (i = 0; i < DSA_NSIG; i++) {
-- size_t remaining = endp - datap;
-+ unsigned remaining = endp - datap;
- sig->data[i] = mpi_read_from_buffer(datap, &remaining);
- datap += remaining;
- }
-diff -uNr linux-2.6.8/crypto/signature/ksign-publickey.c.orig linux-2.6.8/crypto/signature/ksign-publickey.c
---- linux-2.6.8/crypto/signature/ksign-publickey.c.orig 2004-08-27 14:25:15.822925760 +0100
-+++ linux-2.6.8/crypto/signature/ksign-publickey.c 2004-08-27 14:25:24.000000000 +0100
-@@ -9,7 +9,7 @@ static int __init ksign_init(void)
- printk("ksign: Installing public key data\n");
-
- rc = ksign_load_keyring_from_buffer(ksign_def_public_key,
-- sizeof(ksign_def_public_key));
-+ ksign_def_public_key_size);
- if (rc < 0)
- printk("Unable to load default keyring: error=%d\n", -rc);
-
linux-2.6.7-modsign-mpilib.patch:
crypto/mpi/Makefile | 30
crypto/mpi/generic_mpi-asm-defs.h | 10
crypto/mpi/generic_mpih-add1.c | 62 +
crypto/mpi/generic_mpih-lshift.c | 66 +
crypto/mpi/generic_mpih-mul1.c | 58 +
crypto/mpi/generic_mpih-mul2.c | 63 +
crypto/mpi/generic_mpih-mul3.c | 64 +
crypto/mpi/generic_mpih-rshift.c | 65 +
crypto/mpi/generic_mpih-sub1.c | 62 +
crypto/mpi/generic_udiv-w-sdiv.c | 130 +++
crypto/mpi/longlong.h | 1502 ++++++++++++++++++++++++++++++++++++++
crypto/mpi/mpi-add.c | 258 ++++++
crypto/mpi/mpi-bit.c | 245 ++++++
crypto/mpi/mpi-cmp.c | 71 +
crypto/mpi/mpi-div.c | 345 ++++++++
crypto/mpi/mpi-gcd.c | 60 +
crypto/mpi/mpi-inline.c | 33
crypto/mpi/mpi-inline.h | 128 +++
crypto/mpi/mpi-internal.h | 265 ++++++
crypto/mpi/mpi-inv.c | 148 +++
crypto/mpi/mpi-mpow.c | 113 ++
crypto/mpi/mpi-mul.c | 202 +++++
crypto/mpi/mpi-pow.c | 312 +++++++
crypto/mpi/mpi-scan.c | 129 +++
crypto/mpi/mpicoder.c | 359 +++++++++
crypto/mpi/mpih-cmp.c | 58 +
crypto/mpi/mpih-div.c | 534 +++++++++++++
crypto/mpi/mpih-mul.c | 547 +++++++++++++
crypto/mpi/mpiutil.c | 214 +++++
include/linux/crypto/mpi.h | 147 +++
30 files changed, 6280 insertions(+)
Index: linux-2.6.7-modsign-mpilib.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-mpilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.7-modsign-mpilib.patch 9 Sep 2004 14:49:36 -0000 1.2
+++ linux-2.6.7-modsign-mpilib.patch 13 Jul 2005 04:18:42 -0000 1.3
@@ -1,6 +1,6 @@
-diff -urNp linux-602/crypto/mpi/generic_mpi-asm-defs.h linux-603/crypto/mpi/generic_mpi-asm-defs.h
---- linux-602/crypto/mpi/generic_mpi-asm-defs.h
-+++ linux-603/crypto/mpi/generic_mpi-asm-defs.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpi-asm-defs.h linux-903/crypto/mpi/generic_mpi-asm-defs.h
+--- linux-902/crypto/mpi/generic_mpi-asm-defs.h
++++ linux-903/crypto/mpi/generic_mpi-asm-defs.h
@@ -0,0 +1,10 @@
+/* This file defines some basic constants for the MPI machinery. We
+ * need to define the types on a per-CPU basis, so it is done with
@@ -12,9 +12,9 @@
+
+
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-add1.c linux-603/crypto/mpi/generic_mpih-add1.c
---- linux-602/crypto/mpi/generic_mpih-add1.c
-+++ linux-603/crypto/mpi/generic_mpih-add1.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-add1.c linux-903/crypto/mpi/generic_mpih-add1.c
+--- linux-902/crypto/mpi/generic_mpih-add1.c
++++ linux-903/crypto/mpi/generic_mpih-add1.c
@@ -0,0 +1,62 @@
+/* mpihelp-add_1.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1997, 1998,
@@ -78,9 +78,9 @@
+ return cy;
+}
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-lshift.c linux-603/crypto/mpi/generic_mpih-lshift.c
---- linux-602/crypto/mpi/generic_mpih-lshift.c
-+++ linux-603/crypto/mpi/generic_mpih-lshift.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-lshift.c linux-903/crypto/mpi/generic_mpih-lshift.c
+--- linux-902/crypto/mpi/generic_mpih-lshift.c
++++ linux-903/crypto/mpi/generic_mpih-lshift.c
@@ -0,0 +1,66 @@
+/* mpihelp-lshift.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc.
@@ -148,9 +148,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-mul1.c linux-603/crypto/mpi/generic_mpih-mul1.c
---- linux-602/crypto/mpi/generic_mpih-mul1.c
-+++ linux-603/crypto/mpi/generic_mpih-mul1.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul1.c linux-903/crypto/mpi/generic_mpih-mul1.c
+--- linux-902/crypto/mpi/generic_mpih-mul1.c
++++ linux-903/crypto/mpi/generic_mpih-mul1.c
@@ -0,0 +1,58 @@
+/* mpihelp-mul_1.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
@@ -210,9 +210,9 @@
+ return cy_limb;
+}
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-mul2.c linux-603/crypto/mpi/generic_mpih-mul2.c
---- linux-602/crypto/mpi/generic_mpih-mul2.c
-+++ linux-603/crypto/mpi/generic_mpih-mul2.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul2.c linux-903/crypto/mpi/generic_mpih-mul2.c
+--- linux-902/crypto/mpi/generic_mpih-mul2.c
++++ linux-903/crypto/mpi/generic_mpih-mul2.c
@@ -0,0 +1,63 @@
+/* mpihelp-mul_2.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
@@ -277,9 +277,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-mul3.c linux-603/crypto/mpi/generic_mpih-mul3.c
---- linux-602/crypto/mpi/generic_mpih-mul3.c
-+++ linux-603/crypto/mpi/generic_mpih-mul3.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul3.c linux-903/crypto/mpi/generic_mpih-mul3.c
+--- linux-902/crypto/mpi/generic_mpih-mul3.c
++++ linux-903/crypto/mpi/generic_mpih-mul3.c
@@ -0,0 +1,64 @@
+/* mpihelp-mul_3.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
@@ -345,9 +345,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-rshift.c linux-603/crypto/mpi/generic_mpih-rshift.c
---- linux-602/crypto/mpi/generic_mpih-rshift.c
-+++ linux-603/crypto/mpi/generic_mpih-rshift.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-rshift.c linux-903/crypto/mpi/generic_mpih-rshift.c
+--- linux-902/crypto/mpi/generic_mpih-rshift.c
++++ linux-903/crypto/mpi/generic_mpih-rshift.c
@@ -0,0 +1,65 @@
+/* mpih-rshift.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1998, 1999,
@@ -414,9 +414,9 @@
+ return retval;
+}
+
-diff -urNp linux-602/crypto/mpi/generic_mpih-sub1.c linux-603/crypto/mpi/generic_mpih-sub1.c
---- linux-602/crypto/mpi/generic_mpih-sub1.c
-+++ linux-603/crypto/mpi/generic_mpih-sub1.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-sub1.c linux-903/crypto/mpi/generic_mpih-sub1.c
+--- linux-902/crypto/mpi/generic_mpih-sub1.c
++++ linux-903/crypto/mpi/generic_mpih-sub1.c
@@ -0,0 +1,62 @@
+/* mpihelp-add_2.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
@@ -480,9 +480,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/generic_udiv-w-sdiv.c linux-603/crypto/mpi/generic_udiv-w-sdiv.c
---- linux-602/crypto/mpi/generic_udiv-w-sdiv.c
-+++ linux-603/crypto/mpi/generic_udiv-w-sdiv.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_udiv-w-sdiv.c linux-903/crypto/mpi/generic_udiv-w-sdiv.c
+--- linux-902/crypto/mpi/generic_udiv-w-sdiv.c
++++ linux-903/crypto/mpi/generic_udiv-w-sdiv.c
@@ -0,0 +1,130 @@
+/* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
+ * division.
@@ -614,9 +614,9 @@
+
+#endif
+
-diff -urNp linux-602/crypto/mpi/longlong.h linux-603/crypto/mpi/longlong.h
---- linux-602/crypto/mpi/longlong.h
-+++ linux-603/crypto/mpi/longlong.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/longlong.h linux-903/crypto/mpi/longlong.h
+--- linux-902/crypto/mpi/longlong.h
++++ linux-903/crypto/mpi/longlong.h
@@ -0,0 +1,1502 @@
+/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
+ Note: I added some stuff for use with gnupg
@@ -2120,9 +2120,9 @@
+#ifndef UDIV_NEEDS_NORMALIZATION
+#define UDIV_NEEDS_NORMALIZATION 0
+#endif
-diff -urNp linux-602/crypto/mpi/Makefile linux-603/crypto/mpi/Makefile
---- linux-602/crypto/mpi/Makefile
-+++ linux-603/crypto/mpi/Makefile
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/Makefile linux-903/crypto/mpi/Makefile
+--- linux-902/crypto/mpi/Makefile
++++ linux-903/crypto/mpi/Makefile
@@ -0,0 +1,30 @@
+#
+# MPI multiprecision maths library (from gpg)
@@ -2154,9 +2154,9 @@
+ mpi-scan.o \
+ mpiutil.o
+
-diff -urNp linux-602/crypto/mpi/mpi-add.c linux-603/crypto/mpi/mpi-add.c
---- linux-602/crypto/mpi/mpi-add.c
-+++ linux-603/crypto/mpi/mpi-add.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-add.c linux-903/crypto/mpi/mpi-add.c
+--- linux-902/crypto/mpi/mpi-add.c
++++ linux-903/crypto/mpi/mpi-add.c
@@ -0,0 +1,258 @@
+/* mpi-add.c - MPI functions
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -2416,9 +2416,9 @@
+ return 0;
+}
+
-diff -urNp linux-602/crypto/mpi/mpi-bit.c linux-603/crypto/mpi/mpi-bit.c
---- linux-602/crypto/mpi/mpi-bit.c
-+++ linux-603/crypto/mpi/mpi-bit.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-bit.c linux-903/crypto/mpi/mpi-bit.c
+--- linux-902/crypto/mpi/mpi-bit.c
++++ linux-903/crypto/mpi/mpi-bit.c
@@ -0,0 +1,245 @@
+/* mpi-bit.c - MPI bit level fucntions
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
@@ -2665,9 +2665,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/mpi-cmp.c linux-603/crypto/mpi/mpi-cmp.c
---- linux-602/crypto/mpi/mpi-cmp.c
-+++ linux-603/crypto/mpi/mpi-cmp.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-cmp.c linux-903/crypto/mpi/mpi-cmp.c
+--- linux-902/crypto/mpi/mpi-cmp.c
++++ linux-903/crypto/mpi/mpi-cmp.c
@@ -0,0 +1,71 @@
+/* mpi-cmp.c - MPI functions
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
@@ -2740,9 +2740,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/mpicoder.c linux-603/crypto/mpi/mpicoder.c
---- linux-602/crypto/mpi/mpicoder.c
-+++ linux-603/crypto/mpi/mpicoder.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpicoder.c linux-903/crypto/mpi/mpicoder.c
+--- linux-902/crypto/mpi/mpicoder.c
++++ linux-903/crypto/mpi/mpicoder.c
@@ -0,0 +1,359 @@
+/* mpicoder.c - Coder for the external representation of MPIs
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
@@ -3103,9 +3103,9 @@
+ return 0;
+}
+
-diff -urNp linux-602/crypto/mpi/mpi-div.c linux-603/crypto/mpi/mpi-div.c
---- linux-602/crypto/mpi/mpi-div.c
-+++ linux-603/crypto/mpi/mpi-div.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-div.c linux-903/crypto/mpi/mpi-div.c
+--- linux-902/crypto/mpi/mpi-div.c
++++ linux-903/crypto/mpi/mpi-div.c
@@ -0,0 +1,345 @@
+/* mpi-div.c - MPI functions
+ * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
@@ -3452,9 +3452,9 @@
+ return !mpihelp_mod_1( dividend->d, dividend->nlimbs, divisor );
+}
+
-diff -urNp linux-602/crypto/mpi/mpi-gcd.c linux-603/crypto/mpi/mpi-gcd.c
---- linux-602/crypto/mpi/mpi-gcd.c
-+++ linux-603/crypto/mpi/mpi-gcd.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-gcd.c linux-903/crypto/mpi/mpi-gcd.c
+--- linux-902/crypto/mpi/mpi-gcd.c
++++ linux-903/crypto/mpi/mpi-gcd.c
@@ -0,0 +1,60 @@
+/* mpi-gcd.c - MPI functions
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -3516,9 +3516,9 @@
+ mpi_free(b);
+ return -ENOMEM;
+}
-diff -urNp linux-602/crypto/mpi/mpih-cmp.c linux-603/crypto/mpi/mpih-cmp.c
---- linux-602/crypto/mpi/mpih-cmp.c
-+++ linux-603/crypto/mpi/mpih-cmp.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-cmp.c linux-903/crypto/mpi/mpih-cmp.c
+--- linux-902/crypto/mpi/mpih-cmp.c
++++ linux-903/crypto/mpi/mpih-cmp.c
@@ -0,0 +1,58 @@
+/* mpihelp-sub.c - MPI helper functions
+ * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
@@ -3578,9 +3578,9 @@
+ return (op1_word > op2_word) ? 1 : -1;
+}
+
-diff -urNp linux-602/crypto/mpi/mpih-div.c linux-603/crypto/mpi/mpih-div.c
---- linux-602/crypto/mpi/mpih-div.c
-+++ linux-603/crypto/mpi/mpih-div.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-div.c linux-903/crypto/mpi/mpih-div.c
+--- linux-902/crypto/mpi/mpih-div.c
++++ linux-903/crypto/mpi/mpih-div.c
@@ -0,0 +1,534 @@
+/* mpihelp-div.c - MPI helper functions
+ * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
@@ -4116,9 +4116,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/mpih-mul.c linux-603/crypto/mpi/mpih-mul.c
---- linux-602/crypto/mpi/mpih-mul.c
-+++ linux-603/crypto/mpi/mpih-mul.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpih-mul.c linux-903/crypto/mpi/mpih-mul.c
+--- linux-902/crypto/mpi/mpih-mul.c
++++ linux-903/crypto/mpi/mpih-mul.c
@@ -0,0 +1,547 @@
+/* mpihelp-mul.c - MPI helper functions
+ * Copyright (C) 1994, 1996, 1998, 1999,
@@ -4667,9 +4667,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/mpi-inline.c linux-603/crypto/mpi/mpi-inline.c
---- linux-602/crypto/mpi/mpi-inline.c
-+++ linux-603/crypto/mpi/mpi-inline.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inline.c linux-903/crypto/mpi/mpi-inline.c
+--- linux-902/crypto/mpi/mpi-inline.c
++++ linux-903/crypto/mpi/mpi-inline.c
@@ -0,0 +1,33 @@
+/* mpi-inline.c
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -4704,9 +4704,9 @@
+ */
+#include "mpi-inline.h"
+
-diff -urNp linux-602/crypto/mpi/mpi-inline.h linux-603/crypto/mpi/mpi-inline.h
---- linux-602/crypto/mpi/mpi-inline.h
-+++ linux-603/crypto/mpi/mpi-inline.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inline.h linux-903/crypto/mpi/mpi-inline.h
+--- linux-902/crypto/mpi/mpi-inline.h
++++ linux-903/crypto/mpi/mpi-inline.h
@@ -0,0 +1,128 @@
+/* mpi-inline.h - Internal to the Multi Precision Integers
+ * Copyright (C) 1994, 1996, 1998, 1999 Free Software Foundation, Inc.
@@ -4836,9 +4836,9 @@
+
+
+#endif /*G10_MPI_INLINE_H*/
-diff -urNp linux-602/crypto/mpi/mpi-internal.h linux-603/crypto/mpi/mpi-internal.h
---- linux-602/crypto/mpi/mpi-internal.h
-+++ linux-603/crypto/mpi/mpi-internal.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-internal.h linux-903/crypto/mpi/mpi-internal.h
+--- linux-902/crypto/mpi/mpi-internal.h
++++ linux-903/crypto/mpi/mpi-internal.h
@@ -0,0 +1,265 @@
+/* mpi-internal.h - Internal to the Multi Precision Integers
+ * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
@@ -5105,9 +5105,9 @@
+#endif
+
+#endif /*G10_MPI_INTERNAL_H*/
-diff -urNp linux-602/crypto/mpi/mpi-inv.c linux-603/crypto/mpi/mpi-inv.c
---- linux-602/crypto/mpi/mpi-inv.c
-+++ linux-603/crypto/mpi/mpi-inv.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-inv.c linux-903/crypto/mpi/mpi-inv.c
+--- linux-902/crypto/mpi/mpi-inv.c
++++ linux-903/crypto/mpi/mpi-inv.c
@@ -0,0 +1,148 @@
+/* mpi-inv.c - MPI functions
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -5257,9 +5257,9 @@
+ mpi_free(v);
+ return rc;
+}
-diff -urNp linux-602/crypto/mpi/mpi-mpow.c linux-603/crypto/mpi/mpi-mpow.c
---- linux-602/crypto/mpi/mpi-mpow.c
-+++ linux-603/crypto/mpi/mpi-mpow.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-mpow.c linux-903/crypto/mpi/mpi-mpow.c
+--- linux-902/crypto/mpi/mpi-mpow.c
++++ linux-903/crypto/mpi/mpi-mpow.c
@@ -0,0 +1,113 @@
+/* mpi-mpow.c - MPI functions
+ * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
@@ -5374,9 +5374,9 @@
+ kfree(G);
+ return rc;
+}
-diff -urNp linux-602/crypto/mpi/mpi-mul.c linux-603/crypto/mpi/mpi-mul.c
---- linux-602/crypto/mpi/mpi-mul.c
-+++ linux-603/crypto/mpi/mpi-mul.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-mul.c linux-903/crypto/mpi/mpi-mul.c
+--- linux-902/crypto/mpi/mpi-mul.c
++++ linux-903/crypto/mpi/mpi-mul.c
@@ -0,0 +1,202 @@
+/* mpi-mul.c - MPI functions
+ * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
@@ -5580,9 +5580,9 @@
+ return -ENOMEM;
+ return mpi_fdiv_r( w, w, m );
+}
-diff -urNp linux-602/crypto/mpi/mpi-pow.c linux-603/crypto/mpi/mpi-pow.c
---- linux-602/crypto/mpi/mpi-pow.c
-+++ linux-603/crypto/mpi/mpi-pow.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-pow.c linux-903/crypto/mpi/mpi-pow.c
+--- linux-902/crypto/mpi/mpi-pow.c
++++ linux-903/crypto/mpi/mpi-pow.c
@@ -0,0 +1,312 @@
+/* mpi-pow.c - MPI functions
+ * Copyright (C) 1994, 1996, 1998, 2000 Free Software Foundation, Inc.
@@ -5896,9 +5896,9 @@
+ return rc;
+}
+
-diff -urNp linux-602/crypto/mpi/mpi-scan.c linux-603/crypto/mpi/mpi-scan.c
---- linux-602/crypto/mpi/mpi-scan.c
-+++ linux-603/crypto/mpi/mpi-scan.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpi-scan.c linux-903/crypto/mpi/mpi-scan.c
+--- linux-902/crypto/mpi/mpi-scan.c
++++ linux-903/crypto/mpi/mpi-scan.c
@@ -0,0 +1,129 @@
+/* mpi-scan.c - MPI functions
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -6029,9 +6029,9 @@
+}
+
+
-diff -urNp linux-602/crypto/mpi/mpiutil.c linux-603/crypto/mpi/mpiutil.c
---- linux-602/crypto/mpi/mpiutil.c
-+++ linux-603/crypto/mpi/mpiutil.c
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpiutil.c linux-903/crypto/mpi/mpiutil.c
+--- linux-902/crypto/mpi/mpiutil.c
++++ linux-903/crypto/mpi/mpiutil.c
@@ -0,0 +1,214 @@
+/* mpiutil.ac - Utility functions for MPI
+ * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
@@ -6247,9 +6247,9 @@
+ tmp = *a; *a = *b; *b = tmp;
+}
+
-diff -urNp linux-602/include/linux/crypto/mpi.h linux-603/include/linux/crypto/mpi.h
---- linux-602/include/linux/crypto/mpi.h
-+++ linux-603/include/linux/crypto/mpi.h
+diff -urNp --exclude-from=/home/davej/.exclude linux-902/include/linux/crypto/mpi.h linux-903/include/linux/crypto/mpi.h
+--- linux-902/include/linux/crypto/mpi.h
++++ linux-903/include/linux/crypto/mpi.h
@@ -0,0 +1,147 @@
+/* mpi.h - Multi Precision Integers
+ * Copyright (C) 1994, 1996, 1998, 1999,
linux-2.6.7-modsign-script.patch:
Makefile | 27 +
mod-extract.c | 900 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
modsign.sh | 57 +++
3 files changed, 984 insertions(+)
Index: linux-2.6.7-modsign-script.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.7-modsign-script.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6.7-modsign-script.patch 15 Oct 2004 00:15:27 -0000 1.6
+++ linux-2.6.7-modsign-script.patch 13 Jul 2005 04:18:42 -0000 1.7
@@ -1,6 +1,6 @@
-diff -urNp linux-603/scripts/modsign/Makefile linux-604/scripts/modsign/Makefile
---- linux-603/scripts/modsign/Makefile
-+++ linux-604/scripts/modsign/Makefile
+diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/Makefile linux-904/scripts/modsign/Makefile
+--- linux-903/scripts/modsign/Makefile
++++ linux-904/scripts/modsign/Makefile
@@ -0,0 +1,27 @@
+# Set the following to `true' to make a debuggable build.
+# Leave this set to `false' for production use.
@@ -29,9 +29,9 @@
+
+clean:
+ -rm $(OBJS) $(ROOT)
-diff -uNrp linux-2.6.9-rc4-mm1/scripts/modsign/mod-extract.c linux-2.6.9-rc4-mm1-modsign/scripts/modsign/mod-extract.c
---- linux-2.6.9-rc4-mm1/scripts/modsign/mod-extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/scripts/modsign/mod-extract.c 2004-10-13 21:40:59.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/mod-extract.c linux-904/scripts/modsign/mod-extract.c
+--- linux-903/scripts/modsign/mod-extract.c
++++ linux-904/scripts/modsign/mod-extract.c
@@ -0,0 +1,900 @@
+/* mod-extract.c: module extractor for signing
+ *
@@ -933,9 +933,9 @@
+ ftell(outfd), ftell(outfd), xcsum);
+
+} /* end extract_elf32() */
-diff -uNrp linux-2.6.9-rc4-mm1/scripts/modsign/modsign.sh linux-2.6.9-rc4-mm1-modsign/scripts/modsign/modsign.sh
---- linux-2.6.9-rc4-mm1/scripts/modsign/modsign.sh 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9-rc4-mm1-modsign/scripts/modsign/modsign.sh 2004-10-13 20:03:08.000000000 +0100
+diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/modsign.sh linux-904/scripts/modsign/modsign.sh
+--- linux-903/scripts/modsign/modsign.sh
++++ linux-904/scripts/modsign/modsign.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+###############################################################################
linux-2.6.8-lockd-racewarn2.patch:
clntlock.c | 11 ++++++++---
svc.c | 19 +++++++++++++++++--
2 files changed, 25 insertions(+), 5 deletions(-)
Index: linux-2.6.8-lockd-racewarn2.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.8-lockd-racewarn2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.8-lockd-racewarn2.patch 19 Oct 2004 19:07:57 -0000 1.1
+++ linux-2.6.8-lockd-racewarn2.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,5 +1,6 @@
---- linux-2.6.8/fs/lockd/clntlock.c.org 2004-09-27 10:03:38.000000000 -0400
-+++ linux-2.6.8/fs/lockd/clntlock.c 2004-09-27 10:03:52.000000000 -0400
+diff -urNp --exclude-from=/home/davej/.exclude linux-1200/fs/lockd/clntlock.c linux-1201/fs/lockd/clntlock.c
+--- linux-1200/fs/lockd/clntlock.c
++++ linux-1201/fs/lockd/clntlock.c
@@ -50,14 +50,19 @@ nlmclnt_block(struct nlm_host *host, str
struct nlm_wait block, **head;
int err;
@@ -39,9 +40,10 @@
if (!signalled()) {
*statp = block.b_status;
---- linux-2.6.8/fs/lockd/svc.c.org 2004-09-25 05:52:57.000000000 -0400
-+++ linux-2.6.8/fs/lockd/svc.c 2004-09-28 17:14:29.731453016 -0400
-@@ -278,6 +278,8 @@ void
+diff -urNp --exclude-from=/home/davej/.exclude linux-1200/fs/lockd/svc.c linux-1201/fs/lockd/svc.c
+--- linux-1200/fs/lockd/svc.c
++++ linux-1201/fs/lockd/svc.c
+@@ -282,6 +282,8 @@ void
lockd_down(void)
{
static int warned;
@@ -50,7 +52,7 @@
down(&nlmsvc_sema);
if (nlmsvc_users) {
-@@ -294,20 +296,33 @@ lockd_down(void)
+@@ -298,20 +300,33 @@ lockd_down(void)
warned = 0;
kill_proc(nlmsvc_pid, SIGKILL, 1);
linux-2.6.8-netconsole.patch:
netconsole.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 15 deletions(-)
Index: linux-2.6.8-netconsole.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.8-netconsole.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.8-netconsole.patch 25 Jan 2005 00:19:03 -0000 1.4
+++ linux-2.6.8-netconsole.patch 13 Jul 2005 04:18:42 -0000 1.5
@@ -1,6 +1,6 @@
-diff -purN linux-2.6.8/drivers/net/netconsole.c linux/drivers/net/netconsole.c
---- linux-2.6.8/drivers/net/netconsole.c 2004-08-14 01:36:57.000000000 -0400
-+++ linux/drivers/net/netconsole.c 2004-09-10 16:34:14.141135896 -0400
+diff -urNp --exclude-from=/home/davej/.exclude linux-1501/drivers/net/netconsole.c linux-1502/drivers/net/netconsole.c
+--- linux-1501/drivers/net/netconsole.c
++++ linux-1502/drivers/net/netconsole.c
@@ -45,6 +45,9 @@
#include <linux/sysrq.h>
#include <linux/smp.h>
@@ -11,13 +11,14 @@
MODULE_AUTHOR("Maintainer: Matt Mackall <mpm selenic com>");
MODULE_DESCRIPTION("Console driver for network interfaces");
-@@ -58,28 +61,100 @@ static struct netpoll np = {
+@@ -61,29 +61,100 @@ static struct netpoll np = {
.name = "netconsole",
.dev_name = "eth0",
.local_port = 6665,
- .remote_port = 6666,
+ .remote_port = 514,
.remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+ .drop = netpoll_queue,
};
static int configured = 0;
@@ -34,6 +35,7 @@
+static int netlog_configured = 0;
+
#define MAX_PRINT_CHUNK 1000
+
+#define SYSLOG_HEADER_LEN 4
+
+static int syslog_chars = SYSLOG_HEADER_LEN;
@@ -62,7 +64,7 @@
+ syslog_chars = SYSLOG_HEADER_LEN;
+ }
+}
-
++
static void write_msg(struct console *con, const char *msg, unsigned int len)
{
- int frag, left;
@@ -74,12 +76,11 @@
- if (!np.dev)
+ if (!np.dev && !netlog_np.dev)
+ return;
-+
+ if (unlikely(crashdump_mode()))
return;
local_irq_save(flags);
-
+-
- for(left = len; left; ) {
- frag = min(left, MAX_PRINT_CHUNK);
- netpoll_send_udp(&np, msg, frag);
linux-2.6.9-NFSD-non-null-getxattr.patch:
vfs.c | 10 ++++++++++
1 files changed, 10 insertions(+)
Index: linux-2.6.9-NFSD-non-null-getxattr.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-NFSD-non-null-getxattr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.9-NFSD-non-null-getxattr.patch 4 Jan 2005 05:39:49 -0000 1.2
+++ linux-2.6.9-NFSD-non-null-getxattr.patch 13 Jul 2005 04:18:42 -0000 1.3
@@ -1,8 +1,9 @@
---- linux-2.6.9/fs/nfsd/vfs.c.orig 2004-10-18 17:53:51.000000000 -0400
-+++ linux-2.6.9/fs/nfsd/vfs.c 2004-11-08 06:23:01.098362000 -0500
-@@ -450,6 +450,16 @@
-
- down(&inode->i_sem);
+diff -urNp --exclude-from=/home/davej/.exclude linux-1102/fs/nfsd/vfs.c linux-1200/fs/nfsd/vfs.c
+--- linux-1102/fs/nfsd/vfs.c
++++ linux-1200/fs/nfsd/vfs.c
+@@ -461,6 +461,16 @@ _get_posix_acl(struct dentry *dentry, ch
+ if (error)
+ goto out_err;
+ error = -EOPNOTSUPP;
+ if (inode->i_op == NULL)
linux-2.6.9-ieee80211.patch:
linux-2.6.12/drivers/net/wireless/ieee80211/ieee80211.h | 5
linux-2.6.9/drivers/net/wireless/Makefile | 1
linux-2.6.9/drivers/net/wireless/ieee80211/LICENSE | 339 ++
linux-2.6.9/drivers/net/wireless/ieee80211/Makefile | 23
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211.h | 1073 ++++++-
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_crypt.c | 253 +
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_crypt.h | 104
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_crypt_ccmp.c | 493 +++
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_crypt_tkip.c | 734 ++++
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_crypt_wep.c | 285 +
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_module.c | 306 +-
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_rx.c | 1521 ++++++++--
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_tx.c | 762 ++++-
linux-2.6.9/drivers/net/wireless/ieee80211/ieee80211_wx.c | 640 +++-
14 files changed, 6019 insertions(+), 520 deletions(-)
Index: linux-2.6.9-ieee80211.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-ieee80211.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.9-ieee80211.patch 22 Mar 2005 06:57:56 -0000 1.4
+++ linux-2.6.9-ieee80211.patch 13 Jul 2005 04:18:42 -0000 1.5
@@ -7591,3 +7591,18 @@
-EXPORT_SYMBOL(ieee80211_skb_to_txb);
EXPORT_SYMBOL(ieee80211_txb_free);
+--- linux-2.6.12/drivers/net/wireless/ieee80211/ieee80211.h~ 2005-06-22 19:38:18.000000000 -0400
++++ linux-2.6.12/drivers/net/wireless/ieee80211/ieee80211.h 2005-06-22 19:38:29.000000000 -0400
+@@ -632,11 +632,6 @@ enum ieee80211_state {
+ #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+
+
+-extern inline int is_multicast_ether_addr(const u8 *addr)
+-{
+- return ((addr[0] != 0xff) && (0x01 & addr[0]));
+-}
+-
+ extern inline int is_broadcast_ether_addr(const u8 *addr)
+ {
+ return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
+
linux-2.6.9-lockd-block-nosleep.patch:
clntlock.c | 1 +
1 files changed, 1 insertion(+)
Index: linux-2.6.9-lockd-block-nosleep.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-lockd-block-nosleep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-lockd-block-nosleep.patch 23 Nov 2004 02:35:18 -0000 1.1
+++ linux-2.6.9-lockd-block-nosleep.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,5 +1,6 @@
---- linux-2.6.9/fs/lockd/clntlock.c.orig 2004-11-20 20:21:57.824177000 -0500
-+++ linux-2.6.9/fs/lockd/clntlock.c 2004-11-20 23:58:03.027442000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1201/fs/lockd/clntlock.c linux-1202/fs/lockd/clntlock.c
+--- linux-1201/fs/lockd/clntlock.c
++++ linux-1202/fs/lockd/clntlock.c
@@ -74,6 +74,7 @@ nlmclnt_block(struct nlm_host *host, str
* a 1 minute timeout would do. See the comment before
* nlmclnt_lock for an explanation.
linux-2.6.9-lockd-reclaims.patch:
clntlock.c | 2 +-
clntproc.c | 22 +++++++++++++++++++---
host.c | 6 ++++--
xdr4.c | 3 +++
4 files changed, 27 insertions(+), 6 deletions(-)
Index: linux-2.6.9-lockd-reclaims.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-lockd-reclaims.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-lockd-reclaims.patch 23 Nov 2004 02:35:18 -0000 1.1
+++ linux-2.6.9-lockd-reclaims.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,18 +1,7 @@
---- linux-2.6.9/fs/lockd/xdr4.c.org 2004-10-18 17:53:06.000000000 -0400
-+++ linux-2.6.9/fs/lockd/xdr4.c 2004-11-18 10:44:27.324666000 -0500
-@@ -355,6 +355,9 @@ nlm4svc_decode_reboot(struct svc_rqst *r
- argp->state = ntohl(*p++);
- /* Preserve the address in network byte order */
- argp->addr = *p++;
-+ argp->vers = *p++;
-+ argp->proto = *p++;
-+
- return xdr_argsize_check(rqstp, p);
- }
-
---- linux-2.6.9/fs/lockd/clntlock.c.org 2004-11-12 05:43:13.508648000 -0500
-+++ linux-2.6.9/fs/lockd/clntlock.c 2004-11-18 07:57:33.464093000 -0500
-@@ -173,7 +173,7 @@ void nlmclnt_prepare_reclaim(struct nlm_
+diff -urNp --exclude-from=/home/davej/.exclude linux-1202/fs/lockd/clntlock.c linux-1203/fs/lockd/clntlock.c
+--- linux-1202/fs/lockd/clntlock.c
++++ linux-1203/fs/lockd/clntlock.c
+@@ -174,7 +174,7 @@ void nlmclnt_prepare_reclaim(struct nlm_
host->h_nextrebind = 0;
nlm_rebind_host(host);
nlmclnt_mark_reclaim(host);
@@ -21,31 +10,10 @@
}
/*
---- linux-2.6.9/fs/lockd/host.c.org 2004-10-18 17:54:31.000000000 -0400
-+++ linux-2.6.9/fs/lockd/host.c 2004-11-18 07:58:26.263774000 -0500
-@@ -190,15 +190,17 @@ nlm_bind_host(struct nlm_host *host)
- }
- } else {
- xprt = xprt_create_proto(host->h_proto, &host->h_addr, NULL);
-- if (IS_ERR(xprt))
-+ if (IS_ERR(xprt)) {
-+ dprintk("lockd: xprt_create_proto failed: %ld\n", PTR_ERR(xprt));
- goto forgetit;
--
-+ }
- xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
-
- clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
- host->h_version, host->h_authflavor);
- if (IS_ERR(clnt)) {
- xprt_destroy(xprt);
-+ dprintk("lockd: rpc_create_client failed: %ld\n", PTR_ERR(clnt));
- goto forgetit;
- }
- clnt->cl_autobind = 1; /* turn on pmap queries */
---- linux-2.6.9/fs/lockd/clntproc.c.org 2004-10-18 17:55:36.000000000 -0400
-+++ linux-2.6.9/fs/lockd/clntproc.c 2004-11-18 08:02:36.787274000 -0500
-@@ -592,9 +592,25 @@ nlmclnt_reclaim(struct nlm_host *host, s
+diff -urNp --exclude-from=/home/davej/.exclude linux-1202/fs/lockd/clntproc.c linux-1203/fs/lockd/clntproc.c
+--- linux-1202/fs/lockd/clntproc.c
++++ linux-1203/fs/lockd/clntproc.c
+@@ -603,9 +603,25 @@ nlmclnt_reclaim(struct nlm_host *host, s
nlmclnt_setlockargs(req, fl);
req->a_args.reclaim = 1;
@@ -74,4 +42,40 @@
printk(KERN_WARNING "lockd: failed to reclaim lock for pid %d "
"(errno %d, status %d)\n", fl->fl_pid,
-
+diff -urNp --exclude-from=/home/davej/.exclude linux-1202/fs/lockd/host.c linux-1203/fs/lockd/host.c
+--- linux-1202/fs/lockd/host.c
++++ linux-1203/fs/lockd/host.c
+@@ -185,9 +185,10 @@ nlm_bind_host(struct nlm_host *host)
+ }
+ } else {
+ xprt = xprt_create_proto(host->h_proto, &host->h_addr, NULL);
+- if (IS_ERR(xprt))
++ if (IS_ERR(xprt)) {
++ dprintk("lockd: xprt_create_proto failed: %ld\n", PTR_ERR(xprt));
+ goto forgetit;
+-
++ }
+ xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
+
+ /* Existing NLM servers accept AUTH_UNIX only */
+@@ -195,6 +196,7 @@ nlm_bind_host(struct nlm_host *host)
+ host->h_version, RPC_AUTH_UNIX);
+ if (IS_ERR(clnt)) {
+ xprt_destroy(xprt);
++ dprintk("lockd: rpc_create_client failed: %ld\n", PTR_ERR(clnt));
+ goto forgetit;
+ }
+ clnt->cl_autobind = 1; /* turn on pmap queries */
+diff -urNp --exclude-from=/home/davej/.exclude linux-1202/fs/lockd/xdr4.c linux-1203/fs/lockd/xdr4.c
+--- linux-1202/fs/lockd/xdr4.c
++++ linux-1203/fs/lockd/xdr4.c
+@@ -355,6 +355,9 @@ nlm4svc_decode_reboot(struct svc_rqst *r
+ argp->state = ntohl(*p++);
+ /* Preserve the address in network byte order */
+ argp->addr = *p++;
++ argp->vers = *p++;
++ argp->proto = *p++;
++
+ return xdr_argsize_check(rqstp, p);
+ }
+
linux-2.6.9-module_version.patch:
block/DAC960.c | 1 +
block/cciss.c | 1 +
block/cpqarray.c | 1 +
message/fusion/mptbase.c | 1 +
net/b44.c | 1 +
net/ixgb/ixgb_main.c | 4 +++-
net/ns83820.c | 1 +
net/tg3.c | 1 +
scsi/ahci.c | 1 +
scsi/gdth.c | 1 +
10 files changed, 12 insertions(+), 1 deletion(-)
Index: linux-2.6.9-module_version.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-module_version.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6.9-module_version.patch 10 Mar 2005 00:26:59 -0000 1.6
+++ linux-2.6.9-module_version.patch 13 Jul 2005 04:18:42 -0000 1.7
@@ -1,92 +1,69 @@
-
-Add MODULE_VERSION to tg3 driver.
-
- drivers/net/tg3.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.9/drivers/net/tg3.c.orig
-+++ linux-2.6.9/drivers/net/tg3.c
-@@ -143,6 +143,7 @@ MODULE_DESCRIPTION("Broadcom Tigon3 ethe
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/block/cciss.c linux-1720/drivers/block/cciss.c
+--- linux-1700/drivers/block/cciss.c
++++ linux-1720/drivers/block/cciss.c
+@@ -54,6 +54,7 @@ MODULE_AUTHOR("Hewlett-Packard Company")
+ MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.6");
+ MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
+ " SA6i P600 P800 E400");
++MODULE_VERSION("2.6.6");
MODULE_LICENSE("GPL");
- MODULE_PARM(tg3_debug, "i");
- MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
-+MODULE_VERSION(DRV_MODULE_VERSION);
- static int tg3_debug = -1; /* -1 == use TG3_DEF_MSG_ENABLE as value */
+ #include "cciss_cmd.h"
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/block/cpqarray.c linux-1720/drivers/block/cpqarray.c
+--- linux-1700/drivers/block/cpqarray.c
++++ linux-1720/drivers/block/cpqarray.c
+@@ -52,6 +52,7 @@
+ /* Original author Chris Frantz - Compaq Computer Corporation */
+ MODULE_AUTHOR("Compaq Computer Corporation");
+ MODULE_DESCRIPTION("Driver for Compaq Smart2 Array Controllers version 2.6.0");
++MODULE_VERSION("2.6.0");
+ MODULE_LICENSE("GPL");
-
-Add MODULE_VERSION to e1000 driver.
-
- drivers/net/e1000/e1000_main.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletion(-)
-
---- linux-2.6.9/drivers/net/e1000/e1000_main.c~ 2004-12-24 01:16:26.686982200 -0500
-+++ linux-2.6.9/drivers/net/e1000/e1000_main.c 2004-12-24 01:17:25.863985928 -0500
-@@ -57,7 +57,8 @@ char e1000_driver_string[] = "Intel(R) P
- #else
- #define DRIVERNAPI "-NAPI"
- #endif
--char e1000_driver_version[] = "5.6.10.1-k2"DRIVERNAPI;
-+#define DRV_VERSION "5.6.10.1-k2"DRIVERNAPI;
-+char e1000_driver_version[] = DRV_VERSION;
- char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
+ #include "cpqarray.h"
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/block/DAC960.c linux-1720/drivers/block/DAC960.c
+--- linux-1700/drivers/block/DAC960.c
++++ linux-1720/drivers/block/DAC960.c
+@@ -7109,3 +7109,4 @@ module_init(DAC960_init_module);
+ module_exit(DAC960_cleanup_module);
- /* e1000_pci_tbl - PCI Device ID Table
-@@ -201,6 +202,7 @@ static struct pci_driver e1000_driver =
- MODULE_AUTHOR("Intel Corporation, <linux nics intel com>");
- MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_VERSION);
-
- static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
- module_param(debug, int, 0);
-
-
-Add MODULE_VERSION to b44 driver.
-
- drivers/net/b44.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.9/drivers/net/b44.c.orig
-+++ linux-2.6.9/drivers/net/b44.c
-@@ -79,6 +79,7 @@ MODULE_DESCRIPTION("Broadcom 4400 10/100
++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_PARM(b44_debug, "i");
- MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
-+MODULE_VERSION(DRV_MODULE_VERSION);
++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
+@@ -85,6 +85,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);
static int b44_debug = -1; /* -1 == use B44_DEF_MSG_ENABLE as value */
+ module_param(b44_debug, int, 0);
+ MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
++MODULE_VERSION(DRV_MODULE_VERSION);
-
---- linux-2.6.9/drivers/net/ns83820.c.orig
-+++ linux-2.6.9/drivers/net/ns83820.c
-@@ -2139,6 +2139,7 @@ static void __exit ns83820_exit(void)
- MODULE_AUTHOR("Benjamin LaHaise <bcrl redhat com>");
- MODULE_DESCRIPTION("National Semiconductor DP83820 10/100/1000 driver");
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(VERSION);
-
- MODULE_DEVICE_TABLE(pci, ns83820_pci_tbl);
-
-
-Add MODULE_VERSION to r8169 driver.
-
- drivers/net/r8169.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.9/drivers/net/ixgb/ixgb_main.c~ 2004-12-24 01:18:09.990277712 -0500
-+++ linux-2.6.9/drivers/net/ixgb/ixgb_main.c 2004-12-24 01:18:39.562782008 -0500
-@@ -43,7 +43,8 @@ char ixgb_driver_string[] = "Intel(R) PR
+ static struct pci_device_id b44_pci_tbl[] = {
+ { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/ixgb/ixgb_main.c linux-1720/drivers/net/ixgb/ixgb_main.c
+--- linux-1700/drivers/net/ixgb/ixgb_main.c
++++ linux-1720/drivers/net/ixgb/ixgb_main.c
+@@ -47,7 +47,8 @@ char ixgb_driver_string[] = "Intel(R) PR
#else
#define DRIVERNAPI "-NAPI"
#endif
--char ixgb_driver_version[] = "1.0.87-k2"DRIVERNAPI;
-+#define DRV_VERSION "1.0.87-k2"DRIVERNAPI
+-char ixgb_driver_version[] = "1.0.95-k2"DRIVERNAPI;
++#define DRV_VERSION "1.0.95-k2"DRIVERNAPI
+char ixgb_driver_version[] = DRV_VERSION;
- char ixgb_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
+ char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
/* ixgb_pci_tbl - PCI Device ID Table
-@@ -139,6 +140,7 @@ static struct pci_driver ixgb_driver = {
+@@ -152,6 +153,7 @@ static struct pci_driver ixgb_driver = {
MODULE_AUTHOR("Intel Corporation, <linux nics intel com>");
MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
MODULE_LICENSE("GPL");
@@ -94,93 +71,32 @@
/* some defines for controlling descriptor fetches in h/w */
#define RXDCTL_PTHRESH_DEFAULT 128 /* chip considers prefech below this */
-
---- linux-2.6.9/drivers/scsi/3w-9xxx.c-orig
-+++ linux-2.6.9/drivers/scsi/3w-9xxx.c
-@@ -73,7 +73,7 @@
- #include "3w-9xxx.h"
-
- /* Globals */
--static const char *twa_driver_version="2.26.02.001";
-+#define TWA_DRIVER_VERSION "2.26.02.001"
- static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
- static unsigned int twa_device_extension_count;
- static int twa_major = -1;
-@@ -83,6 +83,7 @@ extern struct timezone sys_tz;
- MODULE_AUTHOR ("AMCC");
- MODULE_DESCRIPTION ("3ware 9000 Storage Controller Linux Driver");
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(TWA_DRIVER_VERSION);
-
- /* Function prototypes */
- static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header);
-@@ -138,7 +139,7 @@ static ssize_t twa_show_stats(struct cla
- "SCSI Host Resets: %4d\n"
- "SCSI Aborts/Timeouts: %4d\n"
- "AEN's: %4d\n",
-- twa_driver_version,
-+ TWA_DRIVER_VERSION,
- tw_dev->posted_request_count,
- tw_dev->max_posted_request_count,
- tw_dev->pending_request_count,
-@@ -716,7 +717,7 @@ static int twa_chrdev_ioctl(struct inode
- tw_ioctl->driver_command.status = 0;
- /* Copy compatiblity struct into ioctl data buffer */
- tw_compat_info = (TW_Compatibility_Info *)tw_ioctl->data_buffer;
-- strncpy(tw_compat_info->driver_version, twa_driver_version, strlen(twa_driver_version));
-+ strncpy(tw_compat_info->driver_version, TWA_DRIVER_VERSION, strlen(TWA_DRIVER_VERSION));
- tw_compat_info->working_srl = tw_dev->working_srl;
- tw_compat_info->working_branch = tw_dev->working_branch;
- tw_compat_info->working_build = tw_dev->working_build;
-@@ -2138,7 +2139,7 @@ static struct pci_driver twa_driver = {
- /* This function is called on driver initialization */
- static int __init twa_init(void)
- {
-- printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", twa_driver_version);
-+ printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TWA_DRIVER_VERSION);
-
- return pci_module_init(&twa_driver);
- } /* End twa_init() */
---- linux-2.6.9/drivers/block/cciss.c~
-+++ linux-2.6.9/drivers/block/cciss.c
-@@ -52,6 +52,7 @@
- /* Embedded module documentation macros - see modules.h */
- MODULE_AUTHOR("Hewlett-Packard Company");
- MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.4");
-+MODULE_VERSION("2.6.4");
- MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
- " SA6i P600");
- MODULE_LICENSE("GPL");
---- linux-2.6.9/drivers/block/cpqarray.c-old
-+++ linux-2.6.9/drivers/block/cpqarray.c
-@@ -53,6 +53,7 @@
- /* Original author Chris Frantz - Compaq Computer Corporation */
- MODULE_AUTHOR("Compaq Computer Corporation");
- MODULE_DESCRIPTION("Driver for Compaq Smart2 Array Controllers version 2.6.0");
-+MODULE_VERSION("2.6.0");
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/ns83820.c linux-1720/drivers/net/ns83820.c
+--- linux-1700/drivers/net/ns83820.c
++++ linux-1720/drivers/net/ns83820.c
+@@ -2206,6 +2206,7 @@ static void __exit ns83820_exit(void)
+ MODULE_AUTHOR("Benjamin LaHaise <bcrl kvack org>");
+ MODULE_DESCRIPTION("National Semiconductor DP83820 10/100/1000 driver");
MODULE_LICENSE("GPL");
++MODULE_VERSION(VERSION);
- #include "cpqarray.h"
---- linux-2.6.9/drivers/block/DAC960.c-stock
-+++ linux-2.6.9/drivers/block/DAC960.c
-@@ -7108,3 +7108,4 @@ module_init(DAC960_init_module);
- module_exit(DAC960_cleanup_module);
+ MODULE_DEVICE_TABLE(pci, ns83820_pci_tbl);
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(DAC960_DriverVersion);
---- linux-2.6.10/drivers/scsi/gdth.c~ 2005-01-13 19:53:24.000000000 -0500
-+++ linux-2.6.10/drivers/scsi/gdth.c 2005-01-13 19:53:39.000000000 -0500
-@@ -656,6 +656,7 @@ module_param(probe_eisa_isa, int, 0);
- module_param(force_dma32, int, 0);
- MODULE_AUTHOR("Achim Leubner");
- MODULE_LICENSE("GPL");
-+MODULE_VERSION(GDTH_VERSION_STR);
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/tg3.c linux-1720/drivers/net/tg3.c
+--- linux-1700/drivers/net/tg3.c
++++ linux-1720/drivers/net/tg3.c
+@@ -146,6 +146,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);
+ static int tg3_debug = -1; /* -1 == use TG3_DEF_MSG_ENABLE as value */
+ module_param(tg3_debug, int, 0);
+ MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
++MODULE_VERSION(DRV_MODULE_VERSION);
- /* ioctl interface */
- static struct file_operations gdth_fops = {
---- linux-2.6.9/drivers/scsi/ahci.c~
-+++ linux-2.6.9/drivers/scsi/ahci.c
-@@ -1037,6 +1037,7 @@ MODULE_AUTHOR("Jeff Garzik");
+ static struct pci_device_id tg3_pci_tbl[] = {
+ { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700,
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/scsi/ahci.c linux-1720/drivers/scsi/ahci.c
+--- linux-1700/drivers/scsi/ahci.c
++++ linux-1720/drivers/scsi/ahci.c
+@@ -1062,6 +1062,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("AHCI SATA low-level driver");
MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);
@@ -188,13 +104,14 @@
module_init(ahci_init);
module_exit(ahci_exit);
---- linux-2.6.9/drivers/message/fusion/mptbase.c~
-+++ linux-2.6.9/drivers/message/fusion/mptbase.c
-@@ -119,6 +119,7 @@
- MODULE_AUTHOR(MODULEAUTHOR);
- MODULE_DESCRIPTION(my_NAME);
+diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/scsi/gdth.c linux-1720/drivers/scsi/gdth.c
+--- linux-1700/drivers/scsi/gdth.c
++++ linux-1720/drivers/scsi/gdth.c
+@@ -656,6 +656,7 @@ module_param(probe_eisa_isa, int, 0);
+ module_param(force_dma32, int, 0);
+ MODULE_AUTHOR("Achim Leubner");
MODULE_LICENSE("GPL");
-+MODULE_VERSION(MPT_LINUX_VERSION_COMMON);
++MODULE_VERSION(GDTH_VERSION_STR);
- /*
- * cmd line parameters
+ /* ioctl interface */
+ static struct file_operations gdth_fops = {
linux-2.6.9-net-tr-irqlock-fix.patch:
tr.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
Index: linux-2.6.9-net-tr-irqlock-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-net-tr-irqlock-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.9-net-tr-irqlock-fix.patch 6 Mar 2005 22:37:13 -0000 1.3
+++ linux-2.6.9-net-tr-irqlock-fix.patch 13 Jul 2005 04:18:42 -0000 1.4
@@ -1,8 +1,9 @@
---- linux-2.6.9/net/802/tr.c.orig 2004-10-18 22:53:12.000000000 +0100
-+++ linux-2.6.9/net/802/tr.c 2004-11-09 19:19:32.273030928 +0000
-@@ -250,10 +250,11 @@ void tr_source_route(struct sk_buff *skb
+diff -urNp --exclude-from=/home/davej/.exclude linux-1203/net/802/tr.c linux-1300/net/802/tr.c
+--- linux-1203/net/802/tr.c
++++ linux-1300/net/802/tr.c
+@@ -251,10 +251,11 @@ void tr_source_route(struct sk_buff *skb
unsigned int hash;
- struct rif_cache_s *entry;
+ struct rif_cache *entry;
unsigned char *olddata;
+ unsigned long flags;
static const unsigned char mcast_func_addr[]
@@ -13,7 +14,7 @@
/*
* Broadcasts are single route as stated in RFC 1042
-@@ -322,7 +323,7 @@ printk("source routing for %02X:%02X:%02
+@@ -323,7 +324,7 @@ printk("source routing for %02X:%02X:%02
else
slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8);
olddata = skb->data;
@@ -22,12 +23,12 @@
skb_pull(skb, slack);
memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack);
-@@ -336,10 +337,11 @@ printk("source routing for %02X:%02X:%02
+@@ -337,10 +338,11 @@ printk("source routing for %02X:%02X:%02
static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
{
unsigned int hash, rii_p = 0;
+ unsigned long flags;
- struct rif_cache_s *entry;
+ struct rif_cache *entry;
- spin_lock_bh(&rif_lock);
@@ -35,7 +36,7 @@
/*
* Firstly see if the entry exists
-@@ -377,7 +379,7 @@ printk("adding rif_entry: addr:%02X:%02X
+@@ -378,7 +380,7 @@ printk("adding rif_entry: addr:%02X:%02X
if(!entry)
{
printk(KERN_DEBUG "tr.c: Couldn't malloc rif cache entry !\n");
@@ -44,7 +45,7 @@
return;
}
-@@ -419,7 +421,7 @@ printk("updating rif_entry: addr:%02X:%0
+@@ -420,7 +422,7 @@ printk("updating rif_entry: addr:%02X:%0
}
entry->last_used=jiffies;
}
@@ -53,7 +54,7 @@
}
/*
-@@ -429,9 +431,9 @@ printk("updating rif_entry: addr:%02X:%0
+@@ -430,9 +432,9 @@ printk("updating rif_entry: addr:%02X:%0
static void rif_check_expire(unsigned long dummy)
{
int i;
@@ -64,8 +65,8 @@
+ spin_lock_irqsave(&rif_lock, flags);
for(i =0; i < RIF_TABLE_SIZE; i++) {
- struct rif_cache_s *entry, **pentry;
-@@ -453,7 +455,7 @@ static void rif_check_expire(unsigned lo
+ struct rif_cache *entry, **pentry;
+@@ -454,7 +456,7 @@ static void rif_check_expire(unsigned lo
}
}
@@ -74,7 +75,7 @@
mod_timer(&rif_timer, next_interval);
-@@ -484,7 +486,7 @@ static struct rif_cache_s *rif_get_idx(l
+@@ -485,7 +487,7 @@ static struct rif_cache *rif_get_idx(l
static void *rif_seq_start(struct seq_file *seq, loff_t *pos)
{
@@ -83,7 +84,7 @@
return *pos ? rif_get_idx(*pos - 1) : SEQ_START_TOKEN;
}
-@@ -515,7 +517,7 @@ static void *rif_seq_next(struct seq_fil
+@@ -516,7 +518,7 @@ static void *rif_seq_next(struct seq_fil
static void rif_seq_stop(struct seq_file *seq, void *v)
{
linux-2.6.9-s390-autoraid.patch:
ibm.c | 9 +++++++++
1 files changed, 9 insertions(+)
Index: linux-2.6.9-s390-autoraid.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-s390-autoraid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-s390-autoraid.patch 22 Oct 2004 18:50:12 -0000 1.1
+++ linux-2.6.9-s390-autoraid.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,9 +1,7 @@
-Raid autorun (bug 123842/130339).
-
-diff -upr -X dontdiff linux-2.6.8-1.607/fs/partitions/ibm.c linux-2.6.8-1.607.z1/fs/partitions/ibm.c
---- linux-2.6.8-1.607/fs/partitions/ibm.c 2004-08-14 01:38:09.000000000 -0400
-+++ linux-2.6.8-1.607.z1/fs/partitions/ibm.c 2004-10-15 21:17:43.000000000 -0400
-@@ -129,6 +129,7 @@ ibm_partition(struct parsed_partitions *
+diff -urNp --exclude-from=/home/davej/.exclude linux-500/fs/partitions/ibm.c linux-501/fs/partitions/ibm.c
+--- linux-500/fs/partitions/ibm.c
++++ linux-501/fs/partitions/ibm.c
+@@ -130,6 +130,7 @@ ibm_partition(struct parsed_partitions *
while ((data = read_dev_sector(bdev, blk*(blocksize/512),
§)) != NULL) {
format1_label_t f1;
@@ -11,7 +9,7 @@
memcpy(&f1, data, sizeof(format1_label_t));
put_dev_sector(sect);
-@@ -154,6 +155,14 @@ ibm_partition(struct parsed_partitions *
+@@ -155,6 +156,14 @@ ibm_partition(struct parsed_partitions *
put_partition(state, counter + 1,
offset * (blocksize >> 9),
size * (blocksize >> 9));
linux-2.6.9-s390-zfcp_port-fix.patch:
zfcp_aux.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
Index: linux-2.6.9-s390-zfcp_port-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-s390-zfcp_port-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-s390-zfcp_port-fix.patch 18 Nov 2004 20:03:09 -0000 1.1
+++ linux-2.6.9-s390-zfcp_port-fix.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,7 +1,7 @@
-diff -urN linux-2.6.9/drivers/s390/scsi/zfcp_aux.c linux-2.6.9_xxx/drivers/s390/scsi/zfcp_aux.c
---- linux-2.6.9/drivers/s390/scsi/zfcp_aux.c 2004-11-12 14:40:39.769648724 +0100
-+++ linux-2.6.9_xxx/drivers/s390/scsi/zfcp_aux.c 2004-11-12 14:42:01.199648724 +0100
-@@ -1776,7 +1776,10 @@
+diff -urNp --exclude-from=/home/davej/.exclude linux-501/drivers/s390/scsi/zfcp_aux.c linux-502/drivers/s390/scsi/zfcp_aux.c
+--- linux-501/drivers/s390/scsi/zfcp_aux.c
++++ linux-502/drivers/s390/scsi/zfcp_aux.c
+@@ -1772,7 +1772,10 @@ static void zfcp_ns_gid_pn_handler(unsig
ct_iu_req = zfcp_sg_to_address(ct->req);
ct_iu_resp = zfcp_sg_to_address(ct->resp);
linux-2.6.9-scsi-advansys-enabler.patch:
Kconfig | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.9-scsi-advansys-enabler.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-scsi-advansys-enabler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-scsi-advansys-enabler.patch 10 Mar 2005 22:32:34 -0000 1.1
+++ linux-2.6.9-scsi-advansys-enabler.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,5 +1,6 @@
---- linux-2.6.11/drivers/scsi/Kconfig~ 2005-03-10 17:11:32.000000000 -0500
-+++ linux-2.6.11/drivers/scsi/Kconfig 2005-03-10 17:11:40.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1070/drivers/scsi/Kconfig linux-1101/drivers/scsi/Kconfig
+--- linux-1070/drivers/scsi/Kconfig
++++ linux-1101/drivers/scsi/Kconfig
@@ -382,7 +382,7 @@ config SCSI_DPT_I2O
config SCSI_ADVANSYS
linux-2.6.9-scsi-megaraid-legacy.patch:
Kconfig.megaraid | 2 --
1 files changed, 2 deletions(-)
Index: linux-2.6.9-scsi-megaraid-legacy.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-scsi-megaraid-legacy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.9-scsi-megaraid-legacy.patch 4 Dec 2004 07:04:26 -0000 1.1
+++ linux-2.6.9-scsi-megaraid-legacy.patch 13 Jul 2005 04:18:42 -0000 1.2
@@ -1,6 +1,7 @@
---- linux-2.6.9/drivers/scsi/megaraid/Kconfig.megaraid~ 2004-12-04 01:58:01.396478568 -0500
-+++ linux-2.6.9/drivers/scsi/megaraid/Kconfig.megaraid 2004-12-04 01:58:30.730019192 -0500
-@@ -63,7 +63,6 @@ config MEGARAID_MAILBOX
+diff -urNp --exclude-from=/home/davej/.exclude linux-1101/drivers/scsi/megaraid/Kconfig.megaraid linux-1102/drivers/scsi/megaraid/Kconfig.megaraid
+--- linux-1101/drivers/scsi/megaraid/Kconfig.megaraid
++++ linux-1102/drivers/scsi/megaraid/Kconfig.megaraid
+@@ -64,7 +64,6 @@ config MEGARAID_MAILBOX
To compile this driver as a module, choose M here: the
module will be called megaraid_mbox
@@ -8,7 +9,7 @@
config MEGARAID_LEGACY
tristate "LSI Logic Legacy MegaRAID Driver"
depends on PCI && SCSI
-@@ -74,4 +73,3 @@ config MEGARAID_LEGACY
+@@ -75,4 +74,3 @@ config MEGARAID_LEGACY
To compile this driver as a module, choose M here: the
module will be called megaraid
linux-2.6.9-spinlock-debug-panic.patch:
spinlock.h | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
Index: linux-2.6.9-spinlock-debug-panic.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-spinlock-debug-panic.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.9-spinlock-debug-panic.patch 6 Mar 2005 22:35:14 -0000 1.4
+++ linux-2.6.9-spinlock-debug-panic.patch 13 Jul 2005 04:18:42 -0000 1.5
@@ -1,53 +1,11 @@
-
-If we leave lock debugging on then it currently proceeds to far in the
-interest of debug to be safe (as in the IDE case). This change is my proposal
-for fixing that - basically we panic rather than just log if we
-
- lock a locked spinlock
- unlock an unlocked spinlock
- use an uninitialised lock
-
-on the basis these three are not safe for customers to continue execution.
-
-Alan
-
---- 1/include/linux/spinlock.h.old 2004-12-07 16:14:45.042942744 +0000
-+++ 2/include/linux/spinlock.h 2004-12-07 16:16:21.135334480 +0000
-@@ -104,7 +104,7 @@
- #define CHECK_LOCK(x) \
- do { \
- if ((x)->magic != SPINLOCK_MAGIC) { \
-- printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
-+ panic("%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
- __FILE__, __LINE__, (x)); \
- } \
- } while(0)
-@@ -114,7 +114,7 @@
- CHECK_LOCK(x); \
- if ((x)->lock&&(x)->babble) { \
- (x)->babble--; \
-- printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
-+ panic("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
- __FILE__,__LINE__, (x)->module, \
- (x), (x)->owner, (x)->oline); \
- } \
-@@ -170,7 +170,7 @@
- CHECK_LOCK(x); \
- if (!(x)->lock&&(x)->babble) { \
- (x)->babble--; \
-- printk("%s:%d: spin_unlock(%s:%p) not locked\n", \
-+ panic("%s:%d: spin_unlock(%s:%p) not locked\n", \
- __FILE__,__LINE__, (x)->module, (x));\
- } \
- (x)->lock = 0; \
-
---- linux-2.6.11/include/linux/spinlock.h~ 2005-03-04 01:10:52.000000000 -0500
-+++ linux-2.6.11/include/linux/spinlock.h 2005-03-04 01:13:27.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-1720/include/linux/spinlock.h linux-1730/include/linux/spinlock.h
+--- linux-1720/include/linux/spinlock.h
++++ linux-1730/include/linux/spinlock.h
@@ -114,8 +114,8 @@ typedef struct {
#define CHECK_LOCK(x) \
do { \
if ((x)->magic != SPINLOCK_MAGIC) { \
-- panic("%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
+- printk(KERN_ERR "%s:%d: spin_is_locked on uninitialized spinlock %p.\n", \
- __FILE__, __LINE__, (x)); \
+ panic("%s:%d: spin_is_locked on uninitialized spinlock %p. (%s)\n", \
+ __FILE__, __LINE__, (x), print_tainted()); \
@@ -58,7 +16,7 @@
CHECK_LOCK(x); \
if ((x)->lock&&(x)->babble) { \
(x)->babble--; \
-- panic("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
+- printk("%s:%d: spin_lock(%s:%p) already locked by %s/%d\n", \
+ panic("%s:%d: spin_lock(%s:%p) already locked by %s/%d. (%s)\n", \
__FILE__,__LINE__, (x)->module, \
- (x), (x)->owner, (x)->oline); \
@@ -106,7 +64,7 @@
CHECK_LOCK(x); \
if (!(x)->lock&&(x)->babble) { \
(x)->babble--; \
-- panic("%s:%d: spin_unlock(%s:%p) not locked\n", \
+- printk("%s:%d: spin_unlock(%s:%p) not locked\n", \
- __FILE__,__LINE__, (x)->module, (x));\
+ panic("%s:%d: spin_unlock(%s:%p) not locked. (%s)\n", \
+ __FILE__,__LINE__, (x)->module, (x), print_tainted());\
linux-2.6.9-vm-oomkiller-debugging.patch:
oom_kill.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6.9-vm-oomkiller-debugging.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.9-vm-oomkiller-debugging.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.9-vm-oomkiller-debugging.patch 6 Mar 2005 22:35:14 -0000 1.2
+++ linux-2.6.9-vm-oomkiller-debugging.patch 13 Jul 2005 04:18:42 -0000 1.3
@@ -1,5 +1,6 @@
---- linux-2.6.10/mm/oom_kill.c~ 2005-02-02 23:00:38.000000000 -0500
-+++ linux-2.6.10/mm/oom_kill.c 2005-02-02 23:02:37.000000000 -0500
+diff -urNp --exclude-from=/home/davej/.exclude linux-2000/mm/oom_kill.c linux-2001/mm/oom_kill.c
+--- linux-2000/mm/oom_kill.c
++++ linux-2001/mm/oom_kill.c
@@ -268,12 +268,12 @@ retry:
/* Found nothing?!?! Either we hang forever, or we panic. */
if (!p) {
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]