sync with OpenBSD -current
This commit is contained in:
parent
5c4b1d765f
commit
b97c2ce374
GPG key ID:
F42C07F07E2E35B7
10 changed files with 33 additions and 84 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ampintc.c,v 1.31 2023/09/22 01:10:43 jsg Exp $ */
|
||||
/* $OpenBSD: ampintc.c,v 1.32 2024/07/06 10:39:50 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
|
||||
*
|
||||
|
|
@ -185,7 +185,6 @@ void *ampintc_intr_establish_fdt(void *, int *, int,
|
|||
struct cpu_info *, int (*)(void *), void *, char *);
|
||||
void ampintc_intr_disestablish(void *);
|
||||
void ampintc_irq_handler(void *);
|
||||
const char *ampintc_intr_string(void *);
|
||||
uint32_t ampintc_iack(void);
|
||||
void ampintc_eoi(uint32_t);
|
||||
void ampintc_set_priority(int, int);
|
||||
|
|
@ -897,16 +896,6 @@ ampintc_intr_disestablish(void *cookie)
|
|||
free(ih, M_DEVBUF, sizeof(*ih));
|
||||
}
|
||||
|
||||
const char *
|
||||
ampintc_intr_string(void *cookie)
|
||||
{
|
||||
struct intrhand *ih = (struct intrhand *)cookie;
|
||||
static char irqstr[1 + sizeof("ampintc irq ") + 4];
|
||||
|
||||
snprintf(irqstr, sizeof irqstr, "ampintc irq %d", ih->ih_irq);
|
||||
return irqstr;
|
||||
}
|
||||
|
||||
/*
|
||||
* GICv2m frame controller for MSI interrupts.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: efiboot.c,v 1.55 2024/07/03 22:29:37 kettenis Exp $ */
|
||||
/* $OpenBSD: efiboot.c,v 1.56 2024/07/07 09:38:44 patrick Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
|
||||
|
|
@ -1120,6 +1120,8 @@ struct smbios_dtb {
|
|||
"qcom/sc8280xp-lenovo-thinkpad-x13s.dtb" },
|
||||
{ "LENOVO", "21BY",
|
||||
"qcom/sc8280xp-lenovo-thinkpad-x13s.dtb" },
|
||||
{ "LENOVO", "83ED",
|
||||
"qcom/x1e80100-lenovo-yoga-slim7x.dtb" },
|
||||
};
|
||||
|
||||
void *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ipifuncs.c,v 1.36 2024/05/22 05:51:49 jsg Exp $ */
|
||||
/* $OpenBSD: ipifuncs.c,v 1.37 2024/07/07 03:03:09 jsg Exp $ */
|
||||
/* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -137,12 +137,6 @@ i386_ipi_wbinvd(struct cpu_info *ci)
|
|||
wbinvd();
|
||||
}
|
||||
|
||||
void
|
||||
i386_spurious(void)
|
||||
{
|
||||
printf("spurious intr\n");
|
||||
}
|
||||
|
||||
void
|
||||
i386_send_ipi(struct cpu_info *ci, int ipimask)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: i82489var.h,v 1.15 2021/03/11 11:16:57 jsg Exp $ */
|
||||
/* $OpenBSD: i82489var.h,v 1.16 2024/07/07 03:03:09 jsg Exp $ */
|
||||
/* $NetBSD: i82489var.h,v 1.1.2.2 2000/02/21 18:46:14 sommerfeld Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -68,7 +68,6 @@ i82489_writereg(int reg, u_int32_t val)
|
|||
* was delivered.. "Oh, sorry, i caught you at a bad time".
|
||||
* Low-order 4 bits must be all ones.
|
||||
*/
|
||||
extern void i386_spurious(void);
|
||||
extern void Xintrspurious(void);
|
||||
#define LAPIC_SPURIOUS_VECTOR 0xef
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_qwx_pci.c,v 1.21 2024/07/05 21:24:13 patrick Exp $ */
|
||||
/* $OpenBSD: if_qwx_pci.c,v 1.22 2024/07/06 05:34:35 patrick Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2023 Stefan Sperling <stsp@openbsd.org>
|
||||
|
|
@ -4130,7 +4130,7 @@ qwx_pci_intr(void *arg)
|
|||
ret = 1;
|
||||
}
|
||||
|
||||
if (test_bit(QWX_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
|
||||
if (test_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
|
||||
for (i = 0; i < nitems(sc->ext_irq_grp); i++) {
|
||||
if (qwx_dp_service_srng(sc, i))
|
||||
ret = 1;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: nfs_vnops.c,v 1.200 2024/05/14 06:26:05 jsg Exp $ */
|
||||
/* $OpenBSD: nfs_vnops.c,v 1.201 2024/07/06 09:53:25 jsg Exp $ */
|
||||
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -88,7 +88,6 @@ int nfs_mkdir(void *);
|
|||
int nfs_mknod(void *);
|
||||
int nfs_mknodrpc(struct vnode *, struct vnode **, struct componentname *,
|
||||
struct vattr *);
|
||||
int nfs_null(struct vnode *, struct ucred *, struct proc *);
|
||||
int nfs_open(void *);
|
||||
int nfs_pathconf(void *);
|
||||
int nfs_print(void *);
|
||||
|
|
@ -270,22 +269,6 @@ nfs_cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
|
|||
cache_enter(dvp, vp, cnp);
|
||||
}
|
||||
|
||||
/*
|
||||
* nfs null call from vfs.
|
||||
*/
|
||||
int
|
||||
nfs_null(struct vnode *vp, struct ucred *cred, struct proc *procp)
|
||||
{
|
||||
struct nfsm_info info;
|
||||
int error = 0;
|
||||
|
||||
info.nmi_mb = info.nmi_mreq = nfsm_reqhead(0);
|
||||
info.nmi_errorp = &error;
|
||||
error = nfs_request(vp, NFSPROC_NULL, &info);
|
||||
m_freem(info.nmi_mrep);
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* nfs access vnode op.
|
||||
* For nfs version 2, just return ok. File accesses may fail later.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufs_extern.h,v 1.40 2024/05/13 01:15:53 jsg Exp $ */
|
||||
/* $OpenBSD: ufs_extern.h,v 1.41 2024/07/07 01:39:06 jsg Exp $ */
|
||||
/* $NetBSD: ufs_extern.h,v 1.5 1996/02/09 22:36:03 christos Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -97,7 +97,6 @@ int ufs_getlbns(struct vnode *, daddr_t, struct indir *, int *);
|
|||
|
||||
/* ufs_ihash.c */
|
||||
void ufs_ihashinit(void);
|
||||
struct vnode *ufs_ihashlookup(dev_t, ufsino_t);
|
||||
struct vnode *ufs_ihashget(dev_t, ufsino_t);
|
||||
int ufs_ihashins(struct inode *);
|
||||
void ufs_ihashrem(struct inode *);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufs_ihash.c,v 1.26 2021/10/19 06:11:45 semarie Exp $ */
|
||||
/* $OpenBSD: ufs_ihash.c,v 1.27 2024/07/07 01:39:06 jsg Exp $ */
|
||||
/* $NetBSD: ufs_ihash.c,v 1.3 1996/02/09 22:36:04 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -75,30 +75,6 @@ ufs_ihashinit(void)
|
|||
arc4random_buf(&ihashkey, sizeof(ihashkey));
|
||||
}
|
||||
|
||||
/*
|
||||
* Use the device/inum pair to find the incore inode, and return a pointer
|
||||
* to it. If it is in core, return it, even if it is locked.
|
||||
*/
|
||||
struct vnode *
|
||||
ufs_ihashlookup(dev_t dev, ufsino_t inum)
|
||||
{
|
||||
struct inode *ip;
|
||||
struct ihashhead *ipp;
|
||||
|
||||
/* XXXLOCKING lock hash list */
|
||||
ipp = INOHASH(dev, inum);
|
||||
LIST_FOREACH(ip, ipp, i_hash) {
|
||||
if (inum == ip->i_number && dev == ip->i_dev)
|
||||
break;
|
||||
}
|
||||
/* XXXLOCKING unlock hash list? */
|
||||
|
||||
if (ip)
|
||||
return (ITOV(ip));
|
||||
|
||||
return (NULLVP);
|
||||
}
|
||||
|
||||
/*
|
||||
* Use the device/inum pair to find the incore inode, and return a pointer
|
||||
* to it. If it is in core, but locked, wait for it.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue