The patch titled
Subject: kernel.h: split out instruction pointer accessors
has been added to the -mm tree. Its filename is
kernelh-split-out-instruction-pointer-accessors.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/kernelh-split-out-instruction-pointer-accessors.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/kernelh-split-out-instruction-pointer-accessors.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: kernel.h: split out instruction pointer accessors
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.
Link: https://lkml.kernel.org/r/20211028161248.45232-1-andriy.shevchenko@xxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/bottom_half.h | 2 +-
include/linux/instruction_pointer.h | 8 ++++++++
include/linux/kernel.h | 4 +---
3 files changed, 10 insertions(+), 4 deletions(-)
--- a/include/linux/bottom_half.h~kernelh-split-out-instruction-pointer-accessors
+++ a/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)
--- /dev/null
+++ a/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 */
--- a/include/linux/kernel.h~kernelh-split-out-instruction-pointer-accessors
+++ a/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
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
memblock-use-memblock_free-for-freeing-virtual-pointers-fix.patch
kernelh-drop-unneeded-linux-kernelh-inclusion-from-other-headers-fix.patch
kernelh-split-out-instruction-pointer-accessors.patch
