Commit 716f8954 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a4523a8b cb6b2eb9
...@@ -1636,7 +1636,7 @@ static int __init prom_find_machine_type(void) ...@@ -1636,7 +1636,7 @@ static int __init prom_find_machine_type(void)
compat, sizeof(compat)-1); compat, sizeof(compat)-1);
if (len <= 0) if (len <= 0)
return PLATFORM_GENERIC; return PLATFORM_GENERIC;
if (strncmp(compat, RELOC("chrp"), 4)) if (strcmp(compat, RELOC("chrp")))
return PLATFORM_GENERIC; return PLATFORM_GENERIC;
/* Default to pSeries. We need to know if we are running LPAR */ /* Default to pSeries. We need to know if we are running LPAR */
......
...@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void) ...@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void)
{ {
/* Manually leave the kernel version on the panel. */ /* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64\n", 0); ppc_md.progress("Linux ppc64\n", 0);
ppc_md.progress(system_utsname.version, 0); ppc_md.progress(system_utsname.release, 0);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment