Commit 43821596 authored Dec 15, 2023 by Peter Zijlstra Committed by Alexei Starovoitov Dec 15, 2023

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>

parent 1467affd

arch/riscv/include/asm/cfi.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

arch/riscv/kernel/cfi.c

+1 −1

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

		/*

arch/x86/include/asm/cfi.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,8 +7,9 @@
		*
		* Copyright (C) 2022 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);

arch/x86/kernel/cfi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,10 +4,10 @@
		*
		* Copyright (C) 2022 Google LLC
		*/
		#include <asm/cfi.h>
		#include <linux/string.h>
		#include <linux/cfi.h>
		#include <asm/insn.h>
		#include <asm/insn-eval.h>
		#include <linux/string.h>

		/*
		* Returns the target address and the expected type when regs->ip points

include/asm-generic/Kbuild

+1 −0

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