memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f1c2c19c
...@@ -237,7 +237,7 @@ static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min, ...@@ -237,7 +237,7 @@ static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min,
#ifndef CONFIG_SPARSEMEM #ifndef CONFIG_SPARSEMEM
int pfn_valid(unsigned long pfn) int pfn_valid(unsigned long pfn)
{ {
struct memblock_region *mem = &memblock.memory; struct memblock_type *mem = &memblock.memory;
unsigned int left = 0, right = mem->cnt; unsigned int left = 0, right = mem->cnt;
do { do {
......
...@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg, ...@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg,
static int valid_sdram(unsigned long addr, unsigned long size) static int valid_sdram(unsigned long addr, unsigned long size)
{ {
struct memblock_property res; struct memblock_region res;
res.base = addr; res.base = addr;
res.size = size; res.size = size;
......
...@@ -77,8 +77,8 @@ void __init setup_memory(void) ...@@ -77,8 +77,8 @@ void __init setup_memory(void)
/* Find main memory where is the kernel */ /* Find main memory where is the kernel */
for (i = 0; i < memblock.memory.cnt; i++) { for (i = 0; i < memblock.memory.cnt; i++) {
memory_start = (u32) memblock.memory.region[i].base; memory_start = (u32) memblock.memory.regions[i].base;
memory_end = (u32) memblock.memory.region[i].base memory_end = (u32) memblock.memory.regions[i].base
+ (u32) memblock.memory.region[i].size; + (u32) memblock.memory.region[i].size;
if ((memory_start <= (u32)_text) && if ((memory_start <= (u32)_text) &&
((u32)_text <= memory_end)) { ((u32)_text <= memory_end)) {
......
...@@ -660,7 +660,7 @@ static void __init htab_initialize(void) ...@@ -660,7 +660,7 @@ static void __init htab_initialize(void)
/* create bolted the linear mapping in the hash table */ /* create bolted the linear mapping in the hash table */
for (i=0; i < memblock.memory.cnt; i++) { for (i=0; i < memblock.memory.cnt; i++) {
base = (unsigned long)__va(memblock.memory.region[i].base); base = (unsigned long)__va(memblock.memory.regions[i].base);
size = memblock.memory.region[i].size; size = memblock.memory.region[i].size;
DBG("creating mapping for region: %lx..%lx (prot: %lx)\n", DBG("creating mapping for region: %lx..%lx (prot: %lx)\n",
......
...@@ -86,10 +86,10 @@ int page_is_ram(unsigned long pfn) ...@@ -86,10 +86,10 @@ int page_is_ram(unsigned long pfn)
for (i=0; i < memblock.memory.cnt; i++) { for (i=0; i < memblock.memory.cnt; i++) {
unsigned long base; unsigned long base;
base = memblock.memory.region[i].base; base = memblock.memory.regions[i].base;
if ((paddr >= base) && if ((paddr >= base) &&
(paddr < (base + memblock.memory.region[i].size))) { (paddr < (base + memblock.memory.regions[i].size))) {
return 1; return 1;
} }
} }
...@@ -149,7 +149,7 @@ int ...@@ -149,7 +149,7 @@ int
walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
void *arg, int (*func)(unsigned long, unsigned long, void *)) void *arg, int (*func)(unsigned long, unsigned long, void *))
{ {
struct memblock_property res; struct memblock_region res;
unsigned long pfn, len; unsigned long pfn, len;
u64 end; u64 end;
int ret = -1; int ret = -1;
...@@ -206,7 +206,7 @@ void __init do_init_bootmem(void) ...@@ -206,7 +206,7 @@ void __init do_init_bootmem(void)
/* Add active regions with valid PFNs */ /* Add active regions with valid PFNs */
for (i = 0; i < memblock.memory.cnt; i++) { for (i = 0; i < memblock.memory.cnt; i++) {
unsigned long start_pfn, end_pfn; unsigned long start_pfn, end_pfn;
start_pfn = memblock.memory.region[i].base >> PAGE_SHIFT; start_pfn = memblock.memory.regions[i].base >> PAGE_SHIFT;
end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i); end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i);
add_active_range(0, start_pfn, end_pfn); add_active_range(0, start_pfn, end_pfn);
} }
...@@ -219,16 +219,16 @@ void __init do_init_bootmem(void) ...@@ -219,16 +219,16 @@ void __init do_init_bootmem(void)
/* reserve the sections we're already using */ /* reserve the sections we're already using */
for (i = 0; i < memblock.reserved.cnt; i++) { for (i = 0; i < memblock.reserved.cnt; i++) {
unsigned long addr = memblock.reserved.region[i].base + unsigned long addr = memblock.reserved.regions[i].base +
memblock_size_bytes(&memblock.reserved, i) - 1; memblock_size_bytes(&memblock.reserved, i) - 1;
if (addr < lowmem_end_addr) if (addr < lowmem_end_addr)
reserve_bootmem(memblock.reserved.region[i].base, reserve_bootmem(memblock.reserved.regions[i].base,
memblock_size_bytes(&memblock.reserved, i), memblock_size_bytes(&memblock.reserved, i),
BOOTMEM_DEFAULT); BOOTMEM_DEFAULT);
else if (memblock.reserved.region[i].base < lowmem_end_addr) { else if (memblock.reserved.regions[i].base < lowmem_end_addr) {
unsigned long adjusted_size = lowmem_end_addr - unsigned long adjusted_size = lowmem_end_addr -
memblock.reserved.region[i].base; memblock.reserved.regions[i].base;
reserve_bootmem(memblock.reserved.region[i].base, reserve_bootmem(memblock.reserved.regions[i].base,
adjusted_size, BOOTMEM_DEFAULT); adjusted_size, BOOTMEM_DEFAULT);
} }
} }
...@@ -237,7 +237,7 @@ void __init do_init_bootmem(void) ...@@ -237,7 +237,7 @@ void __init do_init_bootmem(void)
/* reserve the sections we're already using */ /* reserve the sections we're already using */
for (i = 0; i < memblock.reserved.cnt; i++) for (i = 0; i < memblock.reserved.cnt; i++)
reserve_bootmem(memblock.reserved.region[i].base, reserve_bootmem(memblock.reserved.regions[i].base,
memblock_size_bytes(&memblock.reserved, i), memblock_size_bytes(&memblock.reserved, i),
BOOTMEM_DEFAULT); BOOTMEM_DEFAULT);
...@@ -257,10 +257,10 @@ static int __init mark_nonram_nosave(void) ...@@ -257,10 +257,10 @@ static int __init mark_nonram_nosave(void)
for (i = 0; i < memblock.memory.cnt - 1; i++) { for (i = 0; i < memblock.memory.cnt - 1; i++) {
memblock_region_max_pfn = memblock_region_max_pfn =
(memblock.memory.region[i].base >> PAGE_SHIFT) + (memblock.memory.regions[i].base >> PAGE_SHIFT) +
(memblock.memory.region[i].size >> PAGE_SHIFT); (memblock.memory.regions[i].size >> PAGE_SHIFT);
memblock_next_region_start_pfn = memblock_next_region_start_pfn =
memblock.memory.region[i+1].base >> PAGE_SHIFT; memblock.memory.regions[i+1].base >> PAGE_SHIFT;
if (memblock_region_max_pfn < memblock_next_region_start_pfn) if (memblock_region_max_pfn < memblock_next_region_start_pfn)
register_nosave_region(memblock_region_max_pfn, register_nosave_region(memblock_region_max_pfn,
......
...@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x) ...@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x)
void __init wii_memory_fixups(void) void __init wii_memory_fixups(void)
{ {
struct memblock_property *p = memblock.memory.region; struct memblock_region *p = memblock.memory.region;
/* /*
* This is part of a workaround to allow the use of two * This is part of a workaround to allow the use of two
......
...@@ -978,7 +978,7 @@ static void __init add_node_ranges(void) ...@@ -978,7 +978,7 @@ static void __init add_node_ranges(void)
unsigned long size = memblock_size_bytes(&memblock.memory, i); unsigned long size = memblock_size_bytes(&memblock.memory, i);
unsigned long start, end; unsigned long start, end;
start = memblock.memory.region[i].base; start = memblock.memory.regions[i].base;
end = start + size; end = start + size;
while (start < end) { while (start < end) {
unsigned long this_end; unsigned long this_end;
...@@ -1299,7 +1299,7 @@ static void __init bootmem_init_nonnuma(void) ...@@ -1299,7 +1299,7 @@ static void __init bootmem_init_nonnuma(void)
if (!size) if (!size)
continue; continue;
start_pfn = memblock.memory.region[i].base >> PAGE_SHIFT; start_pfn = memblock.memory.regions[i].base >> PAGE_SHIFT;
end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i); end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i);
add_active_range(0, start_pfn, end_pfn); add_active_range(0, start_pfn, end_pfn);
} }
...@@ -1339,7 +1339,7 @@ static void __init trim_reserved_in_node(int nid) ...@@ -1339,7 +1339,7 @@ static void __init trim_reserved_in_node(int nid)
numadbg(" trim_reserved_in_node(%d)\n", nid); numadbg(" trim_reserved_in_node(%d)\n", nid);
for (i = 0; i < memblock.reserved.cnt; i++) { for (i = 0; i < memblock.reserved.cnt; i++) {
unsigned long start = memblock.reserved.region[i].base; unsigned long start = memblock.reserved.regions[i].base;
unsigned long size = memblock_size_bytes(&memblock.reserved, i); unsigned long size = memblock_size_bytes(&memblock.reserved, i);
unsigned long end = start + size; unsigned long end = start + size;
......
...@@ -554,7 +554,7 @@ void __init omap_vram_reserve_sdram_memblock(void) ...@@ -554,7 +554,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
size = PAGE_ALIGN(size); size = PAGE_ALIGN(size);
if (paddr) { if (paddr) {
struct memblock_property res; struct memblock_region res;
res.base = paddr; res.base = paddr;
res.size = size; res.size = size;
......
...@@ -18,22 +18,22 @@ ...@@ -18,22 +18,22 @@
#define MAX_MEMBLOCK_REGIONS 128 #define MAX_MEMBLOCK_REGIONS 128
struct memblock_property { struct memblock_region {
u64 base; u64 base;
u64 size; u64 size;
}; };
struct memblock_region { struct memblock_type {
unsigned long cnt; unsigned long cnt;
u64 size; u64 size;
struct memblock_property region[MAX_MEMBLOCK_REGIONS+1]; struct memblock_region regions[MAX_MEMBLOCK_REGIONS+1];
}; };
struct memblock { struct memblock {
unsigned long debug; unsigned long debug;
u64 rmo_size; u64 rmo_size;
struct memblock_region memory; struct memblock_type memory;
struct memblock_region reserved; struct memblock_type reserved;
}; };
extern struct memblock memblock; extern struct memblock memblock;
...@@ -56,27 +56,27 @@ extern u64 memblock_end_of_DRAM(void); ...@@ -56,27 +56,27 @@ extern u64 memblock_end_of_DRAM(void);
extern void __init memblock_enforce_memory_limit(u64 memory_limit); extern void __init memblock_enforce_memory_limit(u64 memory_limit);
extern int __init memblock_is_reserved(u64 addr); extern int __init memblock_is_reserved(u64 addr);
extern int memblock_is_region_reserved(u64 base, u64 size); extern int memblock_is_region_reserved(u64 base, u64 size);
extern int memblock_find(struct memblock_property *res); extern int memblock_find(struct memblock_region *res);
extern void memblock_dump_all(void); extern void memblock_dump_all(void);
static inline u64 static inline u64
memblock_size_bytes(struct memblock_region *type, unsigned long region_nr) memblock_size_bytes(struct memblock_type *type, unsigned long region_nr)
{ {
return type->region[region_nr].size; return type->regions[region_nr].size;
} }
static inline u64 static inline u64
memblock_size_pages(struct memblock_region *type, unsigned long region_nr) memblock_size_pages(struct memblock_type *type, unsigned long region_nr)
{ {
return memblock_size_bytes(type, region_nr) >> PAGE_SHIFT; return memblock_size_bytes(type, region_nr) >> PAGE_SHIFT;
} }
static inline u64 static inline u64
memblock_start_pfn(struct memblock_region *type, unsigned long region_nr) memblock_start_pfn(struct memblock_type *type, unsigned long region_nr)
{ {
return type->region[region_nr].base >> PAGE_SHIFT; return type->regions[region_nr].base >> PAGE_SHIFT;
} }
static inline u64 static inline u64
memblock_end_pfn(struct memblock_region *type, unsigned long region_nr) memblock_end_pfn(struct memblock_type *type, unsigned long region_nr)
{ {
return memblock_start_pfn(type, region_nr) + return memblock_start_pfn(type, region_nr) +
memblock_size_pages(type, region_nr); memblock_size_pages(type, region_nr);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment