[PATCH 2/6 v5] Move of_drconf_cell to prom.h
From: Nathan Fontenot <hidden>
Date: 2009-10-28 20:54:54
Also in:
lkml
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 <nfont at austin.ibm.com> --- Index: powerpc/arch/powerpc/include/asm/prom.h ===================================================================
--- powerpc.orig/arch/powerpc/include/asm/prom.h 2009-10-28 15:20:37.000000000 -0500
+++ powerpc/arch/powerpc/include/asm/prom.h 2009-10-28 15:21:44.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; +}; + +#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-10-28 15:20:37.000000000 -0500
+++ powerpc/arch/powerpc/mm/numa.c 2009-10-28 15:21:44.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.