Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c1266c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perfcounters-rename-for-linus' of... 

Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Tidy up after the big rename
  perf: Do the big rename: Performance Counters -> Performance Events
  perf_counter: Rename 'event' to event_id/hw_event
  perf_counter: Rename list_entry -> group_entry, counter_list -> group_list

Manually resolved some fairly trivial conflicts with the tracing tree in
include/trace/ftrace.h and kernel/trace/trace_syscalls.c.
parents b8c7f1dc 57c0c15b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4000,7 +4000,7 @@ S: Maintained 
F:	include/linux/delayacct.h

F:	kernel/delayacct.c



PERFORMANCE COUNTER SUBSYSTEM

PERFORMANCE EVENTS SUBSYSTEM

M:	Peter Zijlstra <a.p.zijlstra@chello.nl>

M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

arch/arm/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ 
#define __NR_preadv			(__NR_SYSCALL_BASE+361)

#define __NR_pwritev			(__NR_SYSCALL_BASE+362)

#define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)

#define __NR_perf_counter_open		(__NR_SYSCALL_BASE+364)

#define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ 
		CALL(sys_preadv)

		CALL(sys_pwritev)

		CALL(sys_rt_tgsigqueueinfo)

		CALL(sys_perf_counter_open)

		CALL(sys_perf_event_open)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/blackfin/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ 
#define __NR_preadv		366

#define __NR_pwritev		367

#define __NR_rt_tgsigqueueinfo	368

#define __NR_perf_counter_open	369

#define __NR_perf_event_open	369



#define __NR_syscall		370

#define NR_syscalls		__NR_syscall

arch/blackfin/mach-common/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ ENTRY(_sys_call_table) 
	.long _sys_preadv

	.long _sys_pwritev

	.long _sys_rt_tgsigqueueinfo

	.long _sys_perf_counter_open

	.long _sys_perf_event_open



	.rept NR_syscalls-(.-_sys_call_table)/4

	.long _sys_ni_syscall