From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>, Will Deacon <will@kernel.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: locking/core] arm: Break cyclic percpu include
Date: Sat, 11 Jul 2020 10:09:54 -0000 [thread overview]
Message-ID: <159446219427.4006.4005355405552922553.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200623083721.454517573@infradead.org>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: a6342915881a687b07847b7c57628de07a256525
Gitweb: https://git.kernel.org/tip/a6342915881a687b07847b7c57628de07a256525
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 22 Jun 2020 17:21:58 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 10 Jul 2020 12:00:02 +02:00
arm: Break cyclic percpu include
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>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200623083721.454517573@infradead.org
---
arch/arm/include/asm/percpu.h | 2 ++
arch/arm/include/asm/thread_info.h | 5 -----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h
index f44f448..e2fcb3c 100644
--- a/arch/arm/include/asm/percpu.h
+++ b/arch/arm/include/asm/percpu.h
@@ -5,6 +5,8 @@
#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
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 3609a69..536b6b9 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -76,11 +76,6 @@ struct thread_info {
}
/*
- * 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
*/
static inline struct thread_info *current_thread_info(void) __attribute_const__;
next prev parent reply other threads:[~2020-07-11 10:10 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
2020-06-25 7:31 ` Will Deacon
2020-07-11 10:09 ` tip-bot2 for Peter Zijlstra [this message]
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=159446219427.4006.4005355405552922553.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--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
all inboxes | Powered by JetHome®