1. 01 Aug, 2003 40 commits
    • Linus Torvalds's avatar
      Merge bk://gkernel.bkbits.net/net-drivers-2.5 · 8128c97e
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      8128c97e
    • Jeff Garzik's avatar
      Merge kernel.bkbits.net:net-drivers-2.6 · 0fa2e9bd
      Jeff Garzik authored
      into redhat.com:/garz/repo/net-drivers-2.6
      0fa2e9bd
    • Randy Dunlap's avatar
      [PATCH] janitor: convert to pci_name() · 42098570
      Randy Dunlap authored
      [ GregKH has already done this is USB and PCI core. ]
      
      From: "Warren A. Layton" <zeevon@debian.org>
      
      Based on a request from Matthew Wilcox, convert instances of
      pci_dev->slot_name to use pci_name() instead:
      
        "In order to support PCI Domains, we have to stop using slot_name.
         It's related to driver model transition too since pci_dev->slot_name
         was redundant with pci_dev->dev.bus_id.  So I introduced the inline
         function pci_name().  Now there's about 300-400 places in the tree
         that're using slot_name which need to be converted to use pci_name().
         once that's done, we can remove the slot_name pointer in pci_dev and
         save a (void *) per pci_dev."
      42098570
    • Randy Dunlap's avatar
      [PATCH] don't init statics to 0 (fs/) · 9cf89014
      Randy Dunlap authored
      From: Leann Ogasawara <ogasawara@osdl.org>
      
      Uninitialize static variables initialized to 0 so they are pushed to the
      .bss instead of .data.
      9cf89014
    • Randy Dunlap's avatar
      [PATCH] janitor: don't init statics to 0 · ae87487b
      Randy Dunlap authored
      From: Leann Ogasawara <ogasawara@osdl.org>
      
      Uninitialize static variables initialized to 0 so they are pushed to the
      .bss instead of .data.
      ae87487b
    • Randy Dunlap's avatar
      [PATCH] jantior: return -EFAULT on copy_user error · 53ef8f80
      Randy Dunlap authored
      From: Daniele Bellucci <bellucda@tiscali.it>
      
      Return proper error code from copy_to_user failure in fs/sysfs/bin.c
      53ef8f80
    • Randy Dunlap's avatar
      [PATCH] janitor: use char arrays for strings · d9bc3929
      Randy Dunlap authored
      From: maximilian attems <janitor@sternwelten.at>
      
      Use char arrays instead of char* for strings:
       a. uses a single variable instead of two.
       b. shorter code.
       c. __initdata will be completely dropped.
      d9bc3929
    • Randy Dunlap's avatar
      [PATCH] janitor: make serio init/exit static · 3fa99ba8
      Randy Dunlap authored
      From: Daniele Bellucci <bellucda@tiscali.it>
      3fa99ba8
    • Randy Dunlap's avatar
      [PATCH] janitor: add MODULE_LICENSE() in 2 drivers · dcafa048
      Randy Dunlap authored
      From: dan carpenter <error27@email.com>
      
      Neither one of these drivers has a clear maintainer.  The patches are
      straight forward and tested.  Both drivers are released under the GPL.
      dcafa048
    • Randy Dunlap's avatar
      [PATCH] janitor: don't init static data (arm26) · bda8b959
      Randy Dunlap authored
      By Leann Ogasawara <ogasawara@osdl.org>
      
      Uninitialize static variables initialized to 0 so they are pushed to the
      .bss instead of .data.
      bda8b959
    • Jan Kara's avatar
      [PATCH] Fix old quota format locking · 96fa2f0a
      Jan Kara authored
      This fixes a bug in locking (we take one lock twice) for old quota
      format.  Without this patch the old format simply don't work (I really
      don't know how that could happen).
      
      Thanks go to Herbert Potzl who spotted it.
      96fa2f0a
    • Greg Kroah-Hartman's avatar
      PCI: merge fixups. · 0ea22499
      Greg Kroah-Hartman authored
      0ea22499
    • Greg Kroah-Hartman's avatar
      merge · 840d4d9a
      Greg Kroah-Hartman authored
      840d4d9a
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.6 · a72d939d
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      a72d939d
    • Linus Torvalds's avatar
      Merge XFS updates. · 6e423ec5
      Linus Torvalds authored
      6e423ec5
    • Greg Kroah-Hartman's avatar
    • Mitchell Blank Jr.'s avatar
      [PATCH] PCI: add 2 entries to pci_ids.h · 8abc952d
      Mitchell Blank Jr. authored
      These have been in the pci.ids file for awhile but not in <linux/pci_ids.h>
      They're used by my drivers/atm/lanai.c driver that has been in tree for
      some time now (it provides its own copy of these #define's protected by
      an #ifndef - I'll remove that once this patch goes into the mainline)
      8abc952d
    • Mitchell Blank Jr.'s avatar
      [PATCH] PCI: Trivial DMA-mapping.txt fix · 382d7478
      Mitchell Blank Jr. authored
      As far as I can tell "pci_set_consistent()" doesn't exist - the docs probably
      meant to say "pci_set_consistent_dma_mask()".
      382d7478
    • Andrew Morton's avatar
      [PATCH] cpu_idle() startup race fix · 49487a3d
      Andrew Morton authored
      Diagnosis from Christian Vogel <vogel@skunk.physik.uni-erlangen.de>
      
      cpu_idle() tests pm_idle() just once then falls into the
      
      	while (!need_resched())
      		idle();
      
      loop.
      
      Problem is, that loop never terminates (need_resched() always returns false
      on preemptive kernels).
      
      The other problem is that ACPI updates pm_idle _after_ cpu_idle() has taken a
      local copy.  So we always call default_idle(), even when pm_idle is pointing
      at a new idle handler.
      
      So fix it to pick up changed values of pm_idle() each time around the inner
      loop.
      49487a3d
    • Andrew Morton's avatar
      [PATCH] export install_page() to modules · 1dfe1754
      Andrew Morton authored
      install_page() is a library function which we expect will be used by all
      drivers which implement vm_operations.populate().  Therefore it should be
      exported to kernel modules.
      
      Petr Vandrovec has a project which involves sparse mappings of device memory
      which can use remap_file_pages().  It needs install_page().
      1dfe1754
    • Andrew Morton's avatar
      [PATCH] Watchdog: use module_param · 3420e0e6
      Andrew Morton authored
      From: Wim Van Sebroeck <wim@iguana.be>
      
      The first patch convert these watchdog modules to the new module_param syntax.
      
      The second patch fixes machzwd.c (you need to declare the variable before
      using the module_param subroutine).
      3420e0e6
    • Andrew Morton's avatar
      [PATCH] ftl.c warning fix · 9c2a5b7c
      Andrew Morton authored
      From: Adrian Bunk <bunk@fs.tum.de>
      
      A 16bit number can _never_ be > 65536.  So don't bother to check for it.
      9c2a5b7c
    • Andrew Morton's avatar
      [PATCH] serial drivers are not experimental · ac0151e3
      Andrew Morton authored
      From: Andries.Brouwer@cwi.nl
      
      A few days ago I needed a serial line and couldnt find the option in
      menuconfig.  Turned out that SERIAL_8250 depends on EXPERIMENTAL.  I
      suppose that dependence should be removed.
      ac0151e3
    • Andrew Morton's avatar
      [PATCH] dscc4 compile fix for hdlc · e2ce67e9
      Andrew Morton authored
      From: Francois Romieu <romieu@fr.zoreil.com>
      
      The wan driver I maintain was hit by hdlc changes too. Please
      apply patch below. It is diffed against plain -test2 but it
      applies equally as well against -test2-mm2.
      
      More important changes will come in a near future for this
      driver but I'd rather keep the changes separated.
      
      Description:
      - after the hdlc changes, dscc4 module doesn't need to set
        hdlc->proto(.id) itself anymore;
      - MOD_{INC/DEC}_USE_COUNT removal;
      - SET_NETDEV_DEV() use;
      e2ce67e9
    • Andrew Morton's avatar
      [PATCH] generic HDLC updates · 6e28ae46
      Andrew Morton authored
      From: Krzysztof Halasa <khc@pm.waw.pl>
      
      The following patch upgrades generic HDLC to support "new" protocol
      handlers.
      6e28ae46
    • Andrew Morton's avatar
      [PATCH] IPMI build fix · a51ae743
      Andrew Morton authored
      From: Adrian Bunk <bunk@fs.tum.de>
      
      Fix ACPI compile error if doing processor probing only: acpi_find_bmc is
      only available #ifdef CONFIG_ACPI_INTERPRETER.
      a51ae743
    • Andrew Morton's avatar
      [PATCH] export agp_memory_reserved · 4c0c1725
      Andrew Morton authored
      nvidia-agp needs it.
      4c0c1725
    • Andrew Morton's avatar
      [PATCH] i810fb oops fix · 3dd9a2ff
      Andrew Morton authored
      The module device table is not NULL-terminated, so we run off the end during
      probing and oops.
      
      Also, move all those static decls out of .h and into .c
      3dd9a2ff
    • Andrew Morton's avatar
      [PATCH] quota typo fix · efc0596c
      Andrew Morton authored
      From: Herbert Potzl <herbert@13thfloor.at>
      
      quota.h typo fix
      efc0596c
    • Andrew Morton's avatar
      [PATCH] Fix dac960 for devfs · 6a740541
      Andrew Morton authored
      From: Dave Olien <dmo@osdl.org>
      
      It wasn't initializing the devfs_name member of the gendisk structures to
      contain the root name of the logical disk.
      6a740541
    • Andrew Morton's avatar
      [PATCH] binfmt_script argv[0] fix · 867c7a0a
      Andrew Morton authored
      From: Arun Sharma <arun.sharma@intel.com>
      
      A script such as
      
        #!/bin/foo.bar
        ...
      
      where /bin/foo.bar is handled by binfmt_misc, is not handled correctly i.e.
      the interpreter of foo.bar doesn't receive the correct arguments.
      
      The binfmt_misc handler requires that bprm->filename is appropriately
      filled so that the argv[1] could be correctly passed to the interpreter.
      
      However, binfmt_script, as it exists today doesn't populate bprm->filename
      correctly.
      
      Another motivation for this patch is the output of ps.  Emulators which use
      binfmt_misc may want to keep the output of ps consistent with native
      execution.  This requires preserving bprm->filename.  The attached patch
      guarantees this even if we have to go through several binfmt handlers
      (think of finite loops involving binfmt_script and binfmt_misc).
      867c7a0a
    • Andrew Morton's avatar
      [PATCH] pc300_drv build fix · f4f980fb
      Andrew Morton authored
      From: Adrian Bunk <bunk@fs.tum.de>
      
      Fix compile error introduced by the HDLC update.
      f4f980fb
    • Andrew Morton's avatar
      [PATCH] com20020_cs.c doesn't compile · 10aeaa6e
      Andrew Morton authored
      From: Adrian Bunk <bunk@fs.tum.de>
      
      drivers/net/pcmcia/com20020_cs.c wasn't updated to the module owner
      field changes
      10aeaa6e
    • Andrew Morton's avatar
      [PATCH] uidhash init-time locking · 47f7edc1
      Andrew Morton authored
      From: <ffrederick@prov-liege.be>
      
      Add the necessary locking around uid_hash_insert() in uid_cache_init().
      
      (It's an initcall, and the chances of another CPU racing with us here are
      basically zero.  But it's good for documentary purposes and the code gets
      dropped later anyway...)
      47f7edc1
    • Andrew Morton's avatar
      [PATCH] Move the special_file() definition · cbc8594c
      Andrew Morton authored
      From: <ffrederick@prov-liege.be>
      
      The special_file() macro is being duplicated in JFS.  Move it to fs.h.
      cbc8594c
    • Andrew Morton's avatar
      [PATCH] fix read_dir() · 7a6fbd69
      Andrew Morton authored
      This function tries to allocate increasingly large buffers, but it gets the
      bounds wrong by a factor of PAGE_SIZE.  It causes boot-time devfs mounting
      to fail.
      7a6fbd69
    • Andrew Morton's avatar
      [PATCH] ext3: fix commit assertion failure · b84ee08e
      Andrew Morton authored
      We're getting asserion failures in commit in data=journal mode.
      
      journal_unmap_buffer() has unexpectedly donated this buffer to the committing
      transaction, and the commit-time assertion doesn't expect that to happen.  It
      doesn't happen in 2.4 because both paths are under lock_journal().
      
      Simply remove the assertion: the commit code will uncheckpoint the buffer and
      then recheckpoint it if needed.
      b84ee08e
    • Andrew Morton's avatar
      [PATCH] fix ip_conntrack_core.h compile error · 01b1174f
      Andrew Morton authored
      From: Felipe Alfaro Solana <felipe_alfaro@linuxmail.org>
      
      Fix compile error in 2.6.0-test2 when Netfilter IP connection tracking
      is enabled.
      01b1174f
    • Andrew Morton's avatar
      [PATCH] fix select() with an xoffed tty · 791c4b04
      Andrew Morton authored
      From: Manfred Spraul <manfred@colorfullife.com>
      
      Eli Barzilay noticed that select() for tty devices is broken: For
      stopped tty devices, select says POLLOUT and write fails with -EAGAIN.
      
          http://marc.theaimsgroup.com/?l=linux-kernel&m=105902461110282&w=2
      
      I've tracked this back to normal_poll in drivers/char/n_tty.c:
      
       > if (tty->driver->chars_in_buffer(tty) < WAKEUP_CHARS)
       >                mask |= POLLOUT | POLLWRNORM;
      
      It assumes that a following write will succeed if less than 256 bytes
      are in the write buffer right now. This assumption is wrong for
      con_write_room: if the console is stopped, it returns 0 bytes buffer
      size (con_write_room()). Ditto for pty_write_room.
      791c4b04
    • Andrew Morton's avatar
      [PATCH] Fix ipt_helper compilation · a74ccc26
      Andrew Morton authored
      From: florin@iucha.net (Florin Iucha)
      
      Fix compilation of net/ipv4/netfilter/ipt_helper.c by including the
      proper header files.
      a74ccc26