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

Commit 9fdfbc2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Provide generic perf_sample_data initialization
  MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer
  perf trace: Don't use pager if scripting
  perf trace/scripting: Remove extraneous header read
  perf, ARM: Modify kuser rmb() call to compile for Thumb-2
  x86/stacktrace: Don't dereference bad frame pointers
  perf archive: Don't try to collect files without a build-id
  perf_events, x86: Fixup fixed counter constraints
  perf, x86: Restrict the ANY flag
  perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE
  perf, x86: add some IBS macros to perf_event.h
  perf, x86: make IBS macros available in perf_event.h
  hw-breakpoints: Remove stub unthrottle callback
  x86/hw-breakpoints: Remove the name field
  perf: Remove pointless breakpoint union
  perf lock: Drop the buffers multiplexing dependency
  perf lock: Fix and add misc documentally things
  percpu: Add __percpu sparse annotations to hw_breakpoint
parents 8cea4eb6 dc1d628a

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -4316,6 +4316,7 @@ PERFORMANCE EVENTS SUBSYSTEM 
M:	Peter Zijlstra <a.p.zijlstra@chello.nl>

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

M:	Paul Mackerras <paulus@samba.org>

M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

M:	Ingo Molnar <mingo@elte.hu>

M:	Arnaldo Carvalho de Melo <acme@redhat.com>

S:	Supported

S:	Supported

F:	kernel/perf_event.c

F:	kernel/perf_event.c

F:	include/linux/perf_event.h

F:	include/linux/perf_event.h

arch/arm/kernel/perf_event.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -965,7 +965,7 @@ armv6pmu_handle_irq(int irq_num, 
	 */

	 */

	armv6_pmcr_write(pmcr);

	armv6_pmcr_write(pmcr);





	data.addr = 0;

	perf_sample_data_init(&data, 0);





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx <= armpmu->num_events; ++idx) {

	for (idx = 0; idx <= armpmu->num_events; ++idx) {
@@ -1945,7 +1945,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) 
	 */

	 */

	regs = get_irq_regs();

	regs = get_irq_regs();





	data.addr = 0;

	perf_sample_data_init(&data, 0);





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);

	for (idx = 0; idx <= armpmu->num_events; ++idx) {

	for (idx = 0; idx <= armpmu->num_events; ++idx) {

arch/powerpc/kernel/perf_event.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1164,10 +1164,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val, 
	 * Finally record data if requested.

	 * Finally record data if requested.

	 */

	 */

	if (record) {

	if (record) {

		struct perf_sample_data data = {

		struct perf_sample_data data;

			.addr	= ~0ULL,



			.period	= event->hw.last_period,

		perf_sample_data_init(&data, ~0ULL);

		};

		data.period = event->hw.last_period;





		if (event->attr.sample_type & PERF_SAMPLE_ADDR)

		if (event->attr.sample_type & PERF_SAMPLE_ADDR)

			perf_get_data_addr(regs, &data.addr);

			perf_get_data_addr(regs, &data.addr);

arch/sparc/kernel/perf_event.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1189,7 +1189,7 @@ static int __kprobes perf_event_nmi_handler(struct notifier_block *self, 




	regs = args->regs;

	regs = args->regs;





	data.addr = 0;

	perf_sample_data_init(&data, 0);





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);

arch/x86/include/asm/hw_breakpoint.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * (display/resolving)

 * (display/resolving)

 */

 */

struct arch_hw_breakpoint {

struct arch_hw_breakpoint {

	char		*name; /* Contains name of the symbol to set bkpt */

	unsigned long	address;

	unsigned long	address;

	u8		len;

	u8		len;

	u8		type;

	u8		type;