27 May, 2010

14 commits


26 May, 2010

26 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
    squashfs: update documentation to include description of xattr layout
    squashfs: fix name reading in squashfs_xattr_get
    squashfs: constify xattr handlers
    squashfs: xattr fix sparse warnings
    squashfs: xattr_lookup sparse fix
    squashfs: add xattr support configure option
    squashfs: add new extended inode types
    squashfs: add support for xattr reading
    squashfs: add xattr id support

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: roccat: fix build failure if built as module
    HID: roccat: propagate special events of roccat hardware to userspace
    HID: Add the GYR4101US USB ID to hid-gyration
    HID: fix hid-roccat-kone for bin_attr API change

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: emu10k1: allow high-resolution mixer controls
    ALSA: pcm: fix delta calculation at boundary wraparound
    ALSA: hda_intel: fix handling of non-completion stream interrupts
    ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
    ALSA: hda: Fix model quirk for Dell M1730
    ALSA: hda - iMac9,1 sound fixes
    ALSA: hda: Use LPIB for Toshiba A100-259
    ALSA: hda: Use LPIB for Acer Aspire 5110
    ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
    ALSA: usb-audio: add support for Akai MPD16
    ALSA: pcm: fix the fix of the runtime->boundary calculation

    Linus Torvalds
     
  • This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was
    also totally broken (see commit 0d2daf5cc858 that reverted the crc32
    version of it). As reported by Stephen Rothwell, it causes problems on
    big-endian machines:

    > In file included from fs/jfs/jfs_types.h:33,
    > from fs/jfs/jfs_incore.h:26,
    > from fs/jfs/file.c:22:
    > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined

    The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN"
    model. It's not how we do things, and it isn't how we _should_ do
    things. So don't go there.

    Requested-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wan ZongShun
     
  • It doesn't work on big-endian - those architectures don't define
    __LITTLE_ENDIAN.

    Cc: Joakim Tjernlund
    Reported-by: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • fs/fscache/object-list.c: In function 'fscache_objlist_lookup':
    fs/fscache/object-list.c:105: warning: cast to pointer from integer of different size

    Acked-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Slightly rearrange the logic that determines capabilities and vm_flags.
    Disable BDI_CAP_MAP_DIRECT in all cases if the device can't support the
    protections. Allow private readonly mappings of readonly backing devices.

    Signed-off-by: Bernd Schmidt
    Signed-off-by: Mike Frysinger
    Acked-by: David McCullough
    Acked-by: Greg Ungerer
    Acked-by: Paul Mundt
    Acked-by: David Howells
    Cc: Hugh Dickins
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bernd Schmidt
     
  • The original code called mpol_put(new) while "new" was an ERR_PTR.

    Signed-off-by: Dan Carpenter
    Cc: Lee Schermerhorn
    Cc: KOSAKI Motohiro
    Cc: Christoph Lameter
    Acked-by: David Rientjes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dan Carpenter
     
  • Takashi Iwai
     
  • Signed-off-by: Phillip Lougher

    Phillip Lougher
     
  • * 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
     
  • * '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
     
  • * 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
     
  • This reverts commit 480b02df3aa9f07d1c7df0cd8be7a5ca73893455, since
    Rafael reports that it causes occasional kernel paging request faults in
    load_module().

    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: Rafael J. Wysocki
    Cc: Rusty Russell
    Cc: Brandon Philips
    Cc: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • 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: David S. Miller

    David S. Miller
     
  • 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: Sarveshwar Bandi
    Signed-off-by: David S. Miller

    Sarveshwar Bandi
     
  • The commit 00b7c3395aec3df43de5bd02a3c5a099ca51169f
    "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: J. R. Okajima
    Reviewed-and-tested-by: WANG Cong
    Signed-off-by: David S. Miller

    J. R. Okajima
     
  • This patch adds a few new product id's for the hso driver.

    Signed-off-by: Filip Aben
    Signed-off-by: David S. Miller

    Filip Aben
     
  • sk_common_release() might destroy our last reference to the socket.
    So an extra temporary reference is needed during cleanup.

    Signed-off-by: Rémi Denis-Courmont
    Signed-off-by: David S. Miller

    Rémi Denis-Courmont
     
  • 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
    Cc: Ingo Molnar
    Cc: Ivan Kokshaysky
    Cc: linux-alpha@vger.kernel.org
    Acked-by: Richard Henderson
    Signed-off-by: Matt Turner

    Matt Turner
     
  • As explained in commit 1c0fe6e3bd, 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
    Cc: linux-arch@vger.kernel.org
    Acked-by: David Rientjes
    Signed-off-by: Matt Turner
    Signed-off-by: Nick Piggin

    Nick Piggin
     
  • 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
    model.

    CC: Thomas Gleixner
    CC: Richard Henderson
    Acked-by: Ivan Kokshaysky
    Tested-by: Ivan Kokshaysky
    Signed-off-by: Matt Turner
    Signed-off-by: John Stultz

    John Stultz
     
  • This adds:
    alias: devname:
    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-g537b60d-dirty/modules.devname
    # 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
    numbers.

    Note:
    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
    Cc: David S. Miller
    Cc: Miklos Szeredi
    Cc: Chris Mason
    Cc: Alasdair G Kergon
    Cc: Tigran Aivazian
    Cc: Ian Kent
    Signed-Off-By: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     
  • David S. Miller
     
  • David S. Miller