[PATCH 2/5] Move of_drconf_cell struct definition to asm/prom.h
This patch moves the definition of the of_drconf_cell struct to asm/prom.h to make it available for all powerpc/pseries code. Signed-off-by: Nathan Fontenot --- arch/powerpc/include/asm/prom.h | 16 arch/powerpc/mm/numa.c | 12 2 files changed, 16 insertions(+), 12 deletions(-) Index: dt-next/arch/powerpc/mm/numa.c === --- dt-next.orig/arch/powerpc/mm/numa.c 2012-10-02 08:30:23.0 -0500 +++ dt-next/arch/powerpc/mm/numa.c 2012-10-02 08:41:42.0 -0500 @@ -397,18 +397,6 @@ return result; } -struct of_drconf_cell { - u64 base_addr; - u32 drc_index; - u32 reserved; - u32 aa_index; - u32 flags; -}; - -#define DRCONF_MEM_ASSIGNED0x0008 -#define DRCONF_MEM_AI_INVALID 0x0040 -#define DRCONF_MEM_RESERVED0x0080 - /* * Read the next memblock list entry from the ibm,dynamic-memory property * and return the information in the provided of_drconf_cell structure. Index: dt-next/arch/powerpc/include/asm/prom.h === --- dt-next.orig/arch/powerpc/include/asm/prom.h2011-11-17 09:12:07.0 -0600 +++ dt-next/arch/powerpc/include/asm/prom.h 2012-10-02 08:41:42.0 -0500 @@ -58,6 +58,22 @@ extern void of_instantiate_rtc(void); +/* The of_drconf_cell struct defines the layout of the LMB array + * specified in the device tree property + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory + */ +struct of_drconf_cell { + u64 base_addr; + u32 drc_index; + u32 reserved; + u32 aa_index; + u32 flags; +}; + +#define DRCONF_MEM_ASSIGNED0x0008 +#define DRCONF_MEM_AI_INVALID 0x0040 +#define DRCONF_MEM_RESERVED0x0080 + /* These includes are put at the bottom because they may contain things * that are overridden by this file. Ideally they shouldn't be included * by this file, but there are a bunch of .c files that currently depend -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/5] Move of_drconf_cell struct definition to asm/prom.h
This patch moves the definition of the of_drconf_cell struct to asm/prom.h to make it available for all powerpc/pseries code. Signed-off-by: Nathan Fontenot nf...@linux.vnet.ibm.com --- arch/powerpc/include/asm/prom.h | 16 arch/powerpc/mm/numa.c | 12 2 files changed, 16 insertions(+), 12 deletions(-) Index: dt-next/arch/powerpc/mm/numa.c === --- dt-next.orig/arch/powerpc/mm/numa.c 2012-10-02 08:30:23.0 -0500 +++ dt-next/arch/powerpc/mm/numa.c 2012-10-02 08:41:42.0 -0500 @@ -397,18 +397,6 @@ return result; } -struct of_drconf_cell { - u64 base_addr; - u32 drc_index; - u32 reserved; - u32 aa_index; - u32 flags; -}; - -#define DRCONF_MEM_ASSIGNED0x0008 -#define DRCONF_MEM_AI_INVALID 0x0040 -#define DRCONF_MEM_RESERVED0x0080 - /* * Read the next memblock list entry from the ibm,dynamic-memory property * and return the information in the provided of_drconf_cell structure. Index: dt-next/arch/powerpc/include/asm/prom.h === --- dt-next.orig/arch/powerpc/include/asm/prom.h2011-11-17 09:12:07.0 -0600 +++ dt-next/arch/powerpc/include/asm/prom.h 2012-10-02 08:41:42.0 -0500 @@ -58,6 +58,22 @@ extern void of_instantiate_rtc(void); +/* The of_drconf_cell struct defines the layout of the LMB array + * specified in the device tree property + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory + */ +struct of_drconf_cell { + u64 base_addr; + u32 drc_index; + u32 reserved; + u32 aa_index; + u32 flags; +}; + +#define DRCONF_MEM_ASSIGNED0x0008 +#define DRCONF_MEM_AI_INVALID 0x0040 +#define DRCONF_MEM_RESERVED0x0080 + /* These includes are put at the bottom because they may contain things * that are overridden by this file. Ideally they shouldn't be included * by this file, but there are a bunch of .c files that currently depend -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/