From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 18 Aug 2011 19:13:50 +0000 (+0100)
Subject: um: generic ftrace.h will do...
X-Git-Tag: firefly_0821_release~3680^2~4231^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b8c655d727ebfe78769b62a0349227d5a656e967;p=firefly-linux-kernel-4.4.55.git

um: generic ftrace.h will do...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 5962826ac205..451f4517b334 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -1,2 +1,3 @@
 generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
 generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
+generic-y += ftrace.h
diff --git a/arch/um/include/asm/ftrace.h b/arch/um/include/asm/ftrace.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/arch/um/include/asm/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */