CVS commit: src/sys/arch/acorn26/acorn26

2016-12-24 Thread Cherry G. Mathew
Module Name:src
Committed By:   cherry
Date:   Sat Dec 24 17:11:31 UTC 2016

Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c

Log Message:
pass the bank handle to uvm_physseg_get_avail_start();

Should fix the acorn26 kernel build.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/acorn26/acorn26/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.37 src/sys/arch/acorn26/acorn26/pmap.c:1.38
--- src/sys/arch/acorn26/acorn26/pmap.c:1.37	Fri Dec 23 07:15:27 2016
+++ src/sys/arch/acorn26/acorn26/pmap.c	Sat Dec 24 17:11:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.37 2016/12/23 07:15:27 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.38 2016/12/24 17:11:31 cherry Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -102,7 +102,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.37 2016/12/23 07:15:27 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.38 2016/12/24 17:11:31 cherry Exp $");
 
 #include  /* for cold */
 #include 
@@ -311,7 +311,7 @@ pmap_steal_memory(vsize_t size, vaddr_t 
 			((char*)MEMC_PHYS_BASE +
 ptoa(avail_start));
 			avail_start++;
-			uvm_physseg_set_avail_start(avail_start);
+			uvm_physseg_set_avail_start(bank, avail_start);
 
 			break;
 		}



CVS commit: src/sys/arch/acorn26/acorn26

2014-03-08 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Mar  8 16:55:38 UTC 2014

Modified Files:
src/sys/arch/acorn26/acorn26: db_interface.c

Log Message:
Make db_validate_address compile under 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn26/acorn26/db_interface.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/db_interface.c
diff -u src/sys/arch/acorn26/acorn26/db_interface.c:1.19 src/sys/arch/acorn26/acorn26/db_interface.c:1.20
--- src/sys/arch/acorn26/acorn26/db_interface.c:1.19	Sat Jan  5 15:04:00 2013
+++ src/sys/arch/acorn26/acorn26/db_interface.c	Sat Mar  8 16:55:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.19 2013/01/05 15:04:00 christos Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $	*/
 
 /* 
  * Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.19 2013/01/05 15:04:00 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $);
 
 #include opt_ddb.h
 
@@ -169,11 +169,10 @@ volatile bool db_validating, db_faulted;
 int
 db_validate_address(vm_offset_t addr)
 {
-	volatile uint8_t tmp;
 
 	db_faulted = false;
 	db_validating = true;
-	tmp = *(uint8_t *)addr;
+	(void) *(volatile uint8_t *)addr;
 	db_validating = false;
 	return db_faulted;
 }



CVS commit: src/sys/arch/acorn26/acorn26

2013-08-12 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Aug 12 16:02:50 UTC 2013

Modified Files:
src/sys/arch/acorn26/acorn26: bus_asm.S locore.S

Log Message:
Convert to unified syntax


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn26/acorn26/bus_asm.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/acorn26/acorn26/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/bus_asm.S
diff -u src/sys/arch/acorn26/acorn26/bus_asm.S:1.5 src/sys/arch/acorn26/acorn26/bus_asm.S:1.6
--- src/sys/arch/acorn26/acorn26/bus_asm.S:1.5	Wed Oct  4 20:14:44 2006
+++ src/sys/arch/acorn26/acorn26/bus_asm.S	Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $	*/
+/*	$NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $	*/
 
 /*
  * Copyright (c) 2006 Ben Harris
@@ -59,7 +59,7 @@
  */
 
 #include machine/asm.h
-RCSID($NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $)
+RCSID($NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $)
 
 /*
  * bus_space I/O functions for podulebus
@@ -109,7 +109,7 @@ ENTRY(iobus_bs_rm_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldrb	r1, [r0]
@@ -128,7 +128,7 @@ ENTRY(iobus_bs_rm_2)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldr	r1, [r0]
@@ -153,7 +153,7 @@ ENTRY(iobus_bs_wm_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldrb	r1, [r3], #0x0001
@@ -172,7 +172,7 @@ ENTRY(iobus_bs_wm_2)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldrb	r1, [r3], #0x0001
@@ -200,7 +200,7 @@ ENTRY(iobus_bs_rr_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldrb	r1, [r12], r0
@@ -249,7 +249,7 @@ ENTRY(iobus_bs_rr_2)
 	bgt	1b
 
 2:	teq	r10, #0
-	ldmeqdb	fp, {r4-r10, fp, sp, pc}
+	ldmdbeq	fp, {r4-r10, fp, sp, pc}
 
 	/*
 	 * Fast read_region_2 code.  This is at its best when dealing with
@@ -272,7 +272,7 @@ ENTRY(iobus_bs_rr_2)
 	stmia	r9!, {r0, r2, r4, r6}
 	bgt	2b
 	adds	r7, r10, #7
-	ldmeqdb	fp, {r4-r10, fp, sp, pc}
+	ldmdbeq	fp, {r4-r10, fp, sp, pc}
 	mov	r0, #4
 	mov	r10, #0
 	b	1b
@@ -292,7 +292,7 @@ ENTRY(iobus_bs_wr_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	ldrb	r1, [r3], #0x0001
@@ -335,7 +335,7 @@ ENTRY(iobus_bs_wr_2)
 	bgt	1b
 
 2:	teq	r10, #0
-	ldmeqdb	fp, {r4-r10, fp, sp, pc}
+	ldmdbeq	fp, {r4-r10, fp, sp, pc}
 
 	/*
 	 * Fast write_region_2 code.  This is at its best when dealing with
@@ -366,7 +366,7 @@ ENTRY(iobus_bs_wr_2)
 	stmia	r8!, {r0-r7}
 	bgt	2b
 	adds	r7, r10, #7
-	ldmeqdb	fp, {r4-r10, fp, sp, pc}
+	ldmdbeq	fp, {r4-r10, fp, sp, pc}
 	mov	r0, #4
 	mov	r10, #0
 	b	1b
@@ -384,7 +384,7 @@ ENTRY(iobus_bs_sm_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	strb	r3, [r0]
@@ -402,7 +402,7 @@ ENTRY(iobus_bs_sm_2)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 	orr	r3, r3, r3, lsl #16
 1:
@@ -427,7 +427,7 @@ ENTRY(iobus_bs_sr_1)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 1:
 	strb	r3, [r12], r0
@@ -447,7 +447,7 @@ ENTRY(iobus_bs_sr_2)
 
 	/* Make sure that we have a positive length */
 	cmp	r2, #0x
-	ldmledb	fp, {fp, sp, pc}
+	ldmdble	fp, {fp, sp, pc}
 
 	orr	r3, r3, r3, lsl #16
 1:

Index: src/sys/arch/acorn26/acorn26/locore.S
diff -u src/sys/arch/acorn26/acorn26/locore.S:1.22 src/sys/arch/acorn26/acorn26/locore.S:1.23
--- src/sys/arch/acorn26/acorn26/locore.S:1.22	Thu Dec 10 05:10:00 2009
+++ src/sys/arch/acorn26/acorn26/locore.S	Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2009/12/10 05:10:00 rmind Exp $ */
+/* $NetBSD: locore.S,v 1.23 2013/08/12 16:02:50 matt Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -353,7 +353,7 @@ ENTRY_NP(int_off_save)
 /* LINTSTUB: Func: void int_restore(int i) */
 ENTRY_NP(int_restore)
 	tst	r0, #(R15_IRQ_DISABLE)	/* Were IRQs already disabled? */
-	biceqs	r15, r14, #(R15_IRQ_DISABLE)	/* No, enable again */
+	bicseq	r15, r14, #(R15_IRQ_DISABLE)	/* No, enable again */
 	movs	r15, r14			/* Yes, just return */
 /* LINTSTUB: Func: void fiq_off(void) */
 ENTRY(fiq_off)
@@ -452,4 +452,4 @@ ENTRY(cpu_Debugger)
 	ldmfd	r13!, {pc}
 #endif
 
-RCSID($NetBSD: locore.S,v 1.22 2009/12/10 

CVS commit: src/sys/arch/acorn26/acorn26

2013-06-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Jun 27 21:16:20 UTC 2013

Modified Files:
src/sys/arch/acorn26/acorn26: cpu.c

Log Message:
move assignment outside setjmp, because static analyzers are not smart enough
to know that it is impossible for id to be uninitialized.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn26/acorn26/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/cpu.c
diff -u src/sys/arch/acorn26/acorn26/cpu.c:1.28 src/sys/arch/acorn26/acorn26/cpu.c:1.29
--- src/sys/arch/acorn26/acorn26/cpu.c:1.28	Sat Nov 21 15:32:13 2009
+++ src/sys/arch/acorn26/acorn26/cpu.c	Thu Jun 27 17:16:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.28 2009/11/21 20:32:13 rmind Exp $ */
+/* $NetBSD: cpu.c,v 1.29 2013/06/27 21:16:20 christos Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 Ben Harris
@@ -32,7 +32,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.28 2009/11/21 20:32:13 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.29 2013/06/27 21:16:20 christos Exp $);
 
 #include sys/device.h
 #include sys/proc.h
@@ -147,14 +147,13 @@ static register_t
 cpu_identify(void)
 {
 	register_t dummy;
-	volatile register_t id;
+	volatile register_t id = CPU_ID_ARM2;
 	void *cp_core, *cp15;
 
 	cp_core = install_coproc_handler(CORE_UNKNOWN_HANDLER,
 	cpu_undef_handler);
 	cp15 = install_coproc_handler(SYSTEM_COPROC, cpu_undef_handler);
 	if (setjmp(undef_jmp) == 0) {
-		id = CPU_ID_ARM2;
 		/* ARM250 and ARM3 support SWP. */
 		__asm volatile (swp r0, r0, [%0] : : r (dummy) : r0);
 		id = CPU_ID_ARM250;



CVS commit: src/sys/arch/acorn26/acorn26

2012-08-16 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Aug 16 16:23:48 UTC 2012

Modified Files:
src/sys/arch/acorn26/acorn26: genassym.cf

Log Message:
CURPCB is dead


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/acorn26/acorn26/genassym.cf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/genassym.cf
diff -u src/sys/arch/acorn26/acorn26/genassym.cf:1.12 src/sys/arch/acorn26/acorn26/genassym.cf:1.13
--- src/sys/arch/acorn26/acorn26/genassym.cf:1.12	Thu Dec 10 05:10:00 2009
+++ src/sys/arch/acorn26/acorn26/genassym.cf	Thu Aug 16 16:23:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.12 2009/12/10 05:10:00 rmind Exp $
+# $NetBSD: genassym.cf,v 1.13 2012/08/16 16:23:48 matt Exp $
 #
 # Copyright (c) 1999 Ben Harris
 # All rights reserved.
@@ -75,5 +75,3 @@ endif
 
 define	CI_ASTPENDING	offsetof(struct cpu_info, ci_astpending)
 define	CI_CURLWP	offsetof(struct cpu_info, ci_curlwp)
-define	CI_CURPCB	offsetof(struct cpu_info, ci_curpcb)
-



CVS commit: src/sys/arch/acorn26/acorn26

2012-08-16 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Aug 16 18:15:11 UTC 2012

Modified Files:
src/sys/arch/acorn26/acorn26: start.c

Log Message:
Add include of machine/pcb.h


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/acorn26/acorn26/start.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/start.c
diff -u src/sys/arch/acorn26/acorn26/start.c:1.18 src/sys/arch/acorn26/acorn26/start.c:1.19
--- src/sys/arch/acorn26/acorn26/start.c:1.18	Mon Nov 15 06:07:41 2010
+++ src/sys/arch/acorn26/acorn26/start.c	Thu Aug 16 18:15:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: start.c,v 1.18 2010/11/15 06:07:41 uebayasi Exp $ */
+/* $NetBSD: start.c,v 1.19 2012/08/16 18:15:10 matt Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -31,7 +31,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: start.c,v 1.18 2010/11/15 06:07:41 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: start.c,v 1.19 2012/08/16 18:15:10 matt Exp $);
 
 #include opt_modular.h
 
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, $NetBSD: start.c,v 1.
 #include machine/boot.h
 #include machine/machdep.h
 #include machine/memcreg.h
+#include machine/pcb.h
 
 #include dev/cons.h
 



CVS commit: src/sys/arch/acorn26/acorn26

2012-01-30 Thread Havard Eidnes
Module Name:src
Committed By:   he
Date:   Mon Jan 30 17:03:58 UTC 2012

Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c

Log Message:
Convert from malloc()/free() to kmem_* family of functions.
Discussed with and some guidance from para@.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/acorn26/acorn26/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.33 src/sys/arch/acorn26/acorn26/pmap.c:1.34
--- src/sys/arch/acorn26/acorn26/pmap.c:1.33	Mon Nov 15 06:06:51 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c	Mon Jan 30 17:03:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.34 2012/01/30 17:03:58 he Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -102,10 +102,10 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.34 2012/01/30 17:03:58 he Exp $);
 
 #include sys/kernel.h /* for cold */
-#include sys/malloc.h
+#include sys/kmem.h
 #include sys/pool.h
 #include sys/systm.h
 #include sys/lwp.h
@@ -347,7 +347,7 @@ pmap_init2()
 	UVMHIST_CALLED(pmaphist);
 	/* We can now call malloc().  Rationalise our memory usage. */
 	pv_table_size = physmem * sizeof(struct pv_entry);
-	new_pv_table = malloc(pv_table_size, M_VMPMAP, M_WAITOK);
+	new_pv_table = kmem_alloc(pv_table_size, KM_SLEEP);
 	memcpy(new_pv_table, pv_table, pv_table_size);
 	old_pv_table = pv_table;
 	pv_table = new_pv_table;
@@ -380,9 +380,9 @@ pmap_create(void)
 		pmap_init2();
 	pmap = pool_get(pmap_pool, PR_WAITOK);
 	memset(pmap, 0, sizeof(*pmap));
-	pmap-pm_entries = (struct pv_entry **)malloc(
-		sizeof(struct pv_entry *) * PM_NENTRIES, M_VMPMAP,
-		M_WAITOK | M_ZERO);
+	pmap-pm_entries = (struct pv_entry **)kmem_zalloc(
+		sizeof(struct pv_entry *) * PM_NENTRIES,
+		KM_SLEEP);
 	pmap-pm_count = 1;
 	return pmap;
 }
@@ -406,7 +406,8 @@ pmap_destroy(pmap_t pmap)
 		if (pmap-pm_entries[i] != NULL)
 			panic(pmap_destroy: pmap isn't empty);
 #endif
-	free((void *)pmap-pm_entries, M_VMPMAP);
+	kmem_free((void *)pmap-pm_entries,
+		sizeof(struct pv_entry *) * PM_NENTRIES);
 	pool_put(pmap_pool, pmap);
 }
 
@@ -531,14 +532,14 @@ pv_update(struct pv_entry *pv)
 static struct pv_entry *
 pv_alloc(void)
 {
-	return malloc(sizeof(struct pv_entry), M_VMPMAP, M_NOWAIT | M_ZERO);
+	return kmem_intr_zalloc(sizeof(struct pv_entry), KM_NOSLEEP);
 }
 
 static void
 pv_free(struct pv_entry *pv)
 {
 
-	free(pv, M_VMPMAP);
+	kmem_intr_free(pv, sizeof(struct pv_entry));
 }
 
 static struct pv_entry *



CVS commit: src/sys/arch/acorn26/acorn26

2011-12-10 Thread KIYOHARA Takashi
Module Name:src
Committed By:   kiyohara
Date:   Sun Dec 11 03:19:20 UTC 2011

Modified Files:
src/sys/arch/acorn26/acorn26: cons_machdep.c

Log Message:
Split boot.h and memcreg.h for MKSYMS and MODULAR.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/acorn26/acorn26/cons_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/cons_machdep.c
diff -u src/sys/arch/acorn26/acorn26/cons_machdep.c:1.12 src/sys/arch/acorn26/acorn26/cons_machdep.c:1.13
--- src/sys/arch/acorn26/acorn26/cons_machdep.c:1.12	Wed Mar 18 10:22:21 2009
+++ src/sys/arch/acorn26/acorn26/cons_machdep.c	Sun Dec 11 03:19:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cons_machdep.c,v 1.12 2009/03/18 10:22:21 cegger Exp $ */
+/* $NetBSD: cons_machdep.c,v 1.13 2011/12/11 03:19:20 kiyohara Exp $ */
 /*-
  * Copyright (c) 1998 Ben Harris
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cons_machdep.c,v 1.12 2009/03/18 10:22:21 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: cons_machdep.c,v 1.13 2011/12/11 03:19:20 kiyohara Exp $);
 
 #include sys/param.h
 #include sys/syslog.h
@@ -48,7 +48,8 @@ __KERNEL_RCSID(0, $NetBSD: cons_machdep
 #include machine/db_machdep.h
 #include ddb/db_extern.h
 #include ddb/db_interface.h
-
+#endif
+#if NKSYMS || defined(DDB) || defined(MODULAR)
 #include machine/boot.h
 #include machine/memcreg.h
 #endif



CVS commit: src/sys/arch/acorn26/acorn26

2011-06-15 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Jun 15 15:03:51 UTC 2011

Modified Files:
src/sys/arch/acorn26/acorn26: machdep.c

Log Message:
Put proper casts to address range checks.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/acorn26/acorn26/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/machdep.c
diff -u src/sys/arch/acorn26/acorn26/machdep.c:1.34 src/sys/arch/acorn26/acorn26/machdep.c:1.35
--- src/sys/arch/acorn26/acorn26/machdep.c:1.34	Sun Jun 12 03:35:36 2011
+++ src/sys/arch/acorn26/acorn26/machdep.c	Wed Jun 15 15:03:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.34 2011/06/12 03:35:36 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.35 2011/06/15 15:03:51 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998 Ben Harris
@@ -32,7 +32,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.34 2011/06/12 03:35:36 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.35 2011/06/15 15:03:51 tsutsui Exp $);
 
 #include sys/buf.h
 #include sys/kernel.h
@@ -217,7 +217,7 @@
 mm_md_physacc(paddr_t pa, vm_prot_t prot)
 {
 
-	return (pa  MEMC_PHYS_BASE + ptoa(physmem)) ? EFAULT : 0;
+	return (pa  (paddr_t)MEMC_PHYS_BASE + ptoa(physmem)) ? EFAULT : 0;
 }
 
 int
@@ -225,6 +225,7 @@
 {
 	const vaddr_t v = (vaddr_t)ptr;
 
-	*handled = (v = MEMC_PHYS_BASE  v  MEMC_PHYS_BASE + ptoa(physmem));
+	*handled = (v = (vaddr_t)MEMC_PHYS_BASE 
+	v  (vaddr_t)MEMC_PHYS_BASE + ptoa(physmem));
 	return 0;
 }



CVS commit: src/sys/arch/acorn26/acorn26

2010-11-14 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Mon Nov 15 06:05:27 UTC 2010

Modified Files:
src/sys/arch/acorn26/acorn26: except.c

Log Message:
Dereferencing struct proc * and struct lwp *, include them


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn26/acorn26/except.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/except.c
diff -u src/sys/arch/acorn26/acorn26/except.c:1.25 src/sys/arch/acorn26/acorn26/except.c:1.26
--- src/sys/arch/acorn26/acorn26/except.c:1.25	Wed Jul  7 01:17:26 2010
+++ src/sys/arch/acorn26/acorn26/except.c	Mon Nov 15 06:05:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.25 2010/07/07 01:17:26 chs Exp $ */
+/* $NetBSD: except.c,v 1.26 2010/11/15 06:05:27 uebayasi Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * All rights reserved.
@@ -31,7 +31,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: except.c,v 1.25 2010/07/07 01:17:26 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: except.c,v 1.26 2010/11/15 06:05:27 uebayasi Exp $);
 
 #include opt_ddb.h
 
@@ -41,6 +41,8 @@
 #include sys/syslog.h
 #include sys/systm.h
 #include sys/cpu.h
+#include sys/lwp.h
+#include sys/proc.h
 
 #include uvm/uvm_extern.h
 



CVS commit: src/sys/arch/acorn26/acorn26

2010-11-14 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Mon Nov 15 06:06:51 UTC 2010

Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c

Log Message:
struct proc * and struct lwp * derefs.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/acorn26/acorn26/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.32 src/sys/arch/acorn26/acorn26/pmap.c:1.33
--- src/sys/arch/acorn26/acorn26/pmap.c:1.32	Fri Nov 12 12:48:49 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c	Mon Nov 15 06:06:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.32 2010/11/12 12:48:49 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -102,12 +102,14 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.32 2010/11/12 12:48:49 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.33 2010/11/15 06:06:51 uebayasi Exp $);
 
 #include sys/kernel.h /* for cold */
 #include sys/malloc.h
 #include sys/pool.h
 #include sys/systm.h
+#include sys/lwp.h
+#include sys/proc.h
 
 #include uvm/uvm.h
 #include uvm/uvm_stat.h



CVS commit: src/sys/arch/acorn26/acorn26

2010-11-14 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Mon Nov 15 06:07:41 UTC 2010

Modified Files:
src/sys/arch/acorn26/acorn26: start.c

Log Message:
lwp0 needs sys/lwp.h.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/acorn26/acorn26/start.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/start.c
diff -u src/sys/arch/acorn26/acorn26/start.c:1.17 src/sys/arch/acorn26/acorn26/start.c:1.18
--- src/sys/arch/acorn26/acorn26/start.c:1.17	Fri Nov 27 03:23:03 2009
+++ src/sys/arch/acorn26/acorn26/start.c	Mon Nov 15 06:07:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: start.c,v 1.17 2009/11/27 03:23:03 rmind Exp $ */
+/* $NetBSD: start.c,v 1.18 2010/11/15 06:07:41 uebayasi Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -31,13 +31,14 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: start.c,v 1.17 2009/11/27 03:23:03 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: start.c,v 1.18 2010/11/15 06:07:41 uebayasi Exp $);
 
 #include opt_modular.h
 
 #include sys/msgbuf.h
 #include sys/syslog.h
 #include sys/systm.h
+#include sys/lwp.h
 
 #include dev/i2c/i2cvar.h
 #include acorn26/ioc/iociicvar.h



CVS commit: src/sys/arch/acorn26/acorn26

2010-11-12 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Fri Nov 12 12:48:49 UTC 2010

Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c

Log Message:
Include uvm/uvm.h for UVM internal definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/acorn26/acorn26/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.31 src/sys/arch/acorn26/acorn26/pmap.c:1.32
--- src/sys/arch/acorn26/acorn26/pmap.c:1.31	Wed Nov 10 09:27:21 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c	Fri Nov 12 12:48:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.31 2010/11/10 09:27:21 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.32 2010/11/12 12:48:49 uebayasi Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -102,14 +102,14 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.31 2010/11/10 09:27:21 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.32 2010/11/12 12:48:49 uebayasi Exp $);
 
 #include sys/kernel.h /* for cold */
 #include sys/malloc.h
 #include sys/pool.h
 #include sys/systm.h
 
-#include uvm/uvm_extern.h
+#include uvm/uvm.h
 #include uvm/uvm_stat.h
 
 #include arm/cpuconf.h



CVS commit: src/sys/arch/acorn26/acorn26

2009-05-10 Thread Havard Eidnes
Module Name:src
Committed By:   he
Date:   Sun May 10 21:47:57 UTC 2009

Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c

Log Message:
Also update the prototype for pmap_enter1() after the recent
int - u_int change.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn26/acorn26/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.27 src/sys/arch/acorn26/acorn26/pmap.c:1.28
--- src/sys/arch/acorn26/acorn26/pmap.c:1.27	Tue Apr 21 21:29:58 2009
+++ src/sys/arch/acorn26/acorn26/pmap.c	Sun May 10 21:47:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.28 2009/05/10 21:47:57 he Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -102,7 +102,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.28 2009/05/10 21:47:57 he Exp $);
 
 #include sys/kernel.h /* for cold */
 #include sys/malloc.h
@@ -202,7 +202,7 @@
 static struct pv_entry *pv_get(pmap_t pmap, int ppn, int lpn);
 static void pv_release(pmap_t pmap, int ppn, int lpn);
 
-static int pmap_enter1(pmap_t, vaddr_t, paddr_t, vm_prot_t, int, int);
+static int pmap_enter1(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int, int);
 
 static void *pmap_find(paddr_t);