mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 04:11:49 +00:00
2961b42303
This patch fixes the following compile error caused by
commit 23cf11ddb5
(mips: types: use <asm-generic/int-*.h> for the mips architecture):
<-- snip -->
...
CC kernel/bounds.s
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
include2/asm/types.h:56:2: error: #endif without #if
make[2]: *** [kernel/bounds.s] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
55 lines
1.1 KiB
C
55 lines
1.1 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle
|
|
* Copyright (C) 1999 Silicon Graphics, Inc.
|
|
*/
|
|
#ifndef _ASM_TYPES_H
|
|
#define _ASM_TYPES_H
|
|
|
|
#if _MIPS_SZLONG == 64
|
|
# include <asm-generic/int-l64.h>
|
|
#else
|
|
# include <asm-generic/int-ll64.h>
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
typedef unsigned short umode_t;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
/*
|
|
* These aren't exported outside the kernel to avoid name space clashes
|
|
*/
|
|
#ifdef __KERNEL__
|
|
|
|
#define BITS_PER_LONG _MIPS_SZLONG
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|
|
|| defined(CONFIG_64BIT)
|
|
typedef u64 dma_addr_t;
|
|
#else
|
|
typedef u32 dma_addr_t;
|
|
#endif
|
|
typedef u64 dma64_addr_t;
|
|
|
|
/*
|
|
* Don't use phys_t. You've been warned.
|
|
*/
|
|
#ifdef CONFIG_64BIT_PHYS_ADDR
|
|
typedef unsigned long long phys_t;
|
|
#else
|
|
typedef unsigned long phys_t;
|
|
#endif
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _ASM_TYPES_H */
|