diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-07-28 21:57:58 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-07-28 21:57:58 +0000 |
| commit | 9166829d87c15f27009bc183caf9a518131a272e (patch) | |
| tree | 7249fc6d7e845c2a96b10742c4ebfa0f2b565023 /sys/arch/i386/include | |
| parent | 0bb4bf32c533cbf40b194ba69eba643acebca59b (diff) | |
Store the acpi processor ID/UID in struct cpu_info, and use it to attach
acpicpu(4) drivers to the right cpu(4).
ok mlarkin@, guenther@
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 3 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpuvar.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 18166923abd..2c98cc221bf 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.147 2016/03/15 03:17:51 guenther Exp $ */ +/* $OpenBSD: cpu.h,v 1.148 2016/07/28 21:57:57 kettenis Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -83,6 +83,7 @@ struct cpu_info { struct proc *ci_curproc; /* current owner of the processor */ cpuid_t ci_cpuid; /* our CPU ID */ u_int ci_apicid; /* our APIC ID */ + u_int ci_acpi_proc_id; u_int32_t ci_randseed; #if defined(MULTIPROCESSOR) diff --git a/sys/arch/i386/include/cpuvar.h b/sys/arch/i386/include/cpuvar.h index 1fcb4634f16..1e4cca64be9 100644 --- a/sys/arch/i386/include/cpuvar.h +++ b/sys/arch/i386/include/cpuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuvar.h,v 1.6 2015/07/18 19:21:03 sf Exp $ */ +/* $OpenBSD: cpuvar.h,v 1.7 2016/07/28 21:57:57 kettenis Exp $ */ /* $NetBSD: cpuvar.h,v 1.1.2.3 2000/02/21 18:54:07 sommerfeld Exp $ */ /*- @@ -78,7 +78,8 @@ extern struct cpu_functions mp_cpu_funcs; struct cpu_attach_args { const char *caa_name; - int cpu_number; + int cpu_apicid; + int cpu_acpi_proc_id; int cpu_role; struct cpu_functions *cpu_func; int cpu_signature; |