aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 00:06:41 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 00:21:49 -0400
commite3239ff92a17976ac5d26fa0fe40ef3a9daf2523 (patch)
treeda3c493196811ccae1b79c3c94234f5d481c8221 /include/linux/memblock.h
parentf1c2c19c498e27de48bf0dc4221e6e31b1823169 (diff)
memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include/linux/memblock.h')
-rw-r--r--include/linux/memblock.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index a59faf2b5edd..86e7daf742f2 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -18,22 +18,22 @@
18 18
19#define MAX_MEMBLOCK_REGIONS 128 19#define MAX_MEMBLOCK_REGIONS 128
20 20
21struct memblock_property { 21struct memblock_region {
22 u64 base; 22 u64 base;
23 u64 size; 23 u64 size;
24}; 24};
25 25
26struct memblock_region { 26struct memblock_type {
27 unsigned long cnt; 27 unsigned long cnt;
28 u64 size; 28 u64 size;
29 struct memblock_property region[MAX_MEMBLOCK_REGIONS+1]; 29 struct memblock_region regions[MAX_MEMBLOCK_REGIONS+1];
30}; 30};
31 31
32struct memblock { 32struct memblock {
33 unsigned long debug; 33 unsigned long debug;
34 u64 rmo_size; 34 u64 rmo_size;
35 struct memblock_region memory; 35 struct memblock_type memory;
36 struct memblock_region reserved; 36 struct memblock_type reserved;
37}; 37};
38 38
39extern struct memblock memblock; 39extern struct memblock memblock;
@@ -56,27 +56,27 @@ extern u64 memblock_end_of_DRAM(void);
56extern void __init memblock_enforce_memory_limit(u64 memory_limit); 56extern void __init memblock_enforce_memory_limit(u64 memory_limit);
57extern int __init memblock_is_reserved(u64 addr); 57extern int __init memblock_is_reserved(u64 addr);
58extern int memblock_is_region_reserved(u64 base, u64 size); 58extern int memblock_is_region_reserved(u64 base, u64 size);
59extern int memblock_find(struct memblock_property *res); 59extern int memblock_find(struct memblock_region *res);
60 60
61extern void memblock_dump_all(void); 61extern void memblock_dump_all(void);
62 62
63static inline u64 63static inline u64
64memblock_size_bytes(struct memblock_region *type, unsigned long region_nr) 64memblock_size_bytes(struct memblock_type *type, unsigned long region_nr)
65{ 65{
66 return type->region[region_nr].size; 66 return type->regions[region_nr].size;
67} 67}
68static inline u64 68static inline u64
69memblock_size_pages(struct memblock_region *type, unsigned long region_nr) 69memblock_size_pages(struct memblock_type *type, unsigned long region_nr)
70{ 70{
71 return memblock_size_bytes(type, region_nr) >> PAGE_SHIFT; 71 return memblock_size_bytes(type, region_nr) >> PAGE_SHIFT;
72} 72}
73static inline u64 73static inline u64
74memblock_start_pfn(struct memblock_region *type, unsigned long region_nr) 74memblock_start_pfn(struct memblock_type *type, unsigned long region_nr)
75{ 75{
76 return type->region[region_nr].base >> PAGE_SHIFT; 76 return type->regions[region_nr].base >> PAGE_SHIFT;
77} 77}
78static inline u64 78static inline u64
79memblock_end_pfn(struct memblock_region *type, unsigned long region_nr) 79memblock_end_pfn(struct memblock_type *type, unsigned long region_nr)
80{ 80{
81 return memblock_start_pfn(type, region_nr) + 81 return memblock_start_pfn(type, region_nr) +
82 memblock_size_pages(type, region_nr); 82 memblock_size_pages(type, region_nr);