1. 07 Jan, 2011 15 commits
  2. 06 Jan, 2011 10 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-amd-nb-for-linus' of... · 42cbd8ef
      Linus Torvalds authored
      Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, cacheinfo: Cleanup L3 cache index disable support
        x86, amd-nb: Cleanup AMD northbridge caching code
        x86, amd-nb: Complete the rename of AMD NB and related code
      42cbd8ef
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · dda5f0a3
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        MAINTAINERS: Update timer related entries
        timers: Use this_cpu_read
        timerqueue: Make timerqueue_getnext() static inline
        hrtimer: fix timerqueue conversion flub
        hrtimers: Convert hrtimers to use timerlist infrastructure
        timers: Fixup allmodconfig build issue
        timers: Rename timerlist infrastructure to timerqueue
        timers: Introduce timerlist infrastructure.
        hrtimer: Remove stale comment on curr_timer
        timer: Warn when del_timer_sync() is called in hardirq context
        timer: Del_timer_sync() can be used in softirq context
        timer: Make try_to_del_timer_sync() the same on SMP and UP
        posix-timers: Annotate lock_timer()
        timer: Permit statically-declared work with deferrable timers
        time: Use ARRAY_SIZE macro in timecompare.c
        timer: Initialize the field slack of timer_list
        timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS
        time: Compensate for rounding on odd-frequency clocksources
      
      Fix up trivial conflict in MAINTAINERS
      dda5f0a3
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · 65b2074f
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        sched: Change wait_for_completion_*_timeout() to return a signed long
        sched, autogroup: Fix reference leak
        sched, autogroup: Fix potential access to freed memory
        sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
        sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight
        sched: Move periodic share updates to entity_tick()
        printk: Use this_cpu_{read|write} api on printk_pending
        sched: Make pushable_tasks CONFIG_SMP dependant
        sched: Add 'autogroup' scheduling feature: automated per session task groups
        sched: Fix unregister_fair_sched_group()
        sched: Remove unused argument dest_cpu to migrate_task()
        mutexes, sched: Introduce arch_mutex_cpu_relax()
        sched: Add some clock info to sched_debug
        cpu: Remove incorrect BUG_ON
        cpu: Remove unused variable
        sched: Fix UP build breakage
        sched: Make task dump print all 15 chars of proc comm
        sched: Update tg->shares after cpu.shares write
        sched: Allow update_cfs_load() to update global load
        sched: Implement demand based update_cfs_load()
        ...
      65b2074f
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 28d9bfc3
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146 commits)
        tools, perf: Documentation for the power events API
        perf: Add calls to suspend trace point
        perf script: Make some lists static
        perf script: Use the default lost event handler
        perf session: Warn about errors when processing pipe events too
        perf tools: Fix perf_event.h header usage
        perf test: Clarify some error reports in the open syscall test
        x86, NMI: Add touch_nmi_watchdog to io_check_error delay
        x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
        x86: Only call smp_processor_id in non-preempt cases
        perf timechart: Adjust perf timechart to the new power events
        perf: Clean up power events by introducing new, more generic ones
        perf: Do not export power_frequency, but power_start event
        perf test: Add test for counting open syscalls
        perf evsel: Auto allocate resources needed for some methods
        perf evsel: Use {cpu,thread}_map to shorten list of parameters
        perf tools: Refactor all_tids to hold nr and the map
        perf tools: Refactor cpumap to hold nr and the map
        perf evsel: Introduce per cpu and per thread open helpers
        perf evsel: Steal the counter reading routines from stat
        ...
      28d9bfc3
    • Linus Torvalds's avatar
      Merge branch 'core-futexes-for-linus' of... · f3b0cfa9
      Linus Torvalds authored
      Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        futex: Add futex_q static initializer
        futex: Replace fshared and clockrt with combined flags
        futex: Cleanup stale fshared flag interfaces
      f3b0cfa9
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 2af49b60
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: remove unused __list_for_each_rcu() macro
        rculist: fix borked __list_for_each_rcu() macro
        rcu: reduce __call_rcu()-induced contention on rcu_node structures
        rcu: limit rcu_node leaf-level fanout
        rcu: fine-tune grace-period begin/end checks
        rcu: Keep gpnum and completed fields synchronized
        rcu: Stop chasing QS if another CPU did it for us
        rcu: increase synchronize_sched_expedited() batching
        rcu: Make synchronize_srcu_expedited() fast if running readers
        rcu: fix race condition in synchronize_sched_expedited()
        rcu: update documentation/comments for Lai's adoption patch
        rcu,cleanup: simplify the code when cpu is dying
        rcu,cleanup: move synchronize_sched_expedited() out of sched.c
        rcu: get rid of obsolete "classic" names in TREE_RCU tracing
        rcu: Distinguish between boosting and boosted
        rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing.
        rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU
        rcu: priority boosting for TINY_PREEMPT_RCU
        rcu: move TINY_RCU from softirq to kthread
        rcu: add priority-inversion testing to rcutorture
      2af49b60
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · b08b2721
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Don't flush delete workqueue when releasing the transaction lock
        GFS2: fsck.gfs2 reported statfs error after gfs2_grow
        GFS2: Merge glock state fields into a bitfield
        GFS2: Fix uninitialised error value in previous patch
        GFS2: fix recursive locking during rindex truncates
        GFS2: reread rindex when necessary to grow rindex
        GFS2: Remove duplicate #defines from glock.h
        GFS2: Clean up of gdlm_lock function
        GFS2: Allow gfs2 to update quota usage values through the quotactl interface
        GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg
        GFS2: fs/gfs2/glock.c: Use printf extension %pV
        GFS2: Clean up duplicated setattr code
        GFS2: Remove unreachable calls to vmtruncate
        GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS
        GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM
      b08b2721
    • Randy Dunlap's avatar
      kernel-doc: code reorganization · 8484baaa
      Randy Dunlap authored
      Move 'main' code vs. subroutines around so that they are not so
      intermixed, for better readability/understanding (relative to Perl).
      It was messy to follow the primary flow of code execution with the
      code being mixed.  Now the code begins with data initialization,
      followed by all subroutines, then ends with the main code execution.
      
      This is almost totally source code movement, with a few changes as
      needed for forward declarations.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8484baaa
    • Nicolas Kaiser's avatar
      Documentation: update kernel-docs.txt · d5ba92b7
      Nicolas Kaiser authored
      Fixed typos, and removed duplicated entries.
      Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d5ba92b7
    • Michael Prokop's avatar
      Documentation/dontdiff: add further autogenerated files to ignore list · a4064978
      Michael Prokop authored
      Mainly resulting from (but not limited to) autogenerated files of
      lib/raid6 and drivers/gpu/drm/radeon. List generated as result of
      a diff of a clean 2.6.36 tree against a built one.
      Signed-off-by: default avatarMichael Prokop <mika@grml.org>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a4064978
  3. 05 Jan, 2011 14 commits
    • Jean Pihet's avatar
      tools, perf: Documentation for the power events API · 4b95f135
      Jean Pihet authored
      Provides documentation for the following:
      - the new power trace API,
      - the old (legacy) power trace API,
      - the DEPRECATED Kconfig option usage.
      Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: trenn@suse.de
      Cc: Len Brown <len.brown@intel.com>
      Cc: Pavel Machek <pavel@ucw.cz>
      Cc: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: linux-pm@lists.linux-foundation.org
      LKML-Reference: <1294253342-29056-3-git-send-email-j-pihet@ti.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      4b95f135
    • Jean Pihet's avatar
      perf: Add calls to suspend trace point · 938cfed1
      Jean Pihet authored
      Uses the machine_suspend trace point, called from the
      generic kernel suspend_devices_and_enter function.
      Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
      Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      CC: Thomas Renninger <trenn@suse.de>
      Cc: Len Brown <len.brown@intel.com>
      Cc: Pavel Machek <pavel@ucw.cz>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: linux-pm@lists.linux-foundation.org
      LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@ti.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      938cfed1
    • Arnaldo Carvalho de Melo's avatar
      perf script: Make some lists static · eccdfe2d
      Arnaldo Carvalho de Melo authored
      Not accessed outside builtin-script, so make them static.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      eccdfe2d
    • Arnaldo Carvalho de Melo's avatar
      perf script: Use the default lost event handler · 6d8afb56
      Arnaldo Carvalho de Melo authored
      That already does what was being done here. The warning is now unconditionally
      given by __perf_session__process_pipe_events, just like for non pipe processing.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      6d8afb56
    • Arnaldo Carvalho de Melo's avatar
      perf session: Warn about errors when processing pipe events too · 11095994
      Arnaldo Carvalho de Melo authored
      Just like we do at __perf_session__process_events
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      11095994
    • Stephane Eranian's avatar
      perf tools: Fix perf_event.h header usage · d030260a
      Stephane Eranian authored
      This patch fixes the usage of the perf_event.h header file
      between command modules and the supporting code in util.
      
      It is necessary to ensure that ALL files use the SAME
      perf_event.h header from the kernel source tree.
      
      There were a couple of #include <linux/perf_event.h> mixed
      with #include "../../perf_event.h".
      
      This caused issues on some distros because of mismatch
      in the layout of struct perf_event_attr. That eventually
      led perf stat to segfault.
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Robert Richter <robert.richter@amd.com>
      Cc: Stephane Eranian <eranian@gmail.com>
      LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@mx.google.com>
      Signed-off-by: default avatarStephane Eranian <eranian@google.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      d030260a
    • Arnaldo Carvalho de Melo's avatar
      perf test: Clarify some error reports in the open syscall test · 454a3bbe
      Arnaldo Carvalho de Melo authored
      Rebooted my devel machine, first thing I ran was perf test, that expects
      debugfs to be mounted, test fails. Be more clear about it.
      
      Also add missing newlines and add more informative message when
      sys_perf_event_open fails.
      
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      454a3bbe
    • Huang Ying's avatar
      x86, NMI: Add touch_nmi_watchdog to io_check_error delay · 74d91e3c
      Huang Ying authored
      Prevent the long delay in io_check_error making NMI watchdog
      timeout.
      Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
      Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
      LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      74d91e3c
    • Dongdong Deng's avatar
      x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time · 554ec063
      Dongdong Deng authored
      The spin_lock_debug/rcu_cpu_stall detector uses
      trigger_all_cpu_backtrace() to dump cpu backtrace.
      Therefore it is possible that trigger_all_cpu_backtrace()
      could be called at the same time on different CPUs, which
      triggers and 'unknown reason NMI' warning. The following case
      illustrates the problem:
      
            CPU1                    CPU2                     ...   CPU N
                             trigger_all_cpu_backtrace()
                             set "backtrace_mask" to cpu mask
                                     |
      generate NMI interrupts  generate NMI interrupts       ...
          \                          |                               /
           \                         |                              /
      
      The "backtrace_mask" will be cleaned by the first NMI interrupt
      at nmi_watchdog_tick(), then the following NMI interrupts
      generated by other cpus's arch_trigger_all_cpu_backtrace() will
      be taken as unknown reason NMI interrupts.
      
      This patch uses a test_and_set to avoid the problem, and stop
      the arch_trigger_all_cpu_backtrace() from calling to avoid
      dumping a double cpu backtrace info when there is already a
      trigger_all_cpu_backtrace() in progress.
      Signed-off-by: default avatarDongdong Deng <dongdong.deng@windriver.com>
      Reviewed-by: default avatarBruce Ashfield <bruce.ashfield@windriver.com>
      Cc: fweisbec@gmail.com
      LKML-Reference: <1294198689-15447-2-git-send-email-dzickus@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
      554ec063
    • Don Zickus's avatar
      x86: Only call smp_processor_id in non-preempt cases · 9ab181fa
      Don Zickus authored
      There are some paths that walk the die_chain with preemption on.
      Make sure we are in an NMI call before we start doing anything.
      
      This was triggered by do_general_protection calling notify_die
      with DIE_GPF.
      Reported-by: default avatarJan Kiszka <jan.kiszka@web.de>
      Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
      LKML-Reference: <1294198689-15447-1-git-send-email-dzickus@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      9ab181fa
    • Ingo Molnar's avatar
      Merge commit 'v2.6.37' into perf/core · aef1b9ce
      Ingo Molnar authored
      Merge reason: Add the final .37 tree.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      aef1b9ce
    • NeilBrown's avatar
      sched: Change wait_for_completion_*_timeout() to return a signed long · 6bf41237
      NeilBrown authored
      wait_for_completion_*_timeout() can return:
      
         0: if the wait timed out
       -ve: if the wait was interrupted
       +ve: if the completion was completed.
      
      As they currently return an 'unsigned long', the last two cases
      are not easily distinguished which can easily result in buggy
      code, as is the case for the recently added
      wait_for_completion_interruptible_timeout() call in
      net/sunrpc/cache.c
      
      So change them both to return 'long'.  As MAX_SCHEDULE_TIMEOUT
      is LONG_MAX, a large +ve return value should never overflow.
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: J.  Bruce Fields <bfields@fieldses.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      LKML-Reference: <20110105125016.64ccab0e@notabene.brown>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      6bf41237
    • Ingo Molnar's avatar
      Merge commit 'v2.6.37' into sched/core · 27066fd4
      Ingo Molnar authored
      Merge reason: Merge the final .37 tree.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      27066fd4
    • Linus Torvalds's avatar
      Linux 2.6.37 · 3c0eee3f
      Linus Torvalds authored
      3c0eee3f
  4. 04 Jan, 2011 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 65f42886
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        ipv4/route.c: respect prefsrc for local routes
        bridge: stp: ensure mac header is set
        bridge: fix br_multicast_ipv6_rcv for paged skbs
        atl1: fix oops when changing tx/rx ring params
        drivers/atm/atmtcp.c: add missing atm_dev_put
        starfire: Fix dma_addr_t size test for MIPS
        tg3: fix return value check in tg3_read_vpd()
        Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings()
        ISDN, Gigaset: Fix memory leak in do_disconnect_req()
        CAN: Use inode instead of kernel address for /proc file
        skfp: testing the wrong variable in skfp_driver_init()
        ppp: allow disabling multilink protocol ID compression
        ehea: Avoid changing vlan flags
        ueagle-atm: fix PHY signal initialization race
      65f42886