Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 paravirt removal from Tony Luck:
 "Nobody cares about paravirtualization on ia64 anymore"

* tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: remove paravirt code

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index a9b65cf7b34a..7f3028965064 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -34,7 +34,6 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/mca.h>
-#include <asm/paravirt.h>
 
 extern void ia64_tlb_init (void);
 
@@ -244,7 +243,6 @@ put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot)
 static void __init
 setup_gate (void)
 {
-        void *gate_section;
         struct page *page;
 
         /*
@@ -252,11 +250,10 @@ setup_gate (void)
          * headers etc. and once execute-only page to enable
          * privilege-promotion via "epc":
          */
-        gate_section = paravirt_get_gate_section();
-        page = virt_to_page(ia64_imva(gate_section));
+        page = virt_to_page(ia64_imva(__start_gate_section));
         put_kernel_page(page, GATE_ADDR, PAGE_READONLY);
 #ifdef HAVE_BUGGY_SEGREL
-        page = virt_to_page(ia64_imva(gate_section + PAGE_SIZE));
+        page = virt_to_page(ia64_imva(__start_gate_section + PAGE_SIZE));
         put_kernel_page(page, GATE_ADDR + PAGE_SIZE, PAGE_GATE);
 #else
         put_kernel_page(page, GATE_ADDR + PERCPU_PAGE_SIZE, PAGE_GATE);
@@ -642,8 +639,8 @@ mem_init (void)
          * code can tell them apart.
          */
         for (i = 0; i < NR_syscalls; ++i) {
+                extern unsigned long fsyscall_table[NR_syscalls];
                 extern unsigned long sys_call_table[NR_syscalls];
-                unsigned long *fsyscall_table = paravirt_get_fsyscall_table();
 
                 if (!fsyscall_table[i] || nolwsys)
                         fsyscall_table[i] = sys_call_table[i] | 1;