From 9cfc3cb4ec5e19a9cdba48bd2809f5acbf8b8207 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Fri, 17 Jul 2020 20:37:45 +0200 Subject: [PATCH] ANDROID: Drop orphan out-of-tree diff after CFI revert This cleans up a left over difference from resolving the revert for the CFI support. Cc: Greg Kroah-Hartman Fixes: bd98af7d214e ("Revert "ANDROID: add support for Clang's Control Flow Integrity (CFI)"") Signed-off-by: Matthias Maennich Change-Id: Idaeb8d2a47b724f26f491460d4ebfbdc848ec3ba --- include/linux/compiler_types.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 9efb884aad55..01dd58c74d80 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -231,10 +231,6 @@ struct ftrace_likely_data { # define __noscs #endif -#ifndef __norecordmcount -# define __norecordmcount -#endif - #ifndef asm_volatile_goto #define asm_volatile_goto(x...) asm goto(x) #endif