Hi Lakshmi, On Mon, 2021-01-04 at 11:26 -0800, Lakshmi Ramasubramanian wrote: > diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c > index a05c19b3cc60..3cab318aa3b9 100644 > --- a/arch/powerpc/kexec/file_load_64.c > +++ b/arch/powerpc/kexec/file_load_64.c > @@ -17,6 +17,7 @@ > #include <linux/kexec.h> > #include <linux/of_fdt.h> > #include <linux/libfdt.h> > +#include <linux/of.h> > #include <linux/of_device.h> > #include <linux/memblock.h> > #include <linux/slab.h> > @@ -944,7 +945,8 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt, > struct crash_mem *umem = NULL, *rmem = NULL; > int i, nr_ranges, ret; > > - ret = setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline); > + ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, > + cmdline); > if (ret) > goto out; > The "powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c" moved setup_ima_buffer() to of_kexec_setup_new_fdt(). Defering making the change from setup_new_fdt() to of_kexec_setup_new_fdt() here, is not bisect safe. Mimi
