linux-2.4.1-compilefailure.patch

   1 diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_sable.c linux-2.4.22/arch/alpha/kernel/sys_sable.c
   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
   4 @@ -194,8 +194,9 @@
   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;
  12         static char irq_tab[9][5] __initdata = {
  13                 /*INT    INTA   INTB   INTC   INTD */
  14                 { 32+0,  32+0,  32+0,  32+0,  32+0},  /* IdSel 0,  TULIP  */
  15 diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_titan.c linux-2.4.22/arch/alpha/kernel/sys_titan.c
  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
  18 @@ -99,7 +99,7 @@
  19         *dim2;
  20         *dim3;
  21  #else
  22 -       volatile unsigned long *dimB;
  23 +       volatile unsigned long *dimB=NULL;
  24         dimB = &cchip->dim0.csr;
  25         if (bcpu == 1) dimB = &cchip->dim1.csr;
  26         else if (bcpu == 2) dimB = &cchip->dim2.csr;
  27 diff -urN linux-2.4.22.org/arch/alpha/kernel/sys_wildfire.c linux-2.4.22/arch/alpha/kernel/sys_wildfire.c
  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
  30 @@ -300,8 +300,9 @@
  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 */
  41 diff -urN linux-2.4.22.org/arch/sparc64/solaris/misc.c linux-2.4.22/arch/sparc64/solaris/misc.c
  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
  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>
  52 diff -urN linux-2.4.22.org/drivers/atm/horizon.c linux-2.4.22/drivers/atm/horizon.c
  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
  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;
  73 diff -urN linux-2.4.22.org/drivers/block/blkpg.c linux-2.4.22/drivers/block/blkpg.c
  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
  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() */
  84 diff -urN linux-2.4.22.org/drivers/block/DAC960.c linux-2.4.22/drivers/block/DAC960.c
  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
  87 @@ -5491,11 +5491,7 @@
  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. */
 100 diff -urN linux-2.4.22.org/drivers/block/nbd.c linux-2.4.22/drivers/block/nbd.c
 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
 103 @@ -563,7 +563,7 @@
 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
 112 diff -urN linux-2.4.22.org/drivers/char/amd76x_pm.c linux-2.4.22/drivers/char/amd76x_pm.c
 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
 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>
 123 diff -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
 130 +#include <linux/bitops.h>
 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;
 147 diff -urN linux-2.4.22.org/drivers/net/ns83820.c linux-2.4.22/drivers/net/ns83820.c
 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
 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>
 158 diff -urN linux-2.4.22.org/drivers/net/plip.c linux-2.4.22/drivers/net/plip.c
 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
 161 @@ -1383,7 +1383,7 @@
 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
 170 diff -urN linux-2.4.22.org/drivers/net/rrunner.c linux-2.4.22/drivers/net/rrunner.c
 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
 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.
 182 diff -urN linux-2.4.22.org/drivers/net/wan/sdla_chdlc.c linux-2.4.22/drivers/net/wan/sdla_chdlc.c
 183 --- linux-2.4.22.org/drivers/net/wan/sdla_chdlc.c       2003-11-23 15:59:40.000000000 +0100
 184 +++ linux-2.4.22/drivers/net/wan/sdla_chdlc.c   2003-11-23 16:04:29.000000000 +0100
 185 @@ -50,6 +50,7 @@
 186
 187  #include <linux/module.h>
 188  #include <linux/version.h>
 189 +#include <linux/module.h>
 190  #include <linux/kernel.h>      /* printk(), and other useful stuff */
 191  #include <linux/stddef.h>      /* offsetof(), etc. */
 192  #include <linux/errno.h>       /* return codes */
 193 diff -urN linux-2.4.22.org/drivers/net/wan/sdla_fr.c linux-2.4.22/drivers/net/wan/sdla_fr.c
 194 --- linux-2.4.22.org/drivers/net/wan/sdla_fr.c  2003-11-23 15:59:40.000000000 +0100
 195 +++ linux-2.4.22/drivers/net/wan/sdla_fr.c      2003-11-23 16:04:29.000000000 +0100
 196 @@ -140,6 +140,7 @@
 197
 198  #include <linux/module.h>
 199  #include <linux/version.h>
 200 +#include <linux/module.h>
 201  #include <linux/kernel.h>      /* printk(), and other useful stuff */
 202  #include <linux/stddef.h>      /* offsetof(), etc. */
 203  #include <linux/errno.h>       /* return codes */
 204 diff -urN linux-2.4.22.org/drivers/net/wan/sdla_ppp.c linux-2.4.22/drivers/net/wan/sdla_ppp.c
 205 --- linux-2.4.22.org/drivers/net/wan/sdla_ppp.c 2003-11-23 15:59:41.000000000 +0100
 206 +++ linux-2.4.22/drivers/net/wan/sdla_ppp.c     2003-11-23 16:04:29.000000000 +0100
 207 @@ -92,6 +92,7 @@
 208
 209  #include <linux/module.h>
 210  #include <linux/version.h>
 211 +#include <linux/module.h>
 212  #include <linux/kernel.h>      /* printk(), and other useful stuff */
 213  #include <linux/stddef.h>      /* offsetof(), etc. */
 214  #include <linux/errno.h>       /* return codes */
 215 diff -urN linux-2.4.22.org/drivers/net/wan/sdla_x25.c linux-2.4.22/drivers/net/wan/sdla_x25.c
 216 --- linux-2.4.22.org/drivers/net/wan/sdla_x25.c 2003-11-23 15:59:40.000000000 +0100
 217 +++ linux-2.4.22/drivers/net/wan/sdla_x25.c     2003-11-23 16:04:29.000000000 +0100
 218 @@ -83,6 +83,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 */
 226 diff -urN linux-2.4.22.org/drivers/net/wan/wanpipe_multppp.c linux-2.4.22/drivers/net/wan/wanpipe_multppp.c
 227 --- linux-2.4.22.org/drivers/net/wan/wanpipe_multppp.c  2003-11-23 15:59:41.000000000 +0100
 228 +++ linux-2.4.22/drivers/net/wan/wanpipe_multppp.c      2003-11-23 16:04:29.000000000 +0100
 229 @@ -19,6 +19,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 */
 237 diff -urN linux-2.4.22.org/drivers/net/wireless/hermes.c linux-2.4.22/drivers/net/wireless/hermes.c
 238 --- linux-2.4.22.org/drivers/net/wireless/hermes.c      2003-11-23 15:59:44.000000000 +0100
 239 +++ linux-2.4.22/drivers/net/wireless/hermes.c  2003-11-23 16:04:29.000000000 +0100
 240 @@ -48,6 +48,7 @@
 241  #include <linux/delay.h>
 242  #include <linux/init.h>
 243  #include <linux/kernel.h>
 244 +#include <linux/sched.h>
 245  #include <asm/errno.h>
 246
 247  #include "hermes.h"
 248 diff -urN linux-2.4.22.org/drivers/parport/parport_cs.c linux-2.4.22/drivers/parport/parport_cs.c
 249 --- linux-2.4.22.org/drivers/parport/parport_cs.c       2003-11-23 16:00:28.000000000 +0100
 250 +++ linux-2.4.22/drivers/parport/parport_cs.c   2003-11-23 16:04:29.000000000 +0100
 251 @@ -43,6 +43,7 @@
 252  #include <linux/string.h>
 253  #include <linux/timer.h>
 254  #include <linux/ioport.h>
 255 +#include <linux/major.h>
 256
 257  #include <linux/parport.h>
 258  #include <linux/parport_pc.h>
 259 diff -urN linux-2.4.22.org/drivers/scsi/53c7,8xx.c linux-2.4.22/drivers/scsi/53c7,8xx.c
 260 --- linux-2.4.22.org/drivers/scsi/53c7,8xx.c    2003-11-23 15:59:58.000000000 +0100
 261 +++ linux-2.4.22/drivers/scsi/53c7,8xx.c        2003-11-23 16:04:29.000000000 +0100
 262 @@ -1433,14 +1433,13 @@
 263        command |= PCI_COMMAND_MASTER|PCI_COMMAND_IO;
 264        pci_write_config_word(pdev, PCI_COMMAND, command);
 265
 266 -      if (io_port >= 0x10000000 && is_prep ) {
 267 +      if (io_port >= 0x10000000 && (_machine == _MACH_prep) ) {
 268               /* Mapping on PowerPC can't handle this! */
 269               unsigned long new_io_port;
 270               new_io_port = (io_port & 0x00FFFFFF) | 0x01000000;
 271               printk("SCSI: I/O moved from %08X to %08x\n", io_port, new_io_port);
 272               io_port = new_io_port;
 273               pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, io_port);
 274 -             pdev->base_address[0] = io_port;
 275        }
 276      }
 277  #endif
 278 ;diff -urN linux-2.4.22.org/drivers/scsi/advansys.c linux-2.4.22/drivers/scsi/advansys.c
 279 ;--- linux-2.4.22.org/drivers/scsi/advansys.c   2003-11-23 15:59:57.000000000 +0100
 280 ;+++ linux-2.4.22/drivers/scsi/advansys.c       2003-11-23 16:04:29.000000000 +0100
 281 ;@@ -5551,7 +5551,7 @@
 282 ;                 }
 283 ;             } else {
 284 ;                 ADV_CARR_T      *carrp;
 285 ;-                int             req_cnt;
 286 ;+                int             req_cnt=0;
 287 ;                 adv_req_t       *reqp = NULL;
 288 ;                 int             sg_cnt = 0;
 289 ;
 290 ;@@ -9258,7 +9258,6 @@
 291 ;             ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info)),
 292 ;         offset, byte_data);
 293 ; #else /* CONFIG_PCI */
 294 ;-    return 0;
 295 ; #endif /* CONFIG_PCI */
 296 ; }
 297 ;
 298 diff -urN linux-2.4.22.org/drivers/scsi/imm.c linux-2.4.22/drivers/scsi/imm.c
 299 --- linux-2.4.22.org/drivers/scsi/imm.c 2003-11-23 15:59:58.000000000 +0100
 300 +++ linux-2.4.22/drivers/scsi/imm.c     2003-11-23 16:04:29.000000000 +0100
 301 @@ -322,10 +322,10 @@
 302       * STR      imm     imm
 303       * ===================================
 304       * 0x80     S_REQ   S_REQ
 305 -     * 0x40     !S_BSY  (????)
 306 +     * 0x40     !S_BSY  (?)
 307       * 0x20     !S_CD   !S_CD
 308       * 0x10     !S_IO   !S_IO
 309 -     * 0x08     (????)  !S_BSY
 310 +     * 0x08     (?)  !S_BSY
 311       *
 312       * imm      imm     meaning
 313       * ==================================
 314 @@ -927,7 +927,7 @@
 315         printk("imm: told to abort\n");
 316         break;
 317      case DID_PARITY:
 318 -       printk("imm: parity error (???)\n");
 319 +       printk("imm: parity error (?)\n");
 320         break;
 321      case DID_ERROR:
 322         printk("imm: internal driver error\n");
 323 @@ -936,7 +936,7 @@
 324         printk("imm: told to reset device\n");
 325         break;
 326      case DID_BAD_INTR:
 327 -       printk("imm: bad interrupt (???)\n");
 328 +       printk("imm: bad interrupt (?)\n");
 329         break;
 330      default:
 331         printk("imm: bad return code (%02x)\n", (cmd->result >> 16) & 0xff);
 332 diff -urN linux-2.4.22.org/drivers/scsi/ppa.c linux-2.4.22/drivers/scsi/ppa.c
 333 --- linux-2.4.22.org/drivers/scsi/ppa.c 2003-11-23 15:59:58.000000000 +0100
 334 +++ linux-2.4.22/drivers/scsi/ppa.c     2003-11-23 16:04:29.000000000 +0100
 335 @@ -824,7 +824,7 @@
 336         printk("ppa: told to abort\n");
 337         break;
 338      case DID_PARITY:
 339 -       printk("ppa: parity error (???)\n");
 340 +       printk("ppa: parity error (?)\n");
 341         break;
 342      case DID_ERROR:
 343         printk("ppa: internal driver error\n");
 344 @@ -833,7 +833,7 @@
 345         printk("ppa: told to reset device\n");
 346         break;
 347      case DID_BAD_INTR:
 348 -       printk("ppa: bad interrupt (???)\n");
 349 +       printk("ppa: bad interrupt (?)\n");
 350         break;
 351      default:
 352         printk("ppa: bad return code (%02x)\n", (cmd->result >> 16) & 0xff);
 353 diff -urN linux-2.4.22.org/drivers/scsi/qlogicisp.c linux-2.4.22/drivers/scsi/qlogicisp.c
 354 --- linux-2.4.22.org/drivers/scsi/qlogicisp.c   2003-11-23 15:59:57.000000000 +0100
 355 +++ linux-2.4.22/drivers/scsi/qlogicisp.c       2003-11-23 16:04:29.000000000 +0100
 356 @@ -1034,6 +1034,9 @@
 357
 358                 cmd_slot = sts->handle;
 359                 Cmnd = hostdata->cmd_slots[cmd_slot];
 360 +#ifdef __alpha__
 361 +               if (Cmnd == NULL) mb(); /* Magic, don't move */
 362 +#endif
 363                 hostdata->cmd_slots[cmd_slot] = NULL;
 364
 365                 TRACE("done", out_ptr, Cmnd);
 366 diff -urN linux-2.4.22.org/drivers/sound/cs4281/cs4281m.c linux-2.4.22/drivers/sound/cs4281/cs4281m.c
 367 --- linux-2.4.22.org/drivers/sound/cs4281/cs4281m.c     2003-11-23 16:00:06.000000000 +0100
 368 +++ linux-2.4.22/drivers/sound/cs4281/cs4281m.c 2003-11-23 16:04:30.000000000 +0100
 369 @@ -4597,8 +4597,8 @@
 370         id_table:cs4281_pci_tbl,
 371         probe:cs4281_probe,
 372         remove:cs4281_remove,
 373 -       suspend:CS4281_SUSPEND_TBL,
 374 -       resume:CS4281_RESUME_TBL,
 375 +       suspend:NULL,
 376 +       resume:NULL,
 377  };
 378
 379  int __init cs4281_init_module(void)
 380 diff -urN linux-2.4.22.org/drivers/video/fbcon-mac.c linux-2.4.22/drivers/video/fbcon-mac.c
 381 --- linux-2.4.22.org/drivers/video/fbcon-mac.c  2003-11-23 16:00:19.000000000 +0100
 382 +++ linux-2.4.22/drivers/video/fbcon-mac.c      2003-11-23 16:04:30.000000000 +0100
 383 @@ -18,6 +18,7 @@
 384  #include <linux/string.h>
 385  #include <linux/fb.h>
 386  #include <linux/delay.h>
 387 +#include <linux/sched.h>
 388
 389  #include <video/fbcon.h>
 390  #include <video/fbcon-mac.h>
 391 diff -urN linux-2.4.22.org/drivers/video/sis/sis_main.c linux-2.4.22/drivers/video/sis/sis_main.c
 392 --- linux-2.4.22.org/drivers/video/sis/sis_main.c       2003-11-23 16:00:24.000000000 +0100
 393 +++ linux-2.4.22/drivers/video/sis/sis_main.c   2003-11-23 16:04:30.000000000 +0100
 394 @@ -41,6 +41,7 @@
 395  #include <linux/fs.h>
 396  #include <linux/agp_backend.h>
 397  #include <linux/types.h>
 398 +#include <linux/vmalloc.h>
 399  #include <asm/uaccess.h>
 400
 401  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 402 diff -urN linux-2.4.22.org/fs/dquot.c linux-2.4.22/fs/dquot.c
 403 --- linux-2.4.22.org/fs/dquot.c 2003-11-23 15:58:31.000000000 +0100
 404 +++ linux-2.4.22/fs/dquot.c     2003-11-23 16:04:30.000000000 +0100
 405 @@ -70,6 +70,7 @@
 406  #include <linux/proc_fs.h>
 407
 408  #include <asm/uaccess.h>
 409 +#include <asm/cache.h>
 410
 411  static char *quotatypes[] = INITQFNAMES;
 412  static struct quota_format_type *quota_formats;        /* List of registered formats */
 413 diff -urN linux-2.4.22.org/fs/intermezzo/dir.c linux-2.4.22/fs/intermezzo/dir.c
 414 --- linux-2.4.22.org/fs/intermezzo/dir.c        2003-11-23 15:58:36.000000000 +0100
 415 +++ linux-2.4.22/fs/intermezzo/dir.c    2003-11-23 16:04:30.000000000 +0100
 416 @@ -27,6 +27,8 @@
 417  #include <asm/bitops.h>
 418  #include <asm/uaccess.h>
 419  #include <asm/system.h>
 420 +#include <asm/ioctls.h>
 421 +#include <asm/termios.h>
 422  #include <linux/smp_lock.h>
 423
 424  #include <linux/errno.h>
 425 diff -urN linux-2.4.22.org/fs/locks.c linux-2.4.22/fs/locks.c
 426 --- linux-2.4.22.org/fs/locks.c 2003-11-23 15:58:30.000000000 +0100
 427 +++ linux-2.4.22/fs/locks.c     2003-11-23 16:04:30.000000000 +0100
 428 @@ -422,9 +422,15 @@
 429                                struct file_lock *waiter)
 430  {
 431         if (!list_empty(&waiter->fl_block)) {
 432 +#ifdef __alpha__
 433 +               printk(KERN_ERR "locks_insert_block: removing duplicated lock "
 434 +                       "(pid=%d %ld-%ld type=%d)\n", waiter->fl_pid,
 435 +                       waiter->fl_start, waiter->fl_end, waiter->fl_type);
 436 +#else
 437                 printk(KERN_ERR "locks_insert_block: removing duplicated lock "
 438                         "(pid=%d %Ld-%Ld type=%d)\n", waiter->fl_pid,
 439                         waiter->fl_start, waiter->fl_end, waiter->fl_type);
 440 +#endif
 441                 locks_delete_block(waiter);
 442         }
 443         list_add_tail(&waiter->fl_block, &blocker->fl_block);
 444 @@ -1862,11 +1868,19 @@
 445                      fl->fl_pid,
 446                      inode ? kdevname(inode->i_dev) : "<none>",
 447                      inode ? inode->i_ino : 0);
 448 +#if __alpha__
 449 +       out += sprintf(out, "%ld ", fl->fl_start);
 450 +#else
 451         out += sprintf(out, "%Ld ", fl->fl_start);
 452 +#endif
 453         if (fl->fl_end == OFFSET_MAX)
 454                 out += sprintf(out, "EOF ");
 455         else
 456 +#if __alpha__
 457 +               out += sprintf(out, "%ld ", fl->fl_end);
 458 +#else
 459                 out += sprintf(out, "%Ld ", fl->fl_end);
 460 +#endif
 461         sprintf(out, "%08lx %08lx %08lx %08lx %08lx\n",
 462                 (long)fl, (long)fl->fl_link.prev, (long)fl->fl_link.next,
 463                 (long)fl->fl_next, (long)fl->fl_block.next);
 464 diff -urN linux-2.4.22.org/fs/proc/proc_tty.c linux-2.4.22/fs/proc/proc_tty.c
 465 --- linux-2.4.22.org/fs/proc/proc_tty.c 2003-11-23 15:58:32.000000000 +0100
 466 +++ linux-2.4.22/fs/proc/proc_tty.c     2003-11-23 16:04:30.000000000 +0100
 467 @@ -161,7 +161,7 @@
 468         if (!ent)
 469                 return;
 470
 471 -       remove_proc_entry(driver->driver_name, proc_tty_driver);
 472 +       remove_proc_entry(ent->name, proc_tty_driver);
 473
 474         driver->proc_entry = 0;
 475  }
 476 diff -urN linux-2.4.22.org/include/asm-alpha/hardirq.h linux-2.4.22/include/asm-alpha/hardirq.h
 477 --- linux-2.4.22.org/include/asm-alpha/hardirq.h        2003-11-23 15:58:57.000000000 +0100
 478 +++ linux-2.4.22/include/asm-alpha/hardirq.h    2003-11-23 16:04:30.000000000 +0100
 479 @@ -41,6 +41,7 @@
 480
 481  #define synchronize_irq()      barrier()
 482
 483 +#define release_irqlock(cpu) ((void) 0)
 484  #else
 485
 486  #define irq_attempt(cpu, irq) (cpu_data[cpu].irq_attempt[irq])
 487 diff -urN linux-2.4.22.org/include/asm-alpha/smplock.h linux-2.4.22/include/asm-alpha/smplock.h
 488 --- linux-2.4.22.org/include/asm-alpha/smplock.h        2003-11-23 15:58:57.000000000 +0100
 489 +++ linux-2.4.22/include/asm-alpha/smplock.h    2003-11-23 16:04:30.000000000 +0100
 490 @@ -7,7 +7,7 @@
 491  #include <linux/sched.h>
 492  #include <linux/interrupt.h>
 493  #include <linux/spinlock.h>
 494 -
 495 +#include <asm/hardirq.h>
 496  extern spinlock_t kernel_flag;
 497
 498  #define kernel_locked()                spin_is_locked(&kernel_flag)
 499 diff -urN linux-2.4.22.org/include/asm-i386/rwsem.h linux-2.4.22/include/asm-i386/rwsem.h
 500 --- linux-2.4.22.org/include/asm-i386/rwsem.h   2003-11-23 15:58:53.000000000 +0100
 501 +++ linux-2.4.22/include/asm-i386/rwsem.h       2003-11-23 16:04:30.000000000 +0100
 502 @@ -42,6 +42,7 @@
 503
 504  #include <linux/list.h>
 505  #include <linux/spinlock.h>
 506 +#include <asm/system.h>
 507
 508  struct rwsem_waiter;
 509
 510 diff -urN linux-2.4.22.org/include/linux/binfmts.h linux-2.4.22/include/linux/binfmts.h
 511 --- linux-2.4.22.org/include/linux/binfmts.h    2003-11-23 15:58:49.000000000 +0100
 512 +++ linux-2.4.22/include/linux/binfmts.h        2003-11-23 16:04:30.000000000 +0100
 513 @@ -16,6 +16,8 @@
 514
 515  #ifdef __KERNEL__
 516
 517 +struct mm_struct;
 518 +
 519  /*
 520   * This structure is used to hold the arguments that are used when loading binaries.
 521   */
 522 diff -urN linux-2.4.22.org/include/linux/brlock.h linux-2.4.22/include/linux/brlock.h
 523 --- linux-2.4.22.org/include/linux/brlock.h     2003-11-23 15:58:47.000000000 +0100
 524 +++ linux-2.4.22/include/linux/brlock.h 2003-11-23 16:04:30.000000000 +0100
 525 @@ -39,6 +39,7 @@
 526  };
 527
 528  #include <linux/config.h>
 529 +#include <linux/sched.h>
 530
 531  #ifdef CONFIG_SMP
 532
 533 diff -urN linux-2.4.22.org/include/linux/kbd_kern.h linux-2.4.22/include/linux/kbd_kern.h
 534 --- linux-2.4.22.org/include/linux/kbd_kern.h   2003-11-23 15:58:47.000000000 +0100
 535 +++ linux-2.4.22/include/linux/kbd_kern.h       2003-11-23 16:04:30.000000000 +0100
 536 @@ -3,6 +3,8 @@
 537
 538  #include <linux/interrupt.h>
 539  #include <linux/keyboard.h>
 540 +#include <linux/sched.h>
 541 +#include <linux/tty.h>
 542
 543  extern struct tasklet_struct keyboard_tasklet;
 544
 545 diff -urN linux-2.4.22.org/include/linux/list.h linux-2.4.22/include/linux/list.h
 546 --- linux-2.4.22.org/include/linux/list.h       2003-11-23 15:58:47.000000000 +0100
 547 +++ linux-2.4.22/include/linux/list.h   2003-11-23 16:04:30.000000000 +0100
 548 @@ -15,9 +15,9 @@
 549   * using the generic single-entry routines.
 550   */
 551
 552 -struct list_head {
 553 +typedef struct list_head {
 554         struct list_head *next, *prev;
 555 -};
 556 +} list_t;
 557
 558  #define LIST_HEAD_INIT(name) { &(name), &(name) }
 559
 560 diff -urN linux-2.4.22.org/include/linux/proc_fs.h linux-2.4.22/include/linux/proc_fs.h
 561 --- linux-2.4.22.org/include/linux/proc_fs.h    2003-11-23 15:58:47.000000000 +0100
 562 +++ linux-2.4.22/include/linux/proc_fs.h        2003-11-23 16:04:30.000000000 +0100
 563 @@ -206,6 +206,8 @@
 564  static inline void proc_tty_unregister_driver(struct tty_driver *driver) {};
 565
 566  extern struct proc_dir_entry proc_root;
 567 +extern struct proc_dir_entry proc_root_driver;
 568 +
 569
 570  #endif /* CONFIG_PROC_FS */
 571
 572 diff -urN linux-2.4.22.org/include/linux/vt_kern.h linux-2.4.22/include/linux/vt_kern.h
 573 --- linux-2.4.22.org/include/linux/vt_kern.h    2003-11-23 15:58:47.000000000 +0100
 574 +++ linux-2.4.22/include/linux/vt_kern.h        2003-11-23 16:04:30.000000000 +0100
 575 @@ -9,6 +9,7 @@
 576  #include <linux/config.h>
 577  #include <linux/vt.h>
 578  #include <linux/kd.h>
 579 +#include <linux/tty.h>
 580
 581  /*
 582   * Presently, a lot of graphics programs do not restore the contents of
 583 diff -urN linux-2.4.22.org/include/net/sctp/compat.h linux-2.4.22/include/net/sctp/compat.h
 584 --- linux-2.4.22.org/include/net/sctp/compat.h  2003-11-23 15:59:00.000000000 +0100
 585 +++ linux-2.4.22/include/net/sctp/compat.h      2003-11-23 16:03:28.000000000 +0100
 586 @@ -67,36 +67,4 @@
 587  #define sk_wmem_queued wmem_queued
 588  #define sk_bound_dev_if bound_dev_if
 589
 590 -/*
 591 - * find last bit set.
 592 - */
 593 -static __inline__ int fls(int x)
 594 -{
 595 -       int r = 32;
 596 -
 597 -       if (!x)
 598 -               return 0;
 599 -       if (!(x & 0xffff0000u)) {
 600 -               x <<= 16;
 601 -               r -= 16;
 602 -       }
 603 -       if (!(x & 0xff000000u)) {
 604 -               x <<= 8;
 605 -               r -= 8;
 606 -       }
 607 -       if (!(x & 0xf0000000u)) {
 608 -               x <<= 4;
 609 -               r -= 4;
 610 -       }
 611 -       if (!(x & 0xc0000000u)) {
 612 -               x <<= 2;
 613 -               r -= 2;
 614 -       }
 615 -       if (!(x & 0x80000000u)) {
 616 -               x <<= 1;
 617 -               r -= 1;
 618 -       }
 619 -       return r;
 620 -}
 621 -
 622  #endif /* __net_sctp_compat_h__ */
 623 diff -urN linux-2.4.22.org/init/do_mounts.c linux-2.4.22/init/do_mounts.c
 624 --- linux-2.4.22.org/init/do_mounts.c   2003-11-23 15:58:39.000000000 +0100
 625 +++ linux-2.4.22/init/do_mounts.c       2003-11-23 16:04:30.000000000 +0100
 626 @@ -462,6 +462,10 @@
 627                 close(fd);
 628         }
 629  }
 630 +#else
 631 +static void __init change_floppy(char *fmt, ...)
 632 +{
 633 +}
 634  #endif
 635
 636  #ifdef CONFIG_BLK_DEV_RAM
 637 diff -urN linux-2.4.22.org/kernel/ksyms.c linux-2.4.22/kernel/ksyms.c
 638 --- linux-2.4.22.org/kernel/ksyms.c     2003-11-23 15:58:39.000000000 +0100
 639 +++ linux-2.4.22/kernel/ksyms.c 2003-11-23 16:04:30.000000000 +0100
 640 @@ -512,9 +512,6 @@
 641  EXPORT_SYMBOL(simple_strtoull);
 642  EXPORT_SYMBOL(system_utsname); /* UTS data */
 643  EXPORT_SYMBOL(uts_sem);                /* UTS semaphore */
 644 -#ifndef __mips__
 645 -EXPORT_SYMBOL(sys_call_table);
 646 -#endif
 647  EXPORT_SYMBOL(machine_restart);
 648  EXPORT_SYMBOL(machine_halt);
 649  EXPORT_SYMBOL(machine_power_off);
 650 diff -urN linux-2.4.22.org/lib/rwsem-spinlock.c linux-2.4.22/lib/rwsem-spinlock.c
 651 --- linux-2.4.22.org/lib/rwsem-spinlock.c       2003-11-23 15:58:40.000000000 +0100
 652 +++ linux-2.4.22/lib/rwsem-spinlock.c   2003-11-23 16:04:30.000000000 +0100
 653 @@ -280,6 +280,8 @@
 654  EXPORT_SYMBOL(__down_write);
 655  EXPORT_SYMBOL(__up_read);
 656  EXPORT_SYMBOL(__up_write);
 657 +EXPORT_SYMBOL(__down_write_trylock);
 658 +EXPORT_SYMBOL(__down_read_trylock);
 659  #if RWSEM_DEBUG
 660  EXPORT_SYMBOL(rwsemtrace);
 661  #endif
 662 diff -urN linux-2.4.22.org/mm/vmalloc.c linux-2.4.22/mm/vmalloc.c
 663 --- linux-2.4.22.org/mm/vmalloc.c       2003-11-23 15:58:40.000000000 +0100
 664 +++ linux-2.4.22/mm/vmalloc.c   2003-11-23 16:04:30.000000000 +0100
 665 @@ -12,6 +12,7 @@
 666  #include <linux/spinlock.h>
 667  #include <linux/highmem.h>
 668  #include <linux/smp_lock.h>
 669 +#include <linux/interrupt.h>
 670
 671  #include <asm/uaccess.h>
 672  #include <asm/pgalloc.h>
 673 @@ -19,6 +20,9 @@
 674  rwlock_t vmlist_lock = RW_LOCK_UNLOCKED;
 675  struct vm_struct * vmlist;
 676
 677 +extern void show_stack(unsigned long *);
 678 +
 679 +
 680  static inline void free_area_pte(pmd_t * pmd, unsigned long address, unsigned long size)
 681  {
 682         pte_t * pte;
 683 @@ -244,6 +248,12 @@
 684                 printk(KERN_ERR "Trying to vfree() bad address (%p)\n", addr);
 685                 return;
 686         }
 687 +       if (in_interrupt()) {
 688 +               printk("vfree(): sleeping in interrupt!! \n");
 689 +#ifdef __i386__
 690 +               show_stack(NULL);
 691 +#endif
 692 +       }
 693         write_lock(&vmlist_lock);
 694         for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
 695                 if (tmp->addr == addr) {
 696 diff -urN linux-2.4.22.org/net/sctp/ipv6.c linux-2.4.22/net/sctp/ipv6.c
 697 --- linux-2.4.22.org/net/sctp/ipv6.c    2003-11-23 15:59:36.000000000 +0100
 698 +++ linux-2.4.22/net/sctp/ipv6.c        2003-11-23 16:03:04.000000000 +0100
 699 @@ -74,6 +74,7 @@
 700  #include <net/sctp/sctp.h>
 701
 702  #include <asm/uaccess.h>
 703 +#include <linux/bitops.h>
 704
 705  extern struct notifier_block sctp_inetaddr_notifier;
 706
 707 diff -urN linux-2.4.22.org/net/sunrpc/auth.c linux-2.4.22/net/sunrpc/auth.c
 708 --- linux-2.4.22.org/net/sunrpc/auth.c  2003-11-23 15:59:34.000000000 +0100
 709 +++ linux-2.4.22/net/sunrpc/auth.c      2003-11-23 16:04:30.000000000 +0100
 710 @@ -13,6 +13,7 @@
 711  #include <linux/socket.h>
 712  #include <linux/sunrpc/clnt.h>
 713  #include <linux/spinlock.h>
 714 +#include <linux/module.h>
 715
 716  #ifdef RPC_DEBUG
 717  # define RPCDBG_FACILITY       RPCDBG_AUTH
 718 diff -urN linux-2.4.22.org/net/wanrouter/wanproc.c linux-2.4.22/net/wanrouter/wanproc.c
 719 --- linux-2.4.22.org/net/wanrouter/wanproc.c    2003-11-23 15:59:34.000000000 +0100
 720 +++ linux-2.4.22/net/wanrouter/wanproc.c        2003-11-23 16:04:30.000000000 +0100
 721 @@ -1081,6 +1081,13 @@
 722  }
 723  #endif
 724
 725 +#ifndef CONFIG_PROC_FS
 726 +       int __init wanrouter_proc_init (void)
 727 +       {
 728 +               return 0;
 729 +       }
 730 +#endif
 731 +
 732  /*
 733   *     End
 734   */
 735 diff -urN linux-2.4.24.org/drivers/scsi/scsi_module.c linux-2.4.24/drivers/scsi/scsi_module.c
 736 --- linux-2.4.24.org/drivers/scsi/scsi_module.c 2004-01-18 20:35:20.949771349 +0100
 737 +++ linux-2.4.24/drivers/scsi/scsi_module.c     2004-01-18 20:35:44.792782897 +0100
 738 @@ -29,6 +29,7 @@
 739   * scsi_register.
 740   */
 741
 742 +#ifndef PCMCIA
 743  #include <linux/module.h>
 744  #include <linux/init.h>
 745
 746 @@ -50,6 +51,7 @@
 747
 748  module_init(init_this_scsi_driver);
 749  module_exit(exit_this_scsi_driver);
 750 +#endif
 751
 752  /*
 753   * Overrides for Emacs so that we almost follow Linus's tabbing style.
 754 diff -urN linux-2.4.24.org/include/asm-alpha/bitops.h linux-2.4.24/include/asm-alpha/bitops.h
 755 --- linux-2.4.24.org/include/asm-alpha/bitops.h 2004-01-19 20:58:56.469350313 +0100
 756 +++ linux-2.4.24/include/asm-alpha/bitops.h     2004-01-23 19:18:12.882761301 +0100
 757 @@ -315,6 +315,11 @@
 758         return word ? result+1 : 0;
 759  }
 760
 761 +/*
 762 + * fls: find last bit set.
 763 + */
 764 +#define fls     generic_fls
 765 +
 766  /* Compute powers of two for the given integer.  */
 767  static inline int floor_log2(unsigned long word)
 768  {
 769 --- linux-2.4.26/drivers/char/drm/drmP.h.org    2004-04-19 02:52:58.034427096 +0200
 770 +++ linux-2.4.26/drivers/char/drm/drmP.h        2004-04-19 02:53:24.323430560 +0200
 771 @@ -107,76 +107,6 @@
 772  #define __REALLY_HAVE_MTRR     (__HAVE_MTRR && defined(CONFIG_MTRR))
 773
 774
 775 -                               /* Generic cmpxchg added in 2.3.x */
 776 -#ifndef __HAVE_ARCH_CMPXCHG
 777 -                               /* Include this here so that driver can be
 778 -                                   used with older kernels. */
 779 -#if defined(__alpha__)
 780 -static __inline__ unsigned long
 781 -__cmpxchg_u32(volatile int *m, int old, int new)
 782 -{
 783 -       unsigned long prev, cmp;
 784 -
 785 -       __asm__ __volatile__(
 786 -       "1:     ldl_l %0,%2\n"
 787 -       "       cmpeq %0,%3,%1\n"
 788 -       "       beq %1,2f\n"
 789 -       "       mov %4,%1\n"
 790 -       "       stl_c %1,%2\n"
 791 -       "       beq %1,3f\n"
 792 -       "2:     mb\n"
 793 -       ".subsection 2\n"
 794 -       "3:     br 1b\n"
 795 -       ".previous"
 796 -       : "=&r"(prev), "=&r"(cmp), "=m"(*m)
 797 -       : "r"((long) old), "r"(new), "m"(*m));
 798 -
 799 -       return prev;
 800 -}
 801 -
 802 -static __inline__ unsigned long
 803 -__cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
 804 -{
 805 -       unsigned long prev, cmp;
 806 -
 807 -       __asm__ __volatile__(
 808 -       "1:     ldq_l %0,%2\n"
 809 -       "       cmpeq %0,%3,%1\n"
 810 -       "       beq %1,2f\n"
 811 -       "       mov %4,%1\n"
 812 -       "       stq_c %1,%2\n"
 813 -       "       beq %1,3f\n"
 814 -       "2:     mb\n"
 815 -       ".subsection 2\n"
 816 -       "3:     br 1b\n"
 817 -       ".previous"
 818 -       : "=&r"(prev), "=&r"(cmp), "=m"(*m)
 819 -       : "r"((long) old), "r"(new), "m"(*m));
 820 -
 821 -       return prev;
 822 -}
 823 -
 824 -static __inline__ unsigned long
 825 -__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 826 -{
 827 -       switch (size) {
 828 -               case 4:
 829 -                       return __cmpxchg_u32(ptr, old, new);
 830 -               case 8:
 831 -                       return __cmpxchg_u64(ptr, old, new);
 832 -       }
 833 -       return old;
 834 -}
 835 -#define cmpxchg(ptr,o,n)                                                \
 836 -  ({                                                                    \
 837 -     __typeof__(*(ptr)) _o_ = (o);                                      \
 838 -     __typeof__(*(ptr)) _n_ = (n);                                      \
 839 -     (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,          \
 840 -                                   (unsigned long)_n_, sizeof(*(ptr))); \
 841 -  })
 842 -
 843 -#endif /* alpha */
 844 -#endif
 845  #define __REALLY_HAVE_SG       (__HAVE_SG)
 846
 847  /* Begin the DRM...
 848