diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-i386/apicdef.h | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-i386/apicdef.h')
| -rw-r--r-- | include/asm-i386/apicdef.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-i386/apicdef.h b/include/asm-i386/apicdef.h index 0fed5e3c699c..a96a8f48fbfc 100644 --- a/include/asm-i386/apicdef.h +++ b/include/asm-i386/apicdef.h | |||
| @@ -109,11 +109,7 @@ | |||
| 109 | 109 | ||
| 110 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) | 110 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) |
| 111 | 111 | ||
| 112 | #ifdef CONFIG_NUMA | 112 | #define MAX_IO_APICS 64 |
| 113 | #define MAX_IO_APICS 32 | ||
| 114 | #else | ||
| 115 | #define MAX_IO_APICS 8 | ||
| 116 | #endif | ||
| 117 | 113 | ||
| 118 | /* | 114 | /* |
| 119 | * the local APIC register structure, memory mapped. Not terribly well | 115 | * the local APIC register structure, memory mapped. Not terribly well |