1. 07 1月, 2011 9 次提交
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · dda5f0a3
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'sched-core-for-linus' of... · 65b2074f
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'perf-core-for-linus' of... · 28d9bfc3
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'core-futexes-for-linus' of... · f3b0cfa9
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'core-rcu-for-linus' of... · 2af49b60
      Linus Torvalds 提交于
      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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · b08b2721
      Linus Torvalds 提交于
      * 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
    • R
      kernel-doc: code reorganization · 8484baaa
      Randy Dunlap 提交于
      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: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8484baaa
    • N
      Documentation: update kernel-docs.txt · d5ba92b7
      Nicolas Kaiser 提交于
      Fixed typos, and removed duplicated entries.
      Signed-off-by: NNicolas Kaiser <nikai@nikai.net>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d5ba92b7
    • M
      Documentation/dontdiff: add further autogenerated files to ignore list · a4064978
      Michael Prokop 提交于
      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: NMichael Prokop <mika@grml.org>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a4064978
  2. 06 1月, 2011 7 次提交
    • J
      tools, perf: Documentation for the power events API · 4b95f135
      Jean Pihet 提交于
      Provides documentation for the following:
      - the new power trace API,
      - the old (legacy) power trace API,
      - the DEPRECATED Kconfig option usage.
      Signed-off-by: NJean 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: NIngo Molnar <mingo@elte.hu>
      4b95f135
    • J
      perf: Add calls to suspend trace point · 938cfed1
      Jean Pihet 提交于
      Uses the machine_suspend trace point, called from the
      generic kernel suspend_devices_and_enter function.
      Signed-off-by: NJean Pihet <j-pihet@ti.com>
      Acked-by: NRafael 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: NIngo Molnar <mingo@elte.hu>
      938cfed1
    • A
      perf script: Make some lists static · eccdfe2d
      Arnaldo Carvalho de Melo 提交于
      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: NArnaldo Carvalho de Melo <acme@redhat.com>
      eccdfe2d
    • A
      perf script: Use the default lost event handler · 6d8afb56
      Arnaldo Carvalho de Melo 提交于
      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: NArnaldo Carvalho de Melo <acme@redhat.com>
      6d8afb56
    • A
      perf session: Warn about errors when processing pipe events too · 11095994
      Arnaldo Carvalho de Melo 提交于
      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: NArnaldo Carvalho de Melo <acme@redhat.com>
      11095994
    • S
      perf tools: Fix perf_event.h header usage · d030260a
      Stephane Eranian 提交于
      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: NStephane Eranian <eranian@google.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      d030260a
    • A
      perf test: Clarify some error reports in the open syscall test · 454a3bbe
      Arnaldo Carvalho de Melo 提交于
      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: NArnaldo Carvalho de Melo <acme@redhat.com>
      454a3bbe
  3. 05 1月, 2011 10 次提交
  4. 04 1月, 2011 14 次提交