linux-mips-commits — CVS Commit Patches

[Linux-mips-commits]CVS: linux/arch/mips/math-emu cp1emu.c,1.5,1.6

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/math-emu
In directory usw-pr-cvs1:/tmp/cvs-serv25410

Modified Files:
	cp1emu.c 
Log Message:
Put fp emu trampoline on a properly aligned boundary.

Index: cp1emu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/math-emu/cp1emu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cp1emu.c	2001/08/25 06:24:45	1.5
+++ cp1emu.c	2001/09/21 19:35:57	1.6
@@ -173,7 +173,7 @@
 
 	if (!user_mode(xcp)) {
 		*perr = 0;
-		return (*(unsigned long *) va);
+		return *(unsigned long *) va;
 	}
 
 	*perr = (int) get_user(temp, (unsigned long *) va);
@@ -187,7 +187,7 @@
 
 	if (!user_mode(xcp)) {
 		*perr = 0;
-		return (*(unsigned long long *) va);
+		return *(unsigned long long *) va;
 	}
 
 	*perr = (int) get_user(temp, (unsigned long long *) va);
@@ -230,7 +230,7 @@
  * Two instructions if the instruction is in a branch delay slot.
  */
 
-static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx)
+static int cop1Emulate(struct pt_regs *regs, struct mips_fpu_soft_struct *ctx)
 {
 	mips_instruction ir;
 	vaddr_t emulpc;
@@ -238,17 +238,17 @@
 	unsigned int cond;
 	int err = 0;
 
-	ir = mips_get_word(xcp, REG_TO_VA xcp->cp0_epc, &err);
+	ir = mips_get_word(regs, REG_TO_VA regs->cp0_epc, &err);
 	if (err) {
 		fpuemuprivate.stats.errors++;
 		return SIGBUS;
 	}
 
 	/* XXX NEC Vr54xx bug workaround */
-	if ((xcp->cp0_cause & CAUSEF_BD) && !isBranchInstr(&ir))
-		xcp->cp0_cause &= ~CAUSEF_BD;
+	if ((regs->cp0_cause & CAUSEF_BD) && !isBranchInstr(&ir))
+		regs->cp0_cause &= ~CAUSEF_BD;
 
-	if (xcp->cp0_cause & CAUSEF_BD) {
+	if (regs->cp0_cause & CAUSEF_BD) {
 		/*
 		 * The instruction to be emulated is in a branch delay slot
 		 * which means that we have to  emulate the branch instruction
@@ -261,24 +261,24 @@
 		 * Linux MIPS branch emulator operates on context, updating the
 		 * cp0_epc.
 		 */
-		emulpc = REG_TO_VA(xcp->cp0_epc + 4);	/* Snapshot emulation target */
+		emulpc = REG_TO_VA(regs->cp0_epc + 4);	/* Snapshot emulation target */
 
-		if (__compute_return_epc(xcp)) {
+		if (__compute_return_epc(regs)) {
 #ifdef CP1DBG
 			printk("failed to emulate branch at %p\n",
-				    REG_TO_VA(xcp->cp0_epc));
+				    REG_TO_VA(regs->cp0_epc));
 #endif
-			return SIGILL;;
+			return SIGILL;
 		}
-		ir = mips_get_word(xcp, emulpc, &err);
+		ir = mips_get_word(regs, emulpc, &err);
 		if (err) {
 			fpuemuprivate.stats.errors++;
 			return SIGBUS;
 		}
-		contpc = REG_TO_VA xcp->cp0_epc;
+		contpc = REG_TO_VA regs->cp0_epc;
 	} else {
-		emulpc = REG_TO_VA xcp->cp0_epc;
-		contpc = REG_TO_VA xcp->cp0_epc + 4;
+		emulpc = REG_TO_VA regs->cp0_epc;
+		contpc = REG_TO_VA regs->cp0_epc + 4;
 	}
 
 emul:
@@ -289,12 +289,12 @@
 #ifndef SINGLE_ONLY_FPU
 	case ldc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			int ft = MIPSInst_RT(ir);
-			if (!(xcp->cp0_status & ST0_FR))
+			if (!(regs->cp0_status & ST0_FR))
 				ft &= ~1;
-			ctx->regs[ft] = mips_get_dword(xcp, va, &err);
+			ctx->regs[ft] = mips_get_dword(regs, va, &err);
 			fpuemuprivate.stats.loads++;
 			if (err) {
 				fpuemuprivate.stats.errors++;
@@ -305,13 +305,13 @@
 
 	case sdc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			int ft = MIPSInst_RT(ir);
-			if (!(xcp->cp0_status & ST0_FR))
+			if (!(regs->cp0_status & ST0_FR))
 				ft &= ~1;
 			fpuemuprivate.stats.stores++;
-			if (mips_put_dword(xcp, va, ctx->regs[ft])) {
+			if (mips_put_dword(regs, va, ctx->regs[ft])) {
 				fpuemuprivate.stats.errors++;
 				return SIGBUS;
 			}
@@ -321,17 +321,17 @@
 
 	case lwc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			fpureg_t val;
 			int ft = MIPSInst_RT(ir);
 			fpuemuprivate.stats.loads++;
-			val = mips_get_word(xcp, va, &err);
+			val = mips_get_word(regs, va, &err);
 			if (err) {
 				fpuemuprivate.stats.errors++;
 				return SIGBUS;
 			}
-			if (xcp->cp0_status & ST0_FR) {
+			if (regs->cp0_status & ST0_FR) {
 				/* load whole register */
 				ctx->regs[ft] = val;
 			} else if (ft & 1) {
@@ -353,12 +353,12 @@
 
 	case swc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			unsigned int val;
 			int ft = MIPSInst_RT(ir);
 			fpuemuprivate.stats.stores++;
-			if (xcp->cp0_status & ST0_FR) {
+			if (regs->cp0_status & ST0_FR) {
 				/* store whole register */
 				val = ctx->regs[ft];
 			} else if (ft & 1) {
@@ -373,7 +373,7 @@
 				/* store from l.s. 32 bits */
 				val = ctx->regs[ft];
 			}
-			if (mips_put_word(xcp, va, val)) {
+			if (mips_put_word(regs, va, val)) {
 				fpuemuprivate.stats.errors++;
 				return SIGBUS;
 			}
@@ -382,10 +382,10 @@
 #else				/* old 32-bit fpu registers */
 	case lwc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			ctx->regs[MIPSInst_RT(ir)] =
-			    mips_get_word(xcp, va, &err);
+			    mips_get_word(regs, va, &err);
 			fpuemuprivate.stats.loads++;
 			if (err) {
 				fpuemuprivate.stats.errors++;
@@ -396,11 +396,11 @@
 
 	case swc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			fpuemuprivate.stats.stores++;
 			if (mips_put_word
-			    (xcp, va, ctx->regs[MIPSInst_RT(ir)])) {
+			    (regs, va, ctx->regs[MIPSInst_RT(ir)])) {
 				fpuemuprivate.stats.errors++;
 				return SIGBUS;
 			}
@@ -408,24 +408,24 @@
 		break;
 	case ldc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			unsigned int rt = MIPSInst_RT(ir) & ~1;
 			int errs = 0;
 			fpuemuprivate.stats.loads++;
 #if (defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN) || defined(__MIPSEB__)
 			ctx->regs[rt + 1] =
-			    mips_get_word(xcp, va + 0, &err);
+			    mips_get_word(regs, va + 0, &err);
 			errs += err;
 			ctx->regs[rt + 0] =
-			    mips_get_word(xcp, va + 4, &err);
+			    mips_get_word(regs, va + 4, &err);
 			errs += err;
 #else
 			ctx->regs[rt + 0] =
-			    mips_get_word(xcp, va + 0, &err);
+			    mips_get_word(regs, va + 0, &err);
 			errs += err;
 			ctx->regs[rt + 1] =
-			    mips_get_word(xcp, va + 4, &err);
+			    mips_get_word(regs, va + 4, &err);
 			errs += err;
 #endif
 			if (err)
@@ -435,19 +435,19 @@
 
 	case sdc1_op:
 		{
-			void *va = REG_TO_VA(xcp->regs[MIPSInst_RS(ir)])
+			void *va = REG_TO_VA(regs->regs[MIPSInst_RS(ir)])
 			    + MIPSInst_SIMM(ir);
 			unsigned int rt = MIPSInst_RT(ir) & ~1;
 			fpuemuprivate.stats.stores++;
 #if (defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN) || defined(__MIPSEB__)
-			if (mips_put_word(xcp, va + 0, ctx->regs[rt + 1]))
+			if (mips_put_word(regs, va + 0, ctx->regs[rt + 1]))
 				return SIGBUS;
-			if (mips_put_word(xcp, va + 4, ctx->regs[rt + 0]))
+			if (mips_put_word(regs, va + 4, ctx->regs[rt + 0]))
 				return SIGBUS;
 #else
-			if (mips_put_word(xcp, va + 0, ctx->regs[rt + 0]))
+			if (mips_put_word(regs, va + 0, ctx->regs[rt + 0]))
 				return SIGBUS;
-			if (mips_put_word(xcp, va + 4, ctx->regs[rt + 1]))
+			if (mips_put_word(regs, va + 4, ctx->regs[rt + 1]))
 				return SIGBUS;
 #endif
 		}
@@ -463,9 +463,9 @@
 			/* copregister fs -> gpr[rt] */
 			if (MIPSInst_RT(ir) != 0) {
 				int fs = MIPSInst_RD(ir);
-				if (!(xcp->cp0_status & ST0_FR))
+				if (!(regs->cp0_status & ST0_FR))
 					fs &= ~1;
-				xcp->regs[MIPSInst_RT(ir)] = ctx->regs[fs];
+				regs->regs[MIPSInst_RT(ir)] = ctx->regs[fs];
 			}
 			break;
 
@@ -473,11 +473,11 @@
 			/* copregister fs <- rt */
 				fpureg_t value;
 				int fs = MIPSInst_RD(ir);
-				if (!(xcp->cp0_status & ST0_FR))
+				if (!(regs->cp0_status & ST0_FR))
 					fs &= ~1;
 				value =
 				    (MIPSInst_RT(ir) ==
-				     0) ? 0 : xcp->regs[MIPSInst_RT(ir)];
+				     0) ? 0 : regs->regs[MIPSInst_RT(ir)];
 				ctx->regs[fs] = value;
 			break;
 		}
@@ -493,7 +493,7 @@
 					/* illegal register in single-float mode */
 					return SIGILL;
 #else
-					if (!(xcp->cp0_status & ST0_FR)) {
+					if (!(regs->cp0_status & ST0_FR)) {
 						/* move from m.s. 32 bits */
 						value =
 						    ctx->
@@ -502,7 +502,7 @@
 					}
 #endif
 				}
-				xcp->regs[MIPSInst_RT(ir)] = value;
+				regs->regs[MIPSInst_RT(ir)] = value;
 			}
 			break;
 
@@ -514,14 +514,14 @@
 					value = 0;
 				else
 					value =
-					    (unsigned int) xcp->
+					    (unsigned int) regs->
 					    regs[MIPSInst_RT(ir)];
 				if (MIPSInst_RD(ir) & 1) {
 #ifdef SINGLE_ONLY_FPU
 					/* illegal register in single-float mode */
 					return SIGILL;
 #else
-					if (!(xcp->cp0_status & ST0_FR)) {
+					if (!(regs->cp0_status & ST0_FR)) {
 						/* move to m.s. 32 bits */
 						ctx->
 						    regs[
@@ -550,7 +550,7 @@
 			if (MIPSInst_RT(ir) != 0) {
 				unsigned value =
 				    ctx->regs[MIPSInst_RD(ir)];
-				xcp->regs[MIPSInst_RT(ir)] = value;
+				regs->regs[MIPSInst_RT(ir)] = value;
 			}
 			break;
 
@@ -560,7 +560,7 @@
 				unsigned value;
 				value =
 				    (MIPSInst_RT(ir) ==
-				     0) ? 0 : xcp->regs[MIPSInst_RT(ir)];
+				     0) ? 0 : regs->regs[MIPSInst_RT(ir)];
 				ctx->regs[MIPSInst_RD(ir)] = value;
 			}
 			break;
@@ -576,7 +576,7 @@
 #ifdef CSRTRACE
 					printk
 					    ("%p gpr[%d]<-csr=%08x\n",
-					     REG_TO_VA(xcp->cp0_epc),
+					     REG_TO_VA(regs->cp0_epc),
 					     MIPSInst_RT(ir), value);
 #endif
 				} else if (MIPSInst_RD(ir) == FPCREG_RID)
@@ -584,7 +584,7 @@
 				else
 					value = 0;
 				if (MIPSInst_RT(ir))
-					xcp->regs[MIPSInst_RT(ir)] = value;
+					regs->regs[MIPSInst_RT(ir)] = value;
 			}
 			break;
 
@@ -596,7 +596,7 @@
 				if (MIPSInst_RT(ir) == 0)
 					value = 0;
 				else
-					value = xcp->regs[MIPSInst_RT(ir)];
+					value = regs->regs[MIPSInst_RT(ir)];
 
 				/* we only have one writable control reg
 				 */
@@ -604,7 +604,7 @@
 #ifdef CSRTRACE
 					printk
 					    ("%p gpr[%d]->csr=%08x\n",
-					     REG_TO_VA(xcp->cp0_epc),
+					     REG_TO_VA(regs->cp0_epc),
 					     MIPSInst_RT(ir), value);
 #endif
 					ctx->sr = value;
@@ -618,7 +618,7 @@
 		case bc_op: {
 			int likely = 0;
 
-			if (xcp->cp0_cause & CAUSEF_BD)
+			if (regs->cp0_cause & CAUSEF_BD)
 				return SIGILL;
 
 #if __mips >= 4
@@ -641,14 +641,14 @@
 				return SIGILL;
 			}
 
-			xcp->cp0_cause |= CAUSEF_BD;
+			regs->cp0_cause |= CAUSEF_BD;
 			if (cond) {
 				/* branch taken: emulate dslot instruction */
-				xcp->cp0_epc += 4;
-				contpc = REG_TO_VA xcp->cp0_epc +
+				regs->cp0_epc += 4;
+				contpc = REG_TO_VA regs->cp0_epc +
 				         (MIPSInst_SIMM(ir) << 2);
 
-				ir = mips_get_word(xcp, REG_TO_VA(xcp->cp0_epc),
+				ir = mips_get_word(regs, REG_TO_VA(regs->cp0_epc),
 				      &err);
 				if (err) {
 					fpuemuprivate.stats.errors++;
@@ -680,16 +680,21 @@
 				 * Single step the non-cp1 instruction in the
 				 * dslot
 				 */
-				return mips_dsemul(xcp, ir, contpc);
+				return mips_dsemul(regs, ir, contpc);
 			} else {
 				/* branch not taken */
-				if (likely)
+				if (likely) {
 					/*
 					 * branch likely nullifies dslot if not
 					 * taken
 					 */
-					xcp->cp0_epc += 4;
-					/* else continue & execute dslot as normal insn */
+					regs->cp0_epc += 4;
+					contpc += 4;
+					/*
+					 * else continue & execute dslot as
+					 * normal insn
+					 */
+				}
 			}
 			break;
 		}
@@ -701,7 +706,7 @@
 				return SIGILL;
 
 			/* a real fpu computation instruction */
-				if ((sig = fpu_emu(xcp, ctx, ir)))
+				if ((sig = fpu_emu(regs, ctx, ir)))
 					return sig;
 			}
 		}
@@ -711,7 +716,7 @@
 	case cop1x_op:
 		{
 			int sig;
-			if ((sig = fpux_emu(xcp, ctx, ir)))
+			if ((sig = fpux_emu(regs, ctx, ir)))
 				return sig;
 		}
 		break;
@@ -722,9 +727,9 @@
 		if (MIPSInst_FUNC(ir) != movc_op)
 			return SIGILL;
 		cond = fpucondbit[MIPSInst_RT(ir) >> 2];
-		if (((ctx->sr & cond) != 0) !=
-		    ((MIPSInst_RT(ir) & 1) != 0)) return 0;
-		xcp->regs[MIPSInst_RD(ir)] = xcp->regs[MIPSInst_RS(ir)];
+		if (((ctx->sr & cond) != 0) != ((MIPSInst_RT(ir) & 1) != 0))
+			return 0;
+		regs->regs[MIPSInst_RD(ir)] = regs->regs[MIPSInst_RS(ir)];
 		break;
 #endif
 
@@ -733,8 +738,8 @@
 	}
 
 	/* we did it !! */
-	xcp->cp0_epc = VA_TO_REG(contpc);
-	xcp->cp0_cause &= ~CAUSEF_BD;
+	regs->cp0_epc = VA_TO_REG(contpc);
+	regs->cp0_cause &= ~CAUSEF_BD;
 	return 0;
 }
 
@@ -774,18 +779,18 @@
 #define AdELOAD 0x8c000001	/* lw $0,1($0) */
 
 static int
-mips_dsemul(struct pt_regs *xcp, mips_instruction ir, vaddr_t cpc)
+mips_dsemul(struct pt_regs *regs, mips_instruction ir, vaddr_t cpc)
 {
 	mips_instruction *dsemul_insns;
 	mips_instruction forcetrap;
 	extern asmlinkage void handle_dsemulret(void);
 
 	if (ir == 0) {		/* a nop is easy */
-		xcp->cp0_epc = VA_TO_REG(cpc);
+		regs->cp0_epc = VA_TO_REG(cpc);
 		return 0;
 	}
 #ifdef DSEMUL_TRACE
-	printk("desemul %p %p\n", REG_TO_VA(xcp->cp0_epc), cpc);
+	printk("desemul %p %p\n", REG_TO_VA(regs->cp0_epc), cpc);
 #endif
 
 	/* 
@@ -794,15 +799,15 @@
 	 * the required address any alternative apart from full 
 	 * instruction emulation!!.
 	 */
-	dsemul_insns = (mips_instruction *) (xcp->regs[29] & ~3);
-	dsemul_insns -= 3;	/* Two instructions, plus one for luck ;-) */
+	dsemul_insns = (void*) (regs->regs[29] - 4 * sizeof(mips_instruction));
+	dsemul_insns = (void *) ((unsigned long)dsemul_insns & ALMASK);
 
 	/* Verify that the stack pointer is not competely insane */
 	if (verify_area(VERIFY_WRITE, dsemul_insns,
-	                sizeof(mips_instruction) * 2))
+	                4* sizeof(mips_instruction)))
 		return SIGBUS;
 
-	if (mips_put_word(xcp, &dsemul_insns[0], ir)) {
+	if (mips_put_word(regs, &dsemul_insns[0], ir)) {
 		fpuemuprivate.stats.errors++;
 		return SIGBUS;
 	}
@@ -817,20 +822,22 @@
 	 */
 
 	/* If one is *really* paranoid, one tests for a bad stack pointer */
-	if ((xcp->regs[29] & 0x3) == 0x3)
+	if ((regs->regs[29] & 0x3) == 0x3)
 		forcetrap = AdELOAD - 1;
 	else
 		forcetrap = AdELOAD;
 
-	if (mips_put_word(xcp, &dsemul_insns[1], forcetrap)) {
+	if (mips_put_word(regs, &dsemul_insns[1], forcetrap)) {
 		fpuemuprivate.stats.errors++;
-		return (SIGBUS);
+		return SIGBUS;
 	}
 
 	/* Set thread state to catch and handle the exception */
 	current->thread.dsemul_epc = (unsigned long) cpc;
 	current->thread.dsemul_aerpc = (unsigned long) &dsemul_insns[1];
-	xcp->cp0_epc = VA_TO_REG & dsemul_insns[0];
+	regs->cp0_epc = VA_TO_REG & dsemul_insns[0];
+
+	/* Note this only flushes two instructions  */
 	flush_cache_sigtramp((unsigned long) dsemul_insns);
 
 	return SIGILL;		/* force out of emulation loop */

[Linux-mips-commits]CVS: linux/drivers/char dummy_keyb.c,NONE,1.1

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv16263

Added Files:
	dummy_keyb.c 
Log Message:
Add dummy keyboard driver which allows CONFIG_VT without keyboard.

--- NEW FILE: dummy_keyb.c ---
/*
 * linux/drivers/char/dummy_keyb.c
 *
 * Allows CONFIG_VT on hardware without keyboards.
 *
 * Copyright (C) 1999, 2001 Bradley D. LaRonde
 *
 * 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.
 *
 * What is this for?
 *
 * Not all systems have keyboards.  Some don't even have a keyboard
 * port.  However, some of those systems have video support and can
 * use the virtual terminal support for display.  However, the virtual
 * terminal code expects a keyboard of some kind.  This driver keeps
 * the virtual terminal code happy by providing it a "keyboard", albeit
 * a very quiet one.
 *
 * If you want to use the virtual terminal support but your system
 * does not support a keyboard, define CONFIG_DUMMY_KEYB along with
 * CONFIG_VT.
 *
 */
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/init.h>

void kbd_leds(unsigned char leds)
{
}

int kbd_setkeycode(unsigned int scancode, unsigned int keycode)
{
	return (scancode == keycode) ? 0 : -EINVAL;
}

int kbd_getkeycode(unsigned int scancode)
{
	return scancode;
}

int kbd_translate(unsigned char scancode, unsigned char *keycode,
	char raw_mode)
{
	*keycode = scancode;

	return 1;
}

char kbd_unexpected_up(unsigned char keycode)
{
	return 0x80;
}

void __init kbd_init_hw(void)
{
	printk("Dummy keyboard driver installed.\n");
}

[Linux-mips-commits]CVS: linux/drivers/char Makefile,1.7,1.8

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv16087

Modified Files:
	Makefile 
Log Message:
Add dummy keyboard driver which allows CONFIG_VT without keyboard.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	2001/08/25 02:19:27	1.7
+++ Makefile	2001/09/19 21:57:51	1.8
@@ -143,6 +143,10 @@
   KEYMAP   = qtronixmap.o
 endif
 
+ifeq ($(CONFIG_DUMMY_KEYB),y)
+  KEYBD = dummy_keyb.o
+endif
+
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
 obj-$(CONFIG_SERIAL) += $(SERIAL)
 obj-$(CONFIG_SERIAL_21285) += serial_21285.o

[Linux-mips-commits]CVS: linux/arch/mips/korva irq.c,1.3,1.4

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/korva
In directory usw-pr-cvs1:/tmp/cvs-serv30877

Modified Files:
	irq.c 
Log Message:
Due to overwhelming demand, I revert my reversion of my accidental commit. :-)


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/korva/irq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** irq.c	2001/09/18 21:36:26	1.3
--- irq.c	2001/09/18 23:20:17	1.4
***************
*** 33,37 ****
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq2 = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
--- 33,37 ----
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq_cascade = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
***************
*** 47,51 ****
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq2);
  
  #ifdef CONFIG_REMOTE_DEBUG
--- 47,51 ----
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq_cascade);
  
  #ifdef CONFIG_REMOTE_DEBUG

[Linux-mips-commits]CVS: web/htdocs index.html,1.4,1.5

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/web/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv13728

Modified Files:
	index.html 
Log Message:
Oops.

Index: index.html
===================================================================
RCS file: /cvsroot/linux-mips/web/htdocs/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.html	2001/09/18 21:57:25	1.4
--- index.html	2001/09/18 22:00:12	1.5
***************
*** 39,43 ****
  </table>
  
! <p>Here is how you get the latest code from CVS and instructions on how to build it. <a href="sf-mips-howto.html"></a>
  
  <h2>Status</h2>
--- 39,43 ----
  </table>
  
! <p>Here is how you get the latest code from CVS and instructions on how to build it. <a href="sf-mips-howto.html">CVS howto</a>
  
  <h2>Status</h2>

[Linux-mips-commits]CVS: web/htdocs index.html,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/web/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv12960

Modified Files:
	index.html 
Log Message:
CVS instructions.

Index: index.html
===================================================================
RCS file: /cvsroot/linux-mips/web/htdocs/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.html	2001/09/12 19:19:27	1.3
--- index.html	2001/09/18 21:57:25	1.4
***************
*** 39,42 ****
--- 39,44 ----
  </table>
  
+ <p>Here is how you get the latest code from CVS and instructions on how to build it. <a href="sf-mips-howto.html"></a>
+ 
  <h2>Status</h2>
  

[Linux-mips-commits]CVS: web/htdocs sf-mips-howto.html,NONE,1.1

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/web/htdocs
In directory usw-pr-cvs1:/tmp/cvs-serv12894

Added Files:
	sf-mips-howto.html 
Log Message:
CVS instructions.

--- NEW FILE: sf-mips-howto.html ---
<h3>Quick Guide to Use Linux-MIPS CVS Tree on Sourceforge</h3>

<ul>
<li> Login into CVS tree.

<blockquote><tt><pre>
cvs -d:pserver:ano...@cv...:/cvsroot/linux-mips login
</tt></pre></blockquote>
Press "Return" when prompted for password.  You only need to do this once on any machine.

<li> Check out a copy of the tree.

<blockquote><tt><pre>
cvs -z3 -d:pserver:ano...@cv...:/cvsroot/linux-mips co linux
</tt></pre></blockquote>

<li> To avoid name conflict, rename linux directory to sf-linux.  

<li> Take a look of <tt>sf-linux/Makefile</tt> and determine the kernel version.  Let us say it is v2.4.8.

<li> Goto <a href="http://www.kernel.org/pub/linux/kernel/">http://www.kernel.org/pub/linux/kernel/</a> to grab the right version of kernel source.  Unzip and untar it in the same directory as linux-2.4.8.

<li> 
<blockquote><tt><pre>
cd linux-2.4.8
cp -af ../sf-linux/* .
</tt></pre></blockquote>

<li> You can now develop linux for MIPS machines under linux-2.4.8 directory.  To start, find and use the default config under arch/mips/configs directory for your target board.
</ul>

<hr>
<a href="mailto:ju...@us...">Feedbacks are welcome</a>

[Linux-mips-commits]CVS: linux/arch/mips/korva irq.c,1.2,1.3

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/korva
In directory usw-pr-cvs1:/tmp/cvs-serv8009

Modified Files:
	irq.c 
Log Message:
Revert accidental changes.


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/korva/irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** irq.c	2001/09/18 20:41:44	1.2
--- irq.c	2001/09/18 21:36:26	1.3
***************
*** 33,37 ****
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq_cascade = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
--- 33,37 ----
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq2 = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
***************
*** 47,51 ****
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq_cascade);
  
  #ifdef CONFIG_REMOTE_DEBUG
--- 47,51 ----
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq2);
  
  #ifdef CONFIG_REMOTE_DEBUG

[Linux-mips-commits]CVS: linux/drivers/net/tulip media.c,1.3,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv27229/drivers/net/tulip

Removed Files:
	media.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- media.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips64/kernel branch.c,1.1.1.1,NONE head.S,1.1.1.1,NONE ioctl32.c,1.1.1.1,NONE r4k_fpu.S,1.1.1.1,NONE r4k_tlb.S,1.2,NONE smp.c,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips64/kernel

Removed Files:
	branch.c head.S ioctl32.c r4k_fpu.S r4k_tlb.S smp.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- branch.c DELETED ---

--- head.S DELETED ---

--- ioctl32.c DELETED ---

--- r4k_fpu.S DELETED ---

--- r4k_tlb.S DELETED ---

--- smp.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/korva irq.c,1.1,1.2

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/korva
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/korva

Modified Files:
	irq.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/korva/irq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** irq.c	2001/08/23 19:13:56	1.1
--- irq.c	2001/09/18 20:41:44	1.2
***************
*** 33,37 ****
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq2 = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
--- 33,37 ----
  
  extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
! static struct irqaction irq_cascade = { no_action, 0, 0, "cascade", NULL, NULL };
  
  void __init init_IRQ(void)
***************
*** 47,51 ****
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq2);
  
  #ifdef CONFIG_REMOTE_DEBUG
--- 47,51 ----
  	
  	/* setup cascade interrupt 6 */
! 	setup_irq(6, &irq_cascade);
  
  #ifdef CONFIG_REMOTE_DEBUG

[Linux-mips-commits]CVS: linux/arch/mips/dec/boot ld.ecoff,1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/dec/boot
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/dec/boot

Removed Files:
	ld.ecoff 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- ld.ecoff DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/ite-boards/generic int-handler.S,1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/ite-boards/generic

Removed Files:
	int-handler.S 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- int-handler.S DELETED ---

[Linux-mips-commits]CVS: linux/drivers/net au1000_eth.h,1.1.1.1,NONE saa9730.c,1.4,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv27229/drivers/net

Removed Files:
	au1000_eth.h saa9730.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- au1000_eth.h DELETED ---

--- saa9730.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips64 ld.script.elf32.S,1.1,NONE ld.script.elf64,1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips64

Removed Files:
	ld.script.elf32.S ld.script.elf64 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- ld.script.elf32.S DELETED ---

--- ld.script.elf64 DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/mm extable.c,1.1.1.1,NONE fault.c,1.1.1.1,NONE ioremap.c,1.1.1.1,NONE rm7k.c,1.1.1.1,NONE sb1.c,1.1.1.1,NONE umap.c,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/mm

Removed Files:
	extable.c fault.c ioremap.c rm7k.c sb1.c umap.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- extable.c DELETED ---

--- fault.c DELETED ---

--- ioremap.c DELETED ---

--- rm7k.c DELETED ---

--- sb1.c DELETED ---

--- umap.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips64/lib memset.S,1.1.1.1,NONE rtc-no.c,1.1.1.1,NONE rtc-std.c,1.1.1.1,NONE watch.S,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips64/lib

Removed Files:
	memset.S rtc-no.c rtc-std.c watch.S 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- memset.S DELETED ---

--- rtc-no.c DELETED ---

--- rtc-std.c DELETED ---

--- watch.S DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips64/arc Makefile,1.1.1.1,NONE arc_con.c,1.1.1.1,NONE cmdline.c,1.1.1.1,NONE console.c,1.1.1.1,NONE identify.c,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/arc
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips64/arc

Removed Files:
	Makefile arc_con.c cmdline.c console.c identify.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- Makefile DELETED ---

--- arc_con.c DELETED ---

--- cmdline.c DELETED ---

--- console.c DELETED ---

--- identify.c DELETED ---

[Linux-mips-commits]CVS: linux/include/asm-mips64/gcc sgidefs.h,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64/gcc
In directory usw-pr-cvs1:/tmp/cvs-serv27229/include/asm-mips64/gcc

Removed Files:
	sgidefs.h 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- sgidefs.h DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/baget ld.script.balo,1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/baget
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/baget

Removed Files:
	ld.script.balo 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- ld.script.balo DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips64/math-emu Makefile,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips64/math-emu
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips64/math-emu

Removed Files:
	Makefile 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- Makefile DELETED ---

[Linux-mips-commits]CVS: linux/include/asm-mips socket.h,1.4,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv27229/include/asm-mips

Removed Files:
	socket.h 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- socket.h DELETED ---

[Linux-mips-commits]CVS: linux/include/asm-mips64 atomic.h,1.2,NONE cache.h,1.1.1.1,NONE checksum.h,1.1.1.1,NONE cpu.h,1.1.1.1,NONE delay.h,1.1.1.1,NONE hdreg.h,1.1.1.1,NONE irq.h,1.1.1.1,NONE pgalloc.h,1.1.1.1,NONE processor.h,1.1.1.1,NONE rrm.h,1.1.1.1,NONE semaphore-helper.h,1.1.1.1,NONE semaphore.h,1.1.1.1,NONE siginfo.h,1.1.1.1,NONE smp.h,1.1.1.1,NONE socket.h,1.5,NONE unaligned.h,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv27229/include/asm-mips64

Removed Files:
	atomic.h cache.h checksum.h cpu.h delay.h hdreg.h irq.h 
	pgalloc.h processor.h rrm.h semaphore-helper.h semaphore.h 
	siginfo.h smp.h socket.h unaligned.h 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- atomic.h DELETED ---

--- cache.h DELETED ---

--- checksum.h DELETED ---

--- cpu.h DELETED ---

--- delay.h DELETED ---

--- hdreg.h DELETED ---

--- irq.h DELETED ---

--- pgalloc.h DELETED ---

--- processor.h DELETED ---

--- rrm.h DELETED ---

--- semaphore-helper.h DELETED ---

--- semaphore.h DELETED ---

--- siginfo.h DELETED ---

--- smp.h DELETED ---

--- socket.h DELETED ---

--- unaligned.h DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/algor README,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/algor
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/algor

Removed Files:
	README 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- README DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/ddb5074 Makefile,1.1.1.1,NONE int-handler.S,1.1.1.1,NONE irq.c,1.1.1.1,NONE nile4.c,1.1.1.1,NONE prom.c,1.1.1.1,NONE setup.c,1.1.1.1,NONE time.c,1.1.1.1,NONE

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ddb5074
In directory usw-pr-cvs1:/tmp/cvs-serv27229/arch/mips/ddb5074

Removed Files:
	Makefile int-handler.S irq.c nile4.c prom.c setup.c time.c 
Log Message:
Remove files that do not differ from the ones in Linus's 2.4.8 tree.


--- Makefile DELETED ---

--- int-handler.S DELETED ---

--- irq.c DELETED ---

--- nile4.c DELETED ---

--- prom.c DELETED ---

--- setup.c DELETED ---

--- time.c DELETED ---