Unbreak moko, SOFTSERIAL->SOFTTTY, a pmap change, and a missing file.

Not tested on hardware, but at least compiles now.
problem pointed out by Sylvestre Gallon

4 files changed, 12 insertions, 11 deletions

diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index e2be286d732..077379b490e 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.23 2009/05/24 04:56:19 drahn Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.24 2009/07/14 13:59:49 drahn Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -4692,7 +4692,7 @@ pmap_pte_init_generic(void)
 	pte_l1_c_proto = L1_C_PROTO_generic;
 	pte_l2_s_proto = L2_S_PROTO_generic;
 
-	pmap_copy_page_func = pmap_copy_page_v7;
+	pmap_copy_page_func = pmap_copy_page_generic;
 	pmap_zero_page_func = pmap_zero_page_generic;
 }
 
@@ -4808,6 +4808,7 @@ pmap_pte_init_armv7(void)
 	pte_l1_c_proto = L1_C_PROTO_v7;
 	pte_l2_s_proto = L2_S_PROTO_v7;
 
+	pmap_copy_page_func = pmap_copy_page_v7;
 }
 #endif /* CPU_ARMv7 */
 
diff --git a/sys/arch/arm/s3c2xx0/s3c2410_intr.c b/sys/arch/arm/s3c2xx0/s3c2410_intr.c
index 67472fbc56d..00e66022aa9 100644
--- a/sys/arch/arm/s3c2xx0/s3c2410_intr.c
+++ b/sys/arch/arm/s3c2xx0/s3c2410_intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s3c2410_intr.c,v 1.2 2008/12/08 20:50:20 drahn Exp $ */
+/*	$OpenBSD: s3c2410_intr.c,v 1.3 2009/07/14 13:59:49 drahn Exp $ */
 /* $NetBSD: s3c2410_intr.c,v 1.11 2008/11/24 11:29:52 dogcow Exp $ */
 
 /*
@@ -84,7 +84,7 @@ static const int si_to_ipl[] = {
 #endif
 	[SI_SOFTCLOCK]	= IPL_SOFTCLOCK,
 	[SI_SOFTNET]	= IPL_SOFTNET,
-	[SI_SOFTSERIAL] = IPL_SOFTSERIAL,
+	[SI_SOFTTTY] = IPL_SOFTTTY,
 };
 #endif
 
diff --git a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
index e31ccb12dfe..084cffd4892 100644
--- a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
+++ b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s3c2xx0_intr.c,v 1.2 2008/12/08 20:50:20 drahn Exp $ */
+/*	$OpenBSD: s3c2xx0_intr.c,v 1.3 2009/07/14 13:59:49 drahn Exp $ */
 /* $NetBSD: s3c2xx0_intr.c,v 1.13 2008/04/27 18:58:45 matt Exp $ */
 
 /*
@@ -144,7 +144,7 @@ s3c2xx0_update_intr_masks(int irqno, int level)
 	 * limited input buffer space/"real-time" requirements) a better
 	 * chance at not dropping data.
 	 */
-	s3c2xx0_imask[IPL_VM] &= s3c2xx0_imask[IPL_SOFTSERIAL];
+	s3c2xx0_imask[IPL_VM] &= s3c2xx0_imask[IPL_SOFTTTY];
 	s3c2xx0_imask[IPL_CLOCK] &= s3c2xx0_imask[IPL_VM];
 	s3c2xx0_imask[IPL_HIGH] &= s3c2xx0_imask[IPL_CLOCK];
 
@@ -157,8 +157,8 @@ s3c2xx0_update_intr_masks(int irqno, int level)
 			s3c2xx0_smask[i] |= SI_TO_IRQBIT(SI_SOFTCLOCK);
 		if (i < IPL_SOFTNET)
 			s3c2xx0_smask[i] |= SI_TO_IRQBIT(SI_SOFTNET);
-		if (i < IPL_SOFTSERIAL)
-			s3c2xx0_smask[i] |= SI_TO_IRQBIT(SI_SOFTSERIAL);
+		if (i < IPL_SOFTTTY)
+			s3c2xx0_smask[i] |= SI_TO_IRQBIT(SI_SOFTTTY);
 #if 0
 		printf("mask[%d]: %x %x\n", i, s3c2xx0_smask[i],
 		    s3c2xx0_sk[i]);
@@ -346,7 +346,7 @@ s3c2xx0_irq_do_pending(void)
 	}
 
 	do {
-		DO_SOFTINT(SI_SOFTSERIAL, IPL_SOFTSERIAL);
+		DO_SOFTINT(SI_SOFTTTY, IPL_SOFTTTY);
 		DO_SOFTINT(SI_SOFTNET, IPL_SOFTNET);
 		DO_SOFTINT(SI_SOFTCLOCK, IPL_SOFTCLOCK);
 		DO_SOFTINT(SI_SOFT, IPL_SOFT);
diff --git a/sys/arch/moko/include/intr.h b/sys/arch/moko/include/intr.h
index f0658764ab2..deaa7fe8885 100644
--- a/sys/arch/moko/include/intr.h
+++ b/sys/arch/moko/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.1 2008/11/26 14:47:50 drahn Exp $	*/
+/*	$OpenBSD: intr.h,v 1.2 2009/07/14 13:59:49 drahn Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 #define	IPL_SOFTNET	3	/* software network interrupt */
 #define	IPL_BIO		4	/* block I/O */
 #define	IPL_NET		5	/* network */
-#define	IPL_SOFTSERIAL	6	/* software serial interrupt */
+#define	IPL_SOFTTTY	6	/* software serial interrupt */
 #define	IPL_TTY		7	/* terminals */
 #define	IPL_VM		8	/* memory allocation */
 #define	IPL_AUDIO	9	/* audio device */