From 7af9b4b3128f9d96f22708e9554f6f889bfe4798 Mon Sep 17 00:00:00 2001 From: Martin Langer Date: Sun, 7 Sep 2008 17:51:32 +1000 Subject: [PATCH] --- yaml --- r: 114528 b: refs/heads/master c: a501d8f30e4fcca563e4ee462be00f96e51181d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup-common.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 06eb52e5367d..390964931ae9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b26425ce101a7c1b1ad4ec353d4e860223d9fc4 +refs/heads/master: a501d8f30e4fcca563e4ee462be00f96e51181d5 diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c index 9cc5a52711e5..5ec56ff03e86 100644 --- a/trunk/arch/powerpc/kernel/setup-common.c +++ b/trunk/arch/powerpc/kernel/setup-common.c @@ -254,8 +254,21 @@ static int show_cpuinfo(struct seq_file *m, void *v) /* If we are a Freescale core do a simple check so * we dont have to keep adding cases in the future */ if (PVR_VER(pvr) & 0x8000) { - maj = PVR_MAJ(pvr); - min = PVR_MIN(pvr); + switch (PVR_VER(pvr)) { + case 0x8000: /* 7441/7450/7451, Voyager */ + case 0x8001: /* 7445/7455, Apollo 6 */ + case 0x8002: /* 7447/7457, Apollo 7 */ + case 0x8003: /* 7447A, Apollo 7 PM */ + case 0x8004: /* 7448, Apollo 8 */ + case 0x800c: /* 7410, Nitro */ + maj = ((pvr >> 8) & 0xF); + min = PVR_MIN(pvr); + break; + default: /* e500/book-e */ + maj = PVR_MAJ(pvr); + min = PVR_MIN(pvr); + break; + } } else { switch (PVR_VER(pvr)) { case 0x0020: /* 403 family */