Commit b28c2ee8 authored Feb 17, 2015 by Geoff Levand Committed by Linus Torvalds Feb 17, 2015

kexec: add IND_FLAGS macro



Add a new kexec preprocessor macro IND_FLAGS, which is the bitwise OR of
all the possible kexec IND_ kimage_entry indirection flags.  Having this
macro allows for simplified code in the prosessing of the kexec
kimage_entry items.  Also, remove the local powerpc definition and use the
generic one.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Maximilian Attems <max@stro.at>
Cc: Michal Marek <mmarek@suse.cz>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cf2df639

arch/powerpc/kernel/machine_kexec_64.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -96,8 +96,6 @@ int default_machine_kexec_prepare(struct kimage *image)
		return 0;
		}

		#define IND_FLAGS (IND_DESTINATION \| IND_INDIRECTION \| IND_DONE \| IND_SOURCE)

		static void copy_segments(unsigned long ind)
		{
		unsigned long entry;

include/linux/kexec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#define IND_INDIRECTION (1 << IND_INDIRECTION_BIT)
		#define IND_DONE (1 << IND_DONE_BIT)
		#define IND_SOURCE (1 << IND_SOURCE_BIT)
		#define IND_FLAGS (IND_DESTINATION \| IND_INDIRECTION \| IND_DONE \| IND_SOURCE)

		#if !defined(__ASSEMBLY__)

Admin message