| From: Ilya Leoshkevich <iii@linux.ibm.com> |
| Subject: kmsan: remove an x86-specific #include from kmsan.h |
| Date: Fri, 21 Jun 2024 13:34:52 +0200 |
| |
| Replace the x86-specific asm/pgtable_64_types.h #include with the |
| linux/pgtable.h one, which all architectures have. |
| |
| While at it, sort the headers alphabetically for the sake of consistency |
| with other KMSAN code. |
| |
| Link: https://lkml.kernel.org/r/20240621113706.315500-9-iii@linux.ibm.com |
| Fixes: f80be4571b19 ("kmsan: add KMSAN runtime core") |
| Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> |
| Suggested-by: Heiko Carstens <hca@linux.ibm.com> |
| Reviewed-by: Alexander Potapenko <glider@google.com> |
| Cc: Alexander Gordeev <agordeev@linux.ibm.com> |
| Cc: Christian Borntraeger <borntraeger@linux.ibm.com> |
| Cc: Christoph Lameter <cl@linux.com> |
| Cc: David Rientjes <rientjes@google.com> |
| Cc: Dmitry Vyukov <dvyukov@google.com> |
| Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> |
| Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> |
| Cc: <kasan-dev@googlegroups.com> |
| Cc: Marco Elver <elver@google.com> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org> |
| Cc: Pekka Enberg <penberg@kernel.org> |
| Cc: Roman Gushchin <roman.gushchin@linux.dev> |
| Cc: Steven Rostedt (Google) <rostedt@goodmis.org> |
| Cc: Sven Schnelle <svens@linux.ibm.com> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Cc: Vlastimil Babka <vbabka@suse.cz> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| mm/kmsan/kmsan.h | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/mm/kmsan/kmsan.h~kmsan-remove-an-x86-specific-include-from-kmsanh |
| +++ a/mm/kmsan/kmsan.h |
| @@ -10,14 +10,14 @@ |
| #ifndef __MM_KMSAN_KMSAN_H |
| #define __MM_KMSAN_KMSAN_H |
| |
| -#include <asm/pgtable_64_types.h> |
| #include <linux/irqflags.h> |
| +#include <linux/mm.h> |
| +#include <linux/nmi.h> |
| +#include <linux/pgtable.h> |
| +#include <linux/printk.h> |
| #include <linux/sched.h> |
| #include <linux/stackdepot.h> |
| #include <linux/stacktrace.h> |
| -#include <linux/nmi.h> |
| -#include <linux/mm.h> |
| -#include <linux/printk.h> |
| |
| #define KMSAN_ALLOCA_MAGIC_ORIGIN 0xabcd0100 |
| #define KMSAN_CHAIN_MAGIC_ORIGIN 0xabcd0200 |
| _ |