diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 05:02:44 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 05:02:44 +0100 |
| commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
| tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /arch/powerpc/mm | |
| parent | powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build (diff) | |
| parent | powerpc+of: Remove the pSeries_reconfig.h file (diff) | |
| download | linux-de1bb03af7f4dde8e0e823629909d179fed4beff.tar.xz linux-de1bb03af7f4dde8e0e823629909d179fed4beff.zip | |
Merge branch 'dt' into next
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 12 |
1 files changed, 0 insertions, 12 deletions
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) 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 memblock list entry from the ibm,dynamic-memory property * and return the information in the provided of_drconf_cell structure. |