diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/isp_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pcireg.h | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_carp.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 195753c7fb5..937609b72e0 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_pci.c,v 1.34 2003/06/26 00:47:47 mickey Exp $ */ +/* $OpenBSD: isp_pci.c,v 1.35 2003/12/06 14:40:33 grange Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * @@ -681,8 +681,8 @@ isp_pci_attach(struct device *parent, struct device *self, void *aux) printf(": %s\n", intrstr); if (IS_FC(isp)) { - DEFAULT_NODEWWN(isp) = 0x400000007F000003; - DEFAULT_PORTWWN(isp) = 0x400000007F000003; + DEFAULT_NODEWWN(isp) = 0x400000007F000003ULL; + DEFAULT_PORTWWN(isp) = 0x400000007F000003ULL; } isp->isp_confopts = self->dv_cfdata->cf_flags; diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index e70882fea25..e5061ddd0b8 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcireg.h,v 1.25 2003/11/16 20:30:06 avsm Exp $ */ +/* $OpenBSD: pcireg.h,v 1.26 2003/12/06 14:40:33 grange Exp $ */ /* $NetBSD: pcireg.h,v 1.26 2000/05/10 16:58:42 thorpej Exp $ */ /* @@ -413,7 +413,7 @@ typedef u_int8_t pci_revision_t; ((mr) & PCI_MAPREG_MEM64_ADDR_MASK) #define PCI_MAPREG_MEM64_SIZE(mr) \ (PCI_MAPREG_MEM64_ADDR(mr) & -PCI_MAPREG_MEM64_ADDR(mr)) -#define PCI_MAPREG_MEM64_ADDR_MASK 0xfffffffffffffff0 +#define PCI_MAPREG_MEM64_ADDR_MASK 0xfffffffffffffff0ULL #define PCI_MAPREG_IO_ADDR(mr) \ ((mr) & PCI_MAPREG_IO_ADDR_MASK) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 65eb4701134..6c933a8d34a 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.30 2003/12/03 14:57:09 markus Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.31 2003/12/06 14:40:33 grange Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -657,7 +657,7 @@ carp_prepare_ad(struct mbuf *m, struct carp_softc *sc, struct carp_header *ch) sc->sc_counter = arc4random(); sc->sc_counter = sc->sc_counter << 32; sc->sc_counter += arc4random(); - } else if (sc->sc_counter == 0xffffffffffffffff) { + } else if (sc->sc_counter == 0xffffffffffffffffULL) { sc->sc_counter = 0; } else sc->sc_counter++; |