diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 08:35:53 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 08:35:53 +0900 |
| commit | 8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47 (patch) | |
| tree | e1680876ad4a0267868efc855f070549274f147f /arch/x86/xen/enlighten.c | |
| parent | c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc (diff) | |
| parent | e6d4a76dbf2ff27314e09291dfb9e4afcb9ecd60 (diff) | |
| download | blackbird-op-linux-8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47.tar.gz blackbird-op-linux-8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: remove duplicated #include
xen: x86/32: perform initial startup on initial_page_table
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7250bef7f49e..02c710bebf7a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1200,8 +1200,6 @@ asmlinkage void __init xen_start_kernel(void) /* Allocate and initialize top and mid mfn levels for p2m structure */ xen_build_mfn_list_list(); - init_mm.pgd = pgd; - /* keep using Xen gdt for now; no urgent need to change it */ #ifdef CONFIG_X86_32 |
