Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Sep 27, 2009
  1. Linux 2.6.32-rc1

  2. alpha: Fix duplicate <asm/thread_info.h> include

    .. duplicated by merging the same fix twice, for details see commit
    0d9df25 ("Merge
    Signed-off-by: Linus Torvalds <>
  3. @hidave

    tty: Fix regressions caused by commit b50989d

    hidave authored committed
    The following commit made console open fails while booting:
    	commit b50989d
    	Author: Alan Cox <>
    	Date:   Sat Sep 19 13:13:22 2009 -0700
    	tty: make the kref destructor occur asynchronously
    Due to tty release routines run in a workqueue now, error like the
    following will be reported while booting:
    INIT open /dev/console Input/output error
    It also causes hibernation regression to appear as reported at
    The reason is that now there's latency issue with closing, but when
    we open a "closing not finished" tty, -EIO will be returned.
    Fix it as per the following Alan's suggestion:
      Fun but it's actually not a bug and the fix is wrong in itself as
      the port may be closing but not yet being destructed, in which case
      it seems to do the wrong thing.  Opening a tty that is closing (and
      could be closing for long periods) is supposed to return -EIO.
      I suspect a better way to deal with this and keep the old console
      timing is to split tty->shutdown into two functions.
      tty->shutdown() - called synchronously just before we dump the tty
      onto the waitqueue for destruction
      tty->cleanup() - called when the destructor runs.
      We would then do the shutdown part which can occur in IRQ context
      fine, before queueing the rest of the release (from tty->magic = 0
      ...  the end) to occur asynchronously
      The USB update in -next would then need a call like
           if (tty->cleanup)
      at the top of the async function and the USB shutdown to be split
      between shutdown and cleanup as the USB resource cleanup and final
      tidy cannot occur synchronously as it needs to sleep.
      In other words the logic becomes
           final kref put
                   make object unfindable
                   clean it up
    Signed-off-by: Dave Young <>
    [ rjw: Rebased on top of 2.6.31-git, reworked the changelog. ]
    Signed-off-by: "Rafael J. Wysocki" <>
    [ Changed serial naming to match new rules, dropped tty_shutdown as per
      comments from Alan Stern  - Linus ]
    Signed-off-by: Linus Torvalds <>
  4. ACPI: kill "unused variable ‘i’" warning

    Commit 3d5b6fb ("ACPI: Kill overly
    verbose "power state" log messages") removed the actual use of this
    variable, but didn't remove the variable itself, resulting in build
    warnings like
      drivers/acpi/processor_idle.c: In function ‘acpi_processor_power_init’:
      drivers/acpi/processor_idle.c:1169: warning: unused variable ‘i’
    Just get rid of the now unused variable.
    Signed-off-by: Linus Torvalds <>
  5. const: mark struct vm_struct_operations

    Alexey Dobriyan authored committed
    * mark struct vm_area_struct::vm_ops as const
    * mark vm_ops in AGP code
    But leave TTM code alone, something is fishy there with global vm_ops
    being used.
    Signed-off-by: Alexey Dobriyan <>
    Signed-off-by: Linus Torvalds <>
  6. Merge branch 'timers-for-linus' of git://…

    * 'timers-for-linus' of git://
      hrtimer: Eliminate needless reprogramming of clock events device
  7. Merge branch 'release' of git://…

    * 'release' of git://
      ACPI: IA64=y ACPI=n build fix
      ACPI: Kill overly verbose "power state" log messages
      ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
      ACPI: Clarify resource conflict message
      thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
  8. Merge branch 'x86-fixes-for-linus' of git://…

    * 'x86-fixes-for-linus' of git://
      x86: Fix hwpoison code related build failure on 32-bit NUMAQ
  9. @lenb

    ACPI: IA64=y ACPI=n build fix

    lenb authored
    ia64's sim_defconfig uses CONFIG_ACPI=n
    which now #define's acpi_disabled in <linux/acpi.h>
    So we shouldn't re-define it here in <asm/acpi.h>
    Signed-off-by: Len Brown <>
  10. @lenb

    ACPI: Kill overly verbose "power state" log messages

    Roland Dreier authored lenb committed
    I was recently lucky enough to get a 64-CPU system, so my kernel log
    ends up with 64 lines like:
        ACPI: CPU0 (power states: C1[C1] C2[C3])
    This is pretty useless clutter because this info is already available
    after boot from both /sys/devices/system/cpu/cpu*/cpuidle/state?/ as
    well as /proc/acpi/processor/CPU*/power.
    So just delete the code that prints the C-states in processor_idle.c.
    Signed-off-by: Roland Dreier <>
    Signed-off-by: Len Brown <>
  11. x86: Fix hwpoison code related build failure on 32-bit NUMAQ

    authored Ingo Molnar committed
    This build failure triggers:
     In file included from include/linux/suspend.h:8,
                     from arch/x86/kernel/asm-offsets_32.c:11,
                     from arch/x86/kernel/asm-offsets.c:2:
     include/linux/mm.h:503:2: error: #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > BITS_PER_LONG - NR_PAGEFLAGS
    Because due to the hwpoison page flag we ran out of page
    flags on 32-bit.
    Dont turn on hwpoison on 32-bit NUMA (it's rare in any
    Also clean up the Kconfig dependencies in the generic MM
    code by introducing ARCH_SUPPORTS_MEMORY_FAILURE.
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Ingo Molnar <>
  12. @yakuizhao @lenb

    ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression

    yakuizhao authored lenb committed
    Don't disable ARB_DISABLE when the familary ID is 0x0F.
    This was a 2.6.31 regression, and so this patch
    needs to be applied to 2.6.31.stable
    Signed-off-by: Zhao Yakui <>
    Signed-off-by: Len Brown <>
  13. @jdelvare @lenb

    ACPI: Clarify resource conflict message

    jdelvare authored lenb committed
    The message "ACPI: Device needs an ACPI driver" is misleading. The
    device _may_ need an ACPI driver, if the BIOS implemented a custom
    API for the device in question (which, AFAIK, can't be checked.) If
    not, then either a generic ACPI driver may be used (for example
    "thermal"), or nothing can be done (other than a white list).
    I propose to reword the message to:
    ACPI: If an ACPI driver is available for this device, you should use
    it instead of the native driver
    which I think is more correct. Comments and suggestions welcome.
    I also added a message warning about possible problems and system
    instability when users pass acpi_enforce_resources=lax, as suggested
    by Len.
    Signed-off-by: Jean Delvare <>
    Cc: Thomas Renninger <>
    Cc: Alan Jenkins <>
    Signed-off-by: Len Brown <>
  14. @hmh @lenb

    thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem

    hmh authored lenb committed
    Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:
      CHECK   drivers/platform/x86/thinkpad_acpi.c
    drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
      CC [M]  drivers/platform/x86/thinkpad_acpi.o
    drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
    drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment
    Reported-by: Noah Dain <>
    Reported-by: Audrius Kazukauskas <>
    Signed-off-by: Henrique de Moraes Holschuh <>
    Signed-off-by: Len Brown <>
Commits on Sep 26, 2009
  1. Merge branch 'release' of git://…

    * 'release' of git://
      [IA64] implement ticket locks for Itanium
  2. Merge git://

    * git://
      alpha: fix build after cleanup
      mips: fix build of
  3. Merge branch 'for-linus' of git://

    * 'for-linus' of git://
      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
  4. Merge branch 'for-linus' of git://

    * 'for-linus' of git://
      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
  5. headers: kref.h redux

    Alexey Dobriyan authored committed
    * 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 <>
    Signed-off-by: Linus Torvalds <>
  6. Merge branch 'core-fixes-for-linus' of git://…

    * 'core-fixes-for-linus' of git://
      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
  7. Merge branch 'perf-fixes-for-linus' of git://…

    * 'perf-fixes-for-linus' of git://
      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
  8. Merge branch 'timers-fixes-for-linus' of git://…

    * 'timers-fixes-for-linus' of git://
      clocksource: Resume clocksource without taking the clocksource mutex
  9. Merge branch 'tracing-fixes-for-linus' of git://…

    * 'tracing-fixes-for-linus' of git://
      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()
  10. Merge branch 'x86-fixes-for-linus' of git://…

    * 'x86-fixes-for-linus' of git://
      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
  11. Merge branch 'release' of git://…

    * 'release' of git:// (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
  12. Merge branch 'writeback' of git://

    * 'writeback' of git://
      writeback: pass in super_block to bdi_start_writeback()
  13. Merge git://

    * git://
      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
  14. Merge git://

    * git://
      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.
  15. Merge git://

    * git://
      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.
  16. @npitre

    make Linux bootable on ARM again

    npitre authored committed
    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 <>
    Acked-by: Uwe Kleine-König <>
    Signed-off-by: Linus Torvalds <>
  17. @mhennerich

    backlight: new driver for ADP5520/ADP5501 MFD PMICs

    mhennerich authored Richard Purdie committed
    Signed-off-by: Michael Hennerich <>
    Signed-off-by: Bryan Wu <>
    Signed-off-by: Mike Frysinger <>
    Signed-off-by: Richard Purdie <>
  18. @hmh

    backlight: extend event support to also support poll()

    hmh authored Richard Purdie committed
    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 <>
    Signed-off-by: Richard Purdie <>
  19. @lenb

    ACPI: i2c-scmi: don't use acpi_device_uid()

    Bjorn Helgaas authored lenb committed
    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 <>
    Signed-off-by: Len Brown <>
  20. @lenb
  21. @lenb
Something went wrong with that request. Please try again.