Commit 4e3884fc authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Use "long" for 64-bit values on 64-bit kernel. 



This would get rid of some warnings about "long" vs. "long long".

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent acd86b86

include/asm-mips/addrspace.h

+22 −18
Original line number Diff line number Diff line
@@ -19,12 +19,16 @@ 
#define _ATYPE_

#define _ATYPE32_

#define _ATYPE64_

#define _LLCONST_(x)	x

#define _CONST64_(x)	x

#else

#define _ATYPE_		__PTRDIFF_TYPE__

#define _ATYPE32_	int

#define _ATYPE64_	long long

#define _LLCONST_(x)	x ## LL

#define _ATYPE64_	__s64

#ifdef CONFIG_64BIT

#define _CONST64_(x)	x ## L

#else

#define _CONST64_(x)	x ## LL

#endif

#endif



/*
@@ -48,7 +52,7 @@ 
 */

#define CPHYSADDR(a)		((_ACAST32_(a)) & 0x1fffffff)

#define XPHYSADDR(a)            ((_ACAST64_(a)) &			\

				 _LLCONST_(0x000000ffffffffff))

				 _CONST64_(0x000000ffffffffff))



#ifdef CONFIG_64BIT
@@ -57,14 +61,14 @@ 
 * 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 XKUSEG			_CONST64_(0x0000000000000000)

#define XKSSEG			_CONST64_(0x4000000000000000)

#define XKPHYS			_CONST64_(0x8000000000000000)

#define XKSEG			_CONST64_(0xc000000000000000)

#define CKSEG0			_CONST64_(0xffffffff80000000)

#define CKSEG1			_CONST64_(0xffffffffa0000000)

#define CKSSEG			_CONST64_(0xffffffffc0000000)

#define CKSEG3			_CONST64_(0xffffffffe0000000)



#define CKSEG0ADDR(a)		(CPHYSADDR(a) | CKSEG0)

#define CKSEG1ADDR(a)		(CPHYSADDR(a) | CKSEG1)
@@ -122,7 +126,7 @@ 
#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) | \

#define PHYS_TO_XKPHYS(cm,a)		(_CONST64_(0x8000000000000000) | \

					 ((cm)<<59) | (a))



#if defined (CONFIG_CPU_R4300)						\
@@ -132,20 +136,20 @@ 
    || defined (CONFIG_CPU_NEVADA)					\

    || defined (CONFIG_CPU_TX49XX)					\

    || defined (CONFIG_CPU_MIPS64)

#define TO_PHYS_MASK	_LLCONST_(0x0000000fffffffff)	/* 2^^36 - 1 */

#define TO_PHYS_MASK	_CONST64_(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 */

#define TO_PHYS_MASK	_CONST64_(0x000000ffffffffff)	/* 2^^40 - 1 */

#endif



#if defined (CONFIG_CPU_R10000)

#define TO_PHYS_MASK	_LLCONST_(0x000000ffffffffff)	/* 2^^40 - 1 */

#define TO_PHYS_MASK	_CONST64_(0x000000ffffffffff)	/* 2^^40 - 1 */

#endif



#if defined(CONFIG_CPU_SB1) || defined(CONFIG_CPU_SB1A)

#define TO_PHYS_MASK	_LLCONST_(0x00000fffffffffff)	/* 2^^44 - 1 */

#define TO_PHYS_MASK	_CONST64_(0x00000fffffffffff)	/* 2^^44 - 1 */

#endif



#ifndef CONFIG_CPU_R8000
@@ -155,7 +159,7 @@ 
 * in order to catch bugs in the source code.

 */



#define COMPAT_K1BASE32		_LLCONST_(0xffffffffa0000000)

#define COMPAT_K1BASE32		_CONST64_(0xffffffffa0000000)

#define PHYS_TO_COMPATK1(x)	((x) | COMPAT_K1BASE32) /* 32-bit compat k1 */



#endif