Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cfi: Flip headers

Browse Source 
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>
This commit is contained in:
Peter Zijlstra 2023-12-15 10:12:17 +01:00 committed by Alexei Starovoitov
parent 1467affd16
commit 4382159696
7 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/riscv/include/asm/cfi.h
View File

@ -7,8 +7,9 @@
* *
* Copyright (C) 2023 Google LLC * Copyright (C) 2023 Google LLC
*/ */
#include <linux/bug.h>
#include <linux/cfi.h> struct pt_regs;
#ifdef CONFIG_CFI_CLANG #ifdef CONFIG_CFI_CLANG
enum bug_trap_type handle_cfi_failure(struct pt_regs *regs); enum bug_trap_type handle_cfi_failure(struct pt_regs *regs);

2
arch/riscv/kernel/cfi.c
View File

@ -4,7 +4,7 @@
* *
* Copyright (C) 2023 Google LLC * Copyright (C) 2023 Google LLC
*/ */
#include <asm/cfi.h> #include <linux/cfi.h>
#include <asm/insn.h> #include <asm/insn.h>
/* /*

3
arch/x86/include/asm/cfi.h
View File

@ -7,8 +7,9 @@
* *
* Copyright (C) 2022 Google LLC * Copyright (C) 2022 Google LLC
*/ */
#include <linux/bug.h>
#include <linux/cfi.h> struct pt_regs;
#ifdef CONFIG_CFI_CLANG #ifdef CONFIG_CFI_CLANG
enum bug_trap_type handle_cfi_failure(struct pt_regs *regs); enum bug_trap_type handle_cfi_failure(struct pt_regs *regs);

4
arch/x86/kernel/cfi.c
View File

@ -4,10 +4,10 @@
* *
* Copyright (C) 2022 Google LLC * Copyright (C) 2022 Google LLC
*/ */
#include <asm/cfi.h> #include <linux/string.h>
#include <linux/cfi.h>
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/insn-eval.h> #include <asm/insn-eval.h>
#include <linux/string.h>
/* /*
* Returns the target address and the expected type when regs->ip points * Returns the target address and the expected type when regs->ip points

1
include/asm-generic/Kbuild
View File

@ -11,6 +11,7 @@ mandatory-y += bitops.h
mandatory-y += bug.h mandatory-y += bug.h
mandatory-y += bugs.h mandatory-y += bugs.h
mandatory-y += cacheflush.h mandatory-y += cacheflush.h
mandatory-y += cfi.h
mandatory-y += checksum.h mandatory-y += checksum.h
mandatory-y += compat.h mandatory-y += compat.h
mandatory-y += current.h mandatory-y += current.h

5
include/asm-generic/cfi.h Normal file
View File

@ -0,0 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __ASM_GENERIC_CFI_H
#define __ASM_GENERIC_CFI_H
#endif /* __ASM_GENERIC_CFI_H */

1
include/linux/cfi.h
View File

@ -9,6 +9,7 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/cfi.h>
#ifdef CONFIG_CFI_CLANG #ifdef CONFIG_CFI_CLANG
enum bug_trap_type report_cfi_failure(struct pt_regs *regs, unsigned long addr, enum bug_trap_type report_cfi_failure(struct pt_regs *regs, unsigned long addr,