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

This project is archived. Its data is read-only.

Commit bbc24a25 authored Nov 14, 2011 by Suzuki Poulose Committed by Benjamin Herrenschmidt Nov 16, 2011

powerpc/4xx: Fix typos in kexec config dependencies

Kexec is not supported on 47x. 47x is a variant of 44x with slightly
different MMU and SMP support. There was a typo in the config dependency
for kexec. This patch fixes the same.

Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Cc:	Kumar Gala <galak@kernel.crashing.org>
Cc:	Josh Boyer <jwboyer@gmail.com>
Cc:	linux ppc dev <linuxppc-dev@lists.ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 82640a6b

arch/powerpc/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE

	config KEXEC		config KEXEC
	bool "kexec system call (EXPERIMENTAL)"		bool "kexec system call (EXPERIMENTAL)"
	depends on (PPC_BOOK3S \|\| FSL_BOOKE \|\| (44x && !SMP && !47x)) && EXPERIMENTAL		depends on (PPC_BOOK3S \|\| FSL_BOOKE \|\| (44x && !SMP && !PPC_47x)) && EXPERIMENTAL
	help		help
	kexec is a system call that implements the ability to shutdown your		kexec is a system call that implements the ability to shutdown your
	current kernel, and to start another kernel. It is like a reboot		current kernel, and to start another kernel. It is like a reboot

arch/powerpc/kernel/misc_32.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -738,7 +738,7 @@ relocate_new_kernel:
	mr r5, r31		mr r5, r31

	li r0, 0		li r0, 0
	#elif defined(CONFIG_44x) && !defined(CONFIG_47x)		#elif defined(CONFIG_44x) && !defined(CONFIG_PPC_47x)

	/*		/*
	* Code for setting up 1:1 mapping for PPC440x for KEXEC		* Code for setting up 1:1 mapping for PPC440x for KEXEC