summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/include
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2015-11-21 02:49:33 +0000
committermarius <marius@FreeBSD.org>2015-11-21 02:49:33 +0000
commitc4d318f006ab7a786ecffa936c0b7388f6e08a39 (patch)
tree2466faef275eea6e5b120444743a8bfc5e4c95ec /sys/sparc64/include
parent23848fd24b611ffe90d6d2a29e6ea01ebfc828e7 (diff)
downloadFreeBSD-src-c4d318f006ab7a786ecffa936c0b7388f6e08a39.zip
FreeBSD-src-c4d318f006ab7a786ecffa936c0b7388f6e08a39.tar.gz
Merge from r290547:
Since r289279 bufinit() uses mp_ncpus so adapt to what x86 does and set this variable already in cpu_mp_setmaxid(). While at it, rename cpu_cpuid_prop() to cpu_portid_prop() as well as the MD cpuid variable to portid to avoid confusion with the MI use of "cpuid" and make some variable static/global in order to reduce stack usage. PR: 204685
Diffstat (limited to 'sys/sparc64/include')
-rw-r--r--sys/sparc64/include/md_var.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h
index 6a0a2f6..d3dbf99 100644
--- a/sys/sparc64/include/md_var.h
+++ b/sys/sparc64/include/md_var.h
@@ -47,9 +47,9 @@ extern vm_paddr_t kstack0_phys;
struct pcpu;
struct md_utrap;
-const char *cpu_cpuid_prop(u_int cpu_impl);
uint32_t cpu_get_mid(u_int cpu_impl);
void cpu_identify(u_long vers, u_int clock, u_int id);
+const char *cpu_portid_prop(u_int cpu_impl);
void cpu_setregs(struct pcpu *pc);
int is_physical_memory(vm_paddr_t addr);
struct md_utrap *utrap_alloc(void);
OpenPOWER on IntegriCloud