Module Name: src
Committed By: martin
Date: Thu Oct 30 12:14:37 UTC 2014
Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: disksubr.c
src/sys/arch/amiga/dev [netbsd-7]: siop.c siop2.c
src/sys/arch/arm/arm32 [netbsd-7]: pmap.c
src/sys/arch/mvme68k/stand/installboot [netbsd-7]: installboot.c
src/sys/arch/news68k/news68k [netbsd-7]: bus_space.c
src/sys/arch/newsmips/stand/boot [netbsd-7]: netif_news.c
src/sys/arch/x86/x86 [netbsd-7]: x86_autoconf.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #165):
sys/arch/newsmips/stand/boot/netif_news.c: revision 1.9
sys/arch/mvme68k/stand/installboot/installboot.c: revision 1.19
sys/arch/arm/arm32/pmap.c: revision 1.300
sys/arch/amiga/dev/siop2.c: revision 1.43
sys/arch/amiga/amiga/disksubr.c: revision 1.62
sys/arch/news68k/news68k/bus_space.c: revision 1.13
sys/arch/amiga/dev/siop.c: revision 1.69
sys/arch/x86/x86/x86_autoconf.c: revision 1.72
Remove dead code in various places under arch/.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.4.1 src/sys/arch/amiga/amiga/disksubr.c
cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/arch/amiga/dev/siop.c
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/amiga/dev/siop2.c
cvs rdiff -u -r1.295 -r1.295.2.1 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.18 -r1.18.8.1 \
src/sys/arch/mvme68k/stand/installboot/installboot.c
cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/news68k/news68k/bus_space.c
cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/newsmips/stand/boot/netif_news.c
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/arch/x86/x86/x86_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/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.61 src/sys/arch/amiga/amiga/disksubr.c:1.61.4.1
--- src/sys/arch/amiga/amiga/disksubr.c:1.61 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/amiga/disksubr.c Thu Oct 30 12:14:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: disksubr.c,v 1.61.4.1 2014/10/30 12:14:37 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.61.4.1 2014/10/30 12:14:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -567,16 +567,6 @@ writedisklabel(dev_t dev, void (*strat)(
done:
brelse(bp, 0);
return (error);
-
- /*
- * get write out partition list iff cpu_label is valid.
- */
- if (clp->valid == 0 ||
- (clp->rdblock <= 0 || clp->rdblock >= RDB_MAXBLOCKS))
- return(EINVAL);
-
- (void)getrdbmap(dev, strat, lp, clp);
- return(EINVAL);
}
u_long
Index: src/sys/arch/amiga/dev/siop.c
diff -u src/sys/arch/amiga/dev/siop.c:1.68 src/sys/arch/amiga/dev/siop.c:1.68.4.1
--- src/sys/arch/amiga/dev/siop.c:1.68 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/siop.c Thu Oct 30 12:14:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: siop.c,v 1.68.4.1 2014/10/30 12:14:37 martin Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -70,7 +70,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.68.4.1 2014/10/30 12:14:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1127,9 +1127,6 @@ siop_checkintr(struct siop_softc *sc, u_
}
/* rp->siop_dcntl |= SIOP_DCNTL_STD;*/
return (0);
-#ifdef DDB
- Debugger();
-#endif
}
#endif
*status = -1;
Index: src/sys/arch/amiga/dev/siop2.c
diff -u src/sys/arch/amiga/dev/siop2.c:1.42 src/sys/arch/amiga/dev/siop2.c:1.42.4.1
--- src/sys/arch/amiga/dev/siop2.c:1.42 Wed Jan 22 00:25:16 2014
+++ src/sys/arch/amiga/dev/siop2.c Thu Oct 30 12:14:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $ */
+/* $NetBSD: siop2.c,v 1.42.4.1 2014/10/30 12:14:37 martin Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -70,7 +70,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop2.c,v 1.42.4.1 2014/10/30 12:14:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1256,9 +1256,6 @@ siopng_checkintr(struct siop_softc *sc,
}
/* rp->siop_dcntl |= SIOP_DCNTL_STD;*/
return (0);
-#ifdef DDB
- Debugger();
-#endif
}
#endif
*status = -1;
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.295 src/sys/arch/arm/arm32/pmap.c:1.295.2.1
--- src/sys/arch/arm/arm32/pmap.c:1.295 Fri Jul 25 15:09:43 2014
+++ src/sys/arch/arm/arm32/pmap.c Thu Oct 30 12:14:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.295 2014/07/25 15:09:43 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.295.2.1 2014/10/30 12:14:36 martin Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include <arm/locore.h>
//#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.295 2014/07/25 15:09:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.295.2.1 2014/10/30 12:14:36 martin Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -6221,12 +6221,6 @@ pmap_set_pt_cache_mode(pd_entry_t *kl1,
rv = 1;
}
return rv;
- if (pde & L1_S_V6_SUPER) {
- va = (va & -L1_SS_SIZE) + L1_SS_SIZE;
- } else {
- va = (va & -L1_S_SIZE) + L1_S_SIZE;
- }
- continue;
}
vaddr_t pa = l1pte_pa(pde);
pt_entry_t *ptep = (pt_entry_t *)kernel_pt_lookup(pa);
Index: src/sys/arch/mvme68k/stand/installboot/installboot.c
diff -u src/sys/arch/mvme68k/stand/installboot/installboot.c:1.18 src/sys/arch/mvme68k/stand/installboot/installboot.c:1.18.8.1
--- src/sys/arch/mvme68k/stand/installboot/installboot.c:1.18 Sun Jun 23 02:06:05 2013
+++ src/sys/arch/mvme68k/stand/installboot/installboot.c Thu Oct 30 12:14:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.18 2013/06/23 02:06:05 dholland Exp $ */
+/* $NetBSD: installboot.c,v 1.18.8.1 2014/10/30 12:14:36 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -219,10 +219,6 @@ loadprotoblocks(char *fname, size_t *siz
}
return (char *)bp;
-
- if (bp)
- free((void *)bp);
- return NULL;
}
static void
Index: src/sys/arch/news68k/news68k/bus_space.c
diff -u src/sys/arch/news68k/news68k/bus_space.c:1.12 src/sys/arch/news68k/news68k/bus_space.c:1.12.4.1
--- src/sys/arch/news68k/news68k/bus_space.c:1.12 Mon Mar 24 19:54:28 2014
+++ src/sys/arch/news68k/news68k/bus_space.c Thu Oct 30 12:14:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.12 2014/03/24 19:54:28 christos Exp $ */
+/* $NetBSD: bus_space.c,v 1.12.4.1 2014/10/30 12:14:37 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12 2014/03/24 19:54:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12.4.1 2014/10/30 12:14:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,9 +61,10 @@ bus_space_map(bus_space_tag_t t, bus_add
return 0;
}
- if (t == NEWS68K_BUS_SPACE_EIO)
+ if (t == NEWS68K_BUS_SPACE_EIO) {
*bshp = (bus_space_handle_t)bpa; /* XXX use tt0 mapping */
return 0;
+ }
return 1;
}
Index: src/sys/arch/newsmips/stand/boot/netif_news.c
diff -u src/sys/arch/newsmips/stand/boot/netif_news.c:1.8 src/sys/arch/newsmips/stand/boot/netif_news.c:1.8.38.1
--- src/sys/arch/newsmips/stand/boot/netif_news.c:1.8 Wed Oct 21 23:12:09 2009
+++ src/sys/arch/newsmips/stand/boot/netif_news.c Thu Oct 30 12:14:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netif_news.c,v 1.8 2009/10/21 23:12:09 snj Exp $ */
+/* $NetBSD: netif_news.c,v 1.8.38.1 2014/10/30 12:14:36 martin Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -191,7 +191,7 @@ int
prom_getether(struct romdev *pd, u_char *ea)
{
- if (apcall_ioctl(pd->fd, APIOCGIFHWADDR, ea));
+ if (apcall_ioctl(pd->fd, APIOCGIFHWADDR, ea))
return -1;
#ifdef BOOT_DEBUG
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.71 src/sys/arch/x86/x86/x86_autoconf.c:1.71.2.1
--- src/sys/arch/x86/x86/x86_autoconf.c:1.71 Tue Jun 10 22:01:40 2014
+++ src/sys/arch/x86/x86/x86_autoconf.c Thu Oct 30 12:14:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.71 2014/06/10 22:01:40 christos Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.71.2.1 2014/10/30 12:14:37 martin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.71 2014/06/10 22:01:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.71.2.1 2014/10/30 12:14:37 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -423,7 +423,6 @@ findroot(void)
for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
dv != NULL;
dv = deviter_next(&di)) {
- continue;
if (device_is_a(dv, "fd") &&
device_class(dv) == DV_DISK) {
