diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:50:33 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:53 -0400 |
commit | d83e94acd95789829804fd9e442bd18975f4dc89 (patch) | |
tree | a7aed9c440365914684b895ece5b43cffcdde70c /include/asm-x86 | |
parent | 7a959cff725872ce9c3a534f10724d7bb2cb3c4a (diff) |
x86, io-apic: remove union about dest for log/phy
let user decide the meaning of the bits.
This unifies the 32-bit and 64-bit io-apic code a bit.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/io_apic.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h index 8ec68a50cf10..ce818292d2c7 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
@@ -87,24 +87,8 @@ struct IO_APIC_route_entry { | |||
87 | mask : 1, /* 0: enabled, 1: disabled */ | 87 | mask : 1, /* 0: enabled, 1: disabled */ |
88 | __reserved_2 : 15; | 88 | __reserved_2 : 15; |
89 | 89 | ||
90 | #ifdef CONFIG_X86_32 | ||
91 | union { | ||
92 | struct { | ||
93 | __u32 __reserved_1 : 24, | ||
94 | physical_dest : 4, | ||
95 | __reserved_2 : 4; | ||
96 | } physical; | ||
97 | |||
98 | struct { | ||
99 | __u32 __reserved_1 : 24, | ||
100 | logical_dest : 8; | ||
101 | } logical; | ||
102 | } dest; | ||
103 | #else | ||
104 | __u32 __reserved_3 : 24, | 90 | __u32 __reserved_3 : 24, |
105 | dest : 8; | 91 | dest : 8; |
106 | #endif | ||
107 | |||
108 | } __attribute__ ((packed)); | 92 | } __attribute__ ((packed)); |
109 | 93 | ||
110 | struct IR_IO_APIC_route_entry { | 94 | struct IR_IO_APIC_route_entry { |