Permalink
Switch branches/tags
Commits on Apr 10, 2009
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

    torvalds committed Apr 10, 2009
    …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/.
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.…

    torvalds committed Apr 10, 2009
    …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
  3. Separate out the proc- and unit-specific header directories from the …

    dhowells committed Apr 10, 2009
    …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>
  4. Move arch headers from include/asm-mn10300/ to arch/mn10300/include/a…

    dhowells committed Apr 10, 2009
    …sm/.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
  5. FRV: Move to arch/frv/include/asm/

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

    dhowells committed Apr 10, 2009
    …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. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    torvalds committed Apr 9, 2009
    * 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. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 9, 2009
    …/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. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 9, 2009
    …/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. x86: fix set_fixmap to use phys_addr_t

    Masami Hiramatsu committed with torvalds Apr 9, 2009
    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. MN10300: Kill MN10300's own profiling Kconfig

    dhowells committed with torvalds Apr 9, 2009
    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. FRV: Use <asm-generic/pgtable.h> in NOMMU mode

    dhowells committed with torvalds Apr 9, 2009
    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. keys: Handle there being no fallback destination keyring for request_…

    dhowells committed with torvalds Apr 9, 2009
    …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. afs: BUG to BUG_ON changes

    Stoyan Gaydarov committed with torvalds Apr 9, 2009
    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. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds committed Apr 9, 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: 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. Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    torvalds committed Apr 9, 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:
      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. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds committed Apr 9, 2009
    …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. Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'tim…

    torvalds committed Apr 9, 2009
    …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. MN10300: Convert obsolete no_irq_type to no_irq_chip

    Thomas Gleixner committed with torvalds Apr 9, 2009
    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. Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

    torvalds committed Apr 9, 2009
    * 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. module: try_then_request_module must wait

    herbertx committed with torvalds Apr 9, 2009
    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. sched: do not count frozen tasks toward load

    nathanlynch committed with Ingo Molnar Apr 9, 2009
    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 committed with Ingo Molnar Apr 9, 2009
    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 committed with Ingo Molnar Apr 8, 2009
    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 committed with Ingo Molnar Apr 9, 2009
    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. tracing/syscalls: use a dedicated file header

    fweisbec committed with Ingo Molnar Apr 8, 2009
    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. Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    torvalds committed Apr 9, 2009
    …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. Merge git://git.infradead.org/battery-2.6

    torvalds committed Apr 9, 2009
    * 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. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 9, 2009
    …/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. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Apr 9, 2009
    * 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. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Apr 9, 2009
    * 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
  26. Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/lin…

    torvalds committed Apr 9, 2009
    …ux/kernel/git/tytso/ext4
    
    * 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext3: Try to avoid starting a transaction in writepage for data=writepage
      block_write_full_page: switch synchronous writes to use WRITE_SYNC_PLUG
  27. work_on_cpu(): rewrite it to create a kernel thread on demand

    akpm00 committed with rustyrussell Apr 9, 2009
    Impact: circular locking bugfix
    
    The various implemetnations and proposed implemetnations of work_on_cpu()
    are vulnerable to various deadlocks because they all used queues of some
    form.
    
    Unrelated pieces of kernel code thus gained dependencies wherein if one
    work_on_cpu() caller holds a lock which some other work_on_cpu() callback
    also takes, the kernel could rarely deadlock.
    
    Fix this by creating a short-lived kernel thread for each work_on_cpu()
    invokation.
    
    This is not terribly fast, but the only current caller of work_on_cpu() is
    pci_call_probe().
    
    It would be nice to find some other way of doing the node-local
    allocations in the PCI probe code so that we can zap work_on_cpu()
    altogether.  The code there is rather nasty.  I can't think of anything
    simple at this time...
    
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  28. kthread: move sched-realeted initialization from kthreadd context

    utrace committed with rustyrussell Apr 9, 2009
    kthreadd is the single thread which implements ths "create" request, move
    sched_setscheduler/etc from create_kthread() to kthread_create() to
    improve the scalability.
    
    We should be careful with sched_setscheduler(), use _nochek helper.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: "Eric W. Biederman" <ebiederm@xmission.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    Cc: Vitaliy Gusev <vgusev@openvz.org
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  29. kthread: Don't looking for a task in create_kthread() #2

    Vitaliy Gusev committed with rustyrussell Apr 9, 2009
    Remove the unnecessary find_task_by_pid_ns(). kthread() can just
    use "current" to get the same result.
    
    Signed-off-by: Vitaliy Gusev <vgusev@openvz.org>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>