diff options
author | Nathan Fontenot <nfont@linux.vnet.ibm.com> | 2012-10-02 12:56:11 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 17:43:55 -0500 |
commit | f59497208363f3dd9d62b79b7f7eafc95432de79 (patch) | |
tree | 674e257b5d24e7e1968a3c6bdb02ae391395a463 | |
parent | e81b3295bc54eb0d03f4cdfc8cbf72e731d1b402 (diff) |
powerpc+of: 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 <nfont@linux.vnet.ibm.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/prom.h | 16 | ||||
-rw-r--r-- | arch/powerpc/mm/numa.c | 12 |
2 files changed, 16 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index b5c91901e384..99c92d5363e4 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h | |||
@@ -58,6 +58,22 @@ static inline int of_node_to_nid(struct device_node *device) { return 0; } | |||
58 | 58 | ||
59 | extern void of_instantiate_rtc(void); | 59 | extern void of_instantiate_rtc(void); |
60 | 60 | ||
61 | /* The of_drconf_cell struct defines the layout of the LMB array | ||
62 | * specified in the device tree property | ||
63 | * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory | ||
64 | */ | ||
65 | struct of_drconf_cell { | ||
66 | u64 base_addr; | ||
67 | u32 drc_index; | ||
68 | u32 reserved; | ||
69 | u32 aa_index; | ||
70 | u32 flags; | ||
71 | }; | ||
72 | |||
73 | #define DRCONF_MEM_ASSIGNED 0x00000008 | ||
74 | #define DRCONF_MEM_AI_INVALID 0x00000040 | ||
75 | #define DRCONF_MEM_RESERVED 0x00000080 | ||
76 | |||
61 | /* These includes are put at the bottom because they may contain things | 77 | /* These includes are put at the bottom because they may contain things |
62 | * that are overridden by this file. Ideally they shouldn't be included | 78 | * that are overridden by this file. Ideally they shouldn't be included |
63 | * by this file, but there are a bunch of .c files that currently depend | 79 | * by this file, but there are a bunch of .c files that currently depend |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 59213cfaeca9..bba87ca2b4d7 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -399,18 +399,6 @@ static unsigned long read_n_cells(int n, const unsigned int **buf) | |||
399 | return result; | 399 | return result; |
400 | } | 400 | } |
401 | 401 | ||
402 | struct of_drconf_cell { | ||
403 | u64 base_addr; | ||
404 | u32 drc_index; | ||
405 | u32 reserved; | ||
406 | u32 aa_index; | ||
407 | u32 flags; | ||
408 | }; | ||
409 | |||
410 | #define DRCONF_MEM_ASSIGNED 0x00000008 | ||
411 | #define DRCONF_MEM_AI_INVALID 0x00000040 | ||
412 | #define DRCONF_MEM_RESERVED 0x00000080 | ||
413 | |||
414 | /* | 402 | /* |
415 | * Read the next memblock list entry from the ibm,dynamic-memory property | 403 | * Read the next memblock list entry from the ibm,dynamic-memory property |
416 | * and return the information in the provided of_drconf_cell structure. | 404 | * and return the information in the provided of_drconf_cell structure. |