Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221033
b: refs/heads/master
c: f25b4b4
h: refs/heads/master
i:
  221031: d52392e
v: v3
  • Loading branch information
Russell King committed Oct 28, 2010
1 parent 3f90e41 commit 3858111
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df4f14c7b22e43e67c0e4e3b005ff897a0a72f4d
refs/heads/master: f25b4b4c89ff118df72421dd2cb080a6380896ac
8 changes: 4 additions & 4 deletions trunk/arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,10 @@ void show_mem(void)
printk("%d pages swap cached\n", cached);
}

static void __init find_limits(struct meminfo *mi,
unsigned long *min, unsigned long *max_low, unsigned long *max_high)
static void __init find_limits(unsigned long *min, unsigned long *max_low,
unsigned long *max_high)
{
struct meminfo *mi = &meminfo;
int i;

*min = -1UL;
Expand Down Expand Up @@ -317,12 +318,11 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)

void __init bootmem_init(void)
{
struct meminfo *mi = &meminfo;
unsigned long min, max_low, max_high;

max_low = max_high = 0;

find_limits(mi, &min, &max_low, &max_high);
find_limits(&min, &max_low, &max_high);

arm_bootmem_init(min, max_low);

Expand Down

0 comments on commit 3858111

Please sign in to comment.