Merge with Linux 2.4.0-test12.

6 files changed, 11 insertions, 11 deletions

diff --git a/arch/m68k/fpsp040/bindec.S b/arch/m68k/fpsp040/bindec.S
index ef3a627bf..9fb65e320 100644
--- a/arch/m68k/fpsp040/bindec.S
+++ b/arch/m68k/fpsp040/bindec.S
@@ -484,7 +484,7 @@ A9_str:
 	fmovex	(%a0),%fp0	|load X from memory
 	fabsx	%fp0		|use abs(X)
 	tstw	%d5		|LAMBDA is in lower word of d5
-	bnes	sc_mul		|if neg (LAMBDA = 1), scale by mul
+	bne	sc_mul		|if neg (LAMBDA = 1), scale by mul
 	fdivx	%fp1,%fp0		|calculate X / SCALE -> Y to fp0
 	bras	A10_st		|branch to A10
 
diff --git a/arch/m68k/fpsp040/decbin.S b/arch/m68k/fpsp040/decbin.S
index af1279a4a..d2bf1b641 100644
--- a/arch/m68k/fpsp040/decbin.S
+++ b/arch/m68k/fpsp040/decbin.S
@@ -230,7 +230,7 @@ nextlw:
 |
 m_sign:
 	btst	#31,(%a0)	|test sign of the mantissa
-	beqs	ap_st_z		|if clear, go to append/strip zeros
+	beq	ap_st_z		|if clear, go to append/strip zeros
 	fnegx	%fp0		|if set, negate fp0
 	
 |
@@ -288,7 +288,7 @@ ap_st_z:
 	cmpl	#27,%d1		|test is with 27
 	ble	pwrten		|if abs(expA) <28, skip ap/st zeros
 	btst	#30,(%a0)	|check sign of exp
-	bnes	ap_st_n		|if neg, go to neg side
+	bne	ap_st_n		|if neg, go to neg side
 	clrl	%d1		|zero count reg
 	movel	(%a0),%d4		|load lword 1 to d4
 	bfextu	%d4{#28:#4},%d0	|get M16 in d0
@@ -336,7 +336,7 @@ ap_p_en:
 	tstl	%d0		|check if d0 is zero
 	bnes	ap_p_el		|if not, get next bit
 	fmulx	%fp1,%fp0		|mul mantissa by 10**(no_bits_shifted)
-	bras	pwrten		|go calc pwrten
+	bra	pwrten		|go calc pwrten
 |
 | This section handles a negative adjusted exponent.
 |
diff --git a/arch/m68k/fpsp040/do_func.S b/arch/m68k/fpsp040/do_func.S
index 2df0c3700..0a9c776f0 100644
--- a/arch/m68k/fpsp040/do_func.S
+++ b/arch/m68k/fpsp040/do_func.S
@@ -77,7 +77,7 @@ not_fmovecr:
 	movew	CMDREG1B(%a6),%d0
 	andl	#0x7F,%d0
 	cmpil	#0x38,%d0		|if the extension is >= $38, 
-	bges	serror		|it is illegal
+	bge	serror		|it is illegal
 	bfextu	STAG(%a6){#0:#3},%d1
 	lsll	#3,%d0		|make room for STAG
 	addl	%d1,%d0		|combine for final index into table
diff --git a/arch/m68k/fpsp040/get_op.S b/arch/m68k/fpsp040/get_op.S
index 2bd236d45..480405d4f 100644
--- a/arch/m68k/fpsp040/get_op.S
+++ b/arch/m68k/fpsp040/get_op.S
@@ -171,7 +171,7 @@ PTENRP:
 get_op:
 	clrb	DY_MO_FLG(%a6)
 	tstb	UFLG_TMP(%a6)	|test flag for unsupp/unimp state
-	beqs	uni_getop
+	beq	uni_getop
 
 uns_getop:
 	btstb	#direction_bit,CMDREG1B(%a6)
diff --git a/arch/m68k/fpsp040/util.S b/arch/m68k/fpsp040/util.S
index e59b352ab..cc9ae013b 100644
--- a/arch/m68k/fpsp040/util.S
+++ b/arch/m68k/fpsp040/util.S
@@ -138,20 +138,20 @@ ovf_e1_exc:
 |
 ovf_fsgl:
 	clrl	%d0
-	bras	ovf_res
+	bra	ovf_res
 
 ovff_sgl:
 	movel	#0x00000001,%d0		|set single
-	bras	ovf_res
+	bra	ovf_res
 ovff_dbl:
 	movel	#0x00000002,%d0		|set double
-	bras	ovf_res
+	bra	ovf_res
 |
 | The precision is in the fpcr.
 |
 ovf_fpcr:
 	bfextu	FPCR_MODE(%a6){#0:#2},%d0 |set round precision
-	bras	ovf_res
+	bra	ovf_res
 	
 |
 |
diff --git a/arch/m68k/fpsp040/x_store.S b/arch/m68k/fpsp040/x_store.S
index a3468f338..b3357fd65 100644
--- a/arch/m68k/fpsp040/x_store.S
+++ b/arch/m68k/fpsp040/x_store.S
@@ -92,7 +92,7 @@ opc011:
 	cmpil	#0,%d0		|if dest format is extended
 	beq	dest_ext	|then branch
 	cmpil	#1,%d0		|if dest format is single
-	beqs	dest_sgl	|then branch
+	beq	dest_sgl	|then branch
 |
 |	fall through to dest_dbl
 |