diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:37:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:37:09 -0400 |
| commit | 63518472c05a351d779f35803e6ccfb361ae630a (patch) | |
| tree | d3668e960f945a7a1204cfb839bc8aaabcdf2341 /include | |
| parent | e44e20ff1273cf96c7f195297208f654c49295cf (diff) | |
| parent | e6f1f3c54974a30c65ea0b699809d12f0aa04272 (diff) | |
Pull trivial1 into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/apicdef.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/apicdef.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-i386/apicdef.h b/include/asm-i386/apicdef.h index 5e4a35af2921..9f6995341fdc 100644 --- a/include/asm-i386/apicdef.h +++ b/include/asm-i386/apicdef.h | |||
| @@ -121,7 +121,6 @@ | |||
| 121 | */ | 121 | */ |
| 122 | #define u32 unsigned int | 122 | #define u32 unsigned int |
| 123 | 123 | ||
| 124 | #define lapic ((volatile struct local_apic *)APIC_BASE) | ||
| 125 | 124 | ||
| 126 | struct local_apic { | 125 | struct local_apic { |
| 127 | 126 | ||
diff --git a/include/asm-x86_64/apicdef.h b/include/asm-x86_64/apicdef.h index 5a48e9bcf218..1dd40067c67c 100644 --- a/include/asm-x86_64/apicdef.h +++ b/include/asm-x86_64/apicdef.h | |||
| @@ -137,8 +137,6 @@ | |||
| 137 | */ | 137 | */ |
| 138 | #define u32 unsigned int | 138 | #define u32 unsigned int |
| 139 | 139 | ||
| 140 | #define lapic ((volatile struct local_apic *)APIC_BASE) | ||
| 141 | |||
| 142 | struct local_apic { | 140 | struct local_apic { |
| 143 | 141 | ||
| 144 | /*000*/ struct { u32 __reserved[4]; } __reserved_01; | 142 | /*000*/ struct { u32 __reserved[4]; } __reserved_01; |