Commit e7e2e511 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here is not quite a handful of powerpc fixes for rc3.

  The windfarm fix is a regression fix (though not a new one), the PMU
  interrupt rename is not a fix per-se but has been submitted a long
  time ago and I kept forgetting to put it in (it puts us back in sync
  with x86), the other perf bit is just about putting an API/ABI bit
  definition in the right place for userspace to consume, and finally,
  we have a fix for the VPHN (Virtual Partition Home Node) feature
  (notification that the hypervisor is moving nodes around) which could
  cause lockups so we may as well fix it now"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
  powerpc: VPHN topology change updates all siblings
  powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace
  powerpc: Rename PMU interrupts from CNT to PMI
parents 6d039f8f fe956a1d

arch/powerpc/include/asm/perf_event_server.h

+1 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/types.h>

#include <asm/hw_irq.h>

#include <linux/device.h>

#include <uapi/asm/perf_event.h>



#define MAX_HWEVENTS		8

#define MAX_EVENT_ALTERNATIVES	8
@@ -69,11 +70,6 @@ struct power_pmu { 
#define PPMU_LIMITED_PMC_REQD	2	/* have to put this on a limited PMC */

#define PPMU_ONLY_COUNT_RUN	4	/* only counting in run state */



/*

 * We use the event config bit 63 as a flag to request EBB.

 */

#define EVENT_CONFIG_EBB_SHIFT	63



extern int register_power_pmu(struct power_pmu *);



struct pt_regs;

arch/powerpc/include/asm/smp.h

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ extern void __cpu_die(unsigned int cpu); 
#define smp_setup_cpu_maps()

static inline void inhibit_secondary_onlining(void) {}

static inline void uninhibit_secondary_onlining(void) {}

static inline const struct cpumask *cpu_sibling_mask(int cpu)

{

	return cpumask_of(cpu);

}



#endif /* CONFIG_SMP */

arch/powerpc/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ header-y += mman.h 
header-y += msgbuf.h

header-y += nvram.h

header-y += param.h

header-y += perf_event.h

header-y += poll.h

header-y += posix_types.h

header-y += ps3fb.h

arch/powerpc/include/uapi/asm/perf_event.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Michael Ellerman, IBM Corp.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; version 2 of the

 * License.

 */



#ifndef _UAPI_ASM_POWERPC_PERF_EVENT_H

#define _UAPI_ASM_POWERPC_PERF_EVENT_H



/*

 * We use bit 63 of perf_event_attr.config as a flag to request EBB.

 */

#define PERF_EVENT_CONFIG_EBB_SHIFT	63



#endif /* _UAPI_ASM_POWERPC_PERF_EVENT_H */

arch/powerpc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) 
		seq_printf(p, "%10u ", per_cpu(irq_stat, j).spurious_irqs);

	seq_printf(p, "  Spurious interrupts\n");



	seq_printf(p, "%*s: ", prec, "CNT");

	seq_printf(p, "%*s: ", prec, "PMI");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat, j).pmu_irqs);

	seq_printf(p, "  Performance monitoring interrupts\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE