]> git.pld-linux.org Git - packages/kernel.git/blame - linux-2.4.1-compilefailure.patch
projects / packages / kernel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- missing <linux/mm.h> include (broke build on alpha)
[packages/kernel.git] / linux-2.4.1-compilefailure.patch
CommitLineData
96b6ea31 1diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_sable.c linux-2.4.22/arch/alpha/kernel/sys_sable.c
a67d8cab
AM		 2--- linux-2.4.22.org/arch/alpha/kernel/sys_sable.c 2003-11-23 16:00:51.000000000 +0100
3+++ linux-2.4.22/arch/alpha/kernel/sys_sable.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 4@@ -194,8 +194,9 @@
fc74f98e
JR		 5 */
6
7 static int __init
8-sable_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
9+sable_map_irq(struct pci_dev *dev, u8 slota, u8 pin)
10 {
11+ int slot=slota;
da61f08d 12 static char irq_tab[9][5] __initdata = {
fc74f98e
JR		 13 /*INT INTA INTB INTC INTD */
14 { 32+0, 32+0, 32+0, 32+0, 32+0}, /* IdSel 0, TULIP */
96b6ea31 15diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_titan.c linux-2.4.22/arch/alpha/kernel/sys_titan.c
a67d8cab
AM		 16--- linux-2.4.22.org/arch/alpha/kernel/sys_titan.c 2003-11-23 16:00:51.000000000 +0100
17+++ linux-2.4.22/arch/alpha/kernel/sys_titan.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 18@@ -99,7 +99,7 @@
fc74f98e
JR		 19 *dim2;
20 *dim3;
21 #else
22- volatile unsigned long *dimB;
23+ volatile unsigned long *dimB=NULL;
8d4ad2e6
JR		 24 dimB = &cchip->dim0.csr;
25 if (bcpu == 1) dimB = &cchip->dim1.csr;
fc74f98e 26 else if (bcpu == 2) dimB = &cchip->dim2.csr;
96b6ea31 27diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_wildfire.c linux-2.4.22/arch/alpha/kernel/sys_wildfire.c
a67d8cab
AM		 28--- linux-2.4.22.org/arch/alpha/kernel/sys_wildfire.c 2003-11-23 16:00:51.000000000 +0100
29+++ linux-2.4.22/arch/alpha/kernel/sys_wildfire.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 30@@ -300,8 +300,9 @@
fc74f98e
JR		 31 */
32
33 static int __init
34-wildfire_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
35+wildfire_map_irq(struct pci_dev *dev, u8 slotu, u8 pin)
36 {
37+ int slot=slotu;
38 static char irq_tab[8][5] __initdata = {
39 /*INT INTA INTB INTC INTD */
40 { -1, -1, -1, -1, -1}, /* IdSel 0 ISA Bridge */
96b6ea31 41diff -urN linux-2.4.22.org/arch/sparc64/solaris/misc.c linux-2.4.22/arch/sparc64/solaris/misc.c
a67d8cab
AM		 42--- linux-2.4.22.org/arch/sparc64/solaris/misc.c 2003-11-23 16:01:09.000000000 +0100
43+++ linux-2.4.22/arch/sparc64/solaris/misc.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 44@@ -15,6 +15,7 @@
45 #include <linux/mman.h>
46 #include <linux/file.h>
47 #include <linux/timex.h>
48+#include <linux/major.h>
49
50 #include <asm/uaccess.h>
51 #include <asm/string.h>
52diff -urN linux-2.4.22.org/drivers/atm/horizon.c linux-2.4.22/drivers/atm/horizon.c
a67d8cab
AM		 53--- linux-2.4.22.org/drivers/atm/horizon.c 2003-11-23 16:00:27.000000000 +0100
54+++ linux-2.4.22/drivers/atm/horizon.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 55@@ -480,7 +480,7 @@
56 #endif
57 return;
58 }
59-
60+#if 0
61 static inline void dump_regs (hrz_dev * dev) {
62 #ifdef DEBUG_HORIZON
63 PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG));
64@@ -494,7 +494,7 @@
65 #endif
66 return;
67 }
68-
69+#endif
70 static inline void dump_framer (hrz_dev * dev) {
71 #ifdef DEBUG_HORIZON
72 unsigned int i;
73diff -urN linux-2.4.22.org/drivers/block/blkpg.c linux-2.4.22/drivers/block/blkpg.c
a67d8cab
AM		 74--- linux-2.4.22.org/drivers/block/blkpg.c 2003-11-23 15:59:47.000000000 +0100
75+++ linux-2.4.22/drivers/block/blkpg.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 76@@ -32,6 +32,7 @@
77 #include <linux/fs.h> /* for BLKRASET, ... */
78 #include <linux/sched.h> /* for capable() */
79 #include <linux/blk.h> /* for set_device_ro() */
80+#include <linux/blkdev.h>
81 #include <linux/blkpg.h>
82 #include <linux/genhd.h>
83 #include <linux/swap.h> /* for is_swap_partition() */
96b6ea31 84diff -urN linux-2.4.22.org/drivers/block/DAC960.c linux-2.4.22/drivers/block/DAC960.c
a67d8cab
AM		 85--- linux-2.4.22.org/drivers/block/DAC960.c 2003-11-23 15:59:45.000000000 +0100
86+++ linux-2.4.22/drivers/block/DAC960.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 87@@ -5491,11 +5491,7 @@
fc74f98e
JR		 88 .part[MINOR(Inode->i_rdev)]
89 .nr_sects << 9,
90 (u64 *) Argument);
91- case BLKRAGET:
92- case BLKRASET:
93- case BLKFLSBUF:
94- case BLKBSZGET:
95- case BLKBSZSET:
96+ default:
97 return blk_ioctl(Inode->i_rdev, Request, Argument);
98 case BLKRRPART:
99 /* Re-Read Partition Table. */
96b6ea31 100diff -urN linux-2.4.22.org/drivers/block/nbd.c linux-2.4.22/drivers/block/nbd.c
a67d8cab
AM		 101--- linux-2.4.22.org/drivers/block/nbd.c 2003-11-23 15:59:44.000000000 +0100
102+++ linux-2.4.22/drivers/block/nbd.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 103@@ -563,7 +563,7 @@
fc74f98e
JR		 104 * (Just smiley confuses emacs :-)
105 */
106
107-static int __init nbd_init(void)
108+int __init nbd_init(void)
109 {
110 int i;
111
96b6ea31 112diff -urN linux-2.4.22.org/drivers/char/amd76x_pm.c linux-2.4.22/drivers/char/amd76x_pm.c
a67d8cab
AM		 113--- linux-2.4.22.org/drivers/char/amd76x_pm.c 2003-11-23 15:59:47.000000000 +0100
114+++ linux-2.4.22/drivers/char/amd76x_pm.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 115@@ -73,6 +73,7 @@
116
117
118 #include <linux/config.h>
119+#include <linux/init.h>
120 #include <linux/module.h>
121 #include <linux/slab.h>
122 #include <linux/pci.h>
a67d8cab
AM		 123diff -urN linux-2.4.22.org/drivers/md/dm-io.c linux-2.4.22/drivers/md/dm-io.c
124--- linux-2.4.22.org/drivers/md/dm-io.c 2003-11-23 16:00:41.000000000 +0100
125+++ linux-2.4.22/drivers/md/dm-io.c 2003-11-23 16:04:12.000000000 +0100
126@@ -11,6 +11,8 @@
127 #include <linux/slab.h>
128 #include <linux/sched.h>
129
e3ce28a5 130+#include <linux/bitops.h>
a67d8cab
AM		 131+
132 /* FIXME: can we shrink this ? */
133 struct io_context {
134 int rw;
135@@ -177,11 +179,6 @@
136 /*
137 * Primitives for alignment calculations.
138 */
139-int fls(unsigned n)
140-{
141- return generic_fls32(n);
142-}
143-
144 static inline int log2_floor(unsigned n)
145 {
146 return ffs(n) - 1;
96b6ea31 147diff -urN linux-2.4.22.org/drivers/net/ns83820.c linux-2.4.22/drivers/net/ns83820.c
a67d8cab
AM		 148--- linux-2.4.22.org/drivers/net/ns83820.c 2003-11-23 15:59:37.000000000 +0100
149+++ linux-2.4.22/drivers/net/ns83820.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 150@@ -94,6 +94,7 @@
151
152 #include <linux/module.h>
153 #include <linux/types.h>
154+#include <asm/io.h>
155 #include <linux/pci.h>
156 #include <linux/netdevice.h>
157 #include <linux/etherdevice.h>
96b6ea31 158diff -urN linux-2.4.22.org/drivers/net/plip.c linux-2.4.22/drivers/net/plip.c
a67d8cab
AM		 159--- linux-2.4.22.org/drivers/net/plip.c 2003-11-23 15:59:36.000000000 +0100
160+++ linux-2.4.22/drivers/net/plip.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 161@@ -1383,7 +1383,7 @@
fc74f98e
JR		 162
163 static int parport_ptr;
164
165-static int __init plip_setup(char *str)
166+int __init plip_setup(char *str)
167 {
168 int ints[4];
169
96b6ea31 170diff -urN linux-2.4.22.org/drivers/net/rrunner.c linux-2.4.22/drivers/net/rrunner.c
a67d8cab
AM		 171--- linux-2.4.22.org/drivers/net/rrunner.c 2003-11-23 15:59:37.000000000 +0100
172+++ linux-2.4.22/drivers/net/rrunner.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 173@@ -234,7 +234,7 @@
174 * Don't access any registes before this point!
175 */
176 #ifdef __BIG_ENDIAN
177- writel(readl(&regs->HostCtrl) | NO_SWAP, &regs->HostCtrl);
178+ writel(readl(&rrpriv->regs->HostCtrl) | NO_SWAP, &rrpriv->regs->HostCtrl);
179 #endif
180 /*
181 * Need to add a case for little-endian 64-bit hosts here.
182diff -urN linux-2.4.22.org/drivers/net/sk98lin/h/skgepnm2.h linux-2.4.22/drivers/net/sk98lin/h/skgepnm2.h
a67d8cab
AM		 183--- linux-2.4.22.org/drivers/net/sk98lin/h/skgepnm2.h 2003-11-23 15:59:43.000000000 +0100
184+++ linux-2.4.22/drivers/net/sk98lin/h/skgepnm2.h 2003-11-23 16:04:29.000000000 +0100
96b6ea31 185@@ -371,7 +371,11 @@
fc74f98e
JR		 186 #if SK_TICKS_PER_SEC == 100
187 #define SK_PNMI_HUNDREDS_SEC(t) (t)
188 #else
fc74f98e 189+#if SK_TICKS_PER_SEC == 1000
96b6ea31 190+#define SK_PNMI_HUNDREDS_SEC(t) ((t*1000)>>10)
fc74f98e
JR		 191+#else
192 #define SK_PNMI_HUNDREDS_SEC(t) (((t) * 100) / (SK_TICKS_PER_SEC))
fc74f98e 193+#endif
96b6ea31
AM		 194 #endif /* !SK_TICKS_PER_SEC */
195 #endif /* !SK_PNMI_HUNDREDS_SEC */
fc74f98e 196
96b6ea31 197diff -urN linux-2.4.22.org/drivers/net/tokenring/Config.in linux-2.4.22/drivers/net/tokenring/Config.in
a67d8cab
AM		 198--- linux-2.4.22.org/drivers/net/tokenring/Config.in 2003-11-23 15:59:41.000000000 +0100
199+++ linux-2.4.22/drivers/net/tokenring/Config.in 2003-11-23 16:04:29.000000000 +0100
96b6ea31 200@@ -21,10 +21,10 @@
fc74f98e
JR		 201 dep_tristate ' 3Com 3C359 Token Link Velocity XL adapter support' CONFIG_3C359 $CONFIG_TR $CONFIG_PCI
202 tristate ' Generic TMS380 Token Ring ISA/PCI adapter support' CONFIG_TMS380TR
203 if [ "$CONFIG_TMS380TR" != "n" ]; then
204- dep_tristate ' Generic TMS380 PCI support' CONFIG_TMSPCI $CONFIG_PCI
205- dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA
206- dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI
207- dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA
208+ dep_tristate ' Generic TMS380 PCI support' CONFIG_TMSPCI $CONFIG_PCI $CONFIG_TMS380TR
209+ dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA $CONFIG_TMS380TR
210+ dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI $CONFIG_TMS380TR
211+ dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA $CONFIG_TMS380TR
212 fi
213 if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
214 tristate ' SMC ISA/MCA adapter support' CONFIG_SMCTR
96b6ea31 215diff -urN linux-2.4.22.org/drivers/net/wan/sdla_chdlc.c linux-2.4.22/drivers/net/wan/sdla_chdlc.c
a67d8cab
AM		 216--- linux-2.4.22.org/drivers/net/wan/sdla_chdlc.c 2003-11-23 15:59:40.000000000 +0100
217+++ linux-2.4.22/drivers/net/wan/sdla_chdlc.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 218@@ -50,6 +50,7 @@
219
220 #include <linux/module.h>
221 #include <linux/version.h>
222+#include <linux/module.h>
223 #include <linux/kernel.h> /* printk(), and other useful stuff */
224 #include <linux/stddef.h> /* offsetof(), etc. */
225 #include <linux/errno.h> /* return codes */
96b6ea31 226diff -urN linux-2.4.22.org/drivers/net/wan/sdla_fr.c linux-2.4.22/drivers/net/wan/sdla_fr.c
a67d8cab
AM		 227--- linux-2.4.22.org/drivers/net/wan/sdla_fr.c 2003-11-23 15:59:40.000000000 +0100
228+++ linux-2.4.22/drivers/net/wan/sdla_fr.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 229@@ -140,6 +140,7 @@
230
231 #include <linux/module.h>
232 #include <linux/version.h>
233+#include <linux/module.h>
234 #include <linux/kernel.h> /* printk(), and other useful stuff */
235 #include <linux/stddef.h> /* offsetof(), etc. */
236 #include <linux/errno.h> /* return codes */
96b6ea31 237diff -urN linux-2.4.22.org/drivers/net/wan/sdla_ppp.c linux-2.4.22/drivers/net/wan/sdla_ppp.c
a67d8cab
AM		 238--- linux-2.4.22.org/drivers/net/wan/sdla_ppp.c 2003-11-23 15:59:41.000000000 +0100
239+++ linux-2.4.22/drivers/net/wan/sdla_ppp.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 240@@ -92,6 +92,7 @@
241
242 #include <linux/module.h>
243 #include <linux/version.h>
244+#include <linux/module.h>
245 #include <linux/kernel.h> /* printk(), and other useful stuff */
246 #include <linux/stddef.h> /* offsetof(), etc. */
247 #include <linux/errno.h> /* return codes */
96b6ea31 248diff -urN linux-2.4.22.org/drivers/net/wan/sdla_x25.c linux-2.4.22/drivers/net/wan/sdla_x25.c
a67d8cab
AM		 249--- linux-2.4.22.org/drivers/net/wan/sdla_x25.c 2003-11-23 15:59:40.000000000 +0100
250+++ linux-2.4.22/drivers/net/wan/sdla_x25.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 251@@ -83,6 +83,7 @@
252
253 #include <linux/module.h>
254 #include <linux/version.h>
255+#include <linux/module.h>
256 #include <linux/kernel.h> /* printk(), and other useful stuff */
257 #include <linux/stddef.h> /* offsetof(), etc. */
258 #include <linux/errno.h> /* return codes */
96b6ea31 259diff -urN linux-2.4.22.org/drivers/net/wan/wanpipe_multppp.c linux-2.4.22/drivers/net/wan/wanpipe_multppp.c
a67d8cab
AM		 260--- linux-2.4.22.org/drivers/net/wan/wanpipe_multppp.c 2003-11-23 15:59:41.000000000 +0100
261+++ linux-2.4.22/drivers/net/wan/wanpipe_multppp.c 2003-11-23 16:04:29.000000000 +0100
fc74f98e
JR		 262@@ -19,6 +19,7 @@
263
264 #include <linux/module.h>
265 #include <linux/version.h>
266+#include <linux/module.h>
267 #include <linux/kernel.h> /* printk(), and other useful stuff */
268 #include <linux/stddef.h> /* offsetof(), etc. */
269 #include <linux/errno.h> /* return codes */
96b6ea31 270diff -urN linux-2.4.22.org/drivers/net/wireless/hermes.c linux-2.4.22/drivers/net/wireless/hermes.c
a67d8cab
AM		 271--- linux-2.4.22.org/drivers/net/wireless/hermes.c 2003-11-23 15:59:44.000000000 +0100
272+++ linux-2.4.22/drivers/net/wireless/hermes.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 273@@ -48,6 +48,7 @@
274 #include <linux/delay.h>
275 #include <linux/init.h>
276 #include <linux/kernel.h>
277+#include <linux/sched.h>
278 #include <asm/errno.h>
279
280 #include "hermes.h"
281diff -urN linux-2.4.22.org/drivers/parport/parport_cs.c linux-2.4.22/drivers/parport/parport_cs.c
a67d8cab
AM		 282--- linux-2.4.22.org/drivers/parport/parport_cs.c 2003-11-23 16:00:28.000000000 +0100
283+++ linux-2.4.22/drivers/parport/parport_cs.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 284@@ -43,6 +43,7 @@
285 #include <linux/string.h>
286 #include <linux/timer.h>
287 #include <linux/ioport.h>
288+#include <linux/major.h>
289
290 #include <linux/parport.h>
291 #include <linux/parport_pc.h>
292diff -urN linux-2.4.22.org/drivers/scsi/53c7,8xx.c linux-2.4.22/drivers/scsi/53c7,8xx.c
a67d8cab
AM		 293--- linux-2.4.22.org/drivers/scsi/53c7,8xx.c 2003-11-23 15:59:58.000000000 +0100
294+++ linux-2.4.22/drivers/scsi/53c7,8xx.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31
AM		 295@@ -1433,14 +1433,13 @@
296 command |= PCI_COMMAND_MASTER|PCI_COMMAND_IO;
297 pci_write_config_word(pdev, PCI_COMMAND, command);
298
299- if (io_port >= 0x10000000 && is_prep ) {
300+ if (io_port >= 0x10000000 && (_machine == _MACH_prep) ) {
301 /* Mapping on PowerPC can't handle this! */
302 unsigned long new_io_port;
303 new_io_port = (io_port & 0x00FFFFFF) | 0x01000000;
304 printk("SCSI: I/O moved from %08X to %08x\n", io_port, new_io_port);
305 io_port = new_io_port;
306 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, io_port);
307- pdev->base_address[0] = io_port;
308 }
309 }
310 #endif
311diff -urN linux-2.4.22.org/drivers/scsi/advansys.c linux-2.4.22/drivers/scsi/advansys.c
a67d8cab
AM		 312--- linux-2.4.22.org/drivers/scsi/advansys.c 2003-11-23 15:59:57.000000000 +0100
313+++ linux-2.4.22/drivers/scsi/advansys.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 314@@ -5551,7 +5551,7 @@
fc74f98e
JR		 315 }
316 } else {
317 ADV_CARR_T *carrp;
318- int req_cnt;
319+ int req_cnt=0;
320 adv_req_t *reqp = NULL;
321 int sg_cnt = 0;
322
96b6ea31 323@@ -9258,7 +9258,6 @@
fc74f98e
JR		 324 ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info)),
325 offset, byte_data);
326 #else /* CONFIG_PCI */
327- return 0;
328 #endif /* CONFIG_PCI */
329 }
330
96b6ea31 331diff -urN linux-2.4.22.org/drivers/scsi/eata_dma.c linux-2.4.22/drivers/scsi/eata_dma.c
a67d8cab
AM		 332--- linux-2.4.22.org/drivers/scsi/eata_dma.c 2003-11-23 15:59:58.000000000 +0100
333+++ linux-2.4.22/drivers/scsi/eata_dma.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 334@@ -1067,7 +1067,7 @@
fc74f98e
JR		 335 char *buff = 0;
336 unchar bugs = 0;
337 struct Scsi_Host *sh;
338- hostdata *hd;
339+ hostdata *hd=NULL;
340 int x;
341
342
96b6ea31 343diff -urN linux-2.4.22.org/drivers/scsi/imm.c linux-2.4.22/drivers/scsi/imm.c
a67d8cab
AM		 344--- linux-2.4.22.org/drivers/scsi/imm.c 2003-11-23 15:59:58.000000000 +0100
345+++ linux-2.4.22/drivers/scsi/imm.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 346@@ -322,10 +322,10 @@
fc74f98e
JR		 347 * STR imm imm
348 * ===================================
349 * 0x80 S_REQ S_REQ
350- * 0x40 !S_BSY (????)
351+ * 0x40 !S_BSY (?)
352 * 0x20 !S_CD !S_CD
353 * 0x10 !S_IO !S_IO
354- * 0x08 (????) !S_BSY
355+ * 0x08 (?) !S_BSY
356 *
357 * imm imm meaning
358 * ==================================
96b6ea31 359@@ -927,7 +927,7 @@
fc74f98e
JR		 360 printk("imm: told to abort\n");
361 break;
362 case DID_PARITY:
363- printk("imm: parity error (???)\n");
364+ printk("imm: parity error (?)\n");
365 break;
366 case DID_ERROR:
367 printk("imm: internal driver error\n");
96b6ea31 368@@ -936,7 +936,7 @@
fc74f98e
JR		 369 printk("imm: told to reset device\n");
370 break;
371 case DID_BAD_INTR:
372- printk("imm: bad interrupt (???)\n");
373+ printk("imm: bad interrupt (?)\n");
374 break;
375 default:
376 printk("imm: bad return code (%02x)\n", (cmd->result >> 16) & 0xff);
96b6ea31 377diff -urN linux-2.4.22.org/drivers/scsi/ppa.c linux-2.4.22/drivers/scsi/ppa.c
a67d8cab
AM		 378--- linux-2.4.22.org/drivers/scsi/ppa.c 2003-11-23 15:59:58.000000000 +0100
379+++ linux-2.4.22/drivers/scsi/ppa.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 380@@ -824,7 +824,7 @@
fc74f98e
JR		 381 printk("ppa: told to abort\n");
382 break;
383 case DID_PARITY:
384- printk("ppa: parity error (???)\n");
385+ printk("ppa: parity error (?)\n");
386 break;
387 case DID_ERROR:
388 printk("ppa: internal driver error\n");
96b6ea31 389@@ -833,7 +833,7 @@
fc74f98e
JR		 390 printk("ppa: told to reset device\n");
391 break;
392 case DID_BAD_INTR:
393- printk("ppa: bad interrupt (???)\n");
394+ printk("ppa: bad interrupt (?)\n");
395 break;
396 default:
397 printk("ppa: bad return code (%02x)\n", (cmd->result >> 16) & 0xff);
96b6ea31 398diff -urN linux-2.4.22.org/drivers/scsi/qlogicisp.c linux-2.4.22/drivers/scsi/qlogicisp.c
a67d8cab
AM		 399--- linux-2.4.22.org/drivers/scsi/qlogicisp.c 2003-11-23 15:59:57.000000000 +0100
400+++ linux-2.4.22/drivers/scsi/qlogicisp.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 401@@ -1034,6 +1034,9 @@
fc74f98e
JR		 402
403 cmd_slot = sts->handle;
404 Cmnd = hostdata->cmd_slots[cmd_slot];
405+#ifdef __alpha__
406+ if (Cmnd == NULL) mb(); /* Magic, don't move */
407+#endif
408 hostdata->cmd_slots[cmd_slot] = NULL;
409
410 TRACE("done", out_ptr, Cmnd);
96b6ea31 411diff -urN linux-2.4.22.org/drivers/scsi/sym53c8xx_2/sym_hipd.c linux-2.4.22/drivers/scsi/sym53c8xx_2/sym_hipd.c
a67d8cab
AM		 412--- linux-2.4.22.org/drivers/scsi/sym53c8xx_2/sym_hipd.c 2003-11-23 16:00:04.000000000 +0100
413+++ linux-2.4.22/drivers/scsi/sym53c8xx_2/sym_hipd.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 414@@ -221,7 +221,7 @@
fc74f98e
JR		 415 */
416 static void sym_soft_reset (hcb_p np)
417 {
418- u_char istat;
419+ u_char istat=0;
420 int i;
421
422 if (!(np->features & FE_ISTAT1) || !(INB (nc_istat1) & SCRUN))
96b6ea31 423diff -urN linux-2.4.22.org/drivers/scsi/sym53c8xx.c linux-2.4.22/drivers/scsi/sym53c8xx.c
a67d8cab
AM		 424--- linux-2.4.22.org/drivers/scsi/sym53c8xx.c 2003-11-23 15:59:57.000000000 +0100
425+++ linux-2.4.22/drivers/scsi/sym53c8xx.c 2003-11-23 16:04:29.000000000 +0100
96b6ea31 426@@ -6992,7 +6992,7 @@
fc74f98e
JR		 427
428 static void ncr_soft_reset(ncb_p np)
429 {
430- u_char istat;
431+ u_char istat=0;
432 int i;
433
434 if (!(np->features & FE_ISTAT1) || !(INB (nc_istat1) & SRUN))
96b6ea31 435diff -urN linux-2.4.22.org/drivers/sound/cs4281/cs4281m.c linux-2.4.22/drivers/sound/cs4281/cs4281m.c
a67d8cab
AM		 436--- linux-2.4.22.org/drivers/sound/cs4281/cs4281m.c 2003-11-23 16:00:06.000000000 +0100
437+++ linux-2.4.22/drivers/sound/cs4281/cs4281m.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 438@@ -4597,8 +4597,8 @@
fc74f98e
JR		 439 id_table:cs4281_pci_tbl,
440 probe:cs4281_probe,
441 remove:cs4281_remove,
442- suspend:CS4281_SUSPEND_TBL,
443- resume:CS4281_RESUME_TBL,
444+ suspend:NULL,
445+ resume:NULL,
446 };
447
448 int __init cs4281_init_module(void)
96b6ea31 449diff -urN linux-2.4.22.org/drivers/video/fbcon-mac.c linux-2.4.22/drivers/video/fbcon-mac.c
a67d8cab
AM		 450--- linux-2.4.22.org/drivers/video/fbcon-mac.c 2003-11-23 16:00:19.000000000 +0100
451+++ linux-2.4.22/drivers/video/fbcon-mac.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31
AM		 452@@ -18,6 +18,7 @@
453 #include <linux/string.h>
454 #include <linux/fb.h>
455 #include <linux/delay.h>
456+#include <linux/sched.h>
457
458 #include <video/fbcon.h>
459 #include <video/fbcon-mac.h>
460diff -urN linux-2.4.22.org/drivers/video/sis/init301.c linux-2.4.22/drivers/video/sis/init301.c
a67d8cab
AM		 461--- linux-2.4.22.org/drivers/video/sis/init301.c 2003-11-23 16:00:24.000000000 +0100
462+++ linux-2.4.22/drivers/video/sis/init301.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 463@@ -3528,7 +3528,7 @@
fc74f98e
JR		 464 USHORT RefreshRateTableIndex,
465 PSIS_HW_DEVICE_INFO HwDeviceExtension)
466 {
467- USHORT tempax,tempbx,modeflag;
468+ USHORT tempax=0,tempbx=0,modeflag;
469 USHORT resinfo;
470 USHORT CRT2Index,ResIndex;
471 const SiS_LCDDataStruct *LCDPtr = NULL;
96b6ea31 472diff -urN linux-2.4.22.org/drivers/video/sis/sis_main.c linux-2.4.22/drivers/video/sis/sis_main.c
a67d8cab
AM		 473--- linux-2.4.22.org/drivers/video/sis/sis_main.c 2003-11-23 16:00:24.000000000 +0100
474+++ linux-2.4.22/drivers/video/sis/sis_main.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31
AM		 475@@ -41,6 +41,7 @@
476 #include <linux/fs.h>
477 #include <linux/agp_backend.h>
478 #include <linux/types.h>
479+#include <linux/vmalloc.h>
480 #include <asm/uaccess.h>
481
482 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
483diff -urN linux-2.4.22.org/fs/dquot.c linux-2.4.22/fs/dquot.c
a67d8cab
AM		 484--- linux-2.4.22.org/fs/dquot.c 2003-11-23 15:58:31.000000000 +0100
485+++ linux-2.4.22/fs/dquot.c 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 486@@ -70,6 +70,7 @@
487 #include <linux/proc_fs.h>
488
489 #include <asm/uaccess.h>
490+#include <asm/cache.h>
491
492 static char *quotatypes[] = INITQFNAMES;
493 static struct quota_format_type *quota_formats; /* List of registered formats */
96b6ea31 494diff -urN linux-2.4.22.org/fs/intermezzo/dir.c linux-2.4.22/fs/intermezzo/dir.c
a67d8cab
AM		 495--- linux-2.4.22.org/fs/intermezzo/dir.c 2003-11-23 15:58:36.000000000 +0100
496+++ linux-2.4.22/fs/intermezzo/dir.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31
AM		 497@@ -27,6 +27,8 @@
498 #include <asm/bitops.h>
499 #include <asm/uaccess.h>
500 #include <asm/system.h>
501+#include <asm/ioctls.h>
502+#include <asm/termios.h>
503 #include <linux/smp_lock.h>
504
505 #include <linux/errno.h>
506diff -urN linux-2.4.22.org/fs/locks.c linux-2.4.22/fs/locks.c
a67d8cab
AM		 507--- linux-2.4.22.org/fs/locks.c 2003-11-23 15:58:30.000000000 +0100
508+++ linux-2.4.22/fs/locks.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 509@@ -422,9 +422,15 @@
fc74f98e
JR		 510 struct file_lock *waiter)
511 {
512 if (!list_empty(&waiter->fl_block)) {
513+#ifdef __alpha__
514+ printk(KERN_ERR "locks_insert_block: removing duplicated lock "
515+ "(pid=%d %ld-%ld type=%d)\n", waiter->fl_pid,
516+ waiter->fl_start, waiter->fl_end, waiter->fl_type);
517+#else
518 printk(KERN_ERR "locks_insert_block: removing duplicated lock "
519 "(pid=%d %Ld-%Ld type=%d)\n", waiter->fl_pid,
520 waiter->fl_start, waiter->fl_end, waiter->fl_type);
521+#endif
522 locks_delete_block(waiter);
523 }
524 list_add_tail(&waiter->fl_block, &blocker->fl_block);
96b6ea31 525@@ -1862,11 +1868,19 @@
fc74f98e
JR		 526 fl->fl_pid,
527 inode ? kdevname(inode->i_dev) : "<none>",
528 inode ? inode->i_ino : 0);
529+#if __alpha__
530+ out += sprintf(out, "%ld ", fl->fl_start);
531+#else
532 out += sprintf(out, "%Ld ", fl->fl_start);
533+#endif
534 if (fl->fl_end == OFFSET_MAX)
535 out += sprintf(out, "EOF ");
536 else
537+#if __alpha__
538+ out += sprintf(out, "%ld ", fl->fl_end);
539+#else
540 out += sprintf(out, "%Ld ", fl->fl_end);
541+#endif
542 sprintf(out, "%08lx %08lx %08lx %08lx %08lx\n",
543 (long)fl, (long)fl->fl_link.prev, (long)fl->fl_link.next,
544 (long)fl->fl_next, (long)fl->fl_block.next);
96b6ea31 545diff -urN linux-2.4.22.org/fs/proc/proc_tty.c linux-2.4.22/fs/proc/proc_tty.c
a67d8cab
AM		 546--- linux-2.4.22.org/fs/proc/proc_tty.c 2003-11-23 15:58:32.000000000 +0100
547+++ linux-2.4.22/fs/proc/proc_tty.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 548@@ -161,7 +161,7 @@
fc74f98e
JR		 549 if (!ent)
550 return;
551
552- remove_proc_entry(driver->driver_name, proc_tty_driver);
553+ remove_proc_entry(ent->name, proc_tty_driver);
554
555 driver->proc_entry = 0;
556 }
96b6ea31 557diff -urN linux-2.4.22.org/include/asm-alpha/hardirq.h linux-2.4.22/include/asm-alpha/hardirq.h
a67d8cab
AM		 558--- linux-2.4.22.org/include/asm-alpha/hardirq.h 2003-11-23 15:58:57.000000000 +0100
559+++ linux-2.4.22/include/asm-alpha/hardirq.h 2003-11-23 16:04:30.000000000 +0100
96b6ea31 560@@ -41,6 +41,7 @@
fc74f98e
JR		 561
562 #define synchronize_irq() barrier()
563
564+#define release_irqlock(cpu) ((void) 0)
565 #else
566
567 #define irq_attempt(cpu, irq) (cpu_data[cpu].irq_attempt[irq])
96b6ea31 568diff -urN linux-2.4.22.org/include/asm-alpha/smplock.h linux-2.4.22/include/asm-alpha/smplock.h
a67d8cab
AM		 569--- linux-2.4.22.org/include/asm-alpha/smplock.h 2003-11-23 15:58:57.000000000 +0100
570+++ linux-2.4.22/include/asm-alpha/smplock.h 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 571@@ -7,7 +7,7 @@
572 #include <linux/sched.h>
573 #include <linux/interrupt.h>
574 #include <linux/spinlock.h>
575-
576+#include <asm/hardirq.h>
577 extern spinlock_t kernel_flag;
578
579 #define kernel_locked() spin_is_locked(&kernel_flag)
96b6ea31 580diff -urN linux-2.4.22.org/include/asm-i386/rwsem.h linux-2.4.22/include/asm-i386/rwsem.h
a67d8cab
AM		 581--- linux-2.4.22.org/include/asm-i386/rwsem.h 2003-11-23 15:58:53.000000000 +0100
582+++ linux-2.4.22/include/asm-i386/rwsem.h 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 583@@ -42,6 +42,7 @@
584
585 #include <linux/list.h>
586 #include <linux/spinlock.h>
587+#include <asm/system.h>
588
589 struct rwsem_waiter;
590
96b6ea31 591diff -urN linux-2.4.22.org/include/linux/binfmts.h linux-2.4.22/include/linux/binfmts.h
a67d8cab
AM		 592--- linux-2.4.22.org/include/linux/binfmts.h 2003-11-23 15:58:49.000000000 +0100
593+++ linux-2.4.22/include/linux/binfmts.h 2003-11-23 16:04:30.000000000 +0100
96b6ea31 594@@ -16,6 +16,8 @@
fc74f98e 595
96b6ea31 596 #ifdef __KERNEL__
fc74f98e
JR		 597
598+struct mm_struct;
599+
600 /*
601 * This structure is used to hold the arguments that are used when loading binaries.
602 */
96b6ea31 603diff -urN linux-2.4.22.org/include/linux/brlock.h linux-2.4.22/include/linux/brlock.h
a67d8cab
AM		 604--- linux-2.4.22.org/include/linux/brlock.h 2003-11-23 15:58:47.000000000 +0100
605+++ linux-2.4.22/include/linux/brlock.h 2003-11-23 16:04:30.000000000 +0100
96b6ea31
AM		 606@@ -39,6 +39,7 @@
607 };
608
609 #include <linux/config.h>
610+#include <linux/sched.h>
611
612 #ifdef CONFIG_SMP
613
614diff -urN linux-2.4.22.org/include/linux/kbd_kern.h linux-2.4.22/include/linux/kbd_kern.h
a67d8cab
AM		 615--- linux-2.4.22.org/include/linux/kbd_kern.h 2003-11-23 15:58:47.000000000 +0100
616+++ linux-2.4.22/include/linux/kbd_kern.h 2003-11-23 16:04:30.000000000 +0100
96b6ea31
AM		 617@@ -3,6 +3,8 @@
618
619 #include <linux/interrupt.h>
620 #include <linux/keyboard.h>
621+#include <linux/sched.h>
622+#include <linux/tty.h>
623
624 extern struct tasklet_struct keyboard_tasklet;
625
626diff -urN linux-2.4.22.org/include/linux/list.h linux-2.4.22/include/linux/list.h
a67d8cab
AM		 627--- linux-2.4.22.org/include/linux/list.h 2003-11-23 15:58:47.000000000 +0100
628+++ linux-2.4.22/include/linux/list.h 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 629@@ -15,9 +15,9 @@
630 * using the generic single-entry routines.
631 */
632
633-struct list_head {
634+typedef struct list_head {
635 struct list_head *next, *prev;
636-};
637+} list_t;
638
639 #define LIST_HEAD_INIT(name) { &(name), &(name) }
640
96b6ea31 641diff -urN linux-2.4.22.org/include/linux/proc_fs.h linux-2.4.22/include/linux/proc_fs.h
a67d8cab
AM		 642--- linux-2.4.22.org/include/linux/proc_fs.h 2003-11-23 15:58:47.000000000 +0100
643+++ linux-2.4.22/include/linux/proc_fs.h 2003-11-23 16:04:30.000000000 +0100
96b6ea31 644@@ -206,6 +206,8 @@
fc74f98e
JR		 645 static inline void proc_tty_unregister_driver(struct tty_driver *driver) {};
646
647 extern struct proc_dir_entry proc_root;
648+extern struct proc_dir_entry proc_root_driver;
649+
650
651 #endif /* CONFIG_PROC_FS */
652
96b6ea31 653diff -urN linux-2.4.22.org/include/linux/vt_kern.h linux-2.4.22/include/linux/vt_kern.h
a67d8cab
AM		 654--- linux-2.4.22.org/include/linux/vt_kern.h 2003-11-23 15:58:47.000000000 +0100
655+++ linux-2.4.22/include/linux/vt_kern.h 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 656@@ -9,6 +9,7 @@
657 #include <linux/config.h>
658 #include <linux/vt.h>
659 #include <linux/kd.h>
660+#include <linux/tty.h>
661
662 /*
663 * Presently, a lot of graphics programs do not restore the contents of
a67d8cab
AM		 664diff -urN linux-2.4.22.org/include/net/sctp/compat.h linux-2.4.22/include/net/sctp/compat.h
665--- linux-2.4.22.org/include/net/sctp/compat.h 2003-11-23 15:59:00.000000000 +0100
666+++ linux-2.4.22/include/net/sctp/compat.h 2003-11-23 16:03:28.000000000 +0100
667@@ -67,36 +67,4 @@
668 void sctp_hash_digest(const char *key, const int in_key_len,
669 const char *text, const int text_len,
670 __u8 *digest);
671-/*
672- * find last bit set.
673- */
674-static __inline__ int fls(int x)
675-{
676- int r = 32;
677-
678- if (!x)
679- return 0;
680- if (!(x & 0xffff0000u)) {
681- x <<= 16;
682- r -= 16;
683- }
684- if (!(x & 0xff000000u)) {
685- x <<= 8;
686- r -= 8;
687- }
688- if (!(x & 0xf0000000u)) {
689- x <<= 4;
690- r -= 4;
691- }
692- if (!(x & 0xc0000000u)) {
693- x <<= 2;
694- r -= 2;
695- }
696- if (!(x & 0x80000000u)) {
697- x <<= 1;
698- r -= 1;
699- }
700- return r;
701-}
702-
703 #endif /* __net_sctp_compat_h__ */
96b6ea31 704diff -urN linux-2.4.22.org/init/do_mounts.c linux-2.4.22/init/do_mounts.c
a67d8cab
AM		 705--- linux-2.4.22.org/init/do_mounts.c 2003-11-23 15:58:39.000000000 +0100
706+++ linux-2.4.22/init/do_mounts.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 707@@ -462,6 +462,10 @@
fc74f98e
JR		 708 close(fd);
709 }
710 }
711+#else
712+static void __init change_floppy(char *fmt, ...)
713+{
714+}
715 #endif
716
717 #ifdef CONFIG_BLK_DEV_RAM
96b6ea31 718diff -urN linux-2.4.22.org/kernel/ksyms.c linux-2.4.22/kernel/ksyms.c
a67d8cab
AM		 719--- linux-2.4.22.org/kernel/ksyms.c 2003-11-23 15:58:39.000000000 +0100
720+++ linux-2.4.22/kernel/ksyms.c 2003-11-23 16:04:30.000000000 +0100
721@@ -512,9 +512,6 @@
fc74f98e
JR		 722 EXPORT_SYMBOL(simple_strtoull);
723 EXPORT_SYMBOL(system_utsname); /* UTS data */
724 EXPORT_SYMBOL(uts_sem); /* UTS semaphore */
725-#ifndef __mips__
726-EXPORT_SYMBOL(sys_call_table);
727-#endif
728 EXPORT_SYMBOL(machine_restart);
729 EXPORT_SYMBOL(machine_halt);
730 EXPORT_SYMBOL(machine_power_off);
96b6ea31 731diff -urN linux-2.4.22.org/lib/rwsem-spinlock.c linux-2.4.22/lib/rwsem-spinlock.c
a67d8cab
AM		 732--- linux-2.4.22.org/lib/rwsem-spinlock.c 2003-11-23 15:58:40.000000000 +0100
733+++ linux-2.4.22/lib/rwsem-spinlock.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 734@@ -280,6 +280,8 @@
fc74f98e
JR		 735 EXPORT_SYMBOL(__down_write);
736 EXPORT_SYMBOL(__up_read);
737 EXPORT_SYMBOL(__up_write);
738+EXPORT_SYMBOL(__down_write_trylock);
739+EXPORT_SYMBOL(__down_read_trylock);
740 #if RWSEM_DEBUG
741 EXPORT_SYMBOL(rwsemtrace);
742 #endif
96b6ea31 743diff -urN linux-2.4.22.org/mm/vmalloc.c linux-2.4.22/mm/vmalloc.c
a67d8cab
AM		 744--- linux-2.4.22.org/mm/vmalloc.c 2003-11-23 15:58:40.000000000 +0100
745+++ linux-2.4.22/mm/vmalloc.c 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 746@@ -12,6 +12,7 @@
747 #include <linux/spinlock.h>
748 #include <linux/highmem.h>
749 #include <linux/smp_lock.h>
750+#include <linux/interrupt.h>
751
752 #include <asm/uaccess.h>
753 #include <asm/pgalloc.h>
754@@ -19,6 +20,9 @@
755 rwlock_t vmlist_lock = RW_LOCK_UNLOCKED;
756 struct vm_struct * vmlist;
757
758+extern void show_stack(unsigned long *);
759+
760+
761 static inline void free_area_pte(pmd_t * pmd, unsigned long address, unsigned long size)
762 {
763 pte_t * pte;
96b6ea31 764@@ -244,6 +248,12 @@
fc74f98e
JR		 765 printk(KERN_ERR "Trying to vfree() bad address (%p)\n", addr);
766 return;
767 }
768+ if (in_interrupt()) {
769+ printk("vfree(): sleeping in interrupt!! \n");
770+#ifdef __i386__
771+ show_stack(NULL);
772+#endif
773+ }
774 write_lock(&vmlist_lock);
775 for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
776 if (tmp->addr == addr) {
a67d8cab
AM		 777diff -urN linux-2.4.22.org/net/sctp/ipv6.c linux-2.4.22/net/sctp/ipv6.c
778--- linux-2.4.22.org/net/sctp/ipv6.c 2003-11-23 15:59:36.000000000 +0100
779+++ linux-2.4.22/net/sctp/ipv6.c 2003-11-23 16:03:04.000000000 +0100
780@@ -74,6 +74,7 @@
781 #include <net/sctp/sctp.h>
782
783 #include <asm/uaccess.h>
e3ce28a5 784+#include <linux/bitops.h>
a67d8cab
AM		 785
786 extern struct notifier_block sctp_inetaddr_notifier;
787
96b6ea31 788diff -urN linux-2.4.22.org/net/sunrpc/auth.c linux-2.4.22/net/sunrpc/auth.c
a67d8cab
AM		 789--- linux-2.4.22.org/net/sunrpc/auth.c 2003-11-23 15:59:34.000000000 +0100
790+++ linux-2.4.22/net/sunrpc/auth.c 2003-11-23 16:04:30.000000000 +0100
fc74f98e
JR		 791@@ -13,6 +13,7 @@
792 #include <linux/socket.h>
793 #include <linux/sunrpc/clnt.h>
794 #include <linux/spinlock.h>
795+#include <linux/module.h>
796
797 #ifdef RPC_DEBUG
798 # define RPCDBG_FACILITY RPCDBG_AUTH
96b6ea31 799diff -urN linux-2.4.22.org/net/wanrouter/wanproc.c linux-2.4.22/net/wanrouter/wanproc.c
a67d8cab
AM		 800--- linux-2.4.22.org/net/wanrouter/wanproc.c 2003-11-23 15:59:34.000000000 +0100
801+++ linux-2.4.22/net/wanrouter/wanproc.c 2003-11-23 16:04:30.000000000 +0100
96b6ea31 802@@ -1081,6 +1081,13 @@
fc74f98e
JR		 803 }
804 #endif
805
806+#ifndef CONFIG_PROC_FS
807+ int __init wanrouter_proc_init (void)
808+ {
809+ return 0;
810+ }
811+#endif
812+
813 /*
814 * End
815 */
The Linux kernel (the core of the Linux operating system)
This page took 0.229822 seconds and 4 git commands to generate.