PERFORCE change 37599 for review
Sam Leffler
sam at FreeBSD.org
Fri Sep 5 15:06:48 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=37599
Change 37599 by sam at sam_ebb on 2003/09/05 15:06:20
IFC
Affected files ...
.. //depot/projects/netperf/sys/amd64/include/ucontext.h#2 integrate
.. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#4 integrate
.. //depot/projects/netperf/sys/dev/adlink/adlink.c#4 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-cd.h#3 integrate
.. //depot/projects/netperf/sys/dev/awi/awi_wep.c#3 integrate
.. //depot/projects/netperf/sys/dev/pccard/pccard.c#5 integrate
.. //depot/projects/netperf/sys/i386/isa/isa.h#2 integrate
.. //depot/projects/netperf/sys/i386/isa/isa_compat.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/isa_device.h#2 integrate
.. //depot/projects/netperf/sys/isa/fd.c#2 integrate
.. //depot/projects/netperf/sys/isa/isareg.h#2 integrate
.. //depot/projects/netperf/sys/kern/subr_msgbuf.c#2 integrate
.. //depot/projects/netperf/sys/net/bpf.c#6 integrate
.. //depot/projects/netperf/sys/net/if_vlan.c#4 integrate
.. //depot/projects/netperf/sys/netinet/ip_divert.c#4 integrate
.. //depot/projects/netperf/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#4 integrate
Differences ...
==== //depot/projects/netperf/sys/amd64/include/ucontext.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.13 2003/05/12 18:33:19 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.14 2003/09/05 20:47:27 peter Exp $
*/
#ifndef _MACHINE_UCONTEXT_H_
@@ -70,11 +70,11 @@
#define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */
#define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */
long mc_ownedfp;
- long mc_spare1[1]; /* align next field to 16 bytes */
+ long mc_spare1[1]; /* align mc_fpstate to 16 bytes */
/*
* See <machine/npx.h> for the internals of mc_fpstate[].
*/
- long mc_fpstate[128] __aligned(16);
+ long mc_fpstate[64] __aligned(16);
long mc_spare2[8];
} mcontext_t;
==== //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#4 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.81 2003/09/03 04:46:28 ken Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $");
#include "opt_cd.h"
@@ -152,7 +152,9 @@
int bufs_left;
struct cam_periph *periph;
dev_t dev;
+#ifndef BURN_BRIDGES
eventhandler_tag clonetag;
+#endif
int minimum_command_size;
int outstanding_cmds;
struct task sysctl_task;
@@ -341,6 +343,7 @@
static STAILQ_HEAD(changerlist, cdchanger) changerq;
+#ifndef BURN_BRIDGES
static void
cdclone(void *arg, char *name, int namelen, dev_t *dev)
{
@@ -360,6 +363,7 @@
*dev = softc->dev;
return;
}
+#endif
static void
cdinit(void)
@@ -531,7 +535,9 @@
}
devstat_remove_entry(softc->device_stats);
destroy_dev(softc->dev);
+#ifndef BURN_BRIDGES
EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag);
+#endif
free(softc, M_DEVBUF);
splx(s);
}
@@ -776,8 +782,10 @@
softc->dev = make_dev(&cd_cdevsw, periph->unit_number,
UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number);
softc->dev->si_drv1 = periph;
+#ifndef BURN_BRIDGES
softc->clonetag =
EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000);
+#endif
/*
* Add an async callback so that we get
==== //depot/projects/netperf/sys/dev/adlink/adlink.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.4 2003/08/24 17:48:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.5 2003/09/05 11:05:41 phk Exp $");
#ifdef _KERNEL
#include <sys/param.h>
@@ -274,7 +274,7 @@
/* Sample CH0 only */
bus_space_write_4(sc->t1, sc->h1, 0x00, 1);
- /* Divide clock by ten */
+ /* Divide clock by four */
bus_space_write_4(sc->t1, sc->h1, 0x04, 4);
/* Software trigger mode: software */
==== //depot/projects/netperf/sys/dev/ata/atapi-cd.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.141 2003/09/02 15:53:01 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -242,7 +242,9 @@
free(entry, M_ACD);
}
destroy_dev(cdp->dev);
+#ifndef BURN_BRIDGES
EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh);
+#endif
devstat_remove_entry(cdp->stats);
ata_prtdev(atadev, "WARNING - removed from configuration\n");
ata_free_name(atadev);
@@ -273,6 +275,7 @@
return cdp;
}
+#ifndef BURN_BRIDGES
static void
acd_clone(void *arg, char *name, int namelen, dev_t *dev)
{
@@ -289,6 +292,7 @@
if (unit == cdp->lun)
*dev = makedev(acd_cdevsw.d_maj, cdp->lun);
}
+#endif
static void
acd_make_dev(struct acd_softc *cdp)
@@ -300,7 +304,9 @@
dev->si_drv1 = cdp;
cdp->dev = dev;
cdp->device->flags |= ATA_D_MEDIA_CHANGED;
+#ifndef BURN_BRIDGES
cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000);
+#endif
acd_set_ioparm(cdp);
}
==== //depot/projects/netperf/sys/dev/ata/atapi-cd.h#3 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.36 2003/08/24 09:22:26 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $
*/
/* CDROM Table Of Contents */
@@ -322,5 +322,7 @@
int block_size; /* blocksize currently used */
struct devstat *stats; /* devstat entry */
dev_t dev; /* device place holders */
+#ifndef BURN_BRIDGES
eventhandler_tag clone_evh;
+#endif
};
==== //depot/projects/netperf/sys/dev/awi/awi_wep.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.14 2003/08/24 17:48:06 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.15 2003/09/05 11:09:26 phk Exp $");
/*
* WEP support framework for the awi driver.
@@ -240,7 +240,7 @@
int ctxlen;
awi_crc_init(); /* XXX: not belongs here */
- if (algo < 0 || algo > sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0]))
+ if (algo < 0 || algo >= sizeof(awi_wep_algo)/sizeof(awi_wep_algo[0]))
return EINVAL;
awa = &awi_wep_algo[algo];
if (awa->awa_name == NULL)
==== //depot/projects/netperf/sys/dev/pccard/pccard.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.83 2003/08/25 18:20:03 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.84 2003/09/05 03:08:08 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,14 +284,16 @@
struct pccard_softc *sc = PCCARD_SOFTC(dev);
struct pccard_function *pf;
struct pccard_config_entry *cfe;
+ int state;
/*
* We are running on either the PCCARD socket's event thread
* or in user context detaching a device by user request.
*/
STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) {
- int state = device_get_state(pf->dev);
-
+ if (pf->dev == NULL)
+ continue;
+ state = device_get_state(pf->dev);
if (state == DS_ATTACHED || state == DS_BUSY)
device_detach(pf->dev);
if (pf->cfe != NULL)
==== //depot/projects/netperf/sys/i386/isa/isa.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.h 5.7 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/i386/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $
+ * $FreeBSD: src/sys/i386/isa/isa.h,v 1.24 2003/09/05 14:54:26 peter Exp $
*/
#ifdef PC98
@@ -187,14 +187,4 @@
#define RAM_SIZE (RAM_END - RAM_BEGIN)
#endif /* !RAM_BEGIN */
-/*
- * Oddball Physical Memory Addresses
- */
-#ifndef COMPAQ_RAMRELOC
-#define COMPAQ_RAMRELOC 0x80C00000 /* Compaq RAM relocation/diag */
-#define COMPAQ_RAMSETUP 0x80C00002 /* Compaq RAM setup */
-#define WEITEK_FPU 0xC0000000 /* WTL 2167 */
-#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */
-#endif /* !COMPAQ_RAMRELOC */
-
#endif /* !_I386_ISA_ISA_H_ */
==== //depot/projects/netperf/sys/i386/isa/isa_compat.c#2 (text+ko) ====
@@ -24,8 +24,10 @@
* SUCH DAMAGE.
*/
+#ifndef BURN_BRIDGES
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.27 2003/06/02 16:32:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.28 2003/09/05 14:55:11 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,3 +297,7 @@
}
return 0;
}
+
+#else
+#error "cvs rm sys/i386/isa/isa_compat.c"
+#endif
==== //depot/projects/netperf/sys/i386/isa/isa_device.h#2 (text+ko) ====
@@ -31,12 +31,14 @@
* SUCH DAMAGE.
*
* from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.76 2002/07/09 01:16:18 mike Exp $
+ * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.77 2003/09/05 14:55:11 peter Exp $
*/
#ifndef _I386_ISA_ISA_DEVICE_H_
#define _I386_ISA_ISA_DEVICE_H_
+#ifndef BURN_BRIDGES
+
#ifdef _KERNEL
#include <sys/bus.h>
#include <isa/isavar.h>
@@ -109,4 +111,8 @@
#endif /* COMPAT_OLDISA */
+#else /* BURN_BRIDGES */
+#error "cvs rm sys/i386/isa/isa_device.h"
+#endif /* BURN_BRIDGES */
+
#endif /* !_I386_ISA_ISA_DEVICE_H_ */
==== //depot/projects/netperf/sys/isa/fd.c#2 (text+ko) ====
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.256 2003/07/02 16:09:01 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.257 2003/09/05 10:40:16 phk Exp $");
#include "opt_fdc.h"
#include "card.h"
@@ -316,9 +316,11 @@
struct callout_handle toffhandle;
struct callout_handle tohandle;
struct devstat *device_stats;
+ dev_t masterdev;
+#ifndef BURN_BRIDGES
eventhandler_tag clonetag;
- dev_t masterdev;
dev_t clonedevs[NUMDENS - 1];
+#endif
device_t dev;
fdu_t fdu;
};
@@ -386,7 +388,9 @@
static void fdc_add_child(device_t, const char *, int);
static int fdc_attach(device_t);
static int fdc_print_child(device_t, device_t);
+#ifndef BURN_BRIDGES
static void fd_clone (void *, char *, int, dev_t *);
+#endif
static int fd_probe(device_t);
static int fd_attach(device_t);
static int fd_detach(device_t);
@@ -1117,6 +1121,7 @@
#endif /* NCARD > 0 */
+#ifndef BURN_BRIDGES
/*
* Create a clone device upon request by devfs.
*/
@@ -1170,6 +1175,7 @@
}
}
}
+#endif
/*
* Configuration/initialization, per drive.
@@ -1323,14 +1329,20 @@
fd_attach(device_t dev)
{
struct fd_data *fd;
- int i;
fd = device_get_softc(dev);
+#ifndef BURN_BRIDGES
fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000);
+#endif
fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6,
UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu);
+#ifndef BURN_BRIDGES
+ {
+ int i;
for (i = 0; i < NUMDENS - 1; i++)
fd->clonedevs[i] = NODEV;
+ }
+#endif
fd->device_stats = devstat_new_entry(device_get_name(dev),
device_get_unit(dev), 0, DEVSTAT_NO_ORDERED_TAGS,
DEVSTAT_TYPE_FLOPPY | DEVSTAT_TYPE_IF_OTHER,
@@ -1342,16 +1354,20 @@
fd_detach(device_t dev)
{
struct fd_data *fd;
- int i;
fd = device_get_softc(dev);
untimeout(fd_turnoff, fd, fd->toffhandle);
devstat_remove_entry(fd->device_stats);
destroy_dev(fd->masterdev);
+#ifndef BURN_BRIDGES
+ {
+ int i;
for (i = 0; i < NUMDENS - 1; i++)
if (fd->clonedevs[i] != NODEV)
destroy_dev(fd->clonedevs[i]);
EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag);
+ }
+#endif
return (0);
}
==== //depot/projects/netperf/sys/isa/isareg.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.h 5.7 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/isa/isareg.h,v 1.8 2003/02/02 13:06:18 nyan Exp $
+ * $FreeBSD: src/sys/isa/isareg.h,v 1.9 2003/09/05 14:54:26 peter Exp $
*/
#ifdef PC98
@@ -195,14 +195,4 @@
#define RAM_SIZE (RAM_END - RAM_BEGIN)
#endif /* !RAM_BEGIN */
-/*
- * Oddball Physical Memory Addresses
- */
-#ifndef COMPAQ_RAMRELOC
-#define COMPAQ_RAMRELOC 0x80C00000 /* Compaq RAM relocation/diag */
-#define COMPAQ_RAMSETUP 0x80C00002 /* Compaq RAM setup */
-#define WEITEK_FPU 0xC0000000 /* WTL 2167 */
-#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */
-#endif /* !COMPAQ_RAMRELOC */
-
#endif /* !_ISA_ISA_H_ */
==== //depot/projects/netperf/sys/kern/subr_msgbuf.c#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.1 2003/06/22 02:18:31 iedowse Exp $
+ * $FreeBSD: src/sys/kern/subr_msgbuf.c,v 1.2 2003/09/05 11:12:00 phk Exp $
*/
/*
@@ -73,8 +73,11 @@
mbp->msg_ptr = ptr;
cksum = msgbuf_cksum(mbp);
if (cksum != mbp->msg_cksum) {
- printf("msgbuf cksum mismatch (read %x, calc %x)\n",
- mbp->msg_cksum, cksum);
+ if (bootverbose) {
+ printf("msgbuf cksum mismatch (read %x, calc %x)\n",
+ mbp->msg_cksum, cksum);
+ printf("Old msgbuf not recovered\n");
+ }
msgbuf_clear(mbp);
}
}
==== //depot/projects/netperf/sys/net/bpf.c#6 (text+ko) ====
@@ -37,7 +37,7 @@
*
* @(#)bpf.c 8.4 (Berkeley) 1/9/95
*
- * $FreeBSD: src/sys/net/bpf.c,v 1.114 2003/08/19 17:51:09 sam Exp $
+ * $FreeBSD: src/sys/net/bpf.c,v 1.115 2003/09/04 22:27:45 sam Exp $
*/
#include "opt_bpf.h"
==== //depot/projects/netperf/sys/net/if_vlan.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net/if_vlan.c,v 1.51 2003/07/08 21:54:20 wpaul Exp $
+ * $FreeBSD: src/sys/net/if_vlan.c,v 1.52 2003/09/05 20:58:59 sam Exp $
*/
/*
==== //depot/projects/netperf/sys/netinet/ip_divert.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.74 2003/04/08 14:25:45 des Exp $
+ * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.75 2003/09/05 00:00:51 sam Exp $
*/
#include "opt_inet.h"
==== //depot/projects/netperf/sys/netinet/ip_input.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.240 2003/07/22 18:58:34 sam Exp $
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.241 2003/09/05 00:10:33 sam Exp $
*/
#include "opt_bootp.h"
==== //depot/projects/netperf/sys/nfsclient/bootp_subr.c#4 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.51 2003/08/15 12:04:02 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.52 2003/09/05 11:12:55 phk Exp $");
#include "opt_bootp.h"
@@ -191,10 +191,7 @@
#define OVERLOAD_SNAME 2
/* Site specific tags: */
-#define TAG_SWAP 128
-#define TAG_SWAPSIZE 129
#define TAG_ROOTOPTS 130
-#define TAG_SWAPOPTS 131
#define TAG_COOKIE 134 /* ascii info for userland, via sysctl */
#define TAG_DHCP_MSGTYPE 53
More information about the p4-projects
mailing list