summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-02 18:08:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-02 18:08:45 +0100
commit74e5c265a4955d6a01adc40783346b716271170b (patch)
treefc47a6b896e07a06d4bc14cfb5a475fc59d022c3 /arch/s390/include
parentMerge tag 'openrisc-for-linus' of git://github.com/openrisc/linux (diff)
parents390/kbuild: enable modversions for symbols exported from asm (diff)
downloadlinux-74e5c265a4955d6a01adc40783346b716271170b.tar.xz
linux-74e5c265a4955d6a01adc40783346b716271170b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "Two bug fixes for 4.10-rc3" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/kbuild: enable modversions for symbols exported from asm s390/vtime: correct system time accounting
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/asm-prototypes.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/s390/include/asm/asm-prototypes.h b/arch/s390/include/asm/asm-prototypes.h
new file mode 100644
index 000000000000..2c3413b0ca52
--- /dev/null
+++ b/arch/s390/include/asm/asm-prototypes.h
@@ -0,0 +1,8 @@
+#ifndef _ASM_S390_PROTOTYPES_H
+
+#include <linux/kvm_host.h>
+#include <linux/ftrace.h>
+#include <asm/fpu/api.h>
+#include <asm-generic/asm-prototypes.h>
+
+#endif /* _ASM_S390_PROTOTYPES_H */