From 0025adf20090a3ce1a9b07b4f500e13ccd6ae0ce Mon Sep 17 00:00:00 2001
From: Alexander Potapenko <glider@google.com>
Date: Fri, 7 Dec 2018 13:05:55 +0100
Subject: [PATCH] kmsan: revert changes to syscalls.h

---
 include/linux/syscalls.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 36f6591f1487f..2ac3d13a915bf 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -76,7 +76,6 @@ union bpf_attr;
 #include <linux/signal.h>
 #include <linux/list.h>
 #include <linux/bug.h>
-#include <linux/kmsan.h>
 #include <linux/sem.h>
 #include <asm/siginfo.h>
 #include <linux/unistd.h>
@@ -242,7 +241,6 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)
 	ALLOW_ERROR_INJECTION(sys##name, ERRNO);			\
 	static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
 	asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\
-	__no_sanitize_memory						\
 	asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\
 	{								\
 		long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));\