SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-13 03:03:45 +00:00
parent d22f2a15f3
commit f4a22ff4b2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
17 changed files with 1316 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/arch/amd64/amd64/cacheinfo.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cacheinfo.c,v 1.14 2024/05/08 18:00:55 guenther Exp $ */
/* $OpenBSD: cacheinfo.c,v 1.15 2024/06/13 02:19:20 guenther Exp $ */
/*
* Copyright (c) 2022 Jonathan Gray <jsg@openbsd.org>
@ -246,8 +246,8 @@ intel_print_cacheinfo(struct cpu_info *ci, u_int fn)
}
/* print lower levels that were the same */
for (i = 0; i < leaf; i++)
intel_print_one_cache(ci, i, prev_cache[leaf][0],
prev_cache[leaf][1], prev_cache[leaf][2]);
intel_print_one_cache(ci, i, prev_cache[i][0],
prev_cache[i][1], prev_cache[i][2]);
/* print this (differing) level and higher levels */
goto printit;
}

14
sys/arch/amd64/amd64/conf.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: conf.c,v 1.80 2024/06/11 09:21:32 jsg Exp $ */
/* $OpenBSD: conf.c,v 1.81 2024/06/12 12:54:54 bluhm Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -98,6 +98,15 @@ int nblkdev = nitems(bdevsw);
(dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl */
#define cdev_psp_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), \
(dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, \
dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, \
(dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
#define mmread mmrw
#define mmwrite mmrw
cdev_decl(mm);
@ -143,6 +152,8 @@ cdev_decl(nvram);
#include "drm.h"
#include "viocon.h"
cdev_decl(viocon);
#include "ccp.h"
cdev_decl(psp);
#include "wsdisplay.h"
#include "wskbd.h"
@ -281,6 +292,7 @@ struct cdevsw cdevsw[] =
cdev_fido_init(NFIDO,fido), /* 98: FIDO/U2F security keys */
cdev_pppx_init(NPPPX,pppac), /* 99: PPP Access Concentrator */
cdev_ujoy_init(NUJOY,ujoy), /* 100: USB joystick/gamecontroller */
cdev_psp_init(NCCP,psp), /* 101: PSP */
};
int nchrdev = nitems(cdevsw);