subject:"CVS commit\: \[netbsd\-7\] src\/sys\/arch\/amiga\/amiga"

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

2018-04-09 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Apr  9 13:27:41 UTC 2018

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: cc.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/amiga/amiga/cc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.26 src/sys/arch/amiga/amiga/cc.c:1.26.4.1
--- src/sys/arch/amiga/amiga/cc.c:1.26	Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/amiga/cc.c	Mon Apr  9 13:27:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $	*/
+/*	$NetBSD: cc.c,v 1.26.4.1 2018/04/09 13:27:41 martin Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26.4.1 2018/04/09 13:27:41 martin Exp $");
 
 #include 
 #include 
@@ -503,8 +503,10 @@ alloc_chipmem(u_long size)
 		if (size <= mn->size)
 			break;
 
-	if (mn == NULL)
+	if (mn == NULL) {
+		splx(s);
 		return NULL;
+	}
 
 	if ((mn->size - size) <= sizeof (*mn)) {
 		/*

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

2015-06-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Jun 10 17:19:28 UTC 2015

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: machdep.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #838):
sys/arch/amiga/amiga/machdep.c: revision 1.244
Fix space calculation for dump header. Round up to clicks to avoid
disk alignment issues.


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.243.4.1 src/sys/arch/amiga/amiga/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/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.243 src/sys/arch/amiga/amiga/machdep.c:1.243.4.1
--- src/sys/arch/amiga/amiga/machdep.c:1.243	Mon Mar 24 20:06:31 2014
+++ src/sys/arch/amiga/amiga/machdep.c	Wed Jun 10 17:19:28 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.243.4.1 2015/06/10 17:19:28 snj Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
 #include empm.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.243.4.1 2015/06/10 17:19:28 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -535,7 +535,7 @@ cpu_dumpconf(void)
 		else if (dumplo == 0)
 			dumplo = nblks - btodb(ctob(dumpsize));
 	}
-	--dumplo;	/* XXX assume header fits in one block */
+	dumplo -= btodb(ctob(btoc(MDHDRSIZE + ctob(1) - 1)));
 	/*
 	 * Don't dump on the first PAGE_SIZE (why PAGE_SIZE?)
 	 * in case the dump device includes a disk label.

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

2015-06-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Jun  8 20:46:29 UTC 2015

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: autoconf.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #832):
sys/arch/amiga/amiga/autoconf.c: revision 1.117
use RAW_PART to trigger read of disklabel, other units might by busy due
to discovered wedges.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/arch/amiga/amiga/autoconf.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/amiga/amiga/autoconf.c
diff -u src/sys/arch/amiga/amiga/autoconf.c:1.116 src/sys/arch/amiga/amiga/autoconf.c:1.116.4.1
--- src/sys/arch/amiga/amiga/autoconf.c:1.116	Thu Dec 26 20:38:11 2013
+++ src/sys/arch/amiga/amiga/autoconf.c	Mon Jun  8 20:46:29 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.116.4.1 2015/06/08 20:46:29 snj Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.116.4.1 2015/06/08 20:46:29 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -481,11 +481,11 @@ findroot(void)
 			maj = bdevsw_lookup_major(bdp);
 
 			/* Open disk; forces read of disklabel. */
-			if ((*bdp-d_open)(MAKEDISKDEV(maj,
-			unit, 0), FREAD|FNONBLOCK, 0, lwp0))
+			if ((*bdp-d_open)(MAKEDISKDEV(maj, unit, RAW_PART),
+FREAD|FNONBLOCK, 0, lwp0))
 continue;
-			(void)(*bdp-d_close)(MAKEDISKDEV(maj,
-			unit, 0), FREAD|FNONBLOCK, 0, lwp0);
+			(void)(*bdp-d_close)(MAKEDISKDEV(maj, unit, RAW_PART),
+FREAD|FNONBLOCK, 0, lwp0);
 
 			pp = dkp-dk_label-d_partitions[0];
 			if (pp-p_size != 0  pp-p_fstype == FS_BSDFFS) {

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

2015-01-17 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jan 17 12:20:15 UTC 2015

Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: gayle.c

Log Message:
Pull up following revision(s) (requested by phx in ticket #429):
sys/arch/amiga/amiga/gayle.c: revision 1.8
Fixed crash of A4000 IDE due to uninitialised bus_space_tag and bus_space
handle for the interrupt status register.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/amiga/amiga/gayle.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/amiga/amiga/gayle.c
diff -u src/sys/arch/amiga/amiga/gayle.c:1.7 src/sys/arch/amiga/amiga/gayle.c:1.7.4.1
--- src/sys/arch/amiga/amiga/gayle.c:1.7	Fri Jan  3 00:33:06 2014
+++ src/sys/arch/amiga/amiga/gayle.c	Sat Jan 17 12:20:14 2015
@@ -1,9 +1,9 @@
-/*	$NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $	*/
+/*	$NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $	*/
 
 /* public domain */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $);
 
 /*
  * Gayle management - provide functions for use in the drivers that utilise
@@ -75,9 +75,11 @@ gayle_init(void) {
 	if (is_a4000()) {
 		gayle_t-gayle_isr_bst.base = (bus_addr_t) __UNVOLATILE(ztwomap(
 		GAYLE_IDE_BASE_A4000+GAYLE_IDE_INTREQ_A4000));
-
-		gayle_t-gayle_io_bst.absm = amiga_bus_stride_1;
+		gayle_t-gayle_isr_bst.absm = amiga_bus_stride_1;
 		gayle_t-gayle_isr_t = (gayle_t-gayle_isr_bst);
+
+		bus_space_map(gayle_t-gayle_isr_t, 0, 0x1, 0,
+		(gayle_t-gayle_isr_h));
 	} else {
 		bus_space_subregion(gayle_t-gayle_io_t, gayle_t-gayle_io_h, 
 		GAYLE_INTREQ, 0x1, (gayle_t-gayle_isr_h));

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

CVS commit: [netbsd-7] src/sys/arch/amiga/amiga

4 matches

Site Navigation

Mail list logo

Footer information