Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 212717
b: refs/heads/master
c: 10d0643
h: refs/heads/master
i:
  212715: 87d81fb
v: v3
  • Loading branch information
Yinghai Lu authored and Benjamin Herrenschmidt committed Aug 5, 2010
1 parent 18bb5e4 commit aae58ce
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0b37fad9a63217c39997b2d2b31f44e3d8be727
refs/heads/master: 10d0643988e976360eb3497dcafb55b393b8e480
8 changes: 8 additions & 0 deletions trunk/include/linux/memblock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ static inline unsigned long memblock_region_pages(const struct memblock_region *
region++)


#ifdef ARCH_DISCARD_MEMBLOCK
#define __init_memblock __init
#define __initdata_memblock __initdata
#else
#define __init_memblock
#define __initdata_memblock
#endif

#endif /* CONFIG_HAVE_MEMBLOCK */

#endif /* __KERNEL__ */
Expand Down
48 changes: 24 additions & 24 deletions trunk/mm/memblock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#include <linux/seq_file.h>
#include <linux/memblock.h>

struct memblock memblock;
struct memblock memblock __initdata_memblock;

int memblock_debug;
int memblock_can_resize;
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];
int memblock_debug __initdata_memblock;
int memblock_can_resize __initdata_memblock;
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock;
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock;

/* inline so we don't get a warning when pr_debug is compiled out */
static inline const char *memblock_type_name(struct memblock_type *type)
Expand All @@ -42,23 +42,23 @@ static inline const char *memblock_type_name(struct memblock_type *type)
* Address comparison utilities
*/

static phys_addr_t memblock_align_down(phys_addr_t addr, phys_addr_t size)
static phys_addr_t __init_memblock memblock_align_down(phys_addr_t addr, phys_addr_t size)
{
return addr & ~(size - 1);
}

static phys_addr_t memblock_align_up(phys_addr_t addr, phys_addr_t size)
static phys_addr_t __init_memblock memblock_align_up(phys_addr_t addr, phys_addr_t size)
{
return (addr + (size - 1)) & ~(size - 1);
}

static unsigned long memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
phys_addr_t base2, phys_addr_t size2)
{
return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
}

static long memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
static long __init_memblock memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
phys_addr_t base2, phys_addr_t size2)
{
if (base2 == base1 + size1)
Expand All @@ -69,7 +69,7 @@ static long memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
return 0;
}

static long memblock_regions_adjacent(struct memblock_type *type,
static long __init_memblock memblock_regions_adjacent(struct memblock_type *type,
unsigned long r1, unsigned long r2)
{
phys_addr_t base1 = type->regions[r1].base;
Expand All @@ -80,7 +80,7 @@ static long memblock_regions_adjacent(struct memblock_type *type,
return memblock_addrs_adjacent(base1, size1, base2, size2);
}

long memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
unsigned long i;

Expand Down Expand Up @@ -162,7 +162,7 @@ static phys_addr_t __init memblock_find_base(phys_addr_t size, phys_addr_t align
return MEMBLOCK_ERROR;
}

static void memblock_remove_region(struct memblock_type *type, unsigned long r)
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
{
unsigned long i;

Expand All @@ -174,7 +174,7 @@ static void memblock_remove_region(struct memblock_type *type, unsigned long r)
}

/* Assumption: base addr of region 1 < base addr of region 2 */
static void memblock_coalesce_regions(struct memblock_type *type,
static void __init_memblock memblock_coalesce_regions(struct memblock_type *type,
unsigned long r1, unsigned long r2)
{
type->regions[r1].size += type->regions[r2].size;
Expand All @@ -184,7 +184,7 @@ static void memblock_coalesce_regions(struct memblock_type *type,
/* Defined below but needed now */
static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size);

static int memblock_double_array(struct memblock_type *type)
static int __init_memblock memblock_double_array(struct memblock_type *type)
{
struct memblock_region *new_array, *old_array;
phys_addr_t old_size, new_size, addr;
Expand Down Expand Up @@ -255,13 +255,13 @@ static int memblock_double_array(struct memblock_type *type)
return 0;
}

extern int __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
extern int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
phys_addr_t addr2, phys_addr_t size2)
{
return 1;
}

static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
static long __init_memblock memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
unsigned long coalesced = 0;
long adjacent, i;
Expand Down Expand Up @@ -348,13 +348,13 @@ static long memblock_add_region(struct memblock_type *type, phys_addr_t base, ph
return 0;
}

long memblock_add(phys_addr_t base, phys_addr_t size)
long __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
{
return memblock_add_region(&memblock.memory, base, size);

}

static long __memblock_remove(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
static long __init_memblock __memblock_remove(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
phys_addr_t rgnbegin, rgnend;
phys_addr_t end = base + size;
Expand Down Expand Up @@ -402,7 +402,7 @@ static long __memblock_remove(struct memblock_type *type, phys_addr_t base, phys
return memblock_add_region(type, end, rgnend - end);
}

long memblock_remove(phys_addr_t base, phys_addr_t size)
long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
{
return __memblock_remove(&memblock.memory, base, size);
}
Expand Down Expand Up @@ -568,7 +568,7 @@ phys_addr_t __init memblock_phys_mem_size(void)
return memblock.memory_size;
}

phys_addr_t memblock_end_of_DRAM(void)
phys_addr_t __init_memblock memblock_end_of_DRAM(void)
{
int idx = memblock.memory.cnt - 1;

Expand Down Expand Up @@ -655,7 +655,7 @@ int memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
memblock.reserved.regions[idx].size) >= (base + size);
}

int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
{
return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;
}
Expand All @@ -666,7 +666,7 @@ void __init memblock_set_current_limit(phys_addr_t limit)
memblock.current_limit = limit;
}

static void memblock_dump(struct memblock_type *region, char *name)
static void __init_memblock memblock_dump(struct memblock_type *region, char *name)
{
unsigned long long base, size;
int i;
Expand All @@ -682,7 +682,7 @@ static void memblock_dump(struct memblock_type *region, char *name)
}
}

void memblock_dump_all(void)
void __init_memblock memblock_dump_all(void)
{
if (!memblock_debug)
return;
Expand Down Expand Up @@ -748,7 +748,7 @@ static int __init early_memblock(char *p)
}
early_param("memblock", early_memblock);

#ifdef CONFIG_DEBUG_FS
#if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK)

static int memblock_debug_show(struct seq_file *m, void *private)
{
Expand Down

0 comments on commit aae58ce

Please sign in to comment.