Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.30-rc1-gi…
Commits on Apr 11, 2009
  1. @torvalds

    Revert "ACPI battery: fix async boot oops"

    torvalds authored
    This reverts commit 5d38258, since the
    underlying problem got fixed properly in the previous commit ("async:
    Fix module loading async-work regression").
    
    Cc: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
    Cc: Vegard Nossum <vegard.nossum@gmail.com>
    Cc: Len Brown <len.brown@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    async: Fix module loading async-work regression

    torvalds authored
    Several drivers use asynchronous work to do device discovery, and we
    synchronize with them in the compiled-in case before we actually try to
    mount root filesystems etc.
    
    However, when compiled as modules, that synchronization is missing - the
    module loading completes, but the driver hasn't actually finished
    probing for devices, and that means that any user mode that expects to
    use the devices after the 'insmod' is now potentially broken.
    
    We already saw one case of a similar issue in the ACPI battery code,
    where the kernel itself expected the module to be all done, and unmapped
    the init memory - but the async device discovery was still running.
    That got hacked around by just removing the "__init" (see commit
    5d38258 "ACPI battery: fix async boot
    oops"), but the real fix is to just make the module loading wait for all
    async work to be completed.
    
    It will slow down module loading, but since common devices should be
    built in anyway, and since the bug is really annoying and hard to handle
    from user space (and caused several S3 resume regressions), the simple
    fix to wait is the right one.
    
    This fixes at least
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=13063
    
    but probably a few other bugzilla entries too (12936, for example), and
    is confirmed to fix Rafael's storage driver breakage after resume bug
    report (no bugzilla entry).
    
    We should also be able to now revert that ACPI battery fix.
    
    Reported-and-tested-by: Rafael J. Wysocki <rjw@suse.com>
    Tested-by: Heinz Diehl <htd@fancy-poultry.org>
    Acked-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 10, 2009
  1. @torvalds

    Remove stale include/asm-mn10300/.gitignore file

    torvalds authored
    Requested-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    Merge git://git.infradead.org/~dwmw2/firmware-2.6

    torvalds authored
    * git://git.infradead.org/~dwmw2/firmware-2.6:
      qla1280: Fix off-by-some error in firmware loading.
      Add README.AddingFirmware file. Basically telling people not to.
      firmware: Remove newly-added slicoss and sxg firmware images
      firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
      ALSA: wavefront - Always use request_firmware()
      Remove fdump tool for av7110 firmware
      firmware: convert av7110 driver to request_firmware()
      Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
      Revert "fix modules_install via NFS"
    
    Add-add conflicts in firmware/WHENCE fixed manually
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

    torvalds authored
    …6-mn10300
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
      Separate out the proc- and unit-specific header directories from the general
      Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

    torvalds authored
    …6-frv
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
      FRV: Move to arch/frv/include/asm/
      FRV: Fix indentation errors to keep git-am happy when moving arch header files
  5. Separate out the proc- and unit-specific header directories from the …

    David Howells authored
    …general
    
    MN10300 arch headers and place them instead in the same directories as contain
    the .c files for the processor and unit implementations.
    
    This permits the symlinks include/asm/proc and include/asm/unit to be
    dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
    converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
  6. Move arch headers from include/asm-mn10300/ to arch/mn10300/include/a…

    David Howells authored
    …sm/.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
  7. FRV: Move to arch/frv/include/asm/

    David Howells authored
    Move arch headers from include/asm-frv/ to arch/frv/include/asm/.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
  8. FRV: Fix indentation errors to keep git-am happy when moving arch hea…

    David Howells authored
    …der files
    
    Fix indentation errors to keep git-am happy when moving arch header files.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
Commits on Apr 9, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (27 commits)
      xsysace: Fix dereferencing of cf_id after hd_driveid removal
      at91_ide: turn on PIO 6 support
      at91_ide: remove unused ide_mm_{outb,inb}
      ide-cd: reverse NOT_READY sense key logic
      ide: refactor tf_read() method
      ide: refactor tf_load() method
      ide: call write_devctl() method from tf_read() method
      ide: move common code out of tf_load() method
      ide: simplify 'struct ide_taskfile'
      ide: replace IDE_TFLAG_* flags by IDE_VALID_*
      ide-cd: fix intendation in cdrom_decode_status()
      ide-cd: unify handling of fs and pc requests in cdrom_decode_status()
      ide-cd: convert cdrom_decode_status() to use switch statements
      ide-cd: update debugging support
      ide-cd: respect REQ_QUIET for fs requests in cdrom_decode_status()
      ide: remove unused #include <linux/version.h>
      tx4939ide: Fix tx4939ide_{in,out}put_data_swap argument
      tx493[89]ide: Remove big endian version of tx493[89]ide_tf_{load,read}
      ide-cd: carve out an ide_cd_breathe()-helper for fs write requests
      ide-cd: move status checking into the IRQ handler
      ...
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/nes: Add support for new SFP+ PHY
      RDMA/nes: Add wide_ppm_offset parm for switch compatibility
      RDMA/nes: Fix SFP+ PHY initialization
      RDMA/nes: Fix nes_nic_cm_xmit() error handling
      RDMA/nes: Fix error handling issues
      RDMA/nes: Fix incorrect casts on 32-bit architectures
      IPoIB: Document newish features
      RDMA/cma: Create cm id even when IB port is down
      RDMA/cma: Use rate from IPoIB broadcast when joining IPoIB multicast groups
      IPoIB: Avoid free_netdev() BUG when destroying a child interface
      mlx4_core: Don't leak mailbox for SET_PORT on Ethernet ports
      RDMA/cxgb3: Release dependent resources only when endpoint memory is freed.
      RDMA/cxgb3: Handle EEH events
      IB/mlx4: Use pgprot_writecombine() for BlueFlame pages
  3. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: check block device size on mount
      ext4: Fix off-by-one-error in ext4_valid_extent_idx()
      ext4: Fix big-endian problem in __ext4_check_blockref()
  4. @torvalds

    x86: fix set_fixmap to use phys_addr_t

    Masami Hiramatsu authored torvalds committed
    Use phys_addr_t for receiving a physical address argument instead of
    unsigned long.  This allows fixmap to handle pages higher than 4GB on
    x86-32.
    
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    MN10300: Kill MN10300's own profiling Kconfig

    David Howells authored torvalds committed
    Kill MN10300's own profiling Kconfig as this is superfluous given that the
    profiling options have moved to init/Kconfig and arch/Kconfig.  Not only is
    this now superfluous, but the dependencies are not correct.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    FRV: Use <asm-generic/pgtable.h> in NOMMU mode

    David Howells authored torvalds committed
    asm-frv/pgtable.h could just #include <asm-generic/pgtable.h> in NOMMU mode
    rather than #defining macros for lazy MMU and CPU stuff.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    keys: Handle there being no fallback destination keyring for request_…

    David Howells authored torvalds committed
    …key()
    
    When request_key() is called, without there being any standard process
    keyrings on which to fall back if a destination keyring is not specified, an
    oops is liable to occur when construct_alloc_key() calls down_write() on
    dest_keyring's semaphore.
    
    Due to function inlining this may be seen as an oops in down_write() as called
    from request_key_and_link().
    
    This situation crops up during boot, where request_key() is called from within
    the kernel (such as in CIFS mounts) where nobody is actually logged in, and so
    PAM has not had a chance to create a session keyring and user keyrings to act
    as the fallback.
    
    To fix this, make construct_alloc_key() not attempt to cache a key if there is
    no fallback key if no destination keyring is given specifically.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Tested-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    afs: BUG to BUG_ON changes

    Stoyan Gaydarov authored torvalds committed
    Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …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: cpu_debug remove execute permission
      x86: smarten /proc/interrupts output for new counters
      x86: DMI match for the Dell DXP061 as it needs BIOS reboot
      x86: make 64 bit to use default_inquire_remote_apic
      x86, setup: un-resequence mode setting for VGA 80x34 and 80x60 modes
      x86, intel-iommu: fix X2APIC && !ACPI build failure
  10. @torvalds

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …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:
      tracing: consolidate documents
      blktrace: pass the right pointer to kfree()
      tracing/syscalls: use a dedicated file header
      tracing: append a comma to INIT_FTRACE_GRAPH
  11. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: do not count frozen tasks toward load
      sched: refresh MAINTAINERS entry
      sched: Print sched_group::__cpu_power in sched_domain_debug
      cpuacct: add per-cgroup utime/stime statistics
      posixtimers, sched: Fix posix clock monotonicity
      sched_rt: don't allocate cpumask in fastpath
      cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2
  12. @torvalds

    Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'tim…

    torvalds authored
    …ers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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:
      printk: fix wrong format string iter for printk
      futex: comment requeue key reference semantics
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      irq: fix cpumask memory leak on offstack cpumask kernels
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
      posix-timers: fix RLIMIT_CPU && fork()
      timers: add missing kernel-doc
  13. @torvalds

    MN10300: Convert obsolete no_irq_type to no_irq_chip

    Thomas Gleixner authored torvalds committed
    Convert the last remaining users to no_irq_chip.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
      dm kcopyd: fix callback race
      dm kcopyd: prepare for callback race fix
      dm: implement basic barrier support
      dm: remove dm_request loop
      dm: rework queueing and suspension
      dm: simplify dm_request loop
      dm: split DMF_BLOCK_IO flag into two
      dm: rearrange dm_wq_work
      dm: remove limited barrier support
      dm: add integrity support
  15. @herbertx @torvalds

    module: try_then_request_module must wait

    herbertx authored torvalds committed
    Since the whole point of try_then_request_module is to retry
    the operation after a module has been loaded, we must wait for
    the module to fully load.
    
    Otherwise all sort of things start breaking, e.g., you won't
    be able to read your encrypted disks on the first attempt.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Tested-by: Maciej Rutecki <maciej.rutecki@gmail.com>
    Tested-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @nathanlynch

    sched: do not count frozen tasks toward load

    nathanlynch authored Ingo Molnar committed
    Freezing tasks via the cgroup freezer causes the load average to climb
    because the freezer's current implementation puts frozen tasks in
    uninterruptible sleep (D state).
    
    Some applications which perform job-scheduling functions consult the
    load average when making decisions.  If a cgroup is frozen, the load
    average does not provide a useful measure of the system's utilization
    to such applications.  This is especially inconvenient if the job
    scheduler employs the cgroup freezer as a mechanism for preempting low
    priority jobs.  Contrast this with using SIGSTOP for the same purpose:
    the stopped tasks do not count toward system load.
    
    Change task_contributes_to_load() to return false if the task is
    frozen.  This results in /proc/loadavg behavior that better meets
    users' expectations.
    
    Signed-off-by: Nathan Lynch <ntl@pobox.com>
    Acked-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Nigel Cunningham <nigel@tuxonice.net>
    Tested-by: Nigel Cunningham <nigel@tuxonice.net>
    Cc: <stable@kernel.org>
    Cc: containers@lists.linux-foundation.org
    Cc: linux-pm@lists.linux-foundation.org
    Cc: Matt Helsley <matthltc@us.ibm.com>
    LKML-Reference: <20090408194512.47a99b95@manatee.lan>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  17. tracing: consolidate documents

    Li Zefan authored Ingo Molnar committed
    Move kmemtrace.txt, tracepoints.txt, ftrace.txt and mmiotrace.txt to
    the new trace/ directory.
    
    I didnt find any references to those documents in both source
    files and documents, so no extra work needs to be done.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Acked-by: Pekka Paalanen <pq@iki.fi>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    LKML-Reference: <49DD6E2B.6090200@cn.fujitsu.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  18. x86: cpu_debug remove execute permission

    Jaswinder Singh Rajput authored Ingo Molnar committed
    It seems by mistake these files got execute permissions so removing it.
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    LKML-Reference: <1239211186.9037.2.camel@ht.satnam>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  19. blktrace: pass the right pointer to kfree()

    Li Zefan authored Ingo Molnar committed
    Impact: fix kfree crash with non-standard act_mask string
    
    If passing a string with leading white spaces to strstrip(),
    the returned ptr != the original ptr.
    
    This bug was introduced by me.
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    LKML-Reference: <49DD694C.8020902@cn.fujitsu.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  20. @fweisbec

    tracing/syscalls: use a dedicated file header

    fweisbec authored Ingo Molnar committed
    Impact: fix build warnings and possibe compat misbehavior on IA64
    
    Building a kernel on ia64 might trigger these ugly build warnings:
    
    CC      arch/ia64/ia32/sys_ia32.o
    In file included from arch/ia64/ia32/sys_ia32.c:55:
    arch/ia64/ia32/ia32priv.h:290:1: warning: "elf_check_arch" redefined
    In file included from include/linux/elf.h:7,
                     from include/linux/module.h:14,
                     from include/linux/ftrace.h:8,
                     from include/linux/syscalls.h:68,
                     from arch/ia64/ia32/sys_ia32.c:18:
    arch/ia64/include/asm/elf.h:19:1: warning: this is the location of the previous definition
    [...]
    
    sys_ia32.c includes linux/syscalls.h which in turn includes linux/ftrace.h
    to import the syscalls tracing prototypes.
    
    But including ftrace.h can pull too much things for a low level file,
    especially on ia64 where the ia32 private headers conflict with higher
    level headers.
    
    Now we isolate the syscall tracing headers in their own lightweight file.
    
    Reported-by: Tony Luck <tony.luck@intel.com>
    Tested-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Acked-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Jason Baron <jbaron@redhat.com>
    Cc: "Frank Ch. Eigler" <fche@redhat.com>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
    Cc: Jiaying Zhang <jiayingz@google.com>
    Cc: Michael Rubin <mrubin@google.com>
    Cc: Martin Bligh <mbligh@google.com>
    Cc: Michael Davidson <md@google.com>
    LKML-Reference: <20090408184058.GB6017@nowhere>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  21. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds authored
    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      work_on_cpu(): rewrite it to create a kernel thread on demand
      kthread: move sched-realeted initialization from kthreadd context
      kthread: Don't looking for a task in create_kthread() #2
  22. @torvalds

    Merge git://git.infradead.org/battery-2.6

    torvalds authored
    * git://git.infradead.org/battery-2.6:
      pda_power: Add optional OTG transceiver and voltage regulator support
      pcf50633_charger: Remove unused mbc_set_status function
      pcf50633_charger: Enable periodic charging restart
  23. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      cap_prctl: don't set error to 0 at 'no_change'
  24. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      igb: remove sysfs entry that was used to set the number of vfs
      igbvf: add new driver to support 82576 virtual functions
      drivers/net/eql.c: Fix a dev leakage.
      niu: Fix unused variable warning.
      r6040: set MODULE_VERSION
      bnx2: Don't use reserved names
      FEC driver: add missing #endif
      niu: Fix error handling
      mv643xx_eth: don't reset the rx coal timer on interface up
      smsc911x: correct debugging message on mii read timeout
      ethoc: fix library build errors
      netfilter: ctnetlink: fix regression in expectation handling
      netfilter: fix selection of "LED" target in netfilter
      netfilter: ip6tables regression fix
  25. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc: Hook up sys_preadv and sys_pwritev
      sparc64: add_node_ranges() must be __init
      serial: sunsu: sunsu_kbd_ms_init needs to be __devinit
      sparc: Fix section mismatch warnings in cs4231 sound driver.
      sparc64: Fix section mismatch warnings in PCI controller drivers.
      sparc64: Fix section mismatch warnings in power driver.
      sparc64: get_cells() can't be marked __init
Something went wrong with that request. Please try again.