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/um/include/asm/smp.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/um/include/asm/smp.h')
| -rw-r--r-- | arch/um/include/asm/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/asm/smp.h b/arch/um/include/asm/smp.h index f27a96313174..4a4b09d4f366 100644 --- a/arch/um/include/asm/smp.h +++ b/arch/um/include/asm/smp.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #define cpu_logical_map(n) (n) | 12 | #define cpu_logical_map(n) (n) |
| 13 | #define cpu_number_map(n) (n) | 13 | #define cpu_number_map(n) (n) |
| 14 | #define PROC_CHANGE_PENALTY 15 /* Pick a number, any number */ | ||
| 15 | extern int hard_smp_processor_id(void); | 14 | extern int hard_smp_processor_id(void); |
| 16 | #define NO_PROC_ID -1 | 15 | #define NO_PROC_ID -1 |
| 17 | 16 | ||