1. 09 Jun, 2002 9 commits
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk · e618013a
      Linus Torvalds authored
      into home.transmeta.com:/home/torvalds/v2.5/linux
      e618013a
    • Russell King's avatar
      [ARM] 3 trivial changes: · e0addcb4
      Russell King authored
       - Add ARM version for asm/suspend.h
       - Use inline in atomic.h rather than __inline__
       - Fix up a missed superblock conversion in fs/adfs/map.c
         (hadn't been converted to use ADFS_SB())
      e0addcb4
    • Russell King's avatar
      [ARM] Fix ARM build (, -> _) · 30009ebe
      Russell King authored
      The kbuild infrastructure in 2.5.21 uses the filename to generate a
      dependency file, which is passed into gcc using -Wp,-MD,filename.
      Unfortunately, the ',' in the filename is interpreted by GCC as an
      argument separator for the preprocessor.  So, with a filename
      foo,bar.c gcc ends up passing the three arguments "-MD", "foo" and
      "bar.c" to cpp, which promptly complains.
      
      We therefore rename these files to use an underscore instead of a
      comma.
      30009ebe
    • Russell King's avatar
      Merge http://gkernel.bkbits.net/linus-2.5 · 0494fa17
      Russell King authored
      into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
      0494fa17
    • Russell King's avatar
      [PATCH] Fix more header file breakage · 3150c862
      Russell King authored
      Since namespace.h needs the contents of dcache, task struct and
      semaphores, it seems sensible to include these two files into
      namespace.h.
      
      For the future: If the task_struct in sched.h is split into its own
      include file, namespace.h could include this file, but namespace.h
      will also need asm/semaphore.h
      3150c862
    • Martin Dalecki's avatar
      [PATCH] 2.5.20 locks.h cleanup · eada9464
      Martin Dalecki authored
      Since I have been looking in to the lcoking issues recently
      the following rather trivial gabrage code collection became
      obvious...
      
       - Remove "not yet used" code from 1995 in asm/locks.h. It's garbage.
      
       - Remove useless DEBUG_SPINLOCK code from generic spinlock.h code. Just
         compiling for SMP does the trick already.
      
       - Replace all usages of SPINLOCK_DEBUG with the now global
         CONFIG_DEBUG_SPINLOCK.
      eada9464
    • Martin Dalecki's avatar
      [PATCH] 2.5.20 IDE 86 · 467b45ea
      Martin Dalecki authored
      Most importantly this makes ide-scsi work again, which I broke
      IDE 85. And we are starting to be serious about locking issues.
      However the locking issues will take some patches until they stabilize.
      
       - Add spin locks in ata_special_intr.
      
       - Add Server Works CSB6 handling by Matt Domsch.
      
       - Atari updates by Geert Uytterhoeven:
         * irq_lock is used in more than one file, so make it global and rename it
           to ide_irq_lock
         * `hwgroup' is dead, use `channel' instead
         * ide_irq_lock depends on ATA_ARCH_LOCK, not on m68k or APUS
      
       - Small janitorial tidbits by Angus Sawyer.
      
       - PIIX driver updates by Vojtech Pavlik:
      
         * Removes the CONFIG_BLK_DEV_PIIX_TRY133 option. I've got an official
           statement from Intel saying that the controller definitely isn't intended
           to operate at this speed and doing so may cause severe trouble.
      
         * Fixes a bug in ata-timing.c, where EIDE timing data was discarded by
           accident.
      
         * Fixed a couple bugs in the Artop driver (UDMA clocks, active/recovery
           timing), 8-bit timing merging.
      
         * Removes an unused variable from piix.c
      
       - Move locking out from ide_set_handler(). There are places where it incurred
         too frequent lock grab and release or where we did miss to lock against
         concurrent hardware access.
      
         Generally the locking appears to be too fine grained and inconsistent at many
         places. This is the first cut. We will deal with it step by step.
      
       - Make sure message string is initialized even if FANCY_STATUS_DUMPS is
         disabled.
      
       - Don't lock directly inside udma_init and implementations of this method.
      
       - Guard against REQ_SPECIAL issued by the SCSI layer on us. Use REQ_PC in
         ide-scsi.c instead.
      467b45ea
    • Linus Torvalds's avatar
      fix up fall-out from header cleanups · 71e3ff68
      Linus Torvalds authored
      71e3ff68
    • Mitchell Blank Jr.'s avatar
      [PATCH] atm warning fix (vs 2.5.21) · dce2f963
      Mitchell Blank Jr. authored
      This fixes a large batch of warnings that popped up with the new stricter
      bitops.h that recently was introduced.  We actually didn't have 64-bit
      bug, but we had built our own *_flags_t typedef's that were just struct
      wrappers around an unsigned long.  We used to pass their addresses directly
      to set_bit() and friends but now that causes an error.  The typedef's really
      didn't serve much purpose so the cleanest fix is to just eliminate them and
      use "unsigned long" directly.
      dce2f963
  2. 08 Jun, 2002 30 commits
  3. 07 Jun, 2002 1 commit