diff options
Diffstat (limited to 'arch/sparc/kernel/perf_event.c')
| -rw-r--r-- | arch/sparc/kernel/perf_event.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 62a034318b1..614da624330 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c @@ -22,7 +22,7 @@  #include <asm/stacktrace.h>  #include <asm/cpudata.h>  #include <asm/uaccess.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/nmi.h>  #include <asm/pcr.h> @@ -1343,7 +1343,8 @@ static bool __init supported_pmu(void)  		sparc_pmu = &niagara1_pmu;  		return true;  	} -	if (!strcmp(sparc_pmu_type, "niagara2")) { +	if (!strcmp(sparc_pmu_type, "niagara2") || +	    !strcmp(sparc_pmu_type, "niagara3")) {  		sparc_pmu = &niagara2_pmu;  		return true;  	}  |