diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 13:09:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 13:09:48 -0500 |
| commit | ae5cfc0546ca2698b9dcddf72accbd70e57590a0 (patch) | |
| tree | eb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b /arch | |
| parent | 3dcf6c1b6b29f327ec24a1986aaa8eba399b463f (diff) | |
| parent | dc6821e0cfe74802aefd2067b40fcdc03fc4599e (diff) | |
Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f4bf8aa574f4..58a0e46c404d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -1852,7 +1852,7 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, | |||
| 1852 | xen_write_cr3(__pa(initial_page_table)); | 1852 | xen_write_cr3(__pa(initial_page_table)); |
| 1853 | 1853 | ||
| 1854 | memblock_reserve(__pa(xen_start_info->pt_base), | 1854 | memblock_reserve(__pa(xen_start_info->pt_base), |
| 1855 | xen_start_info->nr_pt_frames * PAGE_SIZE)); | 1855 | xen_start_info->nr_pt_frames * PAGE_SIZE); |
| 1856 | 1856 | ||
| 1857 | return initial_page_table; | 1857 | return initial_page_table; |
| 1858 | } | 1858 | } |