Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6

[mirror_ubuntu-focal-kernel.git] / arch / ia64 / kernel / gate.S

diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index b5f8bdd8618e6907e2548e682d2a0caf5b206c62..0bd1b3bfaf1cad6d6995bdc2087b8138d4d02bc4 100644 (file)
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -14,7 +14,7 @@
 #include <asm/unistd.h>
 #include <asm/kregs.h>
 #include <asm/page.h>
-#include "paravirt_inst.h"
+#include <asm/native/inst.h>
 
 /*
  * We can't easily refer to symbols inside the kernel.  To avoid full runtime relocation,
@@ -376,11 +376,4 @@ GLOBAL_ENTRY(__kernel_syscall_via_epc)
 (p9)   mov r8=ENOSYS
        FSYS_RETURN
 
-#ifdef CONFIG_PARAVIRT
-       /*
-        * padd to make the size of this symbol constant
-        * independent of paravirtualization.
-        */
-       .align PAGE_SIZE / 8
-#endif
 END(__kernel_syscall_via_epc)