The patch titled Subject: kexec: add IND_FLAGS macro has been added to the -mm tree. Its filename is kexec-add-ind_flags-macro.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/kexec-add-ind_flags-macro.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/kexec-add-ind_flags-macro.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geoff Levand <geoff@xxxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxx> Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Acked-by: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Maximilian Attems <max@xxxxxxx> Cc: Michal Marek <mmarek@xxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Paul Bolle <pebolle@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/machine_kexec_64.c | 2 -- include/linux/kexec.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff -puN arch/powerpc/kernel/machine_kexec_64.c~kexec-add-ind_flags-macro arch/powerpc/kernel/machine_kexec_64.c --- a/arch/powerpc/kernel/machine_kexec_64.c~kexec-add-ind_flags-macro +++ a/arch/powerpc/kernel/machine_kexec_64.c @@ -96,8 +96,6 @@ int default_machine_kexec_prepare(struct return 0; } -#define IND_FLAGS (IND_DESTINATION | IND_INDIRECTION | IND_DONE | IND_SOURCE) - static void copy_segments(unsigned long ind) { unsigned long entry; diff -puN include/linux/kexec.h~kexec-add-ind_flags-macro include/linux/kexec.h --- a/include/linux/kexec.h~kexec-add-ind_flags-macro +++ a/include/linux/kexec.h @@ -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__) _ Patches currently in -mm which might be from geoff@xxxxxxxxxxxxx are kexec-fix-make-headers_check.patch kexec-simplify-conditional.patch kexec-add-bit-definitions-for-kimage-entry-flags.patch kexec-add-ind_flags-macro.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html