+++ 25/drivers/pcmcia/hd64465_ss.c 2003-07-19 17:03:50.000000000 -0700
@@ -1,5 +1,5 @@
/*
-- * $Id: 2.6.0-test1-mm2.patch,v 1.1.2.2 2003/07/22 07:20:21 braam Exp $
-+ * $Id: 2.6.0-test1-mm2.patch,v 1.1.2.2 2003/07/22 07:20:21 braam Exp $
+- * $Id$
++ * $Id: hd64465_ss.c,v 1.7 2003/07/06 14:42:50 lethal Exp $
*
* Device driver for the PCMCIA controller module of the
* Hitachi HD64465 handheld companion chip.
*
* Dealing with devices registered to multiple major numbers.
*
-- * $Revision: 1.1.2.2 $
-+ * $Revision: 1.1.2.2 $
+- * $Revision: 1.29 $
++ * $Revision: 1.31 $
*/
#include <linux/config.h>
/*
* drivers/s390/cio/chsc.c
* S/390 common I/O routines -- channel subsystem call
-- * $Revision: 1.1.2.2 $
-+ * $Revision: 1.1.2.2 $
+- * $Revision: 1.73 $
++ * $Revision: 1.74 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
/*
* drivers/s390/cio/cio.c
* S/390 common I/O routines -- low level i/o calls
-- * $Revision: 1.1.2.2 $
-+ * $Revision: 1.1.2.2 $
+- * $Revision: 1.98 $
++ * $Revision: 1.100 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
/*
* drivers/s390/cio/device.c
* bus driver for ccw devices
-- * $Revision: 1.1.2.2 $
-+ * $Revision: 1.1.2.2 $
+- * $Revision: 1.58 $
++ * $Revision: 1.60 $
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
#include "ioasm.h"
#include "chsc.h"
--#define VERSION_QDIO_C "$Revision: 1.1.2.2 $"
-+#define VERSION_QDIO_C "$Revision: 1.1.2.2 $"
+-#define VERSION_QDIO_C "$Revision: 1.51 $"
++#define VERSION_QDIO_C "$Revision: 1.55 $"
/****************** MODULE PARAMETER VARIABLES ********************/
MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
@@ -1,6 +1,6 @@
/*
*
-- * linux/drivers/s390/net/qeth.c ($Revision: 1.1.2.2 $)
-+ * linux/drivers/s390/net/qeth.c ($Revision: 1.1.2.2 $)
+- * linux/drivers/s390/net/qeth.c ($Revision: 1.118 $)
++ * linux/drivers/s390/net/qeth.c ($Revision: 1.126 $)
*
* Linux on zSeries OSA Express and HiperSockets support
*
"reserved for low memory situations");
/****************** MODULE STUFF **********************************/
--#define VERSION_QETH_C "$Revision: 1.1.2.2 $"
-+#define VERSION_QETH_C "$Revision: 1.1.2.2 $"
+-#define VERSION_QETH_C "$Revision: 1.118 $"
++#define VERSION_QETH_C "$Revision: 1.126 $"
static const char *version = "qeth S/390 OSA-Express driver ("
VERSION_QETH_C "/" VERSION_QETH_H "/" VERSION_QETH_MPC_H
QETH_VERSION_IPV6 QETH_VERSION_VLAN ")";
#define QETH_NAME " qeth"
--#define VERSION_QETH_H "$Revision: 1.1.2.2 $"
-+#define VERSION_QETH_H "$Revision: 1.1.2.2 $"
+-#define VERSION_QETH_H "$Revision: 1.47 $"
++#define VERSION_QETH_H "$Revision: 1.49 $"
/******************** CONFIG STUFF ***********************/
//#define QETH_DBF_LIKE_HELL
#ifndef __QETH_MPC_H__
#define __QETH_MPC_H__
--#define VERSION_QETH_MPC_H "$Revision: 1.1.2.2 $"
-+#define VERSION_QETH_MPC_H "$Revision: 1.1.2.2 $"
+-#define VERSION_QETH_MPC_H "$Revision: 1.15 $"
++#define VERSION_QETH_MPC_H "$Revision: 1.16 $"
#define QETH_IPA_TIMEOUT (card->ipa_timeout)
#define QETH_MPC_TIMEOUT 2000
--- linux-2.6.0-test1/drivers/scsi/aic7xxx/aiclib.c 2003-06-14 12:18:22.000000000 -0700
+++ 25/drivers/scsi/aic7xxx/aiclib.c 2003-07-19 17:03:50.000000000 -0700
@@ -30,7 +30,6 @@
- * $Id: 2.6.0-test1-mm2.patch,v 1.1.2.2 2003/07/22 07:20:21 braam Exp $
+ * $Id$
*/
-#include <linux/blk.h>
@@ -45,6 +46,10 @@ static char ixj_c_revision[] = "$Revisio
/*
- * $Log: 2.6.0-test1-mm2.patch,v $
- * Revision 1.1.2.2 2003/07/22 07:20:21 braam
- * - these should apply, but they don't quite compile (something with netdump)
- *
+ * $Log: ixj.c,v $
+ *
+ * Revision 4.8 2003/07/09 19:39:00 Daniele Bellucci
+ * Audit some copy_*_user and minor cleanup.
- MAINTAINERS | 11
- arch/i386/Kconfig | 17 +
- arch/i386/defconfig | 1
- arch/i386/kernel/Makefile | 1
- arch/i386/kernel/apic.c | 54 +++
- arch/i386/kernel/dmi_scan.c | 27 -
- arch/i386/kernel/entry.S | 1
- arch/i386/kernel/i8259.c | 12
- arch/i386/kernel/io_apic.c | 2
- arch/i386/kernel/machine_kexec.c | 116 ++++++
- arch/i386/kernel/reboot.c | 44 --
- arch/i386/kernel/relocate_kernel.S | 107 ++++++
- arch/i386/kernel/smp.c | 24 +
- include/asm-i386/apic.h | 3
- include/asm-i386/apicdef.h | 1
- include/asm-i386/kexec.h | 23 +
- include/asm-i386/unistd.h | 5
- include/linux/kexec.h | 54 +++
- include/linux/reboot.h | 2
- kernel/Makefile | 1
- kernel/kexec.c | 629 +++++++++++++++++++++++++++++++++++++
- kernel/sys.c | 23 +
- 22 files changed, 1089 insertions(+), 69 deletions(-)
+ 0 files changed
---- linux-2.6.0-test1/MAINTAINERS~kexec-2.6.0-full 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/MAINTAINERS 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/MAINTAINERS~kexec-2.6.0-full 2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/MAINTAINERS 2003-07-23 12:08:54.000000000 +0800
@@ -1095,6 +1095,17 @@ W: http://nfs.sourceforge.net/
W: http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
S: Maintained
LANMEDIA WAN CARD DRIVER
P: Andrew Stanley-Jones
M: asj@lanmedia.com
---- linux-2.6.0-test1/arch/i386/Kconfig~kexec-2.6.0-full 2003-07-22 00:52:14.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/Kconfig 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/Kconfig~kexec-2.6.0-full 2003-07-23 12:08:52.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/Kconfig 2003-07-23 12:08:54.000000000 +0800
@@ -804,6 +804,23 @@ config BOOT_IOREMAP
depends on ((X86_SUMMIT || X86_GENERICARCH) && NUMA)
default y
endmenu
---- linux-2.6.0-test1/arch/i386/defconfig~kexec-2.6.0-full 2003-07-13 21:35:57.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/defconfig 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/defconfig~kexec-2.6.0-full 2003-07-14 11:35:57.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/defconfig 2003-07-23 12:08:54.000000000 +0800
@@ -72,6 +72,7 @@ CONFIG_SMP=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
CONFIG_X86_MCE_P4THERMAL=y
---- linux-2.6.0-test1/arch/i386/kernel/Makefile~kexec-2.6.0-full 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/Makefile 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/Makefile~kexec-2.6.0-full 2003-07-23 12:08:31.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/Makefile 2003-07-23 12:08:54.000000000 +0800
@@ -25,6 +25,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoli
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o suspend_asm.o
obj-$(CONFIG_X86_NUMAQ) += numaq.o
obj-$(CONFIG_X86_SUMMIT) += summit.o
---- linux-2.6.0-test1/arch/i386/kernel/apic.c~kexec-2.6.0-full 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/apic.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/apic.c~kexec-2.6.0-full 2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/apic.c 2003-07-23 12:08:54.000000000 +0800
@@ -26,6 +26,7 @@
#include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h>
/*
* This initializes the IO-APIC and APIC hardware if this is
* a UP kernel.
---- linux-2.6.0-test1/arch/i386/kernel/dmi_scan.c~kexec-2.6.0-full 2003-07-13 21:32:44.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/dmi_scan.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/dmi_scan.c~kexec-2.6.0-full 2003-07-14 11:32:44.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/dmi_scan.c 2003-07-23 12:08:54.000000000 +0800
@@ -222,31 +222,6 @@ static __init int set_bios_reboot(struct
return 0;
}
MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"),
NO_MATCH, NO_MATCH
---- linux-2.6.0-test1/arch/i386/kernel/entry.S~kexec-2.6.0-full 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/entry.S 2003-07-22 00:54:27.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/entry.S~kexec-2.6.0-full 2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/entry.S 2003-07-23 12:08:54.000000000 +0800
@@ -905,5 +905,6 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
+ .long sys_kexec_load
nr_syscalls=(.-sys_call_table)/4
---- linux-2.6.0-test1/arch/i386/kernel/i8259.c~kexec-2.6.0-full 2003-07-13 21:38:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/i8259.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/i8259.c~kexec-2.6.0-full 2003-07-14 11:38:03.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/i8259.c 2003-07-23 12:08:54.000000000 +0800
@@ -244,9 +244,21 @@ static int i8259A_resume(struct sys_devi
return 0;
}
};
static struct sys_device device_i8259A = {
---- linux-2.6.0-test1/arch/i386/kernel/io_apic.c~kexec-2.6.0-full 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/io_apic.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/io_apic.c~kexec-2.6.0-full 2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/io_apic.c 2003-07-23 12:08:54.000000000 +0800
@@ -1601,8 +1601,6 @@ void disable_IO_APIC(void)
* Clear the IO-APIC before rebooting:
*/
}
/*
---- /dev/null 2003-01-30 03:24:37.000000000 -0700
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/machine_kexec.c 2003-07-22 00:54:04.000000000 -0600
+--- /dev/null 2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/machine_kexec.c 2003-07-23 12:08:54.000000000 +0800
@@ -0,0 +1,116 @@
+#include <linux/config.h>
+#include <linux/mm.h>
+ rnk = (relocate_new_kernel_t) reboot_code_buffer;
+ (*rnk)(indirection_page, reboot_code_buffer, image->start);
+}
---- linux-2.6.0-test1/arch/i386/kernel/reboot.c~kexec-2.6.0-full 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/reboot.c 2003-07-22 00:55:22.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/reboot.c~kexec-2.6.0-full 2003-07-23 12:08:31.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/reboot.c 2003-07-23 12:08:54.000000000 +0800
@@ -8,6 +8,7 @@
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
if (pm_power_off)
pm_power_off();
}
---- /dev/null 2003-01-30 03:24:37.000000000 -0700
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/relocate_kernel.S 2003-07-22 00:54:04.000000000 -0600
+--- /dev/null 2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/relocate_kernel.S 2003-07-23 12:08:54.000000000 +0800
@@ -0,0 +1,107 @@
+#include <linux/config.h>
+#include <linux/linkage.h>
+ .globl relocate_new_kernel_size
+relocate_new_kernel_size:
+ .long relocate_new_kernel_end - relocate_new_kernel
---- linux-2.6.0-test1/arch/i386/kernel/smp.c~kexec-2.6.0-full 2003-07-22 00:52:14.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/smp.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/smp.c~kexec-2.6.0-full 2003-07-23 12:08:52.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/smp.c 2003-07-23 12:53:45.000000000 +0800
@@ -587,6 +587,30 @@ void stop_this_cpu (void * dummy)
void smp_send_stop(void)
{
+ extern int reboot_cpu;
+ int reboot_cpu_id;
-+
++
+ /* The boot cpu is always logical cpu 0 */
+ reboot_cpu_id = 0;
+
+ }
+
+ /* Make certain I only run on the appropriate processor */
-+ set_cpus_allowed(current, 1 << reboot_cpu_id);
++ set_cpus_allowed(current, cpumask_of_cpu(reboot_cpu_id));
+
+ /* O.k. Now that I'm on the appropriate processor stop
+ * all of the others.
smp_call_function(stop_this_cpu, NULL, 1, 0);
local_irq_disable();
---- linux-2.6.0-test1/include/asm-i386/apic.h~kexec-2.6.0-full 2003-07-13 21:38:53.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/apic.h 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/include/asm-i386/apic.h~kexec-2.6.0-full 2003-07-14 11:38:53.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/apic.h 2003-07-23 12:08:54.000000000 +0800
@@ -97,6 +97,9 @@ extern unsigned int nmi_watchdog;
#define NMI_LOCAL_APIC 2
#define NMI_INVALID 3
#endif /* CONFIG_X86_LOCAL_APIC */
#endif /* __ASM_APIC_H */
---- linux-2.6.0-test1/include/asm-i386/apicdef.h~kexec-2.6.0-full 2003-07-13 21:34:40.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/apicdef.h 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/include/asm-i386/apicdef.h~kexec-2.6.0-full 2003-07-14 11:34:40.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/apicdef.h 2003-07-23 12:08:54.000000000 +0800
@@ -86,6 +86,7 @@
#define APIC_LVT_REMOTE_IRR (1<<14)
#define APIC_INPUT_POLARITY (1<<13)
#define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7)
#define SET_APIC_DELIVERY_MODE(x,y) (((x)&~0x700)|((y)<<8))
#define APIC_MODE_FIXED 0x0
---- /dev/null 2003-01-30 03:24:37.000000000 -0700
-+++ linux-2.6.0-test1-braam/include/asm-i386/kexec.h 2003-07-22 00:54:04.000000000 -0600
+--- /dev/null 2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/kexec.h 2003-07-23 12:08:54.000000000 +0800
@@ -0,0 +1,23 @@
+#ifndef _I386_KEXEC_H
+#define _I386_KEXEC_H
+#define KEXEC_REBOOT_CODE_SIZE 4096
+
+#endif /* _I386_KEXEC_H */
---- linux-2.6.0-test1/include/asm-i386/unistd.h~kexec-2.6.0-full 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/unistd.h 2003-07-22 00:55:57.000000000 -0600
+--- linux-2.6.0-test1/include/asm-i386/unistd.h~kexec-2.6.0-full 2003-07-23 12:08:42.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/unistd.h 2003-07-23 12:08:54.000000000 +0800
@@ -278,8 +278,9 @@
#define __NR_tgkill 270
#define __NR_utimes 271
/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
---- /dev/null 2003-01-30 03:24:37.000000000 -0700
-+++ linux-2.6.0-test1-braam/include/linux/kexec.h 2003-07-22 00:54:04.000000000 -0600
+--- /dev/null 2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/kexec.h 2003-07-23 12:08:54.000000000 +0800
@@ -0,0 +1,54 @@
+#ifndef LINUX_KEXEC_H
+#define LINUX_KEXEC_H
+#endif
+#endif /* LINUX_KEXEC_H */
+
---- linux-2.6.0-test1/include/linux/reboot.h~kexec-2.6.0-full 2003-07-13 21:39:35.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/linux/reboot.h 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/include/linux/reboot.h~kexec-2.6.0-full 2003-07-14 11:39:35.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/reboot.h 2003-07-23 12:08:54.000000000 +0800
@@ -22,6 +22,7 @@
* POWER_OFF Stop OS and remove all power from system, if possible.
* RESTART2 Restart system using given command string.
#ifdef __KERNEL__
---- linux-2.6.0-test1/kernel/Makefile~kexec-2.6.0-full 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/Makefile 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/kernel/Makefile~kexec-2.6.0-full 2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/Makefile 2003-07-23 12:08:54.000000000 +0800
@@ -19,6 +19,7 @@ obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
obj-$(CONFIG_COMPAT) += compat.o
ifneq ($(CONFIG_IA64),y)
---- /dev/null 2003-01-30 03:24:37.000000000 -0700
-+++ linux-2.6.0-test1-braam/kernel/kexec.c 2003-07-22 00:54:04.000000000 -0600
+--- /dev/null 2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/kexec.c 2003-07-23 12:08:54.000000000 +0800
@@ -0,0 +1,629 @@
+#include <linux/mm.h>
+#include <linux/file.h>
+ kimage_free(image);
+ return result;
+}
---- linux-2.6.0-test1/kernel/sys.c~kexec-2.6.0-full 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/sys.c 2003-07-22 00:54:04.000000000 -0600
+--- linux-2.6.0-test1/kernel/sys.c~kexec-2.6.0-full 2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/sys.c 2003-07-23 12:08:54.000000000 +0800
@@ -17,6 +17,7 @@
#include <linux/init.h>
#include <linux/highuid.h>
- arch/i386/Kconfig | 50 ++++++++++++++++++++++++++++
- arch/i386/boot/Makefile | 1
- arch/i386/kernel/i386_ksyms.c | 19 ++++++++++
- arch/i386/kernel/nmi.c | 2 +
- arch/i386/kernel/setup.c | 6 +++
- arch/i386/kernel/smp.c | 16 +++++++-
- arch/i386/kernel/traps.c | 2 +
- arch/i386/mm/init.c | 6 +++
- arch/s390/boot/Makefile | 2 -
- arch/s390/boot/install.sh | 24 +++++++++----
- drivers/Makefile | 1
- include/asm-i386/kmap_types.h | 5 +-
- include/asm-i386/mach-default/irq_vectors.h | 1
- include/asm-i386/smp.h | 1
- include/linux/major.h | 2 +
- init/Makefile | 4 ++
- init/main.c | 10 +++++
- init/version.c | 4 ++
- kernel/ksyms.c | 8 ++++
- kernel/panic.c | 17 +++++++++
- kernel/sched.c | 22 ++++++++++++
- lib/Kconfig | 10 +++--
- mm/page_alloc.c | 3 +
- scripts/mkcompile_h | 4 +-
- 24 files changed, 202 insertions(+), 18 deletions(-)
+ 0 files changed
---- linux-2.6.0-test1/drivers/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:37:15.000000000 -0600
-+++ linux-2.6.0-test1-braam/drivers/Makefile 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/drivers/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:37:15.000000000 +0800
++++ linux-2.6.0-test1-root/drivers/Makefile 2003-07-22 21:43:02.000000000 +0800
@@ -49,3 +49,4 @@ obj-$(CONFIG_ISDN_BOOL) += isdn/
obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
+obj-$(CONFIG_CRASH_DUMP) += dump/
---- linux-2.6.0-test1/include/linux/major.h~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:31:58.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/linux/major.h 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/include/linux/sysctl.h~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:34:40.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/sysctl.h 2003-07-22 21:46:19.000000000 +0800
+@@ -126,6 +126,7 @@ enum
+ KERN_PANIC_ON_OOPS=57, /* int: whether we will panic on an oops */
+ KERN_HPPA_PWRSW=58, /* int: hppa soft-power enable */
+ KERN_HPPA_UNALIGNED=59, /* int: hppa unaligned-trap enable */
++ KERN_DUMP=60, /* directory: dump parameters */
+ };
+
+
+--- linux-2.6.0-test1/include/linux/major.h~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:31:58.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/major.h 2003-07-22 21:43:02.000000000 +0800
@@ -157,6 +157,8 @@
#define OSST_MAJOR 206 /* OnStream-SCx0 SCSI tape */
#define IBM_TTY3270_MAJOR 227
#define IBM_FS3270_MAJOR 228
---- linux-2.6.0-test1/include/asm-i386/mach-default/irq_vectors.h~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:31:59.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/mach-default/irq_vectors.h 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/include/asm-i386/mach-default/irq_vectors.h~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:31:59.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/mach-default/irq_vectors.h 2003-07-22 21:43:02.000000000 +0800
@@ -48,6 +48,7 @@
#define INVALIDATE_TLB_VECTOR 0xfd
#define RESCHEDULE_VECTOR 0xfc
#define THERMAL_APIC_VECTOR 0xf0
/*
---- linux-2.6.0-test1/include/asm-i386/kmap_types.h~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/kmap_types.h 2003-07-22 00:53:23.000000000 -0600
-@@ -1,4 +1,4 @@
--#ifndef _ASM_KMAP_TYPES_H
-+22#ifndef _ASM_KMAP_TYPES_H
- #define _ASM_KMAP_TYPES_H
-
- #include <linux/config.h>
+--- linux-2.6.0-test1/include/asm-i386/kmap_types.h~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:41.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/kmap_types.h 2003-07-22 21:43:02.000000000 +0800
@@ -26,7 +26,8 @@ D(12) KM_IRQ0,
D(13) KM_IRQ1,
D(14) KM_SOFTIRQ0,
D(15) KM_SOFTIRQ1,
-D(16) KM_TYPE_NR
-+D(16) KM_DUMP
-+D(17) KM_TYPE_NR
++D(16) KM_DUMP,
++D(17) KM_TYPE_NR,
};
#undef D
---- linux-2.6.0-test1/include/asm-i386/smp.h~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/asm-i386/smp.h 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/include/asm-i386/smp.h~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:41.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/smp.h 2003-07-22 21:43:02.000000000 +0800
@@ -38,6 +38,7 @@ extern int smp_num_siblings;
extern int cpu_sibling_map[];
extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
extern void smp_send_reschedule(int cpu);
extern void smp_invalidate_rcv(void); /* Process an NMI */
---- linux-2.6.0-test1/arch/i386/kernel/i386_ksyms.c~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:39:21.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/i386_ksyms.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/i386_ksyms.c~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:39:21.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/i386_ksyms.c 2003-07-22 21:43:02.000000000 +0800
@@ -16,6 +16,7 @@
#include <linux/tty.h>
#include <linux/highmem.h>
+EXPORT_SYMBOL(touch_nmi_watchdog);
+#endif
+#endif
---- linux-2.6.0-test1/arch/i386/kernel/nmi.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/nmi.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/nmi.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/nmi.c 2003-07-22 21:43:02.000000000 +0800
@@ -24,6 +24,7 @@
#include <linux/kernel_stat.h>
#include <linux/module.h>
printk("console shuts up ...\n");
console_silent();
spin_unlock(&nmi_print_lock);
---- linux-2.6.0-test1/arch/i386/kernel/setup.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/setup.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/setup.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/setup.c 2003-07-22 21:43:02.000000000 +0800
@@ -439,6 +439,7 @@ static void __init setup_memory_region(v
print_memory_map(who);
} /* setup_memory_region */
void __init setup_arch(char **cmdline_p)
{
unsigned long max_low_pfn;
---- linux-2.6.0-test1/arch/i386/kernel/smp.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/smp.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/smp.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/smp.c 2003-07-22 21:43:02.000000000 +0800
@@ -19,6 +19,7 @@
#include <linux/mc146818rtc.h>
#include <linux/cache.h>
}
}
-
---- linux-2.6.0-test1/arch/i386/kernel/traps.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/kernel/traps.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/kernel/traps.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/traps.c 2003-07-22 21:43:02.000000000 +0800
@@ -25,6 +25,7 @@
#include <linux/highmem.h>
#include <linux/kallsyms.h>
bust_spinlocks(0);
spin_unlock_irq(&die_lock);
if (in_interrupt())
---- linux-2.6.0-test1/arch/i386/mm/init.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/mm/init.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/mm/init.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/mm/init.c 2003-07-22 21:43:02.000000000 +0800
@@ -186,6 +186,12 @@ static inline int page_is_ram(unsigned l
return 0;
}
#ifdef CONFIG_HIGHMEM
pte_t *kmap_pte;
pgprot_t kmap_prot;
---- linux-2.6.0-test1/arch/i386/boot/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:33:11.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/boot/Makefile 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/boot/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:33:11.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/boot/Makefile 2003-07-22 21:43:02.000000000 +0800
@@ -101,3 +101,4 @@ zlilo: $(BOOTIMAGE)
install: $(BOOTIMAGE)
sh $(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
+ if [ -f init/kerntypes.o ]; then cp init/kerntypes.o $(INSTALL_PATH)/Kerntypes; fi
---- linux-2.6.0-test1/arch/i386/Kconfig~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/i386/Kconfig 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/i386/Kconfig~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:10.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/Kconfig 2003-07-22 21:43:02.000000000 +0800
@@ -1297,6 +1297,56 @@ source "arch/i386/oprofile/Kconfig"
menu "Kernel hacking"
config DEBUG_KERNEL
bool "Kernel debugging"
help
---- linux-2.6.0-test1/arch/s390/boot/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:39:33.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/s390/boot/Makefile 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/s390/boot/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:39:33.000000000 +0800
++++ linux-2.6.0-test1-root/arch/s390/boot/Makefile 2003-07-22 21:43:02.000000000 +0800
@@ -16,4 +16,4 @@ $(obj)/image: vmlinux FORCE
install: $(CONFIGURE) $(obj)/image
sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
- System.map Kerntypes "$(INSTALL_PATH)"
+ System.map init/kerntypes.o "$(INSTALL_PATH)"
---- linux-2.6.0-test1/arch/s390/boot/install.sh~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:35:17.000000000 -0600
-+++ linux-2.6.0-test1-braam/arch/s390/boot/install.sh 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/arch/s390/boot/install.sh~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:35:17.000000000 +0800
++++ linux-2.6.0-test1-root/arch/s390/boot/install.sh 2003-07-22 21:43:02.000000000 +0800
@@ -16,7 +16,8 @@
# $1 - kernel version
# $2 - kernel image file
+if [ -f $4 ]; then
+ cp $4 $5/Kerntypes
+fi
---- linux-2.6.0-test1/scripts/mkcompile_h~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:39:36.000000000 -0600
-+++ linux-2.6.0-test1-braam/scripts/mkcompile_h 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/scripts/mkcompile_h~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:39:36.000000000 +0800
++++ linux-2.6.0-test1-root/scripts/mkcompile_h 2003-07-22 21:43:02.000000000 +0800
@@ -33,7 +33,7 @@ UTS_VERSION="$UTS_VERSION `LANG=C date`"
UTS_LEN=64
) > .tmpcompile
# Only replace the real compile.h if the new one is different,
---- linux-2.6.0-test1/kernel/ksyms.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/ksyms.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/kernel/ksyms.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/ksyms.c 2003-07-22 21:43:02.000000000 +0800
@@ -60,6 +60,8 @@
#include <linux/backing-dev.h>
#include <linux/percpu_counter.h>
+EXPORT_SYMBOL(dump_oncpu);
+EXPORT_SYMBOL(dump_function_ptr);
+#endif
---- linux-2.6.0-test1/kernel/panic.c~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:38:38.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/panic.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/kernel/panic.c~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:38:38.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/panic.c 2003-07-22 21:43:02.000000000 +0800
@@ -16,12 +16,16 @@
#include <linux/init.h>
#include <linux/sysrq.h>
mdelay(panic_timeout*1000);
/*
* Should we run the reboot notifier. For the moment Im
---- linux-2.6.0-test1/kernel/sched.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/sched.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/kernel/sched.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/sched.c 2003-07-22 21:43:02.000000000 +0800
@@ -41,6 +41,9 @@
#define cpu_to_node_mask(cpu) (cpu_online_map)
#endif
}
#ifdef CONFIG_PREEMPT
---- linux-2.6.0-test1/lib/Kconfig~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:34:43.000000000 -0600
-+++ linux-2.6.0-test1-braam/lib/Kconfig 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/lib/Kconfig~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:34:43.000000000 +0800
++++ linux-2.6.0-test1-root/lib/Kconfig 2003-07-22 21:43:02.000000000 +0800
@@ -17,14 +17,16 @@ config CRC32
#
config ZLIB_INFLATE
endmenu
---- linux-2.6.0-test1/mm/page_alloc.c~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:30:01.000000000 -0600
-+++ linux-2.6.0-test1-braam/mm/page_alloc.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/mm/page_alloc.c~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:30:01.000000000 +0800
++++ linux-2.6.0-test1-root/mm/page_alloc.c 2003-07-22 21:43:02.000000000 +0800
@@ -89,7 +89,8 @@ static void bad_page(const char *functio
page->mapping = NULL;
}
#define prep_compound_page(page, order) do { } while (0)
#define destroy_compound_page(page, order) do { } while (0)
#else
---- linux-2.6.0-test1/init/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:33:12.000000000 -0600
-+++ linux-2.6.0-test1-braam/init/Makefile 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/init/Makefile~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:33:12.000000000 +0800
++++ linux-2.6.0-test1-root/init/Makefile 2003-07-22 21:43:02.000000000 +0800
@@ -9,6 +9,9 @@ mounts-$(CONFIG_BLK_DEV_RAM) += do_mount
mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o
@echo ' CHK $@'
@sh $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
+
---- linux-2.6.0-test1/init/main.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 00:46:07.000000000 -0600
-+++ linux-2.6.0-test1-braam/init/main.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/init/main.c~lkcd-kernel-changes-2.6.0-test1 2003-07-22 21:13:43.000000000 +0800
++++ linux-2.6.0-test1-root/init/main.c 2003-07-22 21:43:02.000000000 +0800
@@ -100,6 +100,16 @@ extern void ipc_init(void);
int system_running = 0;
* Boot command-line arguments
*/
#define MAX_INIT_ARGS 8
---- linux-2.6.0-test1/init/version.c~lkcd-kernel-changes-2.6.0-test1 2003-07-13 21:34:03.000000000 -0600
-+++ linux-2.6.0-test1-braam/init/version.c 2003-07-22 00:52:14.000000000 -0600
+--- linux-2.6.0-test1/init/version.c~lkcd-kernel-changes-2.6.0-test1 2003-07-14 11:34:03.000000000 +0800
++++ linux-2.6.0-test1-root/init/version.c 2003-07-22 21:43:02.000000000 +0800
@@ -10,6 +10,7 @@
#include <linux/uts.h>
#include <linux/utsname.h>
fs/exec.c | 18 +++++++---
fs/namei.c | 81 +++++++++++++++++++++++++++++++++++++++++++++----
fs/namespace.c | 2 +
+ fs/nfs/dir.c | 4 +-
fs/open.c | 64 +++++++++++++++++++++++++-------------
fs/stat.c | 28 ++++++++++++----
- fs/sysfs/inode.c | 2 -
include/linux/dcache.h | 3 +
include/linux/fs.h | 7 ++++
- include/linux/namei.h | 59 ++++++++++++++++++++++++++++++++---
+ include/linux/namei.h | 56 ++++++++++++++++++++++++++++-----
kernel/ksyms.c | 8 ++++
- net/sunrpc/rpc_pipe.c | 6 +--
- net/unix/af_unix.c | 2 -
- 12 files changed, 228 insertions(+), 52 deletions(-)
+ 10 files changed, 219 insertions(+), 52 deletions(-)
---- linux-2.6.0-test1/fs/sysfs/inode.c~vfs_intent_2.6.0-test1 2003-07-13 21:37:23.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/sysfs/inode.c 2003-07-16 17:32:36.000000000 -0600
-@@ -81,7 +81,7 @@ struct dentry * sysfs_get_dentry(struct
- qstr.name = name;
- qstr.len = strlen(name);
- qstr.hash = full_name_hash(name,qstr.len);
-- return lookup_hash(&qstr,parent);
-+ return lookup_hash(&qstr,parent, NULL);
- }
-
- void sysfs_hash_and_remove(struct dentry * dir, const char * name)
---- linux-2.6.0-test1/fs/exec.c~vfs_intent_2.6.0-test1 2003-07-16 17:19:46.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/exec.c 2003-07-16 18:42:40.000000000 -0600
+--- linux-2.6.0-test1/fs/exec.c~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/exec.c 2003-07-22 13:48:04.000000000 -0600
@@ -116,8 +116,11 @@ asmlinkage long sys_uselib(const char __
struct file * file;
struct nameidata nd;
+ error = user_path_walk_it(library, &nd);
- nd.intent.open.flags = O_RDONLY;
-+ nd.intent.intent.open.flags = O_RDONLY;
++ nd.intent.it_flags = O_RDONLY;
error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
if (error)
goto out;
+ struct file *file;
+
+ intent_init(&nd.intent, IT_OPEN);
-+ nd.intent.intent.open.flags = O_RDONLY;
++ nd.intent.it_flags = O_RDONLY;
+ err = path_lookup(name, LOOKUP_FOLLOW, &nd);
+ file = ERR_PTR(err);
if (!IS_ERR(file)) {
err = deny_write_access(file);
if (err) {
---- linux-2.6.0-test1/fs/namei.c~vfs_intent_2.6.0-test1 2003-07-16 17:19:46.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/namei.c 2003-07-16 18:37:11.000000000 -0600
+--- linux-2.6.0-test1/fs/namei.c~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/namei.c 2003-07-22 13:48:04.000000000 -0600
@@ -263,8 +263,19 @@ int deny_write_access(struct file * file
return 0;
}
/* Fill in the open() intent data */
- nd->intent.open.flags = flag;
- nd->intent.open.create_mode = mode;
-+ nd->intent.intent.open.flags = flag;
-+ nd->intent.intent.open.create_mode = mode;
++ nd->intent.it_flags = flag;
++ nd->intent.it_create_mode = mode;
/*
* The simplest case - just a plain lookup.
}
+
+ intent_init(&nd->intent, it.it_op);
-+ nd->intent.intent.open.flags = it.intent.open.flags;
-+ nd->intent.intent.open.create_mode = it.intent.open.create_mode;
++ nd->intent.it_flags = it.it_flags;
++ nd->intent.it_create_mode = it.it_create_mode;
res = link_path_walk(link, nd);
out:
if (current->link_count || res || nd->last_type!=LAST_NORM)
---- linux-2.6.0-test1/fs/namespace.c~vfs_intent_2.6.0-test1 2003-07-16 17:19:46.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/namespace.c 2003-07-16 18:44:38.000000000 -0600
+--- linux-2.6.0-test1/fs/namespace.c~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/namespace.c 2003-07-22 13:48:04.000000000 -0600
@@ -738,6 +738,7 @@ long do_mount(char * dev_name, char * di
int retval = 0;
int mnt_flags = 0;
static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd)
{
--- linux-2.6.0-test1/fs/open.c~vfs_intent_2.6.0-test1 2003-07-13 21:29:30.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/open.c 2003-07-16 18:39:48.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/open.c 2003-07-22 13:48:04.000000000 -0600
@@ -200,7 +200,7 @@ static inline long do_sys_truncate(const
struct nameidata nd;
struct inode * inode;
/*
* Find an empty file descriptor entry, and mark it busy.
*/
---- linux-2.6.0-test1/fs/stat.c~vfs_intent_2.6.0-test1 2003-07-13 21:31:21.000000000 -0600
-+++ linux-2.6.0-test1-braam/fs/stat.c 2003-07-16 18:44:27.000000000 -0600
+--- linux-2.6.0-test1/fs/stat.c~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/stat.c 2003-07-22 13:48:04.000000000 -0600
@@ -33,7 +33,7 @@ void generic_fillattr(struct inode *inod
stat->blksize = inode->i_blksize;
}
}
return error;
--- linux-2.6.0-test1/include/linux/dcache.h~vfs_intent_2.6.0-test1 2003-07-13 21:39:22.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/linux/dcache.h 2003-07-16 17:49:49.000000000 -0600
++++ linux-2.6.0-test1-braam/include/linux/dcache.h 2003-07-22 13:48:04.000000000 -0600
@@ -4,6 +4,7 @@
#ifdef __KERNEL__
struct dentry_stat_t {
int nr_dentry;
int nr_unused;
---- linux-2.6.0-test1/include/linux/fs.h~vfs_intent_2.6.0-test1 2003-07-16 17:19:46.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/linux/fs.h 2003-07-16 17:32:36.000000000 -0600
+--- linux-2.6.0-test1/include/linux/fs.h~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/include/linux/fs.h 2003-07-22 13:48:04.000000000 -0600
@@ -237,6 +237,8 @@ typedef int (get_blocks_t)(struct inode
#define ATTR_ATTR_FLAG 1024
#define ATTR_KILL_SUID 2048
extern char * getname(const char __user *);
--- linux-2.6.0-test1/include/linux/namei.h~vfs_intent_2.6.0-test1 2003-07-13 21:32:39.000000000 -0600
-+++ linux-2.6.0-test1-braam/include/linux/namei.h 2003-07-16 18:38:10.000000000 -0600
-@@ -2,25 +2,64 @@
++++ linux-2.6.0-test1-braam/include/linux/namei.h 2003-07-22 14:43:29.000000000 -0600
+@@ -2,25 +2,55 @@
#define _LINUX_NAMEI_H
#include <linux/linkage.h>
struct vfsmount;
+struct nameidata;
-+
+
+-struct open_intent {
+- int flags;
+- int create_mode;
+/* intent opcodes */
+#define IT_OPEN (1)
+#define IT_CREAT (1<<1)
+#define IT_UNLINK (1<<5)
+#define IT_TRUNC (1<<6)
+#define IT_GETXATTR (1<<7)
-
- struct open_intent {
- int flags;
- int create_mode;
++
++struct lustre_intent_data {
++ int it_disposition;
++ int it_status;
++ __u64 it_lock_handle;
++ void *it_data;
++ int it_lock_mode;
};
-+struct lustre_intent_data {
-+ int it_mode;
-+ int it_flags;
-+ int it_disposition;
-+ int it_status;
-+ struct iattr *it_iattr;
-+ __u64 it_lock_handle[2];
-+ int it_lock_mode;
-+ void *it_data;
-+};
-+
+#define INTENT_MAGIC 0x19620323
+struct lookup_intent {
-+ int it_magic;
-+ void (*it_op_release)(struct lookup_intent *);
-+ int it_op;
-+ union {
-+ struct open_intent open;
-+ } intent;
++ int it_magic;
++ void (*it_op_release)(struct lookup_intent *);
++ int it_op;
++ int it_flags;
++ int it_create_mode;
+ union {
+ struct lustre_intent_data lustre;
-+ } fsdata;
++ } d;
+};
+
+static inline void intent_init(struct lookup_intent *it, int op)
};
/*
-@@ -41,6 +80,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
+@@ -41,6 +71,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
#define LOOKUP_CONTINUE 4
#define LOOKUP_PARENT 16
#define LOOKUP_NOALT 32
/*
* Intent data
*/
-@@ -49,6 +91,12 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
+@@ -49,6 +82,12 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
#define LOOKUP_ACCESS (0x0400)
extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
#define user_path_walk(name,nd) \
__user_walk(name, LOOKUP_FOLLOW, nd)
#define user_path_walk_link(name,nd) \
-@@ -60,7 +108,6 @@ extern void path_release(struct nameidat
+@@ -60,7 +99,6 @@ extern void path_release(struct nameidat
extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
extern int follow_down(struct vfsmount **, struct dentry **);
extern int follow_up(struct vfsmount **, struct dentry **);
---- linux-2.6.0-test1/kernel/ksyms.c~vfs_intent_2.6.0-test1 2003-07-16 17:20:31.000000000 -0600
-+++ linux-2.6.0-test1-braam/kernel/ksyms.c 2003-07-16 17:32:36.000000000 -0600
-@@ -383,6 +383,7 @@ EXPORT_SYMBOL(unregister_filesystem);
+--- linux-2.6.0-test1/kernel/ksyms.c~vfs_intent_2.6.0-test1 2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/kernel/ksyms.c 2003-07-22 13:48:04.000000000 -0600
+@@ -381,6 +381,7 @@ EXPORT_SYMBOL(unregister_filesystem);
EXPORT_SYMBOL(kern_mount);
EXPORT_SYMBOL(__mntput);
EXPORT_SYMBOL(may_umount);
/* executable format registration */
EXPORT_SYMBOL(register_binfmt);
-@@ -412,6 +413,12 @@ EXPORT_SYMBOL(del_timer);
+@@ -410,6 +411,12 @@ EXPORT_SYMBOL(del_timer);
EXPORT_SYMBOL(request_irq);
EXPORT_SYMBOL(free_irq);
/* waitqueue handling */
EXPORT_SYMBOL(add_wait_queue);
EXPORT_SYMBOL(add_wait_queue_exclusive);
-@@ -559,6 +566,7 @@ EXPORT_SYMBOL(sys_tz);
+@@ -557,6 +564,7 @@ EXPORT_SYMBOL(sys_tz);
EXPORT_SYMBOL(file_fsync);
EXPORT_SYMBOL(fsync_buffers_list);
EXPORT_SYMBOL(clear_inode);
EXPORT_SYMBOL(init_special_inode);
EXPORT_SYMBOL(new_inode);
EXPORT_SYMBOL(__insert_inode_hash);
---- linux-2.6.0-test1/net/unix/af_unix.c~vfs_intent_2.6.0-test1 2003-07-13 21:35:16.000000000 -0600
-+++ linux-2.6.0-test1-braam/net/unix/af_unix.c 2003-07-16 17:32:36.000000000 -0600
-@@ -702,7 +702,7 @@ static int unix_bind(struct socket *sock
- /*
- * Do the final lookup.
- */
-- dentry = lookup_hash(&nd.last, nd.dentry);
-+ dentry = lookup_hash(&nd.last, nd.dentry, NULL);
- err = PTR_ERR(dentry);
- if (IS_ERR(dentry))
- goto out_mknod_unlock;
---- linux-2.6.0-test1/net/sunrpc/rpc_pipe.c~vfs_intent_2.6.0-test1 2003-07-13 21:32:34.000000000 -0600
-+++ linux-2.6.0-test1-braam/net/sunrpc/rpc_pipe.c 2003-07-16 17:32:36.000000000 -0600
-@@ -598,7 +598,7 @@ rpc_lookup_negative(char *path, struct n
- return ERR_PTR(error);
- dir = nd->dentry->d_inode;
- down(&dir->i_sem);
-- dentry = lookup_hash(&nd->last, nd->dentry);
-+ dentry = lookup_hash(&nd->last, nd->dentry, NULL);
- if (IS_ERR(dentry))
- goto out_err;
- if (dentry->d_inode) {
-@@ -660,7 +660,7 @@ rpc_rmdir(char *path)
- return error;
- dir = nd.dentry->d_inode;
- down(&dir->i_sem);
-- dentry = lookup_hash(&nd.last, nd.dentry);
-+ dentry = lookup_hash(&nd.last, nd.dentry, NULL);
- if (IS_ERR(dentry)) {
- error = PTR_ERR(dentry);
- goto out_release;
-@@ -721,7 +721,7 @@ rpc_unlink(char *path)
- return error;
- dir = nd.dentry->d_inode;
- down(&dir->i_sem);
-- dentry = lookup_hash(&nd.last, nd.dentry);
-+ dentry = lookup_hash(&nd.last, nd.dentry, NULL);
- if (IS_ERR(dentry)) {
- error = PTR_ERR(dentry);
- goto out_release;
+--- linux-2.6.0-test1/fs/nfs/dir.c~vfs_intent_2.6.0-test1 2003-07-13 21:34:03.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/nfs/dir.c 2003-07-22 13:48:04.000000000 -0600
+@@ -650,7 +650,7 @@ int nfs_is_exclusive_create(struct inode
+ return 0;
+ if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ return 0;
+- return (nd->intent.open.flags & O_EXCL) != 0;
++ return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+@@ -830,7 +830,7 @@ static int nfs_create(struct inode *dir,
+ attr.ia_valid = ATTR_MODE;
+
+ if (nd && (nd->flags & LOOKUP_CREATE))
+- open_flags = nd->intent.open.flags;
++ open_flags = nd->intent.it_flags;
+
+ /*
+ * The 0 argument passed into the create function should one day
_
-fs/sysfs/inode.c
fs/dcache.c
fs/exec.c
fs/xattr.c
include/linux/fs.h
include/linux/namei.h
kernel/ksyms.c
-net/unix/af_unix.c
-net/sunrpc/rpc_pipe.c
+fs/nfs/dir.c
2.6.0-test1-mm2.patch
-lkcd-cvs-2.5.69.patch
+lkcd-cvs-2.6.0-test1.patch
lkcd-kernel-changes-2.6.0-test1.patch
kexec-2.6.0-full.patch
dump_netdev.patch
lustre_build.patch
lustre_version.patch
vfs_intent_2.6.0-test1.patch
-vfs_nointent_2.5.69_rev1.patch
+vfs_nointent_2.6.0-test1.patch
vfs_races_2.5.72_rev1.patch
vfs_mntcwd_2.5.72_rev1.patch
ext3-san-jdike-2.5.73.patch
if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n",
- valid, src->i_mtime, src->i_ctime);
+ valid, LTIME_S(src->i_mtime),
+ LTIME_S(src->i_ctime));
if (valid & OBD_MD_FLATIME) {
dst->o_atime = LTIME_S(src->i_atime);
if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
CDEBUG(D_INODE, "valid %x, cur time %lu/%lu, new %lu/%lu\n",
- src->o_valid, dst->i_mtime, dst->i_ctime,
+ src->o_valid, LTIME_S(dst->i_mtime),
+ LTIME_S(dst->i_ctime),
(long)src->o_mtime, (long)src->o_ctime);
if (valid & OBD_MD_FLATIME && src->o_atime > LTIME_S(dst->i_atime))
if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
CDEBUG(D_INODE, "valid %x, cur time %lu/%lu, new %lu/%lu\n",
- src->o_valid, dst->i_mtime, dst->i_ctime,
+ src->o_valid,
+ LTIME_S(dst->i_mtime), LTIME_S(dst->i_ctime),
(long)src->o_mtime, (long)src->o_ctime);
if (valid & OBD_MD_FLATIME)
git://git.whamcloud.com / fs / lustre-release.git / commitdiff