Nathan Fontenot wrote: > Move the definition of the of_drconf_cell struct from numa.c to prom.h. > This > is needed so that we can parse the ibm,dynamic-memory device-tree property > when DLPAR adding and removing memory. > > Signed-off-by: Nathan Fontenot <nf...@austin.ibm.com> > --- > > Index: powerpc/arch/powerpc/include/asm/prom.h > =================================================================== > --- powerpc.orig/arch/powerpc/include/asm/prom.h 2009-09-11 > 12:43:39.000000000 -0500 > +++ powerpc/arch/powerpc/include/asm/prom.h 2009-09-11 > 12:52:11.000000000 -0500 > @@ -349,6 +349,18 @@ > */ > extern void __iomem *of_iomap(struct device_node *device, int index); > > +struct of_drconf_cell { > + u64 base_addr; > + u32 drc_index; > + u32 reserved; > + u32 aa_index; > + u32 flags; > +};
Might as well fix this up to use a tab instead of spaces for the indentation if you are moving it. > + > +#define DRCONF_MEM_ASSIGNED 0x00000008 > +#define DRCONF_MEM_AI_INVALID 0x00000040 > +#define DRCONF_MEM_RESERVED 0x00000080 > + > /* > * NB: This is here while we transition from using asm/prom.h > * to linux/of.h > Index: powerpc/arch/powerpc/mm/numa.c > =================================================================== > --- powerpc.orig/arch/powerpc/mm/numa.c 2009-09-11 12:43:39.000000000 > -0500 > +++ powerpc/arch/powerpc/mm/numa.c 2009-09-11 12:52:11.000000000 -0500 > @@ -296,18 +296,6 @@ > return result; > } > > -struct of_drconf_cell { > - u64 base_addr; > - u32 drc_index; > - u32 reserved; > - u32 aa_index; > - u32 flags; > -}; > - > -#define DRCONF_MEM_ASSIGNED 0x00000008 > -#define DRCONF_MEM_AI_INVALID 0x00000040 > -#define DRCONF_MEM_RESERVED 0x00000080 > - > /* > * Read the next lmb list entry from the ibm,dynamic-memory property > * and return the information in the provided of_drconf_cell structure. > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev -- Brian King Linux on Power Virtualization IBM Linux Technology Center _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev