summaryrefslogtreecommitdiff
path: root/arch/mips/include
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
committerDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
commit1632b9e2a14ce9f4e08faf6c4380431d63319bd3 (patch)
tree572e45a2de74d233af5d98242bafbd193e074f43 /arch/mips/include
parentfdc29805bd7cae133303045fc0249d76f3827613 (diff)
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
Split trivial #if defined(__KERNEL__) && X conditionals to make automated disintegration easier. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/types.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 533812b6188..9b96461bc1e 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -15,10 +15,14 @@
* We don't use int-l64.h for the kernel anymore but still use it for
* userspace to avoid code changes.
*/
-#if (_MIPS_SZLONG == 64) && !defined(__KERNEL__)
-# include <asm-generic/int-l64.h>
-#else
+#ifdef __KERNEL__
# include <asm-generic/int-ll64.h>
+#else
+# if _MIPS_SZLONG == 64
+# include <asm-generic/int-l64.h>
+# else
+# include <asm-generic/int-ll64.h>
+# endif
#endif
#ifndef __ASSEMBLY__