diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /include/asm-x86/genapic_32.h | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'include/asm-x86/genapic_32.h')
| -rw-r--r-- | include/asm-x86/genapic_32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h index b02ea6e17de8..754d635f90ff 100644 --- a/include/asm-x86/genapic_32.h +++ b/include/asm-x86/genapic_32.h | |||
| @@ -118,6 +118,7 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; | |||
| 118 | #define get_uv_system_type() UV_NONE | 118 | #define get_uv_system_type() UV_NONE |
| 119 | #define is_uv_system() 0 | 119 | #define is_uv_system() 0 |
| 120 | #define uv_wakeup_secondary(a, b) 1 | 120 | #define uv_wakeup_secondary(a, b) 1 |
| 121 | #define uv_system_init() do {} while (0) | ||
| 121 | 122 | ||
| 122 | 123 | ||
| 123 | #endif | 124 | #endif |