Permalink
Commits on Apr 5, 2010
  1. Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/tj/misc
    
    * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
      eeepc-wmi: include slab.h
      staging/otus: include slab.h from usbdrv.h
      percpu: don't implicitly include slab.h from percpu.h
      kmemcheck: Fix build errors due to missing slab.h
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
      x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h
    
    Fix up trivial conflicts in include/linux/percpu.h due to
    is_kernel_percpu_address() having been introduced since the slab.h
    cleanup with the percpu_up.c splitup.
    torvalds committed Apr 5, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      module: add stub for is_module_percpu_address
      percpu, module: implement and use is_kernel/module_percpu_address()
      module: encapsulate percpu handling better and record percpu_size
    torvalds committed Apr 5, 2010
  3. rmap: fix anon_vma_fork() memory leak

    Fix a memory leak in anon_vma_fork(), where we fail to tear down the
    anon_vmas attached to the new VMA in case setting up the new anon_vma
    fails.
    
    This bug also has the potential to leave behind anon_vma_chain structs
    with pointers to invalid memory.
    
    Reported-by: Minchan Kim <minchan.kim@gmail.com>
    Signed-off-by: Rik van Riel <riel@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rikvanriel committed with torvalds Apr 5, 2010
  4. eeepc-wmi: include slab.h

    eeepc-wmi uses kfree() but doesn't include slab.h.  Include it.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Yong Wang <yong.y.wang@intel.com>
    htejun committed Apr 5, 2010
  5. staging/otus: include slab.h from usbdrv.h

    drivers/staging/otus/usbdrv.h users use slab facilities.  Include
    linux/slab.h from usbdrv.h.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    htejun committed Apr 5, 2010
Commits on Apr 4, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sunxvr500: Ignore secondary output PCI devices.
      sparc64: Implement perf_arch_fetch_caller_regs
      sparc64: Update defconfig.
      sparc64: Fix array size reported by vmemmap_populate()
      sparc: Fix regset register window handling.
      drivers/serial/sunsu.c: Correct use after free
    torvalds committed Apr 4, 2010
  2. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …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: Always build the powerpc perf_arch_fetch_caller_regs version
      perf: Always build the stub perf_arch_fetch_caller_regs version
      perf, probe-finder: Build fix on Debian
      perf/scripts: Tuple was set from long in both branches in python_process_event()
      perf: Fix 'perf sched record' deadlock
      perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels
      perf, x86: Fix AMD hotplug & constraint initialization
      x86: Move notify_cpu_starting() callback to a later stage
      x86,kgdb: Always initialize the hw breakpoint attribute
      perf: Use hot regs with software sched switch/migrate events
      perf: Correctly align perf event tracing buffer
    torvalds committed Apr 4, 2010
  3. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …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: set_cpus_allowed_ptr(): Don't use rq->migration_thread after unlock
      sched: Fix proc_sched_set_task()
    torvalds committed Apr 4, 2010
  4. Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    …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:
      ring-buffer: Add missing unlock
      tracing: Fix lockdep warning in global_clock()
    torvalds committed Apr 4, 2010
  5. proc: pagemap: Hold mmap_sem during page walk

    In initial design, walk_page_range() was designed just for walking page
    table and it didn't require mmap_sem.  Now, find_vma() etc..  are used
    in walk_page_range() and we need mmap_sem around it.
    
    This patch adds mmap_sem around walk_page_range().
    
    Because /proc/<pid>/pagemap's callback routine use put_user(), we have
    to get rid of it to do sane fix.
    
    Changelog: 2010/Apr/2
     - fixed start_vaddr and end overflow
    Changelog: 2010/Apr/1
     - fixed start_vaddr calculation
     - removed unnecessary cast.
     - removed unnecessary change in smaps.
     - use GFP_TEMPORARY instead of GFP_KERNEL
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Matt Mackall <mpm@selenic.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: San Mehat <san@google.com>
    Cc: Brian Swetland <swetland@google.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    [ Fixed kmalloc failure return code as per Matt ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    hkamezawa committed with torvalds Apr 2, 2010
  6. sunxvr500: Ignore secondary output PCI devices.

    These just represent the secondary and further heads attached to the
    card, and they have different sets of PCI bar registers to map.
    
    So don't try to drive them in the main driver.
    
    Reported-by: Frans van Berckel <fberckel@xs4all.nl>
    Tested-by: Frans van Berckel <fberckel@xs4all.nl>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 4, 2010
  7. sparc64: Implement perf_arch_fetch_caller_regs

    We provide regs->tstate, regs->tpc, regs->tnpc and
    regs->u_regs[UREG_FP].
    
    regs->tstate is necessary for:
    
    	user_mode()		(via perf_exclude_event())
    
    	perf_misc_flags()	(via perf_prepare_sample())
    
    regs->tpc is necessary for:
    
    	perf_instruction_pointer() (via perf_prepare_sample())
    
    and regs->u_regs[UREG_FP] is necessary for:
    
    	perf_callchain()	(via perf_prepare_sample())
    
    The regs->tnpc value is provided just to be tidy.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 4, 2010
Commits on Apr 3, 2010
  1. sparc64: Update defconfig.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 3, 2010
  2. sparc64: Fix array size reported by vmemmap_populate()

    vmemmap_populate() attempts to report the used index and total size of
    vmemmap_table, but it wrongly shifts the total size so that it is
    always shown as 0.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    bwhacks committed with davem330 Apr 3, 2010
  3. perf: Always build the powerpc perf_arch_fetch_caller_regs version

    Now that software events use perf_arch_fetch_caller_regs() too, we
    need the powerpc version to be always built.
    
    Fixes the following build error:
    
    	(.text+0x3210): undefined reference to `perf_arch_fetch_caller_regs'
    	(.text+0x3324): undefined reference to `perf_arch_fetch_caller_regs'
    	(.text+0x33bc): undefined reference to `perf_arch_fetch_caller_regs'
    	(.text+0x33ec): undefined reference to `perf_arch_fetch_caller_regs'
    	(.text+0xd4a0): undefined reference to `perf_arch_fetch_caller_regs'
    	arch/powerpc/kernel/built-in.o:(.text+0xd528): more undefined references to `perf_arch_fetch_caller_regs' follow
    	make[1]: *** [.tmp_vmlinux1] Error 1
    	make: *** [sub-make] Error 2
    
    Reported-by: Michael Ellerman <michael@ellerman.id.au>
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    fweisbec committed Apr 3, 2010
  4. perf: Always build the stub perf_arch_fetch_caller_regs version

    Now that software events use perf_arch_fetch_caller_regs() too, we
    need the stub version to be always built in for archs that don't
    implement it.
    
    Fixes the following build error in PARISC:
    
    	kernel/built-in.o: In function `perf_event_task_sched_out':
    	(.text.perf_event_task_sched_out+0x54): undefined reference to `perf_arch_fetch_caller_regs'
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    fweisbec committed Apr 3, 2010
  5. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 5965/1: Fix soft lockup in at91 udc driver
      ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds
      ARM: 6005/1: arm: kprobes: fix register corruption with jprobes
      ARM: 6003/1: removing compilation warning from pl061.h
      ARM: 6001/1: removing compilation warning comming from clkdev.h
      ARM: 6000/1: removing compilation warning comming from <asm/irq.h>
      ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h
      ARM: 5997/1: ARM: Correct the VFPv3 detection
      ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4)
      ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4)
      ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4)
      ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4)
    torvalds committed Apr 3, 2010
  6. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them
      powerpc/fsl: add device tree binding for QE firmware
      of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
    torvalds committed Apr 3, 2010
  7. Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/frederic/random-tracing
    
    * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      reiserfs: Fix locking BUG during mount failure
    torvalds committed Apr 3, 2010
  8. PCI quirk: RS780/RS880: disable MSI behind the PCI bridge

    The missing initialization of the nb_cntl.strap_msi_enable does not
    seem to be the only problem that prevents MSI, so that quirk is not
    sufficient to enable MSI on all machines.  To be safe, disable MSI
    unconditionally for the internal graphics and HDMI audio on these
    chipsets.
    
    [rjw: Added the PCI_VENDOR_ID_AI quirk.]
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    cladisch committed with torvalds Apr 2, 2010
  9. Merge branch 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/jwessel/linux-2.6-kgdb
    
    * 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: Turn off tracing while in the debugger
      kgdb: use atomic_inc and atomic_dec instead of atomic_set
      kgdb: eliminate kgdb_wait(), all cpus enter the same way
      kgdbts,sh: Add in breakpoint pc offset for superh
      kgdb: have ebin2mem call probe_kernel_write once
    torvalds committed Apr 3, 2010
  10. Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
      Freezer: Only show the state of tasks refusing to freeze
    torvalds committed Apr 3, 2010
  11. tty: release_one_tty() forgets to put pids

    release_one_tty(tty) can be called when tty still has a reference
    to pgrp/session. In this case we leak the pid.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Reported-by: Catalin Marinas <catalin.marinas@arm.com>
    Reported-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Acked-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    utrace committed with torvalds Apr 2, 2010
Commits on Apr 2, 2010
  1. perf, probe-finder: Build fix on Debian

    Building chokes with:
    
     In file included from /usr/include/gelf.h:53,
                     from /usr/include/elfutils/libdw.h:53,
                     from util/probe-finder.h:61,
                     from util/probe-finder.c:39:
     /usr/include/libelf.h:98: error: expected specifier-qualifier-list before 'off64_t'
     [...]
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
    LKML-Reference: <20100329164755.GA16034@aftab>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Borislav Petkov committed with Ingo Molnar Mar 29, 2010
  2. kgdb: Turn off tracing while in the debugger

    The kernel debugger should turn off kernel tracing any time the
    debugger is active and restore it on resume.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
    jwessel committed Apr 2, 2010
  3. kgdb: use atomic_inc and atomic_dec instead of atomic_set

    Memory barriers should be used for the kgdb cpu synchronization.  The
    atomic_set() does not imply a memory barrier.
    
    Reported-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    jwessel committed Apr 2, 2010
  4. kgdb: eliminate kgdb_wait(), all cpus enter the same way

    This is a kgdb architectural change to have all the cpus (master or
    slave) enter the same function.
    
    A cpu that hits an exception (wants to be the master cpu) will call
    kgdb_handle_exception() from the trap handler and then invoke a
    kgdb_roundup_cpu() to synchronize the other cpus and bring them into
    the kgdb_handle_exception() as well.
    
    A slave cpu will enter kgdb_handle_exception() from the
    kgdb_nmicallback() and set the exception state to note that the
    processor is a slave.
    
    Previously the salve cpu would have called kgdb_wait().  This change
    allows the debug core to change cpus without resuming the system in
    order to inspect arch specific cpu information.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    jwessel committed Apr 2, 2010
  5. kgdbts,sh: Add in breakpoint pc offset for superh

    The kgdb test suite mimics the behavior of gdb.  For the sh
    architecture the pc must be decremented by 2 for software breakpoint.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    jwessel committed Apr 2, 2010
  6. kgdb: have ebin2mem call probe_kernel_write once

    Rather than call probe_kernel_write() one byte at a time, process the
    whole buffer locally and pass the entire result in one go.  This way,
    architectures that need to do special handling based on the length can
    do so, or we only end up calling memcpy() once.
    
    [sonic.zhang@analog.com: Reported original problem and preliminary patch]
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    jwessel committed Apr 2, 2010
  7. perf/scripts: Tuple was set from long in both branches in python_proc…

    …ess_event()
    
    This is a fix to the signed/unsigned field handling in the
    Python scripting engine, based on a patch from Roel Kluin.
    
    Basically, Python wants to use a PyInt (which is internally a
    long) if it can i.e. if the value will fit into that type.  If
    not, it stores it into a PyLong, which isn't actually a long,
    but an arbitrary-precision integer variable.
    
    The code below is similar to to what Python does internally, and
    it seems to work as expected on the x86 and x86_64 sytems I
    tested it on.
    
    Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Roel Kluin <roel.kluin@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: rostedt@goodmis.org
    LKML-Reference: <1270184305.6422.10.camel@tropicana>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    zanussi committed with Ingo Molnar Apr 2, 2010
  8. sched: set_cpus_allowed_ptr(): Don't use rq->migration_thread after u…

    …nlock
    
    Trivial typo fix. rq->migration_thread can be NULL after
    task_rq_unlock(), this is why we have "mt" which should be
     used instead.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <20100330165829.GA18284@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    utrace committed with Ingo Molnar Mar 30, 2010
  9. sched: Fix proc_sched_set_task()

    Latencytop clearing sum_exec_runtime via proc_sched_set_task() breaks
    task_times().  Other places in kernel use nvcsw and nivcsw, which are
    being cleared as well,  Clear task statistics only.
    
    Reported-by: Török Edwin <edwintorok@gmail.com>
    Signed-off-by: Mike Galbraith <efault@gmx.de>
    Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <1269940193.19286.14.camel@marge.simson.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Mike Galbraith committed with Ingo Molnar Mar 30, 2010
  10. perf: Fix 'perf sched record' deadlock

    perf sched record can deadlock a box should the holder of
    handle->data->lock take an interrupt, and then attempt to
    acquire an rq lock held by a CPU trying to acquire the
    same lock. Disable interrupts.
    
       CPU0                            CPU1
       sched event with rq->lock held
                                       grab handle->data->lock
       spin on handle->data->lock
                                       interrupt
                                       try to grab rq->lock
    
    Reported-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Mike Galbraith <efault@gmx.de>
    Tested-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <1269598293.6174.8.camel@marge.simson.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Mike Galbraith committed with Ingo Molnar Mar 26, 2010