diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/mpspec_def.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/mpspec_def.h')
| -rw-r--r-- | arch/x86/include/asm/mpspec_def.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h index 4a7f96d7c188..c0a955a9a087 100644 --- a/arch/x86/include/asm/mpspec_def.h +++ b/arch/x86/include/asm/mpspec_def.h | |||
| @@ -15,13 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #ifdef CONFIG_X86_32 | 16 | #ifdef CONFIG_X86_32 |
| 17 | # define MAX_MPC_ENTRY 1024 | 17 | # define MAX_MPC_ENTRY 1024 |
| 18 | # define MAX_APICS 256 | ||
| 19 | #else | ||
| 20 | # if NR_CPUS <= 255 | ||
| 21 | # define MAX_APICS 255 | ||
| 22 | # else | ||
| 23 | # define MAX_APICS 32768 | ||
| 24 | # endif | ||
| 25 | #endif | 18 | #endif |
| 26 | 19 | ||
| 27 | /* Intel MP Floating Pointer Structure */ | 20 | /* Intel MP Floating Pointer Structure */ |