xen: Remove x86_32 build target.

Signed-off-by: Keir Fraser <keir@xen.org>

2 files changed, 4 insertions, 24 deletions

diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c
index 33fd14274f..433f881c0c 100644
--- a/xen/arch/x86/oprofile/backtrace.c
+++ b/xen/arch/x86/oprofile/backtrace.c
@@ -10,10 +10,10 @@
  *
  */
 
-#include<xen/types.h>
-#include<asm/page.h>
-#include<xen/xenoprof.h>
-#include<xen/guest_access.h>
+#include <xen/types.h>
+#include <asm/page.h>
+#include <xen/xenoprof.h>
+#include <xen/guest_access.h>
 
 struct frame_head {
     struct frame_head * ebp;
@@ -22,14 +22,12 @@ struct frame_head {
 typedef struct frame_head frame_head_t;
 DEFINE_XEN_GUEST_HANDLE(frame_head_t);
 
-#ifdef CONFIG_X86_64
 struct frame_head_32bit {
     uint32_t ebp;
     uint32_t ret;
 } __attribute__((packed));
 typedef struct frame_head_32bit frame_head32_t;
 DEFINE_COMPAT_HANDLE(frame_head32_t);
-#endif
 
 static struct frame_head *
 dump_hypervisor_backtrace(struct vcpu *vcpu, const struct frame_head *head,
@@ -46,7 +44,6 @@ dump_hypervisor_backtrace(struct vcpu *vcpu, const struct frame_head *head,
     return head->ebp;
 }
 
-#ifdef CONFIG_X86_64
 static inline int is_32bit_vcpu(struct vcpu *vcpu)
 {
     if (is_hvm_vcpu(vcpu))
@@ -54,7 +51,6 @@ static inline int is_32bit_vcpu(struct vcpu *vcpu)
     else
         return is_pv_32bit_vcpu(vcpu);
 }
-#endif
 
 static struct frame_head *
 dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
@@ -62,7 +58,6 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
 {
     frame_head_t bufhead;
 
-#ifdef CONFIG_X86_64
     if ( is_32bit_vcpu(vcpu) )
     {
         __compat_handle_const_frame_head32_t guest_head =
@@ -78,7 +73,6 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head,
         bufhead.ret = bufhead32.ret;
     }
     else
-#endif
     {
         XEN_GUEST_HANDLE(const_frame_head_t) guest_head =
             const_guest_handle_from_ptr(head, frame_head_t);
@@ -136,11 +130,7 @@ static int valid_hypervisor_stack(const struct frame_head *head,
 				  const struct cpu_user_regs *regs)
 {
     unsigned long headaddr = (unsigned long)head;
-#ifdef CONFIG_X86_64
     unsigned long stack = (unsigned long)regs->rsp;
-#else
-    unsigned long stack = (unsigned long)regs;
-#endif
     unsigned long stack_base = (stack & ~(STACK_SIZE - 1)) + STACK_SIZE;
 
     return headaddr > stack && headaddr < stack_base;
diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c
index bdd71a78d6..f3f7536788 100644
--- a/xen/arch/x86/oprofile/op_model_athlon.c
+++ b/xen/arch/x86/oprofile/op_model_athlon.c
@@ -53,12 +53,8 @@ static unsigned long reset_value[MAX_COUNTERS];
 
 extern char svm_stgi_label[];
 
-#ifdef CONFIG_X86_64
 u32 ibs_caps = 0;
 static u64 ibs_op_ctl;
-#else
-#define ibs_op_ctl 0
-#endif
 
 /* IBS cpuid feature detection */
 #define IBS_CPUID_FEATURES              0x8000001b
@@ -352,7 +348,6 @@ static int athlon_check_ctrs(unsigned int const cpu,
 
 static inline void start_ibs(void)
 {
-#ifdef CONFIG_X86_64
 	u64 val = 0;
 
 	if (!ibs_caps)
@@ -390,7 +385,6 @@ static inline void start_ibs(void)
 		val = op_amd_randomize_ibs_op(ibs_op_ctl);
 		wrmsrl(MSR_AMD64_IBSOPCTL, val);
 	}
-#endif
 }
  
 static void athlon_start(struct op_msrs const * const msrs)
@@ -439,8 +433,6 @@ static void athlon_stop(struct op_msrs const * const msrs)
 	stop_ibs();
 }
 
-#ifdef CONFIG_X86_64
-
 #define IBSCTL_LVTOFFSETVAL             (1 << 8)
 #define APIC_EILVT_MSG_NMI              0x4
 #define APIC_EILVT_LVTOFF_IBS           1
@@ -535,8 +527,6 @@ void __init ibs_init(void)
 		(unsigned)ibs_caps);
 }
 
-#endif /* CONFIG_X86_64 */
-
 struct op_x86_model_spec const op_athlon_spec = {
 	.num_counters = K7_NUM_COUNTERS,
 	.num_controls = K7_NUM_CONTROLS,