Commit 766160c2 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds

[PATCH] mips: fix build warnings

This patch has fixed the following warnings.

arch/mips/kernel/genex.S:250:5: warning: "CONFIG_64BIT" is not defined
arch/mips/math-emu/cp1emu.c:1128:5: warning: "__mips64" is not defined
arch/mips/math-emu/cp1emu.c:1206:5: warning: "__mips64" is not defined
arch/mips/math-emu/cp1emu.c:1270:5: warning: "__mips64" is not defined
arch/mips/math-emu/cp1emu.c:323:5: warning: "__mips64" is not defined
arch/mips/math-emu/cp1emu.c:808:5: warning: "__mips64" is not defined
arch/mips/math-emu/cp1emu.c:953:5: warning: "__mips64" is not defined
arch/mips/mm/tlbex.c:519:5: warning: "CONFIG_64BIT" is not defined
include/asm/reg.h:73:5: warning: "CONFIG_64BIT" is not defined
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed5ba2fb
...@@ -244,10 +244,10 @@ NESTED(nmi_handler, PT_SIZE, sp) ...@@ -244,10 +244,10 @@ NESTED(nmi_handler, PT_SIZE, sp)
start with an n and gas will believe \n is ok ... */ start with an n and gas will believe \n is ok ... */
.macro __BUILD_verbose nexception .macro __BUILD_verbose nexception
LONG_L a1, PT_EPC(sp) LONG_L a1, PT_EPC(sp)
#if CONFIG_32BIT #ifdef CONFIG_32BIT
PRINT("Got \nexception at %08lx\012") PRINT("Got \nexception at %08lx\012")
#endif #endif
#if CONFIG_64BIT #ifdef CONFIG_64BIT
PRINT("Got \nexception at %016lx\012") PRINT("Got \nexception at %016lx\012")
#endif #endif
.endm .endm
......
...@@ -320,7 +320,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx) ...@@ -320,7 +320,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx)
case cop1_op: case cop1_op:
switch (MIPSInst_RS(ir)) { switch (MIPSInst_RS(ir)) {
#if __mips64 && !defined(SINGLE_ONLY_FPU) #if defined(__mips64) && !defined(SINGLE_ONLY_FPU)
case dmfc_op: case dmfc_op:
/* copregister fs -> gpr[rt] */ /* copregister fs -> gpr[rt] */
if (MIPSInst_RT(ir) != 0) { if (MIPSInst_RT(ir) != 0) {
...@@ -805,7 +805,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx, ...@@ -805,7 +805,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,
ieee754dp d; ieee754dp d;
ieee754sp s; ieee754sp s;
int w; int w;
#if __mips64 #ifdef __mips64
s64 l; s64 l;
#endif #endif
} rv; /* resulting value */ } rv; /* resulting value */
...@@ -950,7 +950,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx, ...@@ -950,7 +950,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,
} }
#endif /* __mips >= 2 */ #endif /* __mips >= 2 */
#if __mips64 && !defined(SINGLE_ONLY_FPU) #if defined(__mips64) && !defined(SINGLE_ONLY_FPU)
case fcvtl_op:{ case fcvtl_op:{
ieee754sp fs; ieee754sp fs;
...@@ -1125,7 +1125,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx, ...@@ -1125,7 +1125,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,
} }
#endif #endif
#if __mips64 && !defined(SINGLE_ONLY_FPU) #if defined(__mips64) && !defined(SINGLE_ONLY_FPU)
case fcvtl_op:{ case fcvtl_op:{
ieee754dp fs; ieee754dp fs;
...@@ -1203,7 +1203,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx, ...@@ -1203,7 +1203,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,
break; break;
} }
#if __mips64 && !defined(SINGLE_ONLY_FPU) #if defined(__mips64) && !defined(SINGLE_ONLY_FPU)
case l_fmt:{ case l_fmt:{
switch (MIPSInst_FUNC(ir)) { switch (MIPSInst_FUNC(ir)) {
case fcvts_op: case fcvts_op:
...@@ -1267,7 +1267,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx, ...@@ -1267,7 +1267,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,
case w_fmt: case w_fmt:
SITOREG(rv.w, MIPSInst_FD(ir)); SITOREG(rv.w, MIPSInst_FD(ir));
break; break;
#if __mips64 && !defined(SINGLE_ONLY_FPU) #if defined(__mips64) && !defined(SINGLE_ONLY_FPU)
case l_fmt: case l_fmt:
DITOREG(rv.l, MIPSInst_FD(ir)); DITOREG(rv.l, MIPSInst_FD(ir));
break; break;
......
...@@ -516,7 +516,7 @@ static __init int rel_lo(long val) ...@@ -516,7 +516,7 @@ static __init int rel_lo(long val)
static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr) static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr)
{ {
#if CONFIG_64BIT #ifdef CONFIG_64BIT
if (!in_compat_space_p(addr)) { if (!in_compat_space_p(addr)) {
i_lui(buf, rs, rel_highest(addr)); i_lui(buf, rs, rel_highest(addr));
if (rel_higher(addr)) if (rel_higher(addr))
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#endif #endif
#if CONFIG_64BIT #ifdef CONFIG_64BIT
#define EF_R0 0 #define EF_R0 0
#define EF_R1 1 #define EF_R1 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment