diff options
Diffstat (limited to 'arch/mips/include/asm/types.h')
| -rw-r--r-- | arch/mips/include/asm/types.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index 533812b61881..1228b25b290a 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -15,18 +15,16 @@ * 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__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - /* * These aren't exported outside the kernel to avoid name space clashes */ |