xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region

Browse Source 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2010-08-04 14:06:41 +10:00
parent f1c2c19c49
commit e3239ff92a
10 changed files with 118 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/linux/memblock.h
View File

@@ -18,22 +18,22 @@
#define MAX_MEMBLOCK_REGIONS 128
struct memblock_property {
struct memblock_region {
u64 base;
u64 size;
};
struct memblock_region {
struct memblock_type {
unsigned long cnt;
u64 size;
struct memblock_property region[MAX_MEMBLOCK_REGIONS+1];
struct memblock_region regions[MAX_MEMBLOCK_REGIONS+1];
};
struct memblock {
unsigned long debug;
u64 rmo_size;
struct memblock_region memory;
struct memblock_region reserved;
struct memblock_type memory;
struct memblock_type reserved;
};
extern struct memblock memblock;
@@ -56,27 +56,27 @@ extern u64 memblock_end_of_DRAM(void);
extern void __init memblock_enforce_memory_limit(u64 memory_limit);
extern int __init memblock_is_reserved(u64 addr);
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);
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
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;
}
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
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) +
memblock_size_pages(type, region_nr);