summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom_init.c
diff options
context:
space:
mode:
authorMichael Neuling2008-06-18 02:47:26 +0200
committerPaul Mackerras2008-06-30 14:31:11 +0200
commite952e6c4d6635b36c212c056a9427bd93460178c (patch)
tree1791007d187ffea2e66a0150977dc5f3cc3b8c53 /arch/powerpc/kernel/prom_init.c
parentpowerpc: Fix copy-and-paste error in clrsetbits_le16 (diff)
downloadkernel-qcow2-linux-e952e6c4d6635b36c212c056a9427bd93460178c.tar.gz
kernel-qcow2-linux-e952e6c4d6635b36c212c056a9427bd93460178c.tar.xz
kernel-qcow2-linux-e952e6c4d6635b36c212c056a9427bd93460178c.zip
powerpc: Add cputable entry for POWER7
Add a cputable entry for the POWER7 processor. Also tell firmware that we know about POWER7. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Joel Schopp <jschopp@austin.ibm.com> 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 6d6df1e60325..7585ed181ff8 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -650,6 +650,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(0xffff0000), W(0x003f0000), /* POWER7 */
W(0xffffffff), W(0x0f000002), /* all 2.05-compliant */
W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */
5 - 1, /* 5 option vectors */