58 files changed, 901 insertions, 1077 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index e007887a33b0..926c2cc4facc 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1058,7 +1058,7 @@ struct boot_params *efi_main(struct efi_config *c,
                 desc->s = DESC_TYPE_CODE_DATA;
                 desc->dpl = 0;
                 desc->p = 1;
-                desc->limit = 0xf;
+                desc->limit1 = 0xf;
                 desc->avl = 0;
                 desc->l = 0;
                 desc->d = SEG_OP_SIZE_32BIT;
@@ -1078,7 +1078,7 @@ struct boot_params *efi_main(struct efi_config *c,
         desc->s = DESC_TYPE_CODE_DATA;
         desc->dpl = 0;
         desc->p = 1;
-        desc->limit = 0xf;
+        desc->limit1 = 0xf;
         desc->avl = 0;
         if (IS_ENABLED(CONFIG_X86_64)) {
                 desc->l = 1;
@@ -1099,7 +1099,7 @@ struct boot_params *efi_main(struct efi_config *c,
         desc->s = DESC_TYPE_CODE_DATA;
         desc->dpl = 0;
         desc->p = 1;
-        desc->limit = 0xf;
+        desc->limit1 = 0xf;
         desc->avl = 0;
         desc->l = 0;
         desc->d = SEG_OP_SIZE_32BIT;
@@ -1116,7 +1116,7 @@ struct boot_params *efi_main(struct efi_config *c,
                 desc->s = 0;
                 desc->dpl = 0;
                 desc->p = 1;
-                desc->limit = 0x0;
+                desc->limit1 = 0x0;
                 desc->avl = 0;
                 desc->l = 0;
                 desc->d = 0;
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 48ef7bb32c42..8a13d468635a 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -673,16 +673,8 @@ ENTRY(name)				\
         jmp     ret_from_intr;          \
 ENDPROC(name)
 
-
-#ifdef CONFIG_TRACING
-# define TRACE_BUILD_INTERRUPT(name, nr)        BUILD_INTERRUPT3(trace_##name, nr, smp_trace_##name)
-#else
-# define TRACE_BUILD_INTERRUPT(name, nr)
-#endif
-
 #define BUILD_INTERRUPT(name, nr)               \
         BUILD_INTERRUPT3(name, nr, smp_##name); \
-        TRACE_BUILD_INTERRUPT(name, nr)
 
 /* The include is where all of the SMP etc. interrupts come from */
 #include <asm/entry_arch.h>
@@ -880,25 +872,17 @@ ENTRY(xen_failsafe_callback)
 ENDPROC(xen_failsafe_callback)
 
 BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
-                xen_evtchn_do_upcall)
+                 xen_evtchn_do_upcall)
 
 #endif /* CONFIG_XEN */
 
 #if IS_ENABLED(CONFIG_HYPERV)
 
 BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
-        hyperv_vector_handler)
+                 hyperv_vector_handler)
 
 #endif /* CONFIG_HYPERV */
 
-#ifdef CONFIG_TRACING
-ENTRY(trace_page_fault)
-        ASM_CLAC
-        pushl   $trace_do_page_fault
-        jmp     common_exception
-END(trace_page_fault)
-#endif
-
 ENTRY(page_fault)
         ASM_CLAC
         pushl   $do_page_fault
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index ca0b250eefc4..49167258d587 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -748,18 +748,6 @@ ENTRY(\sym)
 END(\sym)
 .endm
 
-#ifdef CONFIG_TRACING
-#define trace(sym) trace_##sym
-#define smp_trace(sym) smp_trace_##sym
-
-.macro trace_apicinterrupt num sym
-apicinterrupt3 \num trace(\sym) smp_trace(\sym)
-.endm
-#else
-.macro trace_apicinterrupt num sym do_sym
-.endm
-#endif
-
 /* Make sure APIC interrupt handlers end up in the irqentry section: */