aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2007-01-12 09:56:44 +0900
committerPaul Mackerras <paulus@samba.org>2007-01-24 21:13:59 +1100
commitef66f796751a214dc8fadaef2f068c3baa8969fa (patch)
tree680474164b1f657d816bf1249f8277fc722b3385 /arch
parentd649bd7b766b9c15c9f5f2f6d8ae0e57303285d0 (diff)
downloadlinux-linaro-stable-ef66f796751a214dc8fadaef2f068c3baa8969fa.tar.gz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/oprofile/common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index b6d82390b6a6..fbd62eacfdf4 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