Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / arch / powerpc / kernel / power7-pmu.c

diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c
index 5d755ef..5a9f5cb 100644 (file)
--- a/arch/powerpc/kernel/power7-pmu.c
+++ b/arch/powerpc/kernel/power7-pmu.c
@@ -358,6 +358,7 @@ static struct power_pmu power7_pmu = {
        .get_constraint         = power7_get_constraint,
        .get_alternatives       = power7_get_alternatives,
        .disable_pmc            = power7_disable_pmc,
+       .flags                  = PPMU_ALT_SIPR,
        .n_generic              = ARRAY_SIZE(power7_generic_events),
        .generic_events         = power7_generic_events,
        .cache_events           = &power7_cache_events,