diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 12:21:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 12:21:51 -0700 |
| commit | 0c5e1577f1108e88475ca7b7ca75c411460173e1 (patch) | |
| tree | d74285bb8d89c7c6d2d6896410fdcf57ff2a3b96 /arch/x86/kernel | |
| parent | 982b2035d9d7033f63db187bac55e9d8998b0266 (diff) | |
| parent | 53f8023febf9b3e18d8fb0d99c55010e473ce53d (diff) | |
| download | op-kernel-dev-0c5e1577f1108e88475ca7b7ca75c411460173e1.zip op-kernel-dev-0c5e1577f1108e88475ca7b7ca75c411460173e1.tar.gz | |
Merge branch 'stable/bug-fixes-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
x86/mm: Fix section mismatch derived from native_pagetable_reserve()
x86,xen: introduce x86_init.mapping.pagetable_reserve
Revert "xen/mmu: Add workaround "x86-64, mm: Put early page table high""
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/x86_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index c11514e9..75ef4b1 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -61,6 +61,10 @@ struct x86_init_ops x86_init __initdata = { .banner = default_banner, }, + .mapping = { + .pagetable_reserve = native_pagetable_reserve, + }, + .paging = { .pagetable_setup_start = native_pagetable_setup_start, .pagetable_setup_done = native_pagetable_setup_done, |
