From: Peter Zijlstra <peterz@infradead.org>
To: Will Deacon <will@kernel.org>
Cc: mingo@kernel.org, tglx@linutronix.de, x86@kernel.org,
linux-kernel@vger.kernel.org, a.darwish@linutronix.de,
rostedt@goodmis.org, bigeasy@linutronix.de, davem@davemloft.net,
sparclinux@vger.kernel.org, mpe@ellerman.id.au,
linuxppc-dev@lists.ozlabs.org, heiko.carstens@de.ibm.com,
linux-s390@vger.kernel.org, linux@armlinux.org.uk
Subject: Re: [PATCH v4 6/8] arm: Break cyclic percpu include
Date: Wed, 24 Jun 2020 19:53:20 +0200 [thread overview]
Message-ID: <20200624175320.GN4781@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20200623090257.GA3743@willie-the-truck>
On Tue, Jun 23, 2020 at 10:02:57AM +0100, Will Deacon wrote:
> On Tue, Jun 23, 2020 at 10:36:51AM +0200, Peter Zijlstra wrote:
> > In order to use <asm/percpu.h> in irqflags.h, we need to make sure
> > asm/percpu.h does not itself depend on irqflags.h.
> >
> > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > ---
> > arch/arm/include/asm/percpu.h | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > --- a/arch/arm/include/asm/percpu.h
> > +++ b/arch/arm/include/asm/percpu.h
> > @@ -10,6 +10,8 @@
> > * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7
> > */
> > #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6)
> > +register unsigned long current_stack_pointer asm ("sp");
>
> If you define this unconditionally, then we can probably get rid of the
> copy in asm/thread_info.h, rather than duplicate the same #define.
The below delta seems to build arm-allnoconfig, arm-defconfig and
arm-allmodconfig.
Although please don't ask me how asm/thread_info.h includes asm/percpu.h
Does that work for you?
diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h
index e86e47486b6b1..e2fcb3cfd3de5 100644
--- a/arch/arm/include/asm/percpu.h
+++ b/arch/arm/include/asm/percpu.h
@@ -5,13 +5,13 @@
#ifndef _ASM_ARM_PERCPU_H_
#define _ASM_ARM_PERCPU_H_
+register unsigned long current_stack_pointer asm ("sp");
+
/*
* Same as asm-generic/percpu.h, except that we store the per cpu offset
* in the TPIDRPRW. TPIDRPRW only exists on V6K and V7
*/
#if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6)
-register unsigned long current_stack_pointer asm ("sp");
-
static inline void set_my_cpu_offset(unsigned long off)
{
/* Set TPIDRPRW */
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 3609a6980c342..536b6b979f634 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -75,11 +75,6 @@ struct thread_info {
.addr_limit = KERNEL_DS, \
}
-/*
- * how to get the current stack pointer in C
- */
-register unsigned long current_stack_pointer asm ("sp");
-
/*
* how to get the thread information struct from C
*/
next prev parent reply other threads:[~2020-06-24 17:55 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 8:36 [PATCH v4 0/8] lockdep: Change IRQ state tracking to use per-cpu variables Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 1/8] lockdep: Prepare for NMI IRQ state tracking Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 2/8] x86/entry: Fix NMI vs " Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 3/8] sparc64: Fix asm/percpu.h build error Peter Zijlstra
2020-06-23 21:35 ` David Miller
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 4/8] powerpc64: Break asm/percpu.h vs spinlock_types.h dependency Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 5/8] s390: Break cyclic percpu include Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 6/8] arm: " Peter Zijlstra
2020-06-23 9:02 ` Will Deacon
2020-06-24 17:53 ` Peter Zijlstra [this message]
2020-06-25 7:31 ` Will Deacon
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 7/8] lockdep: Change hardirq{s_enabled,_context} to per-cpu variables Peter Zijlstra
2020-06-23 15:00 ` Ahmed S. Darwish
2020-06-23 15:24 ` Peter Zijlstra
2020-06-23 16:13 ` Ahmed S. Darwish
2020-06-23 16:37 ` Peter Zijlstra
2020-06-23 17:59 ` Marco Elver
2020-06-23 18:12 ` Peter Zijlstra
2020-06-23 18:39 ` Marco Elver
2020-06-23 19:13 ` Marco Elver
2020-06-23 19:41 ` Peter Zijlstra
2020-06-23 20:08 ` Peter Zijlstra
2020-06-23 20:24 ` Peter Zijlstra
2020-06-23 20:33 ` Peter Zijlstra
2020-06-24 9:00 ` Peter Zijlstra
2020-06-24 10:17 ` Marco Elver
2020-06-24 12:31 ` Peter Zijlstra
2020-06-24 11:32 ` Marco Elver
2020-06-24 15:18 ` Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] kcsan: Make KCSAN compatible with new IRQ state tracking tip-bot2 for Marco Elver
2020-06-30 5:59 ` [PATCH v4 7/8] lockdep: Change hardirq{s_enabled,_context} to per-cpu variables Ahmed S. Darwish
2020-06-30 9:40 ` Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-06-23 8:36 ` [PATCH v4 8/8] lockdep: Remove lockdep_hardirq{s_enabled,_context}() argument Peter Zijlstra
2020-07-11 10:09 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
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=20200624175320.GN4781@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=a.darwish@linutronix.de \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=rostedt@goodmis.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).