Messages in this thread Patch in this message | | | Date | Tue, 7 Oct 2014 13:52:48 -0400 | From | Vivek Goyal <> | Subject | Re: [PATCH V25/5] powerpc/kexec: Use global IND_FLAGS macro |
| |
On Tue, Oct 07, 2014 at 12:21:30AM +0000, Geoff Levand wrote: > linux/kexec.h now defines an IND_FLAGS macro. Remove the local powerpc > definition and use the generic one. > > Signed-off-by: Geoff Levand <geoff@infradead.org>
I think this patch should be merged in previous patch. I guess after applying patch4, series might not be compilable as there are two definitions of IND_FLAGS now.
Thanks Vivek
> --- > arch/powerpc/kernel/machine_kexec_64.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c > index 879b3aa..75652a32 100644 > --- a/arch/powerpc/kernel/machine_kexec_64.c > +++ b/arch/powerpc/kernel/machine_kexec_64.c > @@ -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; > -- > 1.9.1 > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec
| |