These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / ia64 / kernel / head.S

diff --git a/kernel/arch/ia64/kernel/head.S b/kernel/arch/ia64/kernel/head.S
index a4acdda..bb748c5 100644 (file)
--- a/kernel/arch/ia64/kernel/head.S
+++ b/kernel/arch/ia64/kernel/head.S
@@ -26,7 +26,6 @@
 #include <asm/mmu_context.h>
 #include <asm/asm-offsets.h>
 #include <asm/pal.h>
-#include <asm/paravirt.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
@@ -394,41 +393,6 @@ start_ap:
        ;;
 (isBP) st8 [r2]=r28            // save the address of the boot param area passed by the bootloader
 
-#ifdef CONFIG_PARAVIRT
-
-       movl r14=hypervisor_setup_hooks
-       movl r15=hypervisor_type
-       mov r16=num_hypervisor_hooks
-       ;;
-       ld8 r2=[r15]
-       ;;
-       cmp.ltu p7,p0=r2,r16    // array size check
-       shladd r8=r2,3,r14
-       ;;
-(p7)   ld8 r9=[r8]
-       ;;
-(p7)   mov b1=r9
-(p7)   cmp.ne.unc p7,p0=r9,r0  // no actual branch to NULL
-       ;;
-(p7)   br.call.sptk.many rp=b1
-
-       __INITDATA
-
-default_setup_hook = 0         // Currently nothing needs to be done.
-
-       .global hypervisor_type
-hypervisor_type:
-       data8           PARAVIRT_HYPERVISOR_TYPE_DEFAULT
-
-       // must have the same order with PARAVIRT_HYPERVISOR_TYPE_xxx
-
-hypervisor_setup_hooks:
-       data8           default_setup_hook
-num_hypervisor_hooks = (. - hypervisor_setup_hooks) / 8
-       .previous
-
-#endif
-
 #ifdef CONFIG_SMP
 (isAP) br.call.sptk.many rp=start_secondary
 .ret0:
@@ -1063,12 +1027,6 @@ GLOBAL_ENTRY(ia64_native_sched_clock)
        shrp r8=r9,r8,IA64_NSEC_PER_CYC_SHIFT
        br.ret.sptk.many rp
 END(ia64_native_sched_clock)
-#ifndef CONFIG_PARAVIRT
-       //unsigned long long
-       //sched_clock(void) __attribute__((alias("ia64_native_sched_clock")));
-       .global sched_clock
-sched_clock = ia64_native_sched_clock
-#endif
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
 GLOBAL_ENTRY(cycle_to_cputime)