Permalink
Switch branches/tags
Commits on Sep 26, 2009
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

    torvalds committed Sep 26, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      alpha: fix build after vmlinux.lds.S cleanup
      mips: fix build of vmlinux.lds
  2. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

    torvalds committed Sep 26, 2009
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
      leds: move leds-clevo-mail's probe function to .devinit.text
      leds: Fix indentation in LEDS_LP3944 Kconfig entry
      leds: Fix LED names 
      leds: Fix leds-pca9532 whitespace issues
      leds: fix coding style in worker thread code for ledtrig-gpio.
      leds: gpio-leds: fix typographics fault
      leds: Add WM831x status LED driver
  3. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

    torvalds committed Sep 26, 2009
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
      backlight: new driver for ADP5520/ADP5501 MFD PMICs
      backlight: extend event support to also support poll()
      backlight/eeepc-laptop: Update the backlight state when we change brightness
      backlight/acpi: Update the backlight state when we change brightness
      backlight: Allow drivers to update the core, and generate events on changes
      backlight: switch to da903x driver to dev_pm_ops
      backlight: Add support for the Avionic Design Xanthos backlight device.
      backlight: spi driver for LMS283GF05 LCD
      backlight: move hp680-bl's probe function to .devinit.text
      backlight: Add support for new Apple machines.
      backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
      backlight: Add WM831x backlight driver
    
    Trivial conflicts due to '#ifdef CONFIG_PM' differences in
    drivers/video/backlight/da903x_bl.c
  4. headers: kref.h redux

    Alexey Dobriyan authored and torvalds committed Sep 26, 2009
    * remove asm/atomic.h inclusion from kref.h -- not needed, linux/types.h
      is enough for atomic_t
    * remove linux/kref.h inclusion from files which do not need it.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Sep 26, 2009
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      futex: Add memory barrier commentary to futex_wait_queue_me()
      futex: Fix wakeup race by setting TASK_INTERRUPTIBLE before queue_me()
      futex: Correct futex_q woken state commentary
      futex: Make function kernel-doc commentary consistent
      futex: Correct queue_me and unqueue_me commentary
      futex: Correct futex_wait_requeue_pi() commentary
  6. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Sep 26, 2009
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf tools: Dont use openat()
      perf tools: Fix buffer allocation
      perf tools: .gitignore += perf*.html
      perf tools: Handle relative paths while loading module symbols
      perf tools: Fix module symbol loading bug
      perf_event, x86: Fix 'perf sched record' crashing the machine
      perf_event: Update PERF_EVENT_FORK header definition
      perf stat: Fix zero total printouts
  7. Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    torvalds committed Sep 26, 2009
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      clocksource: Resume clocksource without taking the clocksource mutex
  8. Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds committed Sep 26, 2009
    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      modules, tracing: Remove stale struct marker signature from module_layout()
      tracing/workqueue: Use %pf in workqueue trace events
      tracing: Fix a comment and a trivial format issue in tracepoint.h
      tracing: Fix failure path in ftrace_regex_open()
      tracing: Fix failure path in ftrace_graph_write()
      tracing: Check the return value of trace_get_user()
      tracing: Fix off-by-one in trace_get_user()
  9. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds committed Sep 26, 2009
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Remove redundant non-NUMA topology functions
      x86: early_printk: Protect against using the same device twice
      x86: Reduce verbosity of "PAT enabled" kernel message
      x86: Reduce verbosity of "TSC is reliable" message
      x86: mce: Use safer ways to access MCE registers
      x86: mce, inject: Use real inject-msg in raise_local
      x86: mce: Fix thermal throttling message storm
      x86: mce: Clean up thermal throttling state tracking code
      x86: split NX setup into separate file to limit unstack-protected code
      xen: check EFER for NX before setting up GDT mapping
      x86: Cleanup linker script using new linker script macros.
      x86: Use section .data.page_aligned for the idt_table.
      x86: convert to use __HEAD and HEAD_TEXT macros.
      x86: convert compressed loader to use __HEAD and HEAD_TEXT macros.
      x86: fix fragile computation of vsyscall address
  10. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Sep 26, 2009
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (32 commits)
      ACPI: i2c-scmi: don't use acpi_device_uid()
      ACPI: simplify building device HID/CID list
      ACPI: remove acpi_device_uid() and related stuff
      ACPI: remove acpi_device.flags.hardware_id
      ACPI: remove acpi_device.flags.compatible_ids
      ACPI: maintain a single list of _HID and _CID IDs
      ACPI: make sure every acpi_device has an ID
      ACPI: use acpi_device_hid() when possible
      ACPI: fix synthetic HID for \_SB_
      ACPI: handle re-enumeration, when acpi_devices might already exist
      ACPI: factor out device type and status checking
      ACPI: add acpi_bus_get_status_handle()
      ACPI: use acpi_walk_namespace() to enumerate devices
      ACPI: identify device tree root by null parent pointer, not ACPI_BUS_TYPE
      ACPI: enumerate namespace before adding functional fixed hardware devices
      ACPI: convert acpi_bus_scan() to operate on an acpi_handle
      ACPI: add acpi_bus_get_parent() and remove "parent" arguments
      ACPI: remove unnecessary argument checking
      ACPI: remove redundant "type" arguments
      ACPI: remove acpi_device_set_context() "type" argument
      ...
  11. Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

    torvalds committed Sep 26, 2009
    * 'writeback' of git://git.kernel.dk/linux-2.6-block:
      writeback: pass in super_block to bdi_start_writeback()
  12. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds committed Sep 26, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: fix locking and list handling code in cifs_open and its helper
      [CIFS] Remove build warning
      cifs: fix problems with last two commits
      [CIFS] Fix build break when keys support turned off
      cifs: eliminate cifs_init_private
      cifs: convert oplock breaks to use slow_work facility (try #4)
      cifs: have cifsFileInfo hold an extra inode reference
      cifs: take read lock on GlobalSMBSes_lock in is_valid_oplock_break
      cifs: remove cifsInodeInfo.oplockPending flag
      cifs: fix oplock request handling in posix codepath
      [CIFS] Re-enable Lanman security
  13. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Sep 26, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      at91_can: Forgotten git 'add' of at91_can.c
      TI Davinci EMAC: Fix in vector definition for EMAC_VERSION_2
      ax25: Fix ax25_cb refcounting in ax25_ctl_ioctl
      virtio_net: Check for room in the vq before adding buffer
      virtio_net: avoid (most) NETDEV_TX_BUSY by stopping queue early.
      virtio_net: formalize skb_vnet_hdr
      virtio_net: don't free buffers in xmit ring
      virtio_net: return NETDEV_TX_BUSY instead of queueing an extra skb.
      virtio_net: skb_orphan() and nf_reset() in xmit path.
  14. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Sep 26, 2009
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: vio: Kill BUILD_BUG_ON() in vio_dring_avail().
    
    Trivial conflict in arch/sparc/include/asm/vio.h due to David removing
    the whole messy BUG_ON that was confused.
  15. make Linux bootable on ARM again

    npitre authored and torvalds committed Sep 25, 2009
    Commit 200b812 "Clear the exclusive monitor when returning from an
    exception" broke the vast majority of ARM systems in the wild which are
    still pre ARMv6.  The kernel is crashing on the first occurrence of an
    exception due to the removal of the actual return instruction for them.
    Let's add it back.
    
    Signed-off-by: Nicolas Pitre <nico@marvell.com>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. backlight: new driver for ADP5520/ADP5501 MFD PMICs

    mhennerich authored and rpurdie committed Sep 17, 2009
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
  17. backlight: extend event support to also support poll()

    hmh authored and rpurdie committed Sep 20, 2009
    Extend the backlight event support to also allow the use of
    poll()/select() on actual_brightness.
    
    We already have the entire event hookup anyway, adding a single
    function call in one line to get functionality like that is a really
    good deal.
    
    Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
  18. ACPI: i2c-scmi: don't use acpi_device_uid()

    Bjorn Helgaas authored and lenb committed Sep 26, 2009
    We recently removed the acpi_device_uid() interface because nobody
    used it.  I don't think it's essential here either.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Sep 25, 2009
  1. writeback: pass in super_block to bdi_start_writeback()

    Jens Axboe
    Jens Axboe committed Sep 25, 2009
    Sometimes we only want to write pages from a specific super_block,
    so allow that to be passed in.
    
    This fixes a problem with commit 56a131d
    causing writeback on all super_blocks on a bdi, where we only really
    want to sync a specific sb from writeback_inodes_sb().
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  2. at91_can: Forgotten git 'add' of at91_can.c

    davem330 committed Sep 25, 2009
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. TI Davinci EMAC: Fix in vector definition for EMAC_VERSION_2

    Sriram authored and davem330 committed Sep 24, 2009
    In the emac_poll function when looking for interrupt status masks
    correct definition must be chosen based on EMAC_VERSION(the bit
    mask has changed from version 1 to version 2).
    
    Signed-off-by: Sriram <srk@ti.com>
    Acked-by: Chaithrika U S <chaithrika@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. ax25: Fix ax25_cb refcounting in ax25_ctl_ioctl

    Jarek Poplawski authored and davem330 committed Sep 25, 2009
    Use ax25_cb_put after ax25_find_cb in ax25_ctl_ioctl.
    
    Reported-by: Bernard Pidoux F6BVP <f6bvp@free.fr>
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Reviewed-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. ACPI: simplify building device HID/CID list

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    Minor code cleanup, no functional change.  Instead of remembering
    what HIDs & CIDs to add later, just add them immediately.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  6. ACPI: remove acpi_device_uid() and related stuff

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    Nobody uses acpi_device_uid(), so this patch removes it.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  7. ACPI: remove acpi_device.flags.hardware_id

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    Every acpi_device has at least one ID (if there's no _HID or _CID, we
    give it a synthetic or default ID).  So there's no longer a need to
    check whether an ID exists; we can just use it.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  8. ACPI: remove acpi_device.flags.compatible_ids

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    We now keep a single list of IDs that includes both the _HID and any
    _CIDs.  We no longer need to keep track of whether the device has a _CID.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  9. ACPI: maintain a single list of _HID and _CID IDs

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    There's no need to treat _HID and _CID differently.  Keeping them in
    a single list makes code that uses the IDs a little simpler because it
    can just traverse the list rather than checking "do we have a HID?",
    "do we have any CIDs?"
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Reviewed-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  10. ACPI: make sure every acpi_device has an ID

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    This makes sure every acpi_device has at least one ID.  If we build an
    acpi_device for a namespace node with no _HID or _CID, we sometimes
    synthesize an ID like "LNXCPU" or "LNXVIDEO".  If we don't even have
    that, give it a default "device" ID.
    
    Note that this means things like:
        /sys/devices/LNXSYSTM:00/LNXSYBUS:00/HWP0001:00/HWP0002:04/device:00
    (a PCI slot SxFy device) will have "hid" and "modprobe" entries, where
    they didn't before.  These aren't very useful (a HID of "device" doesn't
    tell you what *kind* of device it is, so it doesn't help find a driver),
    but I don't think they're harmful.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  11. ACPI: use acpi_device_hid() when possible

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    Use acpi_device_hid() rather than accessing acpi_device.pnp.hardware_id
    directly.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  12. ACPI: fix synthetic HID for \_SB_

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    This makes \_SB_ show up as /sys/devices/LNXSYSTM:00/LNXSYBUS:00
    rather than "device:00".  This has been broken for a loooong time
    (at least since 2.6.13) because device->parent is an acpi_device
    pointer, not a handle.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  13. ACPI: handle re-enumeration, when acpi_devices might already exist

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    acpi_bus_scan() traverses the namespace to enumerate devices and uses
    acpi_add_single_object() to create acpi_devices.  When the platform
    notifies us of a hot-plug event, we need to traverse part of the namespace
    again to figure out what appeared or disappeared.  (We don't yet call
    acpi_bus_scan() during hot-plug, but I plan to do that in the future.)
    
    This patch makes acpi_add_single_object() notice when we already have
    an acpi_device, so we don't need to make a new one.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  14. ACPI: factor out device type and status checking

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    This patch adds acpi_bus_type_and_status(), which determines the type
    of the object and whether we want to build an acpi_device for it.  If
    it is acpi_device-worthy, it returns the type and the device's current
    status.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  15. ACPI: add acpi_bus_get_status_handle()

    Bjorn Helgaas authored and lenb committed Sep 21, 2009
    Add acpi_bus_get_status_handle() so we can get the status of a namespace
    object before building a struct acpi_device.
    
    This removes a use of "device->flags.dynamic_status", a cached indicator of
    whether _STA exists.  It seems simpler and more reliable to just evaluate
    _STA and catch AE_NOT_FOUND errors.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>