aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom_init.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2006-04-28 19:51:06 -0400
committerPaul Mackerras <paulus@samba.org>2006-04-28 20:56:58 -0400
commit03054d51a70e8c273df5d9bc31fea6c843eaa1c3 (patch)
tree44b1b9e52979a0b083edb5169c1ac328abd4c715 /arch/powerpc/kernel/prom_init.c
parent09b03b6c29638eb5c79b02e585cb1b20d91a8ea0 (diff)
[PATCH] powerpc: Add cputable entry for POWER6
Add a cputable entry for the POWER6 processor. The SIHV and SIPR bits in the mmcra have moved in POWER6, so disable support for that until oprofile is fixed. Also tell firmware that we know about POWER6. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
-rw-r--r--arch/powerpc/kernel/prom_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 00ad7f981a0d..078fb5533541 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -686,6 +686,7 @@ static void __init early_cmdline_parse(void)
686 */ 686 */
687static unsigned char ibm_architecture_vec[] = { 687static unsigned char ibm_architecture_vec[] = {
688 W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */ 688 W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */
689 W(0xffff0000), W(0x003e0000), /* POWER6 */
689 W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */ 690 W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */
690 5 - 1, /* 5 option vectors */ 691 5 - 1, /* 5 option vectors */
691 692