[tip:perf/core] hw_breakpoints: Fix percpu build failure
in [Kernel]
|
Prev: 2.6.33.3: possible recursive locking detected
Next: [PATCH] DMA ENGINE: Do not reset 'private' of channel
From: tip-bot for Frederic Weisbecker on 4 May 2010 04:40 Commit-ID: 777d0411cd1e384115985dac5ccd42031e3eee2b Gitweb: http://git.kernel.org/tip/777d0411cd1e384115985dac5ccd42031e3eee2b Author: Frederic Weisbecker <fweisbec(a)gmail.com> AuthorDate: Mon, 3 May 2010 15:39:45 +0200 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Tue, 4 May 2010 08:39:36 +0200 hw_breakpoints: Fix percpu build failure Fix this build error: kernel/hw_breakpoint.c:58:1: error: pasting "__pcpu_scope_" and "*" does not give a valid preprocessing token It happens if CONFIG_DEBUG_FORCE_WEAK_PER_CPU, because we concatenate someting with the name and we have the "*" in the name. Cc: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Paul Mundt <lethal(a)linux-sh.org> Cc: Mahesh Salgaonkar <mahesh(a)linux.vnet.ibm.com> Cc: K. Prasad <prasad(a)linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Jason Wessel <jason.wessel(a)windriver.com> LKML-Reference: <20100503133942.GA5497(a)nowhere> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- kernel/hw_breakpoint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c index 684b710..7a56b22 100644 --- a/kernel/hw_breakpoint.c +++ b/kernel/hw_breakpoint.c @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned int, nr_cpu_bp_pinned[TYPE_MAX]); /* Number of pinned task breakpoints in a cpu */ -static DEFINE_PER_CPU(unsigned int, *nr_task_bp_pinned[TYPE_MAX]); +static DEFINE_PER_CPU(unsigned int *, nr_task_bp_pinned[TYPE_MAX]); /* Number of non-pinned cpu/task breakpoints in a cpu */ static DEFINE_PER_CPU(unsigned int, nr_bp_flexible[TYPE_MAX]); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |