d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a few bugs in the legacy cpu attachment. Get the unit from the

Browse Source 
parent cpu device before passing it to pcpu_find().  Get the ivars from the
child, not parent cpu device.  These bugs would cause a panic when
dereferencing the pcpu ivar, but weren't present in the acpi attachment
which it seems most people are using.
This commit is contained in:
njl 2005-02-15 07:21:20 +00:00
parent 9a64d9e899
commit 9f5b889b7b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/i386/i386/legacy.c
View File

@ -314,8 +314,7 @@ cpu_add_child(device_t bus, int order, const char *name, int unit)
return (NULL);
resource_list_init(&cd->cd_rl);
pc = pcpu_find(unit);
KASSERT(pc != NULL, ("pcpu_find failed"));
pc = pcpu_find(device_get_unit(bus));
cd->cd_pcpu = pc;
child = device_add_child_ordered(bus, order, name, unit);
@ -343,7 +342,7 @@ cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result)
if (index != CPU_IVAR_PCPU)
return (ENOENT);
cpdev = device_get_ivars(dev);
cpdev = device_get_ivars(child);
*result = (uintptr_t)cpdev->cd_pcpu;
return (0);
}