From: "Jayachandran C" <jchandra@broadcom.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org,
"John Crispin" <john@phrozen.org>
Cc: "Jayachandran C" <jchandra@broadcom.com>
Subject: [PATCH 9/9 UPDATED] MIPS: Netlogic: Fix oprofile compile on XLR uniprocessor
Date: Mon, 25 Mar 2013 13:21:52 +0530 [thread overview]
Message-ID: <1364197912-1734-1-git-send-email-jchandra@broadcom.com> (raw)
In-Reply-To: <514EBDFA.4030903@phrozen.org>
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>
---
arch/mips/oprofile/op_model_mipsxx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 1fd3614..e4b1140 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);
* first hardware thread in the core for setup and init.
* Skip CPUs with non-zero hardware thread id (4 hwt per core)
*/
-#ifdef CONFIG_CPU_XLR
+#if defined(CONFIG_CPU_XLR) && defined(CONFIG_SMP)
#define oprofile_skip_cpu(c) ((cpu_logical_map(c) & 0x3) != 0)
#else
#define oprofile_skip_cpu(c) 0
--
1.7.9.5
prev parent reply other threads:[~2013-03-25 7:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1364062916.git.jchandra@broadcom.com>
2013-03-23 18:27 ` [PATCH 1/9] MIPS: Netlogic: Optimize and fix write_c0_eimr() Jayachandran C
2013-03-23 18:27 ` [PATCH 2/9] MIPS: Netlogic: Remove unused EIMR/EIRR functions Jayachandran C
2013-03-23 19:33 ` Sergei Shtylyov
2013-03-25 7:18 ` Jayachandran C.
2013-03-23 18:27 ` [PATCH 3/9] MIPS: Netlogic: print cpumask with cpumask_scnprintf Jayachandran C
2013-03-23 18:27 ` [PATCH 4/9] MIPS: Netlogic: Avoid using fixed PIC IRT index Jayachandran C
2013-03-23 18:27 ` [PATCH 5/9] MIPS: Netlogic: Add 32-bit support for XLP Jayachandran C
2013-03-23 18:27 ` [PATCH 6/9] MIPS: Netlogic: Remove unused code Jayachandran C
2013-03-23 18:27 ` [PATCH 7/9] MIPS: Netlogic: Support for multiple built-in device trees Jayachandran C
2013-03-23 18:28 ` [PATCH 8/9] MIPS: Netlogic: Merge platform usb.h to usb-init.c Jayachandran C
2013-03-23 18:28 ` [PATCH 9/9] MIPS: Netlogic: Fix oprofile compile on XLR uniprocessor Jayachandran C
2013-03-24 8:48 ` John Crispin
2013-03-25 7:51 ` Jayachandran C [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364197912-1734-1-git-send-email-jchandra@broadcom.com \
--to=jchandra@broadcom.com \
--cc=john@phrozen.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox