 cee4cca740
			
		
	
	
	cee4cca740
	
	
	
		
			
			* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
		
			
				
	
	
		
			166 lines
		
	
	
	
		
			4.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			166 lines
		
	
	
	
		
			4.5 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) 1996, 99 Ralf Baechle
 | |
|  * Copyright (C) 2000, 2002  Maciej W. Rozycki
 | |
|  * Copyright (C) 1990, 1999 by Silicon Graphics, Inc.
 | |
|  */
 | |
| #ifndef _ASM_ADDRSPACE_H
 | |
| #define _ASM_ADDRSPACE_H
 | |
| 
 | |
| #include <spaces.h>
 | |
| 
 | |
| /*
 | |
|  *  Configure language
 | |
|  */
 | |
| #ifdef __ASSEMBLY__
 | |
| #define _ATYPE_
 | |
| #define _ATYPE32_
 | |
| #define _ATYPE64_
 | |
| #define _LLCONST_(x)	x
 | |
| #else
 | |
| #define _ATYPE_		__PTRDIFF_TYPE__
 | |
| #define _ATYPE32_	int
 | |
| #define _ATYPE64_	long long
 | |
| #define _LLCONST_(x)	x ## LL
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  *  32-bit MIPS address spaces
 | |
|  */
 | |
| #ifdef __ASSEMBLY__
 | |
| #define _ACAST32_
 | |
| #define _ACAST64_
 | |
| #else
 | |
| #define _ACAST32_		(_ATYPE_)(_ATYPE32_)	/* widen if necessary */
 | |
| #define _ACAST64_		(_ATYPE64_)		/* do _not_ narrow */
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * Returns the kernel segment base of a given address
 | |
|  */
 | |
| #define KSEGX(a)		((_ACAST32_ (a)) & 0xe0000000)
 | |
| 
 | |
| /*
 | |
|  * Returns the physical address of a CKSEGx / XKPHYS address
 | |
|  */
 | |
| #define CPHYSADDR(a)		((_ACAST32_(a)) & 0x1fffffff)
 | |
| #define XPHYSADDR(a)            ((_ACAST64_(a)) &			\
 | |
| 				 _LLCONST_(0x000000ffffffffff))
 | |
| 
 | |
| #ifdef CONFIG_64BIT
 | |
| 
 | |
| /*
 | |
|  * Memory segments (64bit kernel mode addresses)
 | |
|  * The compatibility segments use the full 64-bit sign extended value.  Note
 | |
|  * the R8000 doesn't have them so don't reference these in generic MIPS code.
 | |
|  */
 | |
| #define XKUSEG			_LLCONST_(0x0000000000000000)
 | |
| #define XKSSEG			_LLCONST_(0x4000000000000000)
 | |
| #define XKPHYS			_LLCONST_(0x8000000000000000)
 | |
| #define XKSEG			_LLCONST_(0xc000000000000000)
 | |
| #define CKSEG0			_LLCONST_(0xffffffff80000000)
 | |
| #define CKSEG1			_LLCONST_(0xffffffffa0000000)
 | |
| #define CKSSEG			_LLCONST_(0xffffffffc0000000)
 | |
| #define CKSEG3			_LLCONST_(0xffffffffe0000000)
 | |
| 
 | |
| #define CKSEG0ADDR(a)		(CPHYSADDR(a) | CKSEG0)
 | |
| #define CKSEG1ADDR(a)		(CPHYSADDR(a) | CKSEG1)
 | |
| #define CKSEG2ADDR(a)		(CPHYSADDR(a) | CKSEG2)
 | |
| #define CKSEG3ADDR(a)		(CPHYSADDR(a) | CKSEG3)
 | |
| 
 | |
| #else
 | |
| 
 | |
| #define CKSEG0ADDR(a)		(CPHYSADDR(a) | KSEG0)
 | |
| #define CKSEG1ADDR(a)		(CPHYSADDR(a) | KSEG1)
 | |
| #define CKSEG2ADDR(a)		(CPHYSADDR(a) | KSEG2)
 | |
| #define CKSEG3ADDR(a)		(CPHYSADDR(a) | KSEG3)
 | |
| 
 | |
| /*
 | |
|  * Map an address to a certain kernel segment
 | |
|  */
 | |
| #define KSEG0ADDR(a)		(CPHYSADDR(a) | KSEG0)
 | |
| #define KSEG1ADDR(a)		(CPHYSADDR(a) | KSEG1)
 | |
| #define KSEG2ADDR(a)		(CPHYSADDR(a) | KSEG2)
 | |
| #define KSEG3ADDR(a)		(CPHYSADDR(a) | KSEG3)
 | |
| 
 | |
| /*
 | |
|  * Memory segments (32bit kernel mode addresses)
 | |
|  * These are the traditional names used in the 32-bit universe.
 | |
|  */
 | |
| #define KUSEG			0x00000000
 | |
| #define KSEG0			0x80000000
 | |
| #define KSEG1			0xa0000000
 | |
| #define KSEG2			0xc0000000
 | |
| #define KSEG3			0xe0000000
 | |
| 
 | |
| #define CKUSEG			0x00000000
 | |
| #define CKSEG0			0x80000000
 | |
| #define CKSEG1			0xa0000000
 | |
| #define CKSEG2			0xc0000000
 | |
| #define CKSEG3			0xe0000000
 | |
| 
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * Cache modes for XKPHYS address conversion macros
 | |
|  */
 | |
| #define K_CALG_COH_EXCL1_NOL2	0
 | |
| #define K_CALG_COH_SHRL1_NOL2	1
 | |
| #define K_CALG_UNCACHED		2
 | |
| #define K_CALG_NONCOHERENT	3
 | |
| #define K_CALG_COH_EXCL		4
 | |
| #define K_CALG_COH_SHAREABLE	5
 | |
| #define K_CALG_NOTUSED		6
 | |
| #define K_CALG_UNCACHED_ACCEL	7
 | |
| 
 | |
| /*
 | |
|  * 64-bit address conversions
 | |
|  */
 | |
| #define PHYS_TO_XKSEG_UNCACHED(p)	PHYS_TO_XKPHYS(K_CALG_UNCACHED,(p))
 | |
| #define PHYS_TO_XKSEG_CACHED(p)		PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE,(p))
 | |
| #define XKPHYS_TO_PHYS(p)		((p) & TO_PHYS_MASK)
 | |
| #define PHYS_TO_XKPHYS(cm,a)		(_LLCONST_(0x8000000000000000) | \
 | |
| 					 ((cm)<<59) | (a))
 | |
| 
 | |
| #if defined (CONFIG_CPU_R4300)						\
 | |
|     || defined (CONFIG_CPU_R4X00)					\
 | |
|     || defined (CONFIG_CPU_R5000)					\
 | |
|     || defined (CONFIG_CPU_RM7000)					\
 | |
|     || defined (CONFIG_CPU_NEVADA)					\
 | |
|     || defined (CONFIG_CPU_TX49XX)					\
 | |
|     || defined (CONFIG_CPU_MIPS64)
 | |
| #define TO_PHYS_MASK	_LLCONST_(0x0000000fffffffff)	/* 2^^36 - 1 */
 | |
| #endif
 | |
| 
 | |
| #if defined (CONFIG_CPU_R8000)
 | |
| /* We keep KUSIZE consistent with R4000 for now (2^^40) instead of (2^^48) */
 | |
| #define TO_PHYS_MASK	_LLCONST_(0x000000ffffffffff)	/* 2^^40 - 1 */
 | |
| #endif
 | |
| 
 | |
| #if defined (CONFIG_CPU_R10000)
 | |
| #define TO_PHYS_MASK	_LLCONST_(0x000000ffffffffff)	/* 2^^40 - 1 */
 | |
| #endif
 | |
| 
 | |
| #if defined(CONFIG_CPU_SB1) || defined(CONFIG_CPU_SB1A)
 | |
| #define TO_PHYS_MASK	_LLCONST_(0x00000fffffffffff)	/* 2^^44 - 1 */
 | |
| #endif
 | |
| 
 | |
| #ifndef CONFIG_CPU_R8000
 | |
| 
 | |
| /*
 | |
|  * The R8000 doesn't have the 32-bit compat spaces so we don't define them
 | |
|  * in order to catch bugs in the source code.
 | |
|  */
 | |
| 
 | |
| #define COMPAT_K1BASE32		_LLCONST_(0xffffffffa0000000)
 | |
| #define PHYS_TO_COMPATK1(x)	((x) | COMPAT_K1BASE32) /* 32-bit compat k1 */
 | |
| 
 | |
| #endif
 | |
| 
 | |
| #define KDM_TO_PHYS(x)		(_ACAST64_ (x) & TO_PHYS_MASK)
 | |
| #define PHYS_TO_K0(x)		(_ACAST64_ (x) | CAC_BASE)
 | |
| 
 | |
| #endif /* _ASM_ADDRSPACE_H */
 |