Project

General

Profile

Download (2.36 KB)

Bug #2823 » camsysctlfix.diff

davshao, 06/21/2015 01:17 AM

View differences:

sys/bus/cam/cam_xpt.c
sim_lock_assert_owned(sim->lock);
sim->bus_id = bus;
new_bus = kmalloc(sizeof(*new_bus), M_CAMXPT, M_INTWAIT);
new_bus = kmalloc(sizeof(*new_bus), M_CAMXPT, M_INTWAIT | M_ZERO);
if (strcmp(sim->sim_name, "xpt") != 0) {
sim->path_id =
......
if (bootverbose) {
kprintf("CAM: Configuring bus:");
if (bus->sim) {
kprintf(" %s%d\n",
kprintf(" %s%d.%d, path_id %d\n",
bus->sim->sim_name,
bus->sim->unit_number);
bus->sim->unit_number,
bus->sim->bus_id,
bus->sim->path_id);
} else {
kprintf(" (unknown)\n");
}
......
if (bootverbose) {
kprintf("CAM: Finished configuring bus:");
if (path->bus->sim) {
kprintf(" %s%d\n",
kprintf(" %s%d.%d, path_id %d\n",
path->bus->sim->sim_name,
path->bus->sim->unit_number);
path->bus->sim->unit_number,
path->bus->sim->bus_id,
path->bus->sim->path_id);
} else {
kprintf(" (unknown)\n");
}
sys/sys/sysctl.h
/* This constructs a "raw" MIB oid. */
#define SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)\
static struct sysctl_oid sysctl__##parent##_##name = { \
&sysctl_##parent##_children, \
{ NULL }, \
nbr, \
kind, \
a1, \
a2, \
#name, \
handler, \
fmt, \
0, \
0, \
__DESCR(descr) \
.oid_parent = &sysctl_##parent##_children, \
.oid_link = { NULL }, \
.oid_number = nbr, \
.oid_kind = kind, \
.oid_arg1 = a1, \
.oid_arg2 = a2, \
.oid_name = #name, \
.oid_handler = handler, \
.oid_fmt = fmt, \
.oid_refcnt = 0, \
.oid_running = 0, \
.oid_descr = __DESCR(descr), \
.oid_lock = LOCK_INITIALIZER("SYSdef", 0, LK_CANRECURSE) \
}; \
DATA_SET(sysctl_set, sysctl__##parent##_##name)
(3-3/3)