diff options
author | Peter Zijlstra <peterz@infradead.org> | 2023-12-15 10:12:17 +0100 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2023-12-15 16:25:55 -0800 |
commit | 4382159696c9af67ee047ed55f2dbf05480f52f6 (patch) | |
tree | 9e971990bd6bce7207d849991ac878731c6d70c4 /arch/riscv | |
parent | 1467affd16b236fc86e1b8ec5eaa147e104cd2a6 (diff) | |
download | linux-stable-4382159696c9af67ee047ed55f2dbf05480f52f6.tar.gz linux-stable-4382159696c9af67ee047ed55f2dbf05480f52f6.tar.bz2 linux-stable-4382159696c9af67ee047ed55f2dbf05480f52f6.zip |
cfi: Flip headers
Normal include order is that linux/foo.h should include asm/foo.h, CFI has it
the wrong way around.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Link: https://lore.kernel.org/r/20231215092707.231038174@infradead.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'arch/riscv')
-rw-r--r-- | arch/riscv/include/asm/cfi.h | 3 | ||||
-rw-r--r-- | arch/riscv/kernel/cfi.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/riscv/include/asm/cfi.h b/arch/riscv/include/asm/cfi.h index 56bf9d69d5e3..8f7a62257044 100644 --- a/arch/riscv/include/asm/cfi.h +++ b/arch/riscv/include/asm/cfi.h @@ -7,8 +7,9 @@ * * Copyright (C) 2023 Google LLC */ +#include <linux/bug.h> -#include <linux/cfi.h> +struct pt_regs; #ifdef CONFIG_CFI_CLANG enum bug_trap_type handle_cfi_failure(struct pt_regs *regs); diff --git a/arch/riscv/kernel/cfi.c b/arch/riscv/kernel/cfi.c index 820158d7a291..6ec9dbd7292e 100644 --- a/arch/riscv/kernel/cfi.c +++ b/arch/riscv/kernel/cfi.c @@ -4,7 +4,7 @@ * * Copyright (C) 2023 Google LLC */ -#include <asm/cfi.h> +#include <linux/cfi.h> #include <asm/insn.h> /* |