Merge branches 'no-rebases', 'arch-avr32', 'arch-blackfin', 'arch-cris', 'arch-h8300...

[mirror_ubuntu-bionic-kernel.git] / arch / sh / include / asm / unistd.h

diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h
index 41f59fa827a86bd82ea8e8cab05e57d9e9008429..f1f4775766a64dea0a29b824496e34a9fab60a7f 100644 (file)
--- a/arch/sh/include/asm/unistd.h
+++ b/arch/sh/include/asm/unistd.h
@@ -1,4 +1,3 @@
-#ifdef __KERNEL__
 # ifdef CONFIG_SUPERH32
 #  include <asm/unistd_32.h>
 # else
@@ -39,10 +38,4 @@
  */
 # define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 
-#else
-# ifdef __SH5__
-#  include <asm/unistd_64.h>
-# else
-#  include <asm/unistd_32.h>
-# endif
-#endif
+#include <uapi/asm/unistd.h>