[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20211028161248.45232-1-andriy.shevchenko@linux.intel.com>
Date: Thu, 28 Oct 2021 19:12:48 +0300
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Thomas Gleixner <tglx@...utronix.de>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
linux-kernel@...r.kernel.org
Cc: Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH v3 1/1] kernel.h: split out instruction pointer accessors
From: Stephen Rothwell <sfr@...b.auug.org.au>
bottom_half.h needs _THIS_IP_ to be standalone, so split that and _RET_IP_
out from kernel.h into the new instruction_pointer.h. kernel.h directly
needs them, so include it there and replace the include of kernel.h with
this new file in bottom_half.h.
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
---
v3: fixed yet another lurking typo (lkp), build on x86_64 passed now
include/linux/bottom_half.h | 2 +-
include/linux/instruction_pointer.h | 8 ++++++++
include/linux/kernel.h | 4 +---
3 files changed, 10 insertions(+), 4 deletions(-)
create mode 100644 include/linux/instruction_pointer.h
diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
index 11d107d88d03..fc53e0ad56d9 100644
--- a/include/linux/bottom_half.h
+++ b/include/linux/bottom_half.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_BH_H
#define _LINUX_BH_H
-#include <linux/kernel.h>
+#include <linux/instruction_pointer.h>
#include <linux/preempt.h>
#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_TRACE_IRQFLAGS)
diff --git a/include/linux/instruction_pointer.h b/include/linux/instruction_pointer.h
new file mode 100644
index 000000000000..cda1f706eaeb
--- /dev/null
+++ b/include/linux/instruction_pointer.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_INSTRUCTION_POINTER_H
+#define _LINUX_INSTRUCTION_POINTER_H
+
+#define _RET_IP_ (unsigned long)__builtin_return_address(0)
+#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
+
+#endif /* _LINUX_INSTRUCTION_POINTER_H */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 24df51162e3e..968b4c4fe65b 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -20,6 +20,7 @@
#include <linux/printk.h>
#include <linux/build_bug.h>
#include <linux/static_call_types.h>
+#include <linux/instruction_pointer.h>
#include <asm/byteorder.h>
#include <uapi/linux/kernel.h>
@@ -53,9 +54,6 @@
} \
)
-#define _RET_IP_ (unsigned long)__builtin_return_address(0)
-#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
-
/**
* upper_32_bits - return bits 32-63 of a number
* @n: the number we're accessing
--
2.33.0
Powered by blists - more mailing lists