android-mainline/TODO-diff-leftover-after-SCS-reverts.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Fri, 19 Jun 2020 22:55:07 +0200
Subject: TODO: diff leftover after SCS reverts

Last one of the reverts is
294257f516cf ("Revert "FROMLIST: add support for Clang's Shadow Call Stack (SCS)"")

Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I3441ada10c60527703818a21a67aa6c753bdba81
---
 arch/arm64/kernel/vdso/Makefile | 1 -
 arch/arm64/kvm/hyp/Makefile     | 3 ++-
 include/linux/compiler-clang.h  | 1 +
 kernel/fork.c                   | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@ -26,7 +26,6 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING
 VDSO_LDFLAGS := -Bsymbolic
 
 CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_LTO)
-KBUILD_CFLAGS			+= $(DISABLE_LTO)
 KASAN_SANITIZE			:= n
 UBSAN_SANITIZE			:= n
 OBJECT_FILES_NON_STANDARD	:= y
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -28,5 +28,6 @@ GCOV_PROFILE	:= n
 KASAN_SANITIZE	:= n
 UBSAN_SANITIZE	:= n
 KCOV_INSTRUMENT	:= n
-# remove SCS and CFI flags from all objects in this directory
+
+# remove CFI flags from all objects in this directory
 KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_CFI), $(KBUILD_CFLAGS))
diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
@@ -43,6 +43,7 @@
  */
 #define barrier() __asm__ __volatile__("" : : : "memory")
 
+
 #ifdef CONFIG_LTO_CLANG
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 #define __norecordmcount \
diff --git a/kernel/fork.c b/kernel/fork.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -94,6 +94,7 @@
 #include <linux/thread_info.h>
 #include <linux/stackleak.h>
 #include <linux/kasan.h>
+#include <linux/cpufreq_times.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>