diff options
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index 9abbdf7562c5..3b20613325dc 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c | |||
| @@ -139,13 +139,12 @@ struct set_mtrr_data { | |||
| 139 | mtrr_type smp_type; | 139 | mtrr_type smp_type; |
| 140 | }; | 140 | }; |
| 141 | 141 | ||
| 142 | #ifdef CONFIG_SMP | ||
| 143 | |||
| 144 | static void ipi_handler(void *info) | 142 | static void ipi_handler(void *info) |
| 145 | /* [SUMMARY] Synchronisation handler. Executed by "other" CPUs. | 143 | /* [SUMMARY] Synchronisation handler. Executed by "other" CPUs. |
| 146 | [RETURNS] Nothing. | 144 | [RETURNS] Nothing. |
| 147 | */ | 145 | */ |
| 148 | { | 146 | { |
| 147 | #ifdef CONFIG_SMP | ||
| 149 | struct set_mtrr_data *data = info; | 148 | struct set_mtrr_data *data = info; |
| 150 | unsigned long flags; | 149 | unsigned long flags; |
| 151 | 150 | ||
| @@ -168,9 +167,8 @@ static void ipi_handler(void *info) | |||
| 168 | 167 | ||
| 169 | atomic_dec(&data->count); | 168 | atomic_dec(&data->count); |
| 170 | local_irq_restore(flags); | 169 | local_irq_restore(flags); |
| 171 | } | ||
| 172 | |||
| 173 | #endif | 170 | #endif |
| 171 | } | ||
| 174 | 172 | ||
| 175 | static inline int types_compatible(mtrr_type type1, mtrr_type type2) { | 173 | static inline int types_compatible(mtrr_type type1, mtrr_type type2) { |
| 176 | return type1 == MTRR_TYPE_UNCACHABLE || | 174 | return type1 == MTRR_TYPE_UNCACHABLE || |
