diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:07:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 19:07:35 -0700 |
| commit | d7526f271f2111684211fc7d27814e86a36336c9 (patch) | |
| tree | e84866e500702e8ff26c2591a7b53ae9f4a84bd5 /arch/x86/mm/pgtable_32.c | |
| parent | 67bff7c087f91f79dfa97a33a3aeb147eb467093 (diff) | |
| parent | b810e94c9d8e3fff6741b66cd5a6f099a7887871 (diff) | |
| download | linux-3.10-d7526f271f2111684211fc7d27814e86a36336c9.tar.gz linux-3.10-d7526f271f2111684211fc7d27814e86a36336c9.tar.bz2 linux-3.10-d7526f271f2111684211fc7d27814e86a36336c9.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
powernow-k8: Fix frequency reporting
x86: Fix parse_reservetop() build failure on certain configs
x86: Fix NULL pointer access in irq_force_complete_move() for Xen guests
x86: Fix 'reservetop=' functionality
Diffstat (limited to 'arch/x86/mm/pgtable_32.c')
| -rw-r--r-- | arch/x86/mm/pgtable_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 1a8faf09afe..792854003ed 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -18,6 +18,7 @@ #include <asm/e820.h> #include <asm/tlb.h> #include <asm/tlbflush.h> +#include <asm/io.h> unsigned int __VMALLOC_RESERVE = 128 << 20; @@ -128,6 +129,7 @@ static int __init parse_reservetop(char *arg) address = memparse(arg, &arg); reserve_top_address(address); + fixup_early_ioremap(); return 0; } early_param("reservetop", parse_reservetop); |