From 8c25f26eadb54ca00a0340e79dd31c516d6ff708 Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Tue, 28 Apr 2020 11:24:20 -0700
Subject: [PATCH] ANDROID: cfi: remove unnecessary <asm/memory.h> include

This change makes it possible to compile CFI for x86, which doesn't
provide this header file.

Bug: 145297900
Change-Id: I60ad190bb0c2296b67eef2194b72f381e7f94e2c
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
 kernel/cfi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/cfi.c b/kernel/cfi.c
index 967b0755c00e..b23f6ede42ca 100644
--- a/kernel/cfi.c
+++ b/kernel/cfi.c
@@ -12,7 +12,6 @@
 #include <linux/spinlock.h>
 #include <asm/bug.h>
 #include <asm/cacheflush.h>
-#include <asm/memory.h>
 #include <asm/set_memory.h>
 
 /* Compiler-defined handler names */