Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Feb 23, 2009
  1. Linux 2.6.29-rc6

    authored
  2. acpi/doc: add missing param value

    Randy Dunlap authored committed
    Add missing parameter value to list of available values
    for acpi=<value>.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: Add missing mutex_lock(&dev->struct_mutex)
      drm/i915: fix WC mapping in non-GEM i915 code.
      drm/i915: Fix regression in 95ca9d
      drm/i915: Retire requests from i915_gem_busy_ioctl.
      drm/i915: suspend/resume GEM when KMS is active
      drm/i915: Don't let a device flush to prepare buffers clear new write_domains.
      drm/i915: Cut two args to set_to_gpu_domain that confused this tricky path.
  4. @pierrewillenbrock

    drm/i915: Add missing mutex_lock(&dev->struct_mutex)

    pierrewillenbrock authored Dave Airlie committed
    there might be a nicer way to fix this but this is the simplest for now.
    
    Signed-off-by: Pierre Willenbrock <pierre@pirsoft.de>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  5. drm/i915: fix WC mapping in non-GEM i915 code.

    Jesse Barnes authored Dave Airlie committed
    [airlied - taken from mailing list posting]
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. @ickle

    drm/i915: Fix regression in 95ca9d

    ickle authored Dave Airlie committed
    The object is dereferenced before the NULL check. Oops.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=20235
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. @anholt

    drm/i915: Retire requests from i915_gem_busy_ioctl.

    anholt authored Dave Airlie committed
    This ensures that the user gets the latest information from the hardware
    on whether the buffer is busy, potentially reducing the working set of objects
    that the user chooses.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  8. drm/i915: suspend/resume GEM when KMS is active

    Jesse Barnes authored Dave Airlie committed
    In the KMS case, we need to suspend/resume GEM as well.  So on suspend, make
    sure we idle GEM and stop any new rendering from coming in, and on resume,
    re-init the framebuffer and clear the suspended flag.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. @anholt

    drm/i915: Don't let a device flush to prepare buffers clear new write…

    anholt authored Dave Airlie committed
    …_domains.
    
    The problem was that object_set_to_gpu_domain would set the new write_domains
    that are getting set by this batchbuffer, then the accumulated flushes required
    for all the objects in preparation for this batchbuffer were posted, and the
    brand new write domain would get cleared by the flush being posted.  Instead,
    hang on to the new (or old if we're not changing it) value and set it after
    the flush is queued.
    
    Results from this noticably included conformance test failures from reads
    shortly after writes (where the new write domain had been lost and thus not
    flushed and waited on), but is a suspected cause of hangs in some apps when
    a write domain is lost on a buffer that gets reused for instruction or
    commmand state.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  10. @anholt

    drm/i915: Cut two args to set_to_gpu_domain that confused this tricky…

    anholt authored Dave Airlie committed
    … path.
    
    While not strictly required, it helped while thinking about the following
    change.  This change should be invariant.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Feb 22, 2009
  1. @pcmoore

    selinux: Fix the NetLabel glue code for setsockopt()

    pcmoore authored James Morris committed
    At some point we (okay, I) managed to break the ability for users to use the
    setsockopt() syscall to set IPv4 options when NetLabel was not active on the
    socket in question.  The problem was noticed by someone trying to use the
    "-R" (record route) option of ping:
    
     # ping -R 10.0.0.1
     ping: record route: No message of desired type
    
    The solution is relatively simple, we catch the unlabeled socket case and
    clear the error code, allowing the operation to succeed.  Please note that we
    still deny users the ability to override IPv4 options on socket's which have
    NetLabel labeling active; this is done to ensure the labeling remains intact.
    
    Signed-off-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. @pcmoore

    cipso: Fix documentation comment

    pcmoore authored James Morris committed
    The CIPSO protocol engine incorrectly stated that the FIPS-188 specification
    could be found in the kernel's Documentation directory.  This patch corrects
    that by removing the comment and directing users to the FIPS-188 documented
    hosted online.  For the sake of completeness I've also included a link to the
    CIPSO draft specification on the NetLabel website.
    
    Thanks to Randy Dunlap for spotting the error and letting me know.
    
    Signed-off-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: James Morris <jmorris@namei.org>
  3. Merge branch 'core/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    authored
    …el/git/tip/linux-2.6-tip
    
    * 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix
  4. PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix

    Ingo Molnar authored
    Impact: module build fix
    
    Fix:
    
     ERROR: "sysdev_resume" [arch/x86/kernel/apm.ko] undefined!
     ERROR: "sysdev_suspend" [arch/x86/kernel/apm.ko] undefined!
    
    As these APIs are now used by the APM driver, which can be built
    as a module.
    
    Also fix a few extra (and inconsistent) newlines in comment blocks
    preceding these functions.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  5. docbook: split kernel-api for device-drivers

    Randy Dunlap authored committed
    The kernel-api docbook was much larger than any of the others,
    so processing it took longer and needed some docbook extras in
    some cases, so split it into kernel-api (infrastructure etc.)
    and device drivers/device subsystems.  This allows these docbooks
    to be generated in parallel.  (This reduced the docbook processing
    time on my 4-proc system with make -j4 from about 5min:16sec to
    about 2min:01sec.)
    
    The chapters that were moved from kernel-api to device-drivers are:
    
    Driver Basics
    Device drivers infrastructure
    Parallel Port Devices
    Message-based devices
    Sound Devices
    16x50 UART Driver
    Frame Buffer Library
    Input Subsystem
    Serial Peripheral Interface (SPI)
    I2C and SMBus Subsystem
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @rjwysocki

    PM: Split up sysdev_[suspend|resume] from device_power_[down|up]

    rjwysocki authored committed
    Move the sysdev_suspend/resume from the callee to the callers, with
    no real change in semantics, so that we can rework the disabling of
    interrupts during suspend/hibernation.
    
    This is based on an earlier patch from Linus.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. x86: Add IRQF_TIMER to legacy x86 timer interrupt descriptors

    authored
    Right now nobody cares, but the suspend/resume code will eventually want
    to suspend device interrupts without suspending the timer, and will
    depend on this flag to know.
    
    The modern x86 timer infrastructure uses the local APIC timers and never
    shows up as a device interrupt at all, so it isn't affected and doesn't
    need any of this.
    
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: remove CONFIG_ACPI_SYSTEM
      fujitsu-laptop: Use RFKILL support bitmask from firmware
      x86_64: Fix S3 fail path
      x86_64: acpi/wakeup_64 cleanup
      battery: don't assume we are fully charged when not charging or discharging
      ACPI: EC: Add delay for slow MSI controller
  9. PATCH [2/2] Documentation/filesystems/sysfs.txt: fix descriptions of …

    Mike Murphy authored committed
    …device attributes
    
    Fix descriptions of device attributes to be consistent with the actual
    implementations in include/linux/device.h
    
    Signed-off-by: Mike Murphy <mamurph[at]cs.clemson.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. PATCH [1/2] Documentation/driver-model/device.txt: fix struct device_…

    Mike Murphy authored committed
    …attribute
    
    Fix the presented definition of struct device_attribute to match the
    actual definition in include/linux/device.h
    
    Signed-off-by: Mike Murphy <mamurph[at]cs.clemson.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @geertu

    m68k: atari - Rename "mfp" to "st_mfp"

    geertu authored committed
    http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
    | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
    | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
    | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
    | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed
    
    This is caused by
    
    | # define mfp ((*(volatile struct MFP*)MFP_BAS))
    
    in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
    net/mac80211/ieee80211_i.h.
    
    Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @lenb

    Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' …

    lenb authored
    …and 'suspend' into release
  13. @lenb

    ACPI: remove CONFIG_ACPI_SYSTEM

    Bjorn Helgaas authored lenb committed
    Remove CONFIG_ACPI_SYSTEM.  It was always set the same as CONFIG_ACPI,
    and it had no menu label, so there was no way to set it to anything
    other than "y".
    
    Some things under CONFIG_ACPI_SYSTEM (acpi_irq_handled, acpi_os_gpe_count(),
    event_is_open, register_acpi_notifier(), etc.) are used unconditionally
    by the CA, the OSPM, and drivers, so we depend on them always being
    present.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  14. @gentoochainsaw @lenb

    fujitsu-laptop: Use RFKILL support bitmask from firmware

    gentoochainsaw authored lenb committed
    Up until now, we polled the rfkill status for every incoming FUJ02E3 ACPI event.
    It turns out that the firmware has a bitmask which indicates what rfkill-related
    state it can report.
    The rfkill_supported bitmask is now used to avoid polling for rfkill at all in
    the notification handler if there is no support. Also, it is used in the platform
    device callbacks. As before we register all callbacks and report "unknown" if the
    firmware does not give us status updates for that particular bit.
    
    This was fed through checkpatch.pl and tested on the S6420, S7020 and P8010
    platforms.
    
    Signed-off-by: Tony Vroon <tony@linx.net>
    Tested-by: Stephen Gildea <stepheng+linux@gildea.com>
    Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
    Signed-off-by: Len Brown <len.brown@intel.com>
  15. @jirislaby @lenb

    x86_64: Fix S3 fail path

    jirislaby authored lenb committed
    As acpi_enter_sleep_state can fail, take this into account in
    do_suspend_lowlevel and don't return to the do_suspend_lowlevel's
    caller. This would break (currently) fpu status and preempt count.
    
    Technically, this means use `call' instead of `jmp' and `jmp' to
    the `resume_point' after the `call' (i.e. if
    acpi_enter_sleep_state returns=fails). `resume_point' will handle
    the restore of fpu and preempt count gracefully.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>
  16. @jirislaby @lenb

    x86_64: acpi/wakeup_64 cleanup

    jirislaby authored lenb committed
    - remove %ds re-set, it's already set in wakeup_long64
    - remove double labels and alignment (ENTRY already adds both)
    - use meaningful resume point labelname
    - skip alignment while jumping from wakeup_long64 to the resume point
    - remove .size, .type and unused labels
    [v2]
    - added ENDPROCs
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Feb 21, 2009
  1. Merge branch 'hibernate'

    authored
    * hibernate:
      PM: Fix suspend_console and resume_console to use only one semaphore
      PM: Wait for console in resume
      PM: Fix pm_notifiers during user mode hibernation
      swsusp: clean up shrink_all_zones()
      swsusp: dont fiddle with swappiness
      PM: fix build for CONFIG_PM unset
      PM/hibernate: fix "swap breaks after hibernation failures"
      PM/resume: wait for device probing to finish
      Consolidate driver_probe_done() loops into one place
  2. PM: Fix suspend_console and resume_console to use only one semaphore

    Arve Hjønnevåg authored committed
    This fixes a race where a thread acquires the console while the
    console is suspended, and the console is resumed before this
    thread releases it. In this case, the secondary console
    semaphore would be left locked, and the primary semaphore would
    be released twice. This in turn would cause the console switch
    on suspend or resume to hang forever.
    
    Note that suspend_console does not actually lock the console
    for clients that use acquire_console_sem, it only locks it for
    clients that use try_acquire_console_sem. If we change
    suspend_console to fully lock the console, then the kernel
    may deadlock on suspend. One client of try_acquire_console_sem
    is acquire_console_semaphore_for_printk, which uses it to
    prevent printk from using the console while it is suspended.
    
    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. PM: Wait for console in resume

    Arve Hjønnevåg authored committed
    Avoids later waking up to a blinking cursor if the device woke up and
    returned to sleep before the console switch happened.
    
    Signed-off-by: Brian Swetland <swetland@google.com>
    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @arvidjaar

    PM: Fix pm_notifiers during user mode hibernation

    arvidjaar authored committed
    Snapshot device is opened with O_RDONLY during suspend and O_WRONLY durig
    resume.  Make sure we also call notifiers with correct parameter telling
    them what we are really doing.
    
    Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @hnaz

    swsusp: clean up shrink_all_zones()

    hnaz authored committed
    Move local variables to innermost possible scopes and use local
    variables to cache calculations/reads done more than once.
    
    No change in functionality (intended).
    
    Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @hnaz

    swsusp: dont fiddle with swappiness

    hnaz authored committed
    sc.swappiness is not used in the swsusp memory shrinking path, do not
    set it.
    
    Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @rjwysocki

    PM: fix build for CONFIG_PM unset

    rjwysocki authored committed
    Compilation of kprobes.c with CONFIG_PM unset is broken due to some broken
    config dependncies.  Fix that.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Tested-by: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. PM/hibernate: fix "swap breaks after hibernation failures"

    Alan Jenkins authored committed
    http://bugzilla.kernel.org/show_bug.cgi?id=12239
    
    The image writing code dropped a reference to the current swap device.
    This doesn't show up if the hibernation succeeds - because it doesn't
    affect the image which gets resumed.  But it means multiple _failed_
    hibernations end up freeing the swap device while it is still use!
    
    swsusp_write() finds the block device for the swap file using swap_type_of().
    It then uses blkdev_get() / blkdev_put() to open and close the block device.
    
    Unfortunately, blkdev_get() assumes ownership of the inode of the block_device
    passed to it.  So blkdev_put() calls iput() on the inode.  This is by design
    and other callers expect this behaviour.  The fix is for swap_type_of() to take
    a reference on the inode using bdget().
    
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @fenrus75

    PM/resume: wait for device probing to finish

    fenrus75 authored committed
    the resume code does not currently wait for device probing to finish.
    Even without async function calls this is dicey and not correct,
    but with async function calls during the boot sequence this is going
    to get hit more...
    
    This patch adds the synchronization using the newly introduced helper.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Len Brown <lenb@kernel.org>
    Acked-by: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.