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