diff options
| author | Robert Mustacchi <rm@joyent.com> | 2011-06-08 16:50:40 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2011-06-08 16:50:40 -0700 |
| commit | c9bad83646b9295de489f2ef29cd3c3e04b2a674 (patch) | |
| tree | 38997c06a03ad542c746610417d5ae16684be258 | |
| parent | 63c6adb523e79ba6b06ed19f0b2ae9b738649df7 (diff) | |
| download | illumos-kvm-c9bad83646b9295de489f2ef29cd3c3e04b2a674.tar.gz | |
HVM-342 Remove code ifdef'd with CONFIG_X86_32
| -rw-r--r-- | asm.h | 4 | ||||
| -rw-r--r-- | kvm_apicdef.h | 14 |
2 files changed, 3 insertions, 15 deletions
@@ -9,11 +9,7 @@ # define __ASM_EX_SEC " .section __ex_table,\"a\"\n" #endif -#ifdef CONFIG_X86_32 -# define __ASM_SEL(a,b) __ASM_FORM(a) -#else # define __ASM_SEL(a,b) __ASM_FORM(b) -#endif #define __ASM_SIZE(inst) __ASM_SEL(inst##l, inst##q) #define __ASM_REG(reg) __ASM_SEL(e##reg, r##reg) diff --git a/kvm_apicdef.h b/kvm_apicdef.h index 058a077..a5a190d 100644 --- a/kvm_apicdef.h +++ b/kvm_apicdef.h @@ -24,11 +24,7 @@ #define APIC_LVR_DIRECTED_EOI (1 << 24) #define GET_APIC_VERSION(x) ((x) & 0xFFu) #define GET_APIC_MAXLVT(x) (((x) >> 16) & 0xFFu) -#ifdef CONFIG_X86_32 -# define APIC_INTEGRATED(x) ((x) & 0xF0u) -#else -# define APIC_INTEGRATED(x) (1) -#endif +#define APIC_INTEGRATED(x) (1) #define APIC_XAPIC(x) ((x) >= 0x14) #define APIC_EXT_SPACE(x) ((x) & 0x80000000) #define APIC_TASKPRI 0x80 @@ -142,12 +138,8 @@ #define APIC_BASE_MSR 0x800 #define X2APIC_ENABLE (1UL << 10) -#ifdef CONFIG_X86_32 -# define MAX_IO_APICS 64 -#else -# define MAX_IO_APICS 128 -# define MAX_LOCAL_APIC 32768 -#endif +#define MAX_IO_APICS 128 +#define MAX_LOCAL_APIC 32768 /* * All x86-64 systems are xAPIC compatible. |