diff options
| author | Jayachandran C <jchandra@broadcom.com> | 2013-03-25 02:51:52 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-07 19:19:05 -0400 |
| commit | 83a18415ba295c25d94bdc81fdb3a18fc1c2ce4e (patch) | |
| tree | 18875c6c9175938db93e45571cb7000ac7cdad42 /arch/mips | |
| parent | c80dd3b6799da6b77fed0520a9dda2e8b01617e4 (diff) | |
MIPS: Netlogic: Fix oprofile compile on XLR uniprocessor
The commit c783390a0ecef08df5c804f8c5f647431a04f502 [MIPS: oprofile:
Support for XLR/XLS processors] causes a compilation failure when
oprofile is enabled and SMP is not configured.
arch/mips/oprofile/op_model_mipsxx.c: In function 'mipsxx_cpu_setup':
arch/mips/oprofile/op_model_mipsxx.c:181:2: error: implicit declaration of function 'cpu_logical_map'
To fix this, update oprofile_skip_cpu to not call cpu_logical_map when
CONFIG_SMP is not defined.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Patchwork: http://patchwork.linux-mips.org/patch/5037/
Acked-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index 1fd361462c03..e4b1140cdae0 100644 --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c | |||
| @@ -41,7 +41,7 @@ static int (*save_perf_irq)(void); | |||
| 41 | * first hardware thread in the core for setup and init. | 41 | * first hardware thread in the core for setup and init. |
| 42 | * Skip CPUs with non-zero hardware thread id (4 hwt per core) | 42 | * Skip CPUs with non-zero hardware thread id (4 hwt per core) |
| 43 | */ | 43 | */ |
| 44 | #ifdef CONFIG_CPU_XLR | 44 | #if defined(CONFIG_CPU_XLR) && defined(CONFIG_SMP) |
| 45 | #define oprofile_skip_cpu(c) ((cpu_logical_map(c) & 0x3) != 0) | 45 | #define oprofile_skip_cpu(c) ((cpu_logical_map(c) & 0x3) != 0) |
| 46 | #else | 46 | #else |
| 47 | #define oprofile_skip_cpu(c) 0 | 47 | #define oprofile_skip_cpu(c) 0 |