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
10 if (psmouse_command(psmouse, r, PSMOUSE_CMD_RESET_BAT))
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
55 for(i = 0; i < len; i++)
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
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
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;
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;
111 +/* This matches struct stat64 in glibc2.1, hence the absolutely
112 + * insane amounts of padding around dev_t's.
115 + unsigned long long st_dev;
116 + unsigned char __pad0[4];
118 +#define STAT64_HAS_BROKEN_ST_INO 1
119 + unsigned long __st_ino;
121 + unsigned int st_mode;
122 + unsigned int st_nlink;
124 + unsigned long st_uid;
125 + unsigned long st_gid;
127 + unsigned long long st_rdev;
128 + unsigned char __pad3[4];
131 + unsigned long st_blksize;
133 + unsigned long st_blocks; /* Number 512-byte blocks allocated. */
134 + unsigned long __pad4; /* future possible st_blocks high bits */
136 + unsigned long st_atime;
137 + unsigned long st_atime_nsec;
139 + unsigned long st_mtime;
140 + unsigned int st_mtime_nsec;
142 + unsigned long st_ctime;
143 + unsigned long st_ctime_nsec;
145 + unsigned long long st_ino;
148 +#define STAT_HAVE_NSEC 1
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
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);
161 static int sun_fd_request_irq(void)
167 - error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
168 + error = request_fast_irq(FLOPPY_IRQ, &floppy_hardint,
169 SA_INTERRUPT, "floppy", NULL);
171 return ((error == 0) ? 0 : -1);
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};
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);
179 static unsigned char sun_pci_fd_inb(unsigned long port)
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");
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>");
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>");
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
205 -#include <asm/uaccess.h>
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
215 mount --version | awk -F\- '{print "mount ", $NF}'
217 -depmod -V 2>&1 | grep version | awk 'NR==1 {print "module-init-tools ",$NF}'
218 +depmod -V 2>&1 | awk 'NR==1 {print "module-init-tools ",$NF}'
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
227 static int __init snd_mem_init(void)
229 +#ifdef CONFIG_PROC_FS
230 create_proc_read_entry("driver/snd-page-alloc", 0, 0, snd_mem_proc_read, NULL);
232 #ifdef ENABLE_PREALLOC