From: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Date: Fri, 12 Jan 2007 00:56:44 +0000 (+0900)
Subject: [POWERPC] Fix oprofile support on Cell LPAR
X-Git-Tag: v2.6.21-rc2~42^2~3^2~95
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef66f796751a214dc8fadaef2f068c3baa8969fa;p=linux-2.6-omap-h63xx.git

[POWERPC] Fix oprofile support on Cell LPAR

Op_model_cell supports native Cell. By returning -EINVAL, oprofile
uses timer interrupt on Cell LPAR.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index b6d82390b6a..fbd62eacfdf 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -149,6 +149,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 #ifdef CONFIG_PPC64
 #ifdef CONFIG_PPC_CELL_NATIVE
 		case PPC_OPROFILE_CELL:
+			if (firmware_has_feature(FW_FEATURE_LPAR))
+				return -ENODEV;
 			model = &op_model_cell;
 			break;
 #endif