[packages/kernel.git] / 2.6.0-test1-lkml.patch

diff -Nur linux-2.6.0-test1.org/drivers/input/mouse/synaptics.c linux-2.6.0-test1/drivers/input/mouse/synaptics.c
--- linux-2.6.0-test1.org/drivers/input/mouse/synaptics.c	Mon Jul 14 03:32:41 2003
+++ linux-2.6.0-test1/drivers/input/mouse/synaptics.c	Sun Jul 20 16:42:47 2003
@@ -81,6 +81,8 @@
 {
 	unsigned char r[2];
 
+	return 0;
+
 	if (psmouse_command(psmouse, r, PSMOUSE_CMD_RESET_BAT))
 		return -1;
 	if (r[0] == 0xAA && r[1] == 0x00)
diff -Nur linux-2.6.0-test1.org/fs/reiserfs/hashes.c linux-2.6.0-test1/fs/reiserfs/hashes.c
--- linux-2.6.0-test1.org/fs/reiserfs/hashes.c	Mon Jul 14 03:36:43 2003
+++ linux-2.6.0-test1/fs/reiserfs/hashes.c	Sun Jul 20 16:42:58 2003
@@ -90,10 +90,6 @@
 
 	if (len >= 12)
 	{
-	    	//assert(len < 16);
-		if (len >= 16)
-		    BUG();
-
 		a = (u32)msg[ 0]      |
 		    (u32)msg[ 1] << 8 |
 		    (u32)msg[ 2] << 16|
@@ -116,9 +112,6 @@
 	}
 	else if (len >= 8)
 	{
-	    	//assert(len < 12);
-		if (len >= 12)
-		    BUG();
 		a = (u32)msg[ 0]      |
 		    (u32)msg[ 1] << 8 |
 		    (u32)msg[ 2] << 16|
@@ -137,9 +130,6 @@
 	}
 	else if (len >= 4)
 	{
-	    	//assert(len < 8);
-		if (len >= 8)
-		    BUG();
 		a = (u32)msg[ 0]      |
 		    (u32)msg[ 1] << 8 |
 		    (u32)msg[ 2] << 16|
@@ -154,9 +144,6 @@
 	}
 	else
 	{
-	    	//assert(len < 4);
-		if (len >= 4)
-		    BUG();
 		a = b = c = d = pad;
 		for(i = 0; i < len; i++)
 		{
diff -Nur linux-2.6.0-test1.org/include/asm-i386/stat.h linux-2.6.0-test1/include/asm-i386/stat.h
--- linux-2.6.0-test1.org/include/asm-i386/stat.h	Mon Jul 14 03:30:01 2003
+++ linux-2.6.0-test1/include/asm-i386/stat.h	Sun Jul 20 16:43:07 2003
@@ -8,7 +8,7 @@
 	unsigned short st_nlink;
 	unsigned short st_uid;
 	unsigned short st_gid;
-	unsigned short st_rdev;
+	unsigned int   st_rdev;
 	unsigned long  st_size;
 	unsigned long  st_atime;
 	unsigned long  st_mtime;
diff -Nur linux-2.6.0-test1.org/include/asm-i386/stat.h.orig linux-2.6.0-test1/include/asm-i386/stat.h.orig
--- linux-2.6.0-test1.org/include/asm-i386/stat.h.orig	Thu Jan  1 00:00:00 1970
+++ linux-2.6.0-test1/include/asm-i386/stat.h.orig	Mon Jul 14 03:30:01 2003
@@ -0,0 +1,78 @@
+#ifndef _I386_STAT_H
+#define _I386_STAT_H
+
+struct __old_kernel_stat {
+	unsigned short st_dev;
+	unsigned short st_ino;
+	unsigned short st_mode;
+	unsigned short st_nlink;
+	unsigned short st_uid;
+	unsigned short st_gid;
+	unsigned short st_rdev;
+	unsigned long  st_size;
+	unsigned long  st_atime;
+	unsigned long  st_mtime;
+	unsigned long  st_ctime;
+};
+
+struct stat {
+	unsigned long  st_dev;
+	unsigned long  st_ino;
+	unsigned short st_mode;
+	unsigned short st_nlink;
+	unsigned short st_uid;
+	unsigned short st_gid;
+	unsigned long  st_rdev;
+	unsigned long  st_size;
+	unsigned long  st_blksize;
+	unsigned long  st_blocks;
+	unsigned long  st_atime;
+	unsigned long  st_atime_nsec;
+	unsigned long  st_mtime;
+	unsigned long  st_mtime_nsec;
+	unsigned long  st_ctime;
+	unsigned long  st_ctime_nsec;
+	unsigned long  __unused4;
+	unsigned long  __unused5;
+};
+
+/* This matches struct stat64 in glibc2.1, hence the absolutely
+ * insane amounts of padding around dev_t's.
+ */
+struct stat64 {
+	unsigned long long	st_dev;
+	unsigned char	__pad0[4];
+
+#define STAT64_HAS_BROKEN_ST_INO	1
+	unsigned long	__st_ino;
+
+	unsigned int	st_mode;
+	unsigned int	st_nlink;
+
+	unsigned long	st_uid;
+	unsigned long	st_gid;
+
+	unsigned long long	st_rdev;
+	unsigned char	__pad3[4];
+
+	long long	st_size;
+	unsigned long	st_blksize;
+
+	unsigned long	st_blocks;	/* Number 512-byte blocks allocated. */
+	unsigned long	__pad4;		/* future possible st_blocks high bits */
+
+	unsigned long	st_atime;
+	unsigned long	st_atime_nsec;
+
+	unsigned long	st_mtime;
+	unsigned int	st_mtime_nsec;
+
+	unsigned long	st_ctime;
+	unsigned long	st_ctime_nsec;
+
+	unsigned long long	st_ino;
+};
+
+#define STAT_HAVE_NSEC 1
+
+#endif
diff -Nur linux-2.6.0-test1.org/include/asm-sparc64/floppy.h linux-2.6.0-test1/include/asm-sparc64/floppy.h
--- linux-2.6.0-test1.org/include/asm-sparc64/floppy.h	Mon Jul 14 03:39:23 2003
+++ linux-2.6.0-test1/include/asm-sparc64/floppy.h	Sun Jul 20 16:45:28 2003
@@ -214,7 +214,7 @@
 }
 
 /* Our low-level entry point in arch/sparc/kernel/entry.S */
-extern void floppy_hardint(int irq, void *unused, struct pt_regs *regs);
+extern irqreturn_t floppy_hardint(int irq, void *unused, struct pt_regs *regs);
 
 static int sun_fd_request_irq(void)
 {
@@ -224,7 +224,7 @@
 	if(!once) {
 		once = 1;
 
-		error = request_fast_irq(FLOPPY_IRQ, floppy_hardint, 
+		error = request_fast_irq(FLOPPY_IRQ, &floppy_hardint, 
 					 SA_INTERRUPT, "floppy", NULL);
 
 		return ((error == 0) ? 0 : -1);
@@ -277,7 +277,7 @@
 static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
 static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
 
-extern void floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+extern irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 static unsigned char sun_pci_fd_inb(unsigned long port)
 {
diff -Nur linux-2.6.0-test1.org/mm/slab.c linux-2.6.0-test1/mm/slab.c
--- linux-2.6.0-test1.org/mm/slab.c	Sun Jul 20 16:37:17 2003
+++ linux-2.6.0-test1/mm/slab.c	Sun Jul 20 16:43:53 2003
@@ -2488,11 +2488,11 @@
 		seq_puts(m, "slabinfo - version: 2.0\n");
 #endif
 		seq_puts(m, "# name            <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab>");
-		seq_puts(m, " : tunables <batchcount> <limit <sharedfactor>");
+		seq_puts(m, " : tunables <batchcount> <limit> <sharedfactor>");
 		seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");
 #if STATS
 		seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> <error> <maxfreeable> <freelimit>");
-		seq_puts(m, " : cpustat <allochit <allocmiss <freehit <freemiss>");
+		seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
 #endif
 		seq_putc(m, '\n');
 	}
diff -Nur linux-2.6.0-test1.org/net/sunrpc/xprt.c linux-2.6.0-test1/net/sunrpc/xprt.c
--- linux-2.6.0-test1.org/net/sunrpc/xprt.c	Mon Jul 14 03:36:06 2003
+++ linux-2.6.0-test1/net/sunrpc/xprt.c	Sun Jul 20 16:43:41 2003
@@ -66,8 +66,6 @@
 #include <net/udp.h>
 #include <net/tcp.h>
 
-#include <asm/uaccess.h>
-
 /*
  * Local variables
  */
diff -Nur linux-2.6.0-test1.org/scripts/ver_linux linux-2.6.0-test1/scripts/ver_linux
--- linux-2.6.0-test1.org/scripts/ver_linux	Sun Jul 20 16:37:17 2003
+++ linux-2.6.0-test1/scripts/ver_linux	Sun Jul 20 16:43:15 2003
@@ -28,7 +28,7 @@
 
 mount --version | awk -F\- '{print "mount                 ", $NF}'
 
-depmod -V  2>&1 | grep version | awk 'NR==1 {print "module-init-tools     ",$NF}'
+depmod -V  2>&1 | awk 'NR==1 {print "module-init-tools     ",$NF}'
 
 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
 'NR==1 {print "e2fsprogs             ", $2}'
diff -Nur linux-2.6.0-test1.org/sound/core/memalloc.c linux-2.6.0-test1/sound/core/memalloc.c
--- linux-2.6.0-test1.org/sound/core/memalloc.c	Mon Jul 14 03:38:48 2003
+++ linux-2.6.0-test1/sound/core/memalloc.c	Sun Jul 20 16:43:26 2003
@@ -886,7 +886,9 @@
 
 static int __init snd_mem_init(void)
 {
+#ifdef CONFIG_PROC_FS
 	create_proc_read_entry("driver/snd-page-alloc", 0, 0, snd_mem_proc_read, NULL);
+#endif
 #ifdef ENABLE_PREALLOC
 	preallocate_cards();
 #endif
Commit	Line	Data
95769a63	1	diff -Nur linux-2.6.0-test1.org/drivers/input/mouse/synaptics.c linux-2.6.0-test1/drivers/input/mouse/synaptics.c
	2	--- linux-2.6.0-test1.org/drivers/input/mouse/synaptics.c Mon Jul 14 03:32:41 2003
	3	+++ linux-2.6.0-test1/drivers/input/mouse/synaptics.c Sun Jul 20 16:42:47 2003
	4	@@ -81,6 +81,8 @@
	5	{
	6	unsigned char r[2];
2d636234	7
95769a63	8	+ return 0;
	9	+
	10	if (psmouse_command(psmouse, r, PSMOUSE_CMD_RESET_BAT))
	11	return -1;
	12	if (r[0] == 0xAA && r[1] == 0x00)
	13	diff -Nur linux-2.6.0-test1.org/fs/reiserfs/hashes.c linux-2.6.0-test1/fs/reiserfs/hashes.c
	14	--- linux-2.6.0-test1.org/fs/reiserfs/hashes.c Mon Jul 14 03:36:43 2003
	15	+++ linux-2.6.0-test1/fs/reiserfs/hashes.c Sun Jul 20 16:42:58 2003
	16	@@ -90,10 +90,6 @@
2d636234	17
95769a63	18	if (len >= 12)
	19	{
	20	- //assert(len < 16);
	21	- if (len >= 16)
	22	- BUG();
	23	-
	24	a = (u32)msg[ 0] \|
	25	(u32)msg[ 1] << 8 \|
	26	(u32)msg[ 2] << 16\|
	27	@@ -116,9 +112,6 @@
	28	}
	29	else if (len >= 8)
	30	{
	31	- //assert(len < 12);
	32	- if (len >= 12)
	33	- BUG();
	34	a = (u32)msg[ 0] \|
	35	(u32)msg[ 1] << 8 \|
	36	(u32)msg[ 2] << 16\|
	37	@@ -137,9 +130,6 @@
	38	}
	39	else if (len >= 4)
	40	{
	41	- //assert(len < 8);
	42	- if (len >= 8)
	43	- BUG();
	44	a = (u32)msg[ 0] \|
	45	(u32)msg[ 1] << 8 \|
	46	(u32)msg[ 2] << 16\|
	47	@@ -154,9 +144,6 @@
	48	}
	49	else
	50	{
	51	- //assert(len < 4);
	52	- if (len >= 4)
	53	- BUG();
	54	a = b = c = d = pad;
	55	for(i = 0; i < len; i++)
	56	{
	57	diff -Nur linux-2.6.0-test1.org/include/asm-i386/stat.h linux-2.6.0-test1/include/asm-i386/stat.h
	58	--- linux-2.6.0-test1.org/include/asm-i386/stat.h Mon Jul 14 03:30:01 2003
	59	+++ linux-2.6.0-test1/include/asm-i386/stat.h Sun Jul 20 16:43:07 2003
	60	@@ -8,7 +8,7 @@
	61	unsigned short st_nlink;
	62	unsigned short st_uid;
	63	unsigned short st_gid;
	64	- unsigned short st_rdev;
	65	+ unsigned int st_rdev;
	66	unsigned long st_size;
	67	unsigned long st_atime;
	68	unsigned long st_mtime;
	69	diff -Nur linux-2.6.0-test1.org/include/asm-i386/stat.h.orig linux-2.6.0-test1/include/asm-i386/stat.h.orig
	70	--- linux-2.6.0-test1.org/include/asm-i386/stat.h.orig Thu Jan 1 00:00:00 1970
	71	+++ linux-2.6.0-test1/include/asm-i386/stat.h.orig Mon Jul 14 03:30:01 2003
	72	@@ -0,0 +1,78 @@
	73	+#ifndef _I386_STAT_H
	74	+#define _I386_STAT_H
	75	+
	76	+struct __old_kernel_stat {
	77	+ unsigned short st_dev;
	78	+ unsigned short st_ino;
	79	+ unsigned short st_mode;
	80	+ unsigned short st_nlink;
	81	+ unsigned short st_uid;
82	+ unsigned short st_gid;
83	+ unsigned short st_rdev;
84	+ unsigned long st_size;
85	+ unsigned long st_atime;
86	+ unsigned long st_mtime;
87	+ unsigned long st_ctime;
88	+};
89	+
90	+struct stat {
91	+ unsigned long st_dev;
92	+ unsigned long st_ino;
93	+ unsigned short st_mode;
94	+ unsigned short st_nlink;
95	+ unsigned short st_uid;
96	+ unsigned short st_gid;
97	+ unsigned long st_rdev;
98	+ unsigned long st_size;
99	+ unsigned long st_blksize;
100	+ unsigned long st_blocks;
101	+ unsigned long st_atime;
102	+ unsigned long st_atime_nsec;
103	+ unsigned long st_mtime;
104	+ unsigned long st_mtime_nsec;
105	+ unsigned long st_ctime;
106	+ unsigned long st_ctime_nsec;
107	+ unsigned long __unused4;
108	+ unsigned long __unused5;
109	+};
110	+
111	+/* This matches struct stat64 in glibc2.1, hence the absolutely
112	+ * insane amounts of padding around dev_t's.
113	+ */
114	+struct stat64 {
115	+ unsigned long long st_dev;
116	+ unsigned char __pad0[4];
117	+
118	+#define STAT64_HAS_BROKEN_ST_INO 1
119	+ unsigned long __st_ino;
120	+
121	+ unsigned int st_mode;
122	+ unsigned int st_nlink;
123	+
124	+ unsigned long st_uid;
125	+ unsigned long st_gid;
126	+
127	+ unsigned long long st_rdev;
128	+ unsigned char __pad3[4];
129	+
130	+ long long st_size;
131	+ unsigned long st_blksize;
132	+
133	+ unsigned long st_blocks; /* Number 512-byte blocks allocated. */
134	+ unsigned long __pad4; /* future possible st_blocks high bits */
135	+
136	+ unsigned long st_atime;
137	+ unsigned long st_atime_nsec;
138	+
139	+ unsigned long st_mtime;
140	+ unsigned int st_mtime_nsec;
141	+
142	+ unsigned long st_ctime;
143	+ unsigned long st_ctime_nsec;
144	+
145	+ unsigned long long st_ino;
146	+};
147	+
148	+#define STAT_HAVE_NSEC 1
149	+
150	+#endif
151	diff -Nur linux-2.6.0-test1.org/include/asm-sparc64/floppy.h linux-2.6.0-test1/include/asm-sparc64/floppy.h
152	--- linux-2.6.0-test1.org/include/asm-sparc64/floppy.h Mon Jul 14 03:39:23 2003
153	+++ linux-2.6.0-test1/include/asm-sparc64/floppy.h Sun Jul 20 16:45:28 2003
154	@@ -214,7 +214,7 @@
155	}
156
157	/* Our low-level entry point in arch/sparc/kernel/entry.S */
158	-extern void floppy_hardint(int irq, void unused, struct pt_regs regs);
159	+extern irqreturn_t floppy_hardint(int irq, void unused, struct pt_regs regs);
160
161	static int sun_fd_request_irq(void)
2d636234	162	{
95769a63	163	@@ -224,7 +224,7 @@
	164	if(!once) {
	165	once = 1;
	166
	167	- error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
	168	+ error = request_fast_irq(FLOPPY_IRQ, &floppy_hardint,
	169	SA_INTERRUPT, "floppy", NULL);
	170
	171	return ((error == 0) ? 0 : -1);
	172	@@ -277,7 +277,7 @@
	173	static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
	174	static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
	175
	176	-extern void floppy_interrupt(int irq, void dev_id, struct pt_regs regs);
	177	+extern irqreturn_t floppy_interrupt(int irq, void dev_id, struct pt_regs regs);
	178
	179	static unsigned char sun_pci_fd_inb(unsigned long port)
	180	{
	181	diff -Nur linux-2.6.0-test1.org/mm/slab.c linux-2.6.0-test1/mm/slab.c
	182	--- linux-2.6.0-test1.org/mm/slab.c Sun Jul 20 16:37:17 2003
	183	+++ linux-2.6.0-test1/mm/slab.c Sun Jul 20 16:43:53 2003
	184	@@ -2488,11 +2488,11 @@
	185	seq_puts(m, "slabinfo - version: 2.0\n");
	186	#endif
	187	seq_puts(m, "# name <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab>");
	188	- seq_puts(m, " : tunables <batchcount> <limit <sharedfactor>");
	189	+ seq_puts(m, " : tunables <batchcount> <limit> <sharedfactor>");
	190	seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");
	191	#if STATS
	192	seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> <error> <maxfreeable> <freelimit>");
	193	- seq_puts(m, " : cpustat <allochit <allocmiss <freehit <freemiss>");
	194	+ seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
	195	#endif
	196	seq_putc(m, '\n');
2d636234	197	}
95769a63	198	diff -Nur linux-2.6.0-test1.org/net/sunrpc/xprt.c linux-2.6.0-test1/net/sunrpc/xprt.c
	199	--- linux-2.6.0-test1.org/net/sunrpc/xprt.c Mon Jul 14 03:36:06 2003
	200	+++ linux-2.6.0-test1/net/sunrpc/xprt.c Sun Jul 20 16:43:41 2003
	201	@@ -66,8 +66,6 @@
	202	#include <net/udp.h>
	203	#include <net/tcp.h>
	204
	205	-#include <asm/uaccess.h>
	206	-
	207	/*
	208	* Local variables
	209	*/
	210	diff -Nur linux-2.6.0-test1.org/scripts/ver_linux linux-2.6.0-test1/scripts/ver_linux
	211	--- linux-2.6.0-test1.org/scripts/ver_linux Sun Jul 20 16:37:17 2003
	212	+++ linux-2.6.0-test1/scripts/ver_linux Sun Jul 20 16:43:15 2003
	213	@@ -28,7 +28,7 @@
2d636234	214
95769a63	215	mount --version \| awk -F\- '{print "mount ", $NF}'
2d636234	216
95769a63	217	-depmod -V 2>&1 \| grep version \| awk 'NR==1 {print "module-init-tools ",$NF}'
95769a63	218	+depmod -V 2>&1 \| awk 'NR==1 {print "module-init-tools ",$NF}'
2d636234	219
95769a63	220	tune2fs 2>&1 \| grep "^tune2fs" \| sed 's/,//' \| awk \
	221	'NR==1 {print "e2fsprogs ", $2}'
	222	diff -Nur linux-2.6.0-test1.org/sound/core/memalloc.c linux-2.6.0-test1/sound/core/memalloc.c
	223	--- linux-2.6.0-test1.org/sound/core/memalloc.c Mon Jul 14 03:38:48 2003
	224	+++ linux-2.6.0-test1/sound/core/memalloc.c Sun Jul 20 16:43:26 2003
	225	@@ -886,7 +886,9 @@
2d636234	226
95769a63	227	static int __init snd_mem_init(void)
	228	{
	229	+#ifdef CONFIG_PROC_FS
	230	create_proc_read_entry("driver/snd-page-alloc", 0, 0, snd_mem_proc_read, NULL);
	231	+#endif
	232	#ifdef ENABLE_PREALLOC
	233	preallocate_cards();
	234	#endif