Page MenuHomeFreeBSD
Files F148116798

D23633.id68420.diff
No OneTemporary
Actions

D23633.id68420.diff
View Options

Index: head/sys/dev/drm2/drm_pci.c
===================================================================
--- head/sys/dev/drm2/drm_pci.c
+++ head/sys/dev/drm2/drm_pci.c
@@ -42,7 +42,8 @@
#include <dev/drm2/drmP.h>
static int drm_msi = 1; /* Enable by default. */
-SYSCTL_NODE(_hw, OID_AUTO, drm, CTLFLAG_RW, NULL, "DRM device");
+SYSCTL_NODE(_hw, OID_AUTO, drm, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
+ "DRM device");
SYSCTL_INT(_hw_drm, OID_AUTO, msi, CTLFLAG_RDTUN, &drm_msi, 1,
"Enable MSI interrupts for drm devices");
Index: head/sys/dev/drm2/drm_sysctl.c
===================================================================
--- head/sys/dev/drm2/drm_sysctl.c
+++ head/sys/dev/drm2/drm_sysctl.c
@@ -69,7 +69,7 @@
/* Add the sysctl node for DRI if it doesn't already exist */
drioid = SYSCTL_ADD_NODE(&info->ctx, SYSCTL_CHILDREN(&sysctl___hw), OID_AUTO,
- "dri", CTLFLAG_RW, NULL, "DRI Graphics");
+ "dri", CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, "DRI Graphics");
if (!drioid) {
free(dev->sysctl, DRM_MEM_DRIVER);
dev->sysctl = NULL;
@@ -92,23 +92,17 @@
info->name[0] = '0' + i;
info->name[1] = 0;
top = SYSCTL_ADD_NODE(&info->ctx, SYSCTL_CHILDREN(drioid),
- OID_AUTO, info->name, CTLFLAG_RW, NULL, NULL);
+ OID_AUTO, info->name, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, NULL);
if (!top) {
drm_sysctl_cleanup(dev);
return (-ENOMEM);
}
for (i = 0; i < DRM_SYSCTL_ENTRIES; i++) {
- oid = SYSCTL_ADD_OID(&info->ctx,
- SYSCTL_CHILDREN(top),
- OID_AUTO,
- drm_sysctl_list[i].name,
- CTLTYPE_STRING | CTLFLAG_RD,
- dev,
- 0,
- drm_sysctl_list[i].f,
- "A",
- NULL);
+ oid = SYSCTL_ADD_OID(&info->ctx, SYSCTL_CHILDREN(top),
+ OID_AUTO, drm_sysctl_list[i].name,
+ CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+ dev, 0, drm_sysctl_list[i].f, "A", NULL);
if (!oid) {
drm_sysctl_cleanup(dev);
return (-ENOMEM);
Index: head/sys/dev/pci/pci.c
===================================================================
--- head/sys/dev/pci/pci.c
+++ head/sys/dev/pci/pci.c
@@ -332,7 +332,8 @@
static int pcie_chipset, pcix_chipset;
/* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD, 0, "PCI bus tuning parameters");
+SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
+ "PCI bus tuning parameters");
static int pci_enable_io_modes = 1;
SYSCTL_INT(_hw_pci, OID_AUTO, enable_io_modes, CTLFLAG_RWTUN,

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 9:54 PM (17 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29729141
Default Alt Text
D23633.id68420.diff (2 KB)

Event Timeline