diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-19 17:32:54 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-19 17:32:54 +1100 |
commit | 95889bf99492b738581254332112c0ecb6c41ca8 (patch) | |
tree | 823cd4a54fcde8d2248a69c42d839c2f010c940c /arch/x86/mm/pgtable_32.c | |
parent | 285b0c1f17695658040671fd490fa08b830e6e3a (diff) | |
parent | 56dd35bcac3d5356c0d04837015d0ae3d2b9a679 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/mm/pgtable_32.c')
-rw-r--r-- | arch/x86/mm/pgtable_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index a69bcb8c7621..4dd8cf652579 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -127,7 +127,7 @@ static int __init parse_reservetop(char *arg) address = memparse(arg, &arg); reserve_top_address(address); - fixup_early_ioremap(); + early_ioremap_init(); return 0; } early_param("reservetop", parse_reservetop); |