diff options
| author | Anton Blanchard | 2006-04-29 01:51:06 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2006-04-29 02:56:58 +0200 |
| commit | 03054d51a70e8c273df5d9bc31fea6c843eaa1c3 (patch) | |
| tree | 44b1b9e52979a0b083edb5169c1ac328abd4c715 /arch/powerpc/kernel/prom_init.c | |
| parent | [PATCH] ppc32 CPM_UART: Fixed odd address translations (diff) | |
| download | kernel-qcow2-linux-03054d51a70e8c273df5d9bc31fea6c843eaa1c3.tar.gz kernel-qcow2-linux-03054d51a70e8c273df5d9bc31fea6c843eaa1c3.tar.xz kernel-qcow2-linux-03054d51a70e8c273df5d9bc31fea6c843eaa1c3.zip | |
[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.c | 1 |
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) */ static unsigned char ibm_architecture_vec[] = { W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */ + W(0xffff0000), W(0x003e0000), /* POWER6 */ W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */ 5 - 1, /* 5 option vectors */ |