Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c
index 5d755ef7ac8f..388cf57ad827 100644
--- 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,
@@ -365,7 +366,8 @@ static struct power_pmu power7_pmu = {
 
 static int init_power7_pmu(void)
 {
-        if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
+        if (!cur_cpu_spec->oprofile_cpu_type ||
+            strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
                 return -ENODEV;
 
         return register_power_pmu(&power7_pmu);