CFI: Move function_nocfi() into compiler.h
authorMark Rutland <mark.rutland@arm.com>
Wed, 2 Jun 2021 15:37:01 +0000 (16:37 +0100)
committerKees Cook <keescook@chromium.org>
Mon, 14 Jun 2021 16:12:09 +0000 (09:12 -0700)
commit590e8a082a5772071d7bcfea2b8e5a2453cecad2
treeabbe1d22c6fd26af71471ca6495d2f9a3ace9f80
parent3f1639f8f96c4c60ccf737b02c61eb7c59355a5b
CFI: Move function_nocfi() into compiler.h

Currently the common definition of function_nocfi() is provided by
<linux/mm.h>, and architectures are expected to provide a definition in
<asm/memory.h>. Due to header dependencies, this can make it hard to use
function_nocfi() in low-level headers.

As function_nocfi() has no dependency on any mm code, nor on any memory
definitions, it doesn't need to live in <linux/mm.h> or <asm/memory.h>.
Generally, it would make more sense for it to live in
<linux/compiler.h>, where an architecture can override it in
<asm/compiler.h>.

Move the definitions accordingly.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210602153701.35957-1-mark.rutland@arm.com
arch/arm64/include/asm/compiler.h
arch/arm64/include/asm/memory.h
include/linux/compiler.h
include/linux/mm.h