1. 01 3月, 2010 7 次提交
    • L
      Merge branch 'sched-core-for-linus' of... · f66ffded
      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: (25 commits)
        sched: Fix SCHED_MC regression caused by change in sched cpu_power
        sched: Don't use possibly stale sched_class
        kthread, sched: Remove reference to kthread_create_on_cpu
        sched: cpuacct: Use bigger percpu counter batch values for stats counters
        percpu_counter: Make __percpu_counter_add an inline function on UP
        sched: Remove member rt_se from struct rt_rq
        sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu]
        sched: Remove unused update_shares_locked()
        sched: Use for_each_bit
        sched: Queue a deboosted task to the head of the RT prio queue
        sched: Implement head queueing for sched_rt
        sched: Extend enqueue_task to allow head queueing
        sched: Remove USER_SCHED
        sched: Fix the place where group powers are updated
        sched: Assume *balance is valid
        sched: Remove load_balance_newidle()
        sched: Unify load_balance{,_newidle}()
        sched: Add a lock break for PREEMPT=y
        sched: Remove from fwd decls
        sched: Remove rq_iterator from move_one_task
        ...
      
      Fix up trivial conflicts in kernel/sched.c
      f66ffded
    • L
      Merge branch 'sched-fixes-for-linus' of... · 2531216f
      Linus Torvalds 提交于
      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: Fix race between ttwu() and task_rq_lock()
        sched: Fix SMT scheduler regression in find_busiest_queue()
        sched: Fix sched_mv_power_savings for !SMT
        kernel/sched.c: Suppress unused var warning
      2531216f
    • L
      Merge branch 'perf-core-for-linus' of... · 6556a674
      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: (172 commits)
        perf_event, amd: Fix spinlock initialization
        perf_event: Fix preempt warning in perf_clock()
        perf tools: Flush maps on COMM events
        perf_events, x86: Split PMU definitions into separate files
        perf annotate: Handle samples not at objdump output addr boundaries
        perf_events, x86: Remove superflous MSR writes
        perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
        perf_events, x86: AMD event scheduling
        perf_events: Add new start/stop PMU callbacks
        perf_events: Report the MMAP pgoff value in bytes
        perf annotate: Defer allocating sym_priv->hist array
        perf symbols: Improve debugging information about symtab origins
        perf top: Use a macro instead of a constant variable
        perf symbols: Check the right return variable
        perf/scripts: Tag syscall_name helper as not yet available
        perf/scripts: Add perf-trace-python Documentation
        perf/scripts: Remove unnecessary PyTuple resizes
        perf/scripts: Add syscall tracing scripts
        perf/scripts: Add Python scripting engine
        perf/scripts: Remove check-perf-trace from listed scripts
        ...
      
      Fix trivial conflict in tools/perf/util/probe-event.c
      6556a674
    • L
      Merge branch 'tracing-core-for-linus' of... · e0d27242
      Linus Torvalds 提交于
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
        ftrace: Add function names to dangling } in function graph tracer
        tracing: Simplify memory recycle of trace_define_field
        tracing: Remove unnecessary variable in print_graph_return
        tracing: Fix typo of info text in trace_kprobe.c
        tracing: Fix typo in prof_sysexit_enable()
        tracing: Remove CONFIG_TRACE_POWER from kernel config
        tracing: Fix ftrace_event_call alignment for use with gcc 4.5
        ftrace: Remove memory barriers from NMI code when not needed
        tracing/kprobes: Add short documentation for HAVE_REGS_AND_STACK_ACCESS_API
        s390: Add pt_regs register and stack access API
        tracing/kprobes: Make Kconfig dependencies generic
        tracing: Unify arch_syscall_addr() implementations
        tracing: Add notrace to TRACE_EVENT implementation functions
        ftrace: Allow to remove a single function from function graph filter
        tracing: Add correct/incorrect to sort keys for branch annotation output
        tracing: Simplify test for function_graph tracing start point
        tracing: Drop the tr check from the graph tracing path
        tracing: Add stack dump to trace_printk if stacktrace option is set
        tracing: Use appropriate perl constructs in recordmcount.pl
        tracing: optimize recordmcount.pl for offsets-handling
        ...
      e0d27242
    • L
      Merge branch 'oprofile-for-linus' of... · d25e8dbd
      Linus Torvalds 提交于
      Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        oprofile/x86: fix msr access to reserved counters
        oprofile/x86: use kzalloc() instead of kmalloc()
        oprofile/x86: fix perfctr nmi reservation for mulitplexing
        oprofile/x86: add comment to counter-in-use warning
        oprofile/x86: warn user if a counter is already active
        oprofile/x86: implement randomization for IBS periodic op counter
        oprofile/x86: implement lsfr pseudo-random number generator for IBS
        oprofile/x86: implement IBS cpuid feature detection
        oprofile/x86: remove node check in AMD IBS initialization
        oprofile/x86: remove OPROFILE_IBS config option
        oprofile: remove EXPERIMENTAL from the config option description
        oprofile: remove tracing build dependency
      d25e8dbd
    • L
      Merge branch 'core-rcu-for-linus' of... · 642c4c75
      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: (44 commits)
        rcu: Fix accelerated GPs for last non-dynticked CPU
        rcu: Make non-RCU_PROVE_LOCKING rcu_read_lock_sched_held() understand boot
        rcu: Fix accelerated grace periods for last non-dynticked CPU
        rcu: Export rcu_scheduler_active
        rcu: Make rcu_read_lock_sched_held() take boot time into account
        rcu: Make lockdep_rcu_dereference() message less alarmist
        sched, cgroups: Fix module export
        rcu: Add RCU_CPU_STALL_VERBOSE to dump detailed per-task information
        rcu: Fix rcutorture mod_timer argument to delay one jiffy
        rcu: Fix deadlock in TREE_PREEMPT_RCU CPU stall detection
        rcu: Convert to raw_spinlocks
        rcu: Stop overflowing signed integers
        rcu: Use canonical URL for Mathieu's dissertation
        rcu: Accelerate grace period if last non-dynticked CPU
        rcu: Fix citation of Mathieu's dissertation
        rcu: Documentation update for CONFIG_PROVE_RCU
        security: Apply lockdep-based checking to rcu_dereference() uses
        idr: Apply lockdep-based diagnostics to rcu_dereference() uses
        radix-tree: Disable RCU lockdep checking in radix tree
        vfs: Abstract rcu_dereference_check for files-fdtable use
        ...
      642c4c75
    • L
      Merge branches 'core-ipi-for-linus', 'core-locking-for-linus',... · f91b22c3
      Linus Torvalds 提交于
      Merge branches 'core-ipi-for-linus', 'core-locking-for-linus', 'tracing-fixes-for-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        plist: Fix grammar mistake, and c-style mistake
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        kprobes: Add mcount to the kprobes blacklist
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86_64: Print modules like i386 does
      
      * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Put 'nopat' in kernel-parameters
      
      * 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86-64: Allow fbdev primary video code
      
      * 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Use helpers for rlimits
      f91b22c3
  2. 28 2月, 2010 29 次提交
  3. 27 2月, 2010 4 次提交