kevin/linux
1
Fork 0
Code
6556a67435
linux/arch/sh/kernel
History
Linus Torvalds 6556a67435 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
2010-02-28 10:20:25 -08:00
..
cpu sh: SH-Mobile R-standby register save/restore 2010-02-26 15:29:26 +09:00
vsyscall
.gitignore
asm-offsets.c sh: Add R-standby sleep mode support 2009-10-30 14:38:45 +09:00
cpufreq.c
crash_dump.c
debugtraps.S sh: kgdb: Rework breakpoint handling on top of notifier chain. 2009-12-22 12:44:14 +09:00
disassemble.c
dma-nommu.c sh: Revamp PCI DMA coherence Kconfig bits. 2009-10-27 10:35:02 +09:00
dumpstack.c
dwarf.c sh: Optimise FDE/CIE lookup by using red-black trees 2010-02-08 11:29:15 +09:00
entry-common.S sh: Correct the offset of the return address in ret_from_exception 2010-02-08 10:46:46 +09:00
ftrace.c tracing: Unify arch_syscall_addr() implementations 2010-02-17 13:07:21 +01:00
head_32.S sh: Merge legacy and dynamic PMB modes. 2010-02-18 18:13:51 +09:00
head_64.S sh64: Fix up early serial fixmap. 2010-01-12 15:22:26 +09:00
hw_breakpoint.c sh: Abstracted SH-4A UBC support on hw-breakpoint core. 2010-01-05 19:06:45 +09:00
idle.c sh: machine_ops based reboot support. 2010-01-20 16:42:52 +09:00
init_task.c
io_generic.c sh: Use the generic I/O port base for slowdown. 2009-11-12 16:36:26 +09:00
io_trapped.c sh: Optimize runtime disabling of trapped I/O. 2010-01-27 21:56:57 +09:00
io.c
irq_32.c sh: Annotate irq functions with "notrace" 2009-10-27 07:37:10 +09:00
irq_64.c sh: Annotate irq functions with "notrace" 2009-10-27 07:37:10 +09:00
irq.c genirq: Convert irq_desc.lock to raw_spinlock 2009-12-14 23:55:33 +01:00
kgdb.c sh: kgdb: Rework breakpoint handling on top of notifier chain. 2009-12-22 12:44:14 +09:00
kprobes.c
localtimer.c
machine_kexec.c sh: machine_ops based reboot support. 2010-01-20 16:42:52 +09:00
machvec.c sh: Use the generic I/O port base for slowdown. 2009-11-12 16:36:26 +09:00
Makefile sh: machine_ops based reboot support. 2010-01-20 16:42:52 +09:00
module.c
nmi_debug.c
perf_callchain.c perf: Fix inconsistency between IP and callchain sampling 2010-01-28 14:31:20 +01:00
perf_event.c sh: perf events: Fix up uninitialized variable warning. 2009-11-05 13:56:50 +09:00
process_32.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
process_64.c Merge branch 'sh/stable-updates' 2010-02-02 11:33:45 +09:00
process.c sh: Move over to dynamically allocated FPU context. 2010-01-13 12:51:40 +09:00
ptrace_32.c Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates' 2010-01-13 13:02:55 +09:00
ptrace_64.c Merge branch 'sh/stable-updates' 2010-02-15 14:49:37 +09:00
reboot.c sh: machine_ops based reboot support. 2010-01-20 16:42:52 +09:00
relocate_kernel.S
return_address.c
setup.c sh: Merge legacy and dynamic PMB modes. 2010-02-18 18:13:51 +09:00
sh_bios.c sh: sh_bios detection. 2010-01-12 18:42:52 +09:00
sh_ksyms_32.c sh: Clean up more superfluous symbol exports. 2009-10-27 11:51:19 +09:00
sh_ksyms_64.c sh: Clean up more superfluous symbol exports. 2009-10-27 11:51:19 +09:00
signal_32.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
signal_64.c Merge branch 'sh/stable-updates' 2010-02-15 14:49:37 +09:00
smp.c sh: machine_ops based reboot support. 2010-01-20 16:42:52 +09:00
stacktrace.c
swsusp.c
sys_sh32.c
sys_sh64.c
sys_sh.c Unify sys_mmap* 2009-12-11 06:44:29 -05:00
syscalls_32.S sh: unwire sys_recvmmsg. 2010-01-19 17:00:06 +09:00
syscalls_64.S sh64: wire up sys_accept4. 2010-01-19 17:00:31 +09:00
time.c
topology.c
traps_32.c sh: Setup boot CPU VBR early to enable early page faults. 2010-02-17 12:33:22 +09:00
traps_64.c sh64: Fix up the build for the thread_xstate changes. 2010-01-19 15:40:03 +09:00
traps.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
unwinder.c
vmlinux.lds.S sh: Kill off some superfluous legacy PMB special casing. 2010-02-16 21:43:38 +09:00