CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: thorpej Date: Tue Jun 4 03:03:34 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_ts.c Log Message: Only call wsmouse_input() if we have a wsmousedev attached (which only happens if the DT tells us to connect one). Fixes a panic on my Lamobo R1 (with no connected touchscreen). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_ts.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: thorpej
Date: Tue Jun 4 03:03:34 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_ts.c
Log Message:
Only call wsmouse_input() if we have a wsmousedev attached (which only
happens if the DT tells us to connect one).
Fixes a panic on my Lamobo R1 (with no connected touchscreen).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_ts.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/arm/sunxi/sunxi_ts.c
diff -u src/sys/arch/arm/sunxi/sunxi_ts.c:1.2 src/sys/arch/arm/sunxi/sunxi_ts.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_ts.c:1.2 Mon Oct 9 14:28:01 2017
+++ src/sys/arch/arm/sunxi/sunxi_ts.c Tue Jun 4 03:03:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ts.c,v 1.2 2017/10/09 14:28:01 jmcneill Exp $ */
+/* $NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.2 2017/10/09 14:28:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $");
#include
#include
@@ -268,7 +268,7 @@ sunxi_ts_intr(void *priv)
if (sc->sc_ignoredata) {
/* Discard the first report */
sc->sc_ignoredata = false;
- } else {
+ } else if (sc->sc_wsmousedev != NULL) {
if (sc->sc_ts_inverted_x)
x = __SHIFTOUT_MASK(TP_DATA_MASK) - x;
if (sc->sc_ts_inverted_y)
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: christos
Date: Tue Jun 4 00:08:00 UTC 2019
Modified Files:
src/sbin/fsck_msdos: fat.c
Log Message:
We already incremented cl; fix indexing. Noticed by Xin Li @FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_msdos/fat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/fat.c
diff -u src/sbin/fsck_msdos/fat.c:1.29 src/sbin/fsck_msdos/fat.c:1.30
--- src/sbin/fsck_msdos/fat.c:1.29 Fri Jul 11 10:59:53 2014
+++ src/sbin/fsck_msdos/fat.c Mon Jun 3 20:08:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fat.c,v 1.29 2014/07/11 14:59:53 christos Exp $ */
+/* $NetBSD: fat.c,v 1.30 2019/06/04 00:08:00 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fat.c,v 1.29 2014/07/11 14:59:53 christos Exp $");
+__RCSID("$NetBSD: fat.c,v 1.30 2019/06/04 00:08:00 christos Exp $");
#endif /* not lint */
#include
@@ -562,8 +562,8 @@ writefat(int fs, struct bootblock *boot,
break;
if (fat[cl].next == CLUST_FREE)
boot->NumFree++;
- *p++ |= (u_char)(fat[cl + 1].next << 4);
- *p++ = (u_char)(fat[cl + 1].next >> 4);
+ *p++ |= (u_char)(fat[cl].next << 4);
+ *p++ = (u_char)(fat[cl].next >> 4);
break;
}
}
CVS commit: src/sbin/fsck_msdos
Module Name:src Committed By: christos Date: Tue Jun 4 00:08:00 UTC 2019 Modified Files: src/sbin/fsck_msdos: fat.c Log Message: We already incremented cl; fix indexing. Noticed by Xin Li @FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_msdos/fat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jun 3 15:49:04 UTC 2019 Modified Files: src/sys/dev/pci: if_sk.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_sk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jun 3 15:49:04 UTC 2019
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_sk.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/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.99 src/sys/dev/pci/if_sk.c:1.100
--- src/sys/dev/pci/if_sk.c:1.99 Mon Jun 3 15:39:35 2019
+++ src/sys/dev/pci/if_sk.c Mon Jun 3 15:49:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $ */
+/* $NetBSD: if_sk.c,v 1.100 2019/06/03 15:49:04 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.100 2019/06/03 15:49:04 msaitoh Exp $");
#include
#include
@@ -154,9 +154,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.
#include
int skc_probe(device_t, cfdata_t, void *);
-void skc_attach(device_t, device_t, void *aux);
+void skc_attach(device_t, device_t, void *);
int sk_probe(device_t, cfdata_t, void *);
-void sk_attach(device_t, device_t, void *aux);
+void sk_attach(device_t, device_t, void *);
int skcprint(void *, const char *);
int sk_intr(void *);
void sk_intr_bcom(struct sk_if_softc *);
@@ -1162,7 +1162,8 @@ skc_probe(device_t parent, cfdata_t matc
/*
* Force the GEnesis into reset, then bring it out of reset.
*/
-void sk_reset(struct sk_softc *sc)
+void
+sk_reset(struct sk_softc *sc)
{
DPRINTFN(2, ("sk_reset\n"));
@@ -1399,7 +1400,8 @@ sk_attach(device_t parent, device_t self
ifp = &sc_if->sk_ethercom.ec_if;
/* Try to allocate memory for jumbo buffers. */
if (sk_alloc_jumbo_mem(sc_if)) {
- aprint_error("%s: jumbo buffer allocation failed\n", ifp->if_xname);
+ aprint_error("%s: jumbo buffer allocation failed\n",
+ ifp->if_xname);
goto fail;
}
sc_if->sk_ethercom.ec_capabilities = ETHERCAP_VLAN_MTU
@@ -1648,8 +1650,8 @@ skc_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr, sc,
- device_xname(sc->sk_dev));
+ sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr,
+ sc, device_xname(sc->sk_dev));
if (sc->sk_intrhand == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
@@ -1854,7 +1856,8 @@ skc_attach(device_t parent, device_t sel
sk_sysctl_handler, 0, (void *)sc,
0, CTL_HW, sk_root_num, sk_nodenum, CTL_CREATE,
CTL_EOL)) != 0) {
- aprint_normal_dev(sc->sk_dev, "couldn't create int_mod sysctl node\n");
+ aprint_normal_dev(sc->sk_dev,
+ "couldn't create int_mod sysctl node\n");
goto fail_1;
}
@@ -2617,7 +2620,8 @@ sk_unreset_yukon(struct sk_if_softc *sc_
sc->sk_rev >= SK_YUKON_LITE_REV_A3) {
/* Take PHY out of reset. */
sk_win_write_4(sc, SK_GPIO,
- (sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9) & ~SK_GPIO_DAT9);
+ (sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9)
+ & ~SK_GPIO_DAT9);
}
/* GMAC and GPHY Reset */
@@ -2697,7 +2701,7 @@ sk_init_yukon(struct sk_if_softc *sc_if)
/* transmit parameter register */
DPRINTFN(6, ("sk_init_yukon: 8\n"));
SK_YU_WRITE_2(sc_if, YUKON_TPR, YU_TPR_JAM_LEN(0x3) |
- YU_TPR_JAM_IPG(0xb) | YU_TPR_JAM2DATA_IPG(0x1a) );
+ YU_TPR_JAM_IPG(0xb) | YU_TPR_JAM2DATA_IPG(0x1a));
/* serial mode register */
DPRINTFN(6, ("sk_init_yukon: 9\n"));
@@ -3045,7 +3049,7 @@ void
sk_dump_txdesc(struct sk_tx_desc *desc, int idx)
{
#define DESC_PRINT(X) \
- if (X) \
+ if (X) \
printf("txdesc[%d]." #X "=%#x\n", \
idx, X);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jun 3 15:39:35 UTC 2019
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
Make new sk_unreset_{xmac,yukon}() and use them in sk_attach().
Fixes PR kern/54267 reported by martin.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/pci/if_sk.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/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.98 src/sys/dev/pci/if_sk.c:1.99
--- src/sys/dev/pci/if_sk.c:1.98 Thu May 30 02:32:18 2019
+++ src/sys/dev/pci/if_sk.c Mon Jun 3 15:39:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.98 2019/05/30 02:32:18 msaitoh Exp $ */
+/* $NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.98 2019/05/30 02:32:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.99 2019/06/03 15:39:35 msaitoh Exp $");
#include
#include
@@ -168,7 +168,9 @@ int sk_encap(struct sk_if_softc *, struc
void sk_start(struct ifnet *);
int sk_ioctl(struct ifnet *, u_long, void *);
int sk_init(struct ifnet *);
+void sk_unreset_xmac(struct sk_if_softc *);
void sk_init_xmac(struct sk_if_softc *);
+void sk_unreset_yukon(struct sk_if_softc *);
void sk_init_yukon(struct sk_if_softc *);
void sk_stop(struct ifnet *, int);
void sk_watchdog(struct ifnet *);
@@ -1420,12 +1422,12 @@ sk_attach(device_t parent, device_t self
*/
switch (sc->sk_type) {
case SK_GENESIS:
- sk_init_xmac(sc_if);
+ sk_unreset_xmac(sc_if);
break;
case SK_YUKON:
case SK_YUKON_LITE:
case SK_YUKON_LP:
- sk_init_yukon(sc_if);
+ sk_unreset_yukon(sc_if);
break;
default:
aprint_error_dev(sc->sk_dev, "unknown device type %d\n",
@@ -2429,17 +2431,16 @@ sk_intr(void *xsc)
}
void
-sk_init_xmac(struct sk_if_softc *sc_if)
+sk_unreset_xmac(struct sk_if_softc *sc_if)
{
struct sk_softc *sc = sc_if->sk_softc;
- struct ifnet *ifp = &sc_if->sk_ethercom.ec_if;
static const struct sk_bcom_hack bhack[] = {
{ 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 },
{ 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 },
{ 0x15, 0x0232 }, { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 },
{ 0, 0 } };
- DPRINTFN(1, ("sk_init_xmac\n"));
+ DPRINTFN(1, ("sk_unreset_xmac\n"));
/* Unreset the XMAC. */
SK_IF_WRITE_2(sc_if, 0, SK_TXF1_MACCTL, SK_TXMACCTL_XMAC_UNRESET);
@@ -2495,6 +2496,15 @@ sk_init_xmac(struct sk_if_softc *sc_if)
}
}
}
+}
+
+void
+sk_init_xmac(struct sk_if_softc *sc_if)
+{
+ struct sk_softc *sc = sc_if->sk_softc;
+ struct ifnet *ifp = &sc_if->sk_ethercom.ec_if;
+
+ sk_unreset_xmac(sc_if);
/* Set station address */
SK_XM_WRITE_2(sc_if, XM_PAR0,
@@ -2593,14 +2603,13 @@ sk_init_xmac(struct sk_if_softc *sc_if)
sc_if->sk_link = 1;
}
-void sk_init_yukon(struct sk_if_softc *sc_if)
+void
+sk_unreset_yukon(struct sk_if_softc *sc_if)
{
uint32_t /*mac, */phy;
- uint16_t reg;
struct sk_softc *sc;
- int i;
- DPRINTFN(1, ("sk_init_yukon: start: sk_csr=%#x\n",
+ DPRINTFN(1, ("sk_unreset_yukon: start: sk_csr=%#x\n",
CSR_READ_4(sc_if->sk_softc, SK_CSR)));
sc = sc_if->sk_softc;
@@ -2611,7 +2620,6 @@ void sk_init_yukon(struct sk_if_softc *s
(sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9) & ~SK_GPIO_DAT9);
}
-
/* GMAC and GPHY Reset */
SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET);
@@ -2651,8 +2659,16 @@ void sk_init_yukon(struct sk_if_softc *s
DPRINTFN(3, ("sk_init_yukon: gmac_ctrl=%#x\n",
SK_IF_READ_4(sc_if, 0, SK_GMAC_CTRL)));
+}
+
+void
+sk_init_yukon(struct sk_if_softc *sc_if)
+{
+ uint16_t reg;
+ int i;
- DPRINTFN(6, ("sk_init_yukon: 3\n"));
+ DPRINTFN(1, ("sk_init_yukon: start\n"));
+ sk_unreset_yukon(sc_if);
/* unused read of the interrupt source register */
DPRINTFN(6, ("sk_init_yukon: 4\n"));
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jun 3 15:39:35 UTC 2019
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
Make new sk_unreset_{xmac,yukon}() and use them in sk_attach().
Fixes PR kern/54267 reported by martin.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/pci/if_sk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Mon Jun 3 09:58:31 UTC 2019
Modified Files:
src/sys/dev/usb: if_athn_usb.c
Log Message:
Fix the detach path to prevent panic:
- Fix athn_usb_free_tx_list(). usc->usc_tx_bcn->xfer is freed in the above
for () loop, so remove the if block. OK'd by skrll.
- Add missing athn_usb_free_tx_msg().
- Add missing athn_usb_stop().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_athn_usb.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/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.33 src/sys/dev/usb/if_athn_usb.c:1.34
--- src/sys/dev/usb/if_athn_usb.c:1.33 Mon Jun 3 09:56:08 2019
+++ src/sys/dev/usb/if_athn_usb.c Mon Jun 3 09:58:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.33 2019/06/03 09:56:08 msaitoh Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.34 2019/06/03 09:58:31 msaitoh Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.33 2019/06/03 09:56:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.34 2019/06/03 09:58:31 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -508,6 +508,7 @@ athn_usb_detach(device_t self, int flags
athn_usb_wait_async(usc);
+ athn_usb_stop(&sc->sc_if, 0);
usb_rem_task_wait(usc->usc_udev, &usc->usc_task, USB_TASKQ_DRIVER,
NULL);
@@ -523,6 +524,7 @@ athn_usb_detach(device_t self, int flags
athn_usb_free_rx_list(usc);
athn_usb_free_tx_list(usc);
athn_usb_free_tx_cmd(usc);
+ athn_usb_free_tx_msg(usc);
/* Close Tx/Rx pipes. */
athn_usb_close_pipes(usc);
@@ -764,10 +766,6 @@ athn_usb_free_tx_list(struct athn_usb_so
if (xfer != NULL)
usbd_destroy_xfer(xfer);
}
- if (usc->usc_tx_bcn) {
- usbd_destroy_xfer(usc->usc_tx_bcn->xfer);
- usc->usc_tx_bcn = NULL;
- }
}
Static int
CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Mon Jun 3 09:58:31 UTC 2019 Modified Files: src/sys/dev/usb: if_athn_usb.c Log Message: Fix the detach path to prevent panic: - Fix athn_usb_free_tx_list(). usc->usc_tx_bcn->xfer is freed in the above for () loop, so remove the if block. OK'd by skrll. - Add missing athn_usb_free_tx_msg(). - Add missing athn_usb_stop(). To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_athn_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Mon Jun 3 09:56:08 UTC 2019 Modified Files: src/sys/dev/usb: if_athn_usb.c Log Message: Use pmf(9). To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_athn_usb.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/dev/usb/if_athn_usb.c diff -u src/sys/dev/usb/if_athn_usb.c:1.32 src/sys/dev/usb/if_athn_usb.c:1.33 --- src/sys/dev/usb/if_athn_usb.c:1.32 Sat Apr 27 01:55:05 2019 +++ src/sys/dev/usb/if_athn_usb.c Mon Jun 3 09:56:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_athn_usb.c,v 1.32 2019/04/27 01:55:05 sevan Exp $ */ +/* $NetBSD: if_athn_usb.c,v 1.33 2019/06/03 09:56:08 msaitoh Exp $ */ /* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.32 2019/04/27 01:55:05 sevan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.33 2019/06/03 09:56:08 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -325,6 +325,9 @@ athn_usb_attach(device_t parent, device_ config_mountroot(self, athn_usb_attachhook); usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, usc->usc_udev, sc->sc_dev); + if (!pmf_device_register(self, NULL, NULL)) + aprint_error_dev(self, "couldn't establish power handler\n"); + return; fail: @@ -475,6 +478,8 @@ athn_usb_detach(device_t self, int flags DPRINTFN(DBG_FN, usc, "\n"); + pmf_device_deregister(self); + mutex_enter(&usc->usc_lock); usc->usc_dying = 1; mutex_exit(&usc->usc_lock);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Mon Jun 3 09:56:08 UTC 2019 Modified Files: src/sys/dev/usb: if_athn_usb.c Log Message: Use pmf(9). To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_athn_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: nonaka
Date: Mon Jun 3 09:51:04 UTC 2019
Modified Files:
src/sys/arch/x86/x86: hyperv.c
Log Message:
Use efi_probe().
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/hyperv.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/x86/x86/hyperv.c
diff -u src/sys/arch/x86/x86/hyperv.c:1.3 src/sys/arch/x86/x86/hyperv.c:1.4
--- src/sys/arch/x86/x86/hyperv.c:1.3 Thu May 30 11:15:29 2019
+++ src/sys/arch/x86/x86/hyperv.c Mon Jun 3 09:51:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperv.c,v 1.3 2019/05/30 11:15:29 nonaka Exp $ */
+/* $NetBSD: hyperv.c,v 1.4 2019/06/03 09:51:04 nonaka Exp $ */
/*-
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
@@ -33,7 +33,7 @@
*/
#include
#ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.3 2019/05/30 11:15:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.4 2019/06/03 09:51:04 nonaka Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
@@ -753,7 +753,7 @@ int
hyperv_is_gen1(void)
{
- return !bootmethod_efi;
+ return !efi_probe();
}
void
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: nonaka Date: Mon Jun 3 09:51:04 UTC 2019 Modified Files: src/sys/arch/x86/x86: hyperv.c Log Message: Use efi_probe(). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/hyperv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
