Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/powerpc/kernel/prom_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}