1. 26 Jul, 2010 22 commits
  2. 26 May, 2010 1 commit
  3. 25 May, 2010 17 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · b1cdc467
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits)
        drivers/net/usb/asix.c: Fix pointer cast.
        be2net: Bug fix to avoid disabling bottom half during firmware upgrade.
        proc_dointvec: write a single value
        hso: add support for new products
        Phonet: fix potential use-after-free in pep_sock_close()
        ath9k: remove VEOL support for ad-hoc
        ath9k: change beacon allocation to prefer the first beacon slot
        sock.h: fix kernel-doc warning
        cls_cgroup: Fix build error when built-in
        macvlan: do proper cleanup in macvlan_common_newlink() V2
        be2net: Bug fix in init code in probe
        net/dccp: expansion of error code size
        ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep
        wireless: fix sta_info.h kernel-doc warnings
        wireless: fix mac80211.h kernel-doc warnings
        iwlwifi: testing the wrong variable in iwl_add_bssid_station()
        ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()
        ath9k_htc: dereferencing before check in hif_usb_tx_cb()
        rt2x00: Fix rt2800usb TX descriptor writing.
        rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions.
    • Linus Torvalds's avatar
      Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 · ce7d0226
      Linus Torvalds authored
      * 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
        alpha: simplify and optimize sched_find_first_bit
        alpha: invoke oom-killer from page fault
        Convert alpha to use clocksources instead of arch_gettimeoffset
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · b142ebb6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        driver core: add devname module aliases to allow module on-demand auto-loading
    • Linus Torvalds's avatar
      Revert "module: drop the lock while waiting for module to complete initialization." · 218ce735
      Linus Torvalds authored
      This reverts commit 480b02df
      , since
      Rafael reports that it causes occasional kernel paging request faults in
      Dropping the module lock and re-taking it deep in the call-chain is
      definitely not the right thing to do.  That just turns the mutex from a
      lock into a "random non-locking data structure" that doesn't actually
      protect what it's supposed to protect.
      Requested-and-tested-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Brandon Philips <brandon@ifup.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • David S. Miller's avatar
      drivers/net/usb/asix.c: Fix pointer cast. · f925b130
      David S. Miller authored
      Stephen Rothwell reports the following new warning:
      drivers/net/usb/asix.c: In function 'asix_rx_fixup':
      drivers/net/usb/asix.c:325: warning: cast from pointer to integer of different size
      drivers/net/usb/asix.c:354: warning: cast from pointer to integer of different size
      The code just cares about the low alignment bits, so use
      an "unsigned long" cast instead of one to "u32".
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Sarveshwar Bandi's avatar
      be2net: Bug fix to avoid disabling bottom half during firmware upgrade. · dd131e76
      Sarveshwar Bandi authored
      Certain firmware commands/operations to upgrade firmware could take several
      seconds to complete. The code presently disables bottom half during these
      operations which could lead to unpredictable behaviour in certain cases. This
      patch now does all firmware upgrade operations asynchronously using a
      completion variable.
      Signed-off-by: default avatarSarveshwar Bandi <sarveshwarb@serverengines.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • J. R. Okajima's avatar
      proc_dointvec: write a single value · 563b0467
      J. R. Okajima authored
      The commit 00b7c339
      "sysctl: refactor integer handling proc code"
      modified the behaviour of writing to /proc.
      Before the commit, write("1\n") to /proc/sys/kernel/printk succeeded. But
      now it returns EINVAL.
      This commit supports writing a single value to a multi-valued entry.
      Signed-off-by: default avatarJ. R. Okajima <hooanon05@yahoo.co.jp>
      Reviewed-and-tested-by: default avatarWANG Cong <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Filip Aben's avatar
      hso: add support for new products · dd7496f2
      Filip Aben authored
      This patch adds a few new product id's for the hso driver.
      Signed-off-by: default avatarFilip Aben <f.aben@option.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Rémi Denis-Courmont's avatar
      Phonet: fix potential use-after-free in pep_sock_close() · e513480e
      Rémi Denis-Courmont authored
      sk_common_release() might destroy our last reference to the socket.
      So an extra temporary reference is needed during cleanup.
      Signed-off-by: default avatarRémi Denis-Courmont <remi.denis-courmont@nokia.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Matt Turner's avatar
      alpha: simplify and optimize sched_find_first_bit · a75f5f0f
      Matt Turner authored
      Search only the first 100 bits instead of 140, saving a couple
      instructions. The resulting code is about 1/3 faster (40K ticks/1000
      iterations down to 30K ticks/1000 iterations).
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: linux-alpha@vger.kernel.org
      Acked-by: default avatarRichard Henderson <rth@twiddle.net>
      Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
    • Nick Piggin's avatar
      alpha: invoke oom-killer from page fault · 1cb3d8e2
      Nick Piggin authored
      As explained in commit 1c0fe6e3
      , we want to call the architecture
      independent oom killer when getting an unexplained OOM from
      handle_mm_fault, rather than simply killing current.
      [mattst88: kill now unused 'survive' label]
      Cc: linux-alpha@vger.kernel.org
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: linux-arch@vger.kernel.org
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
      Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
    • John Stultz's avatar
      Convert alpha to use clocksources instead of arch_gettimeoffset · 9ce34c8f
      John Stultz authored
      Alpha has a tsc like rpcc counter that it uses to manage time.
      This can be converted to an actual clocksource instead of utilizing
      the arch_gettimeoffset method that is really only there for legacy
      systems with no continuous counter.
      Further cleanups could be made if alpha converted to the clockevent
      CC: Thomas Gleixner <tglx@linutronix.de>
      CC: Richard Henderson <rth@twiddle.net>
      Acked-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
      Tested-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
      Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
      Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
    • Kay Sievers's avatar
      driver core: add devname module aliases to allow module on-demand auto-loading · 578454ff
      Kay Sievers authored
      This adds:
        alias: devname:<name>
      to some common kernel modules, which will allow the on-demand loading
      of the kernel module when the device node is accessed.
      Ideally all these modules would be compiled-in, but distros seems too
      much in love with their modularization that we need to cover the common
      cases with this new facility. It will allow us to remove a bunch of pretty
      useless init scripts and modprobes from init scripts.
      The static device node aliases will be carried in the module itself. The
      program depmod will extract this information to a file in the module directory:
        $ cat /lib/modules/2.6.34-00650-g537b60d1
        # Device nodes to trigger on-demand module loading.
        microcode cpu/microcode c10:184
        fuse fuse c10:229
        ppp_generic ppp c108:0
        tun net/tun c10:200
        dm_mod mapper/control c10:235
      Udev will pick up the depmod created file on startup and create all the
      static device nodes which the kernel modules specify, so that these modules
      get automatically loaded when the device node is accessed:
        $ /sbin/udevd --debug
        static_dev_create_from_modules: mknod '/dev/cpu/microcode' c10:184
        static_dev_create_from_modules: mknod '/dev/fuse' c10:229
        static_dev_create_from_modules: mknod '/dev/ppp' c108:0
        static_dev_create_from_modules: mknod '/dev/net/tun' c10:200
        static_dev_create_from_modules: mknod '/dev/mapper/control' c10:235
        udev_rules_apply_static_dev_perms: chmod '/dev/net/tun' 0666
        udev_rules_apply_static_dev_perms: chmod '/dev/fuse' 0666
      A few device nodes are switched to statically allocated numbers, to allow
      the static nodes to work. This might also useful for systems which still run
      a plain static /dev, which is completely unsafe to use with any dynamic minor
      The devname aliases must be limited to the *common* and *single*instance*
      device nodes, like the misc devices, and never be used for conceptually limited
      systems like the loop devices, which should rather get fixed properly and get a
      control node for losetup to talk to, instead of creating a random number of
      device nodes in advance, regardless if they are ever used.
      This facility is to hide the mess distros are creating with too modualized
      kernels, and just to hide that these modules are not compiled-in, and not to
      paper-over broken concepts. Thanks! :)
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Miklos Szeredi <miklos@szeredi.hu>
      Cc: Chris Mason <chris.mason@oracle.com>
      Cc: Alasdair G Kergon <agk@redhat.com>
      Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
      Cc: Ian Kent <raven@themaw.net>
      Signed-Off-By: default avatarKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
    • David S. Miller's avatar
    • David S. Miller's avatar
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · ec96e2fe
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
        ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
        ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
        ARM: 6140/1: silence a bogus sparse warning in unwind.c
        ARM: mach-at91: duplicated include
        ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
        ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
        ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
        ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
        ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
        ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
        ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
        ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
        ARM: SPEAR6xx: remove duplicated #include
        ARM: s3c6400_defconfig: Add NAND driver
        ARM: s3c6400_defconfig: enable sound as modules
        ARM: s3c6400_defconfig: enable power management
        ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
        ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
        ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
        ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 8e9815a0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()
        RDMA/nes: Async event for closed QP causes crash
        RDMA/nes: Have ethtool read hardware registers for rx/tx stats
        RDMA/cxgb4: Only insert sq qid in lookup table
        RDMA/cxgb4: Support IB_WR_READ_WITH_INV opcode
        RDMA/cxgb4: Set fence flag for inv-local-stag work requests
        RDMA/cxgb4: Update some HW limits
        RDMA/cxgb4: Don't limit fastreg page list depth
        RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocation
        RDMA/cxgb4: Fix overflow bug in CQ arm
        RDMA/cxgb4: Optimize CQ overflow detection
        RDMA/cxgb4: CQ size must be IQ size - 2
        RDMA/cxgb4: Register RDMA provider based on LLD state_change events
        RDMA/cxgb4: Detach from the LLD after unregistering RDMA device
        IB/ipath: Remove support for QLogic PCIe QLE devices
        IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters
        IB/mad: Make needlessly global mad_sendq_size/mad_recvq_size static
        IB/core: Allow device-specific per-port sysfs files
        mlx4_core: Clean up mlx4_alloc_icm() a bit
        mlx4_core: Fix possible chunk sg list overflow in mlx4_alloc_icm()