summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 08:46:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 08:46:10 -0700
commit716f8954fb3029ca2df52a986b60af8d06f093ee (patch)
treed5f983daab287e0a46ac2a76e78a13037b7ed9b6
parenta4523a8b38089478f93bc053c31f678c63f5ee1b (diff)
parentcb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 (diff)
downloadop-kernel-dev-716f8954fb3029ca2df52a986b60af8d06f093ee.zip
op-kernel-dev-716f8954fb3029ca2df52a986b60af8d06f093ee.tar.gz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes
-rw-r--r--arch/powerpc/kernel/prom_init.c2
-rw-r--r--arch/powerpc/platforms/pseries/setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 078fb55..2d80653 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1636,7 +1636,7 @@ static int __init prom_find_machine_type(void)
compat, sizeof(compat)-1);
if (len <= 0)
return PLATFORM_GENERIC;
- if (strncmp(compat, RELOC("chrp"), 4))
+ if (strcmp(compat, RELOC("chrp")))
return PLATFORM_GENERIC;
/* Default to pSeries. We need to know if we are running LPAR */
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 5eb55ef..5f79f01 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void)
{
/* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64\n", 0);
- ppc_md.progress(system_utsname.version, 0);
+ ppc_md.progress(system_utsname.release, 0);
return 0;
}
OpenPOWER on IntegriCloud