diff options
author | attilio <attilio@FreeBSD.org> | 2011-05-09 16:16:15 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2011-05-09 16:16:15 +0000 |
commit | 804b67ba6f3c9599eb747562e13e498f7111cbb4 (patch) | |
tree | 81196a94e9f93ef5c4919ea2c59e006d1b03351c /sys/powerpc/include | |
parent | 76bdb089757672665285495e9f8a29d1fccd1d7d (diff) | |
download | FreeBSD-src-804b67ba6f3c9599eb747562e13e498f7111cbb4.zip FreeBSD-src-804b67ba6f3c9599eb747562e13e498f7111cbb4.tar.gz |
Add the powerpc support.
Note that there is a dirty hack for calling openpic_write(), but
nwhitehorn approved it.
Discussed with: nwhitehorn
Diffstat (limited to 'sys/powerpc/include')
-rw-r--r-- | sys/powerpc/include/_types.h | 1 | ||||
-rw-r--r-- | sys/powerpc/include/openpicvar.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/pmap.h | 5 | ||||
-rw-r--r-- | sys/powerpc/include/smp.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index fae2416..b0b582e 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -72,7 +72,6 @@ typedef unsigned long long __uint64_t; * Standard type definitions. */ typedef __uint32_t __clock_t; /* clock()... */ -typedef unsigned int __cpumask_t; typedef double __double_t; typedef double __float_t; #ifdef __LP64__ diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h index 4fb9aa7..605dc0f 100644 --- a/sys/powerpc/include/openpicvar.h +++ b/sys/powerpc/include/openpicvar.h @@ -57,7 +57,7 @@ int openpic_common_attach(device_t, uint32_t); /* * PIC interface. */ -void openpic_bind(device_t dev, u_int irq, cpumask_t cpumask); +void openpic_bind(device_t dev, u_int irq, cpuset_t cpumask); void openpic_config(device_t, u_int, enum intr_trigger, enum intr_polarity); void openpic_dispatch(device_t, struct trapframe *); void openpic_enable(device_t, u_int, u_int); diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h index 369ca9d..9166d04 100644 --- a/sys/powerpc/include/pmap.h +++ b/sys/powerpc/include/pmap.h @@ -66,6 +66,7 @@ #include <sys/queue.h> #include <sys/tree.h> +#include <sys/_cpuset.h> #include <sys/_lock.h> #include <sys/_mutex.h> #include <machine/sr.h> @@ -98,7 +99,7 @@ struct pmap { #else register_t pm_sr[16]; #endif - cpumask_t pm_active; + cpuset_t pm_active; struct pmap *pmap_phys; struct pmap_statistics pm_stats; @@ -175,7 +176,7 @@ void slb_free_user_cache(struct slb **); struct pmap { struct mtx pm_mtx; /* pmap mutex */ tlbtid_t pm_tid[MAXCPU]; /* TID to identify this pmap entries in TLB */ - cpumask_t pm_active; /* active on cpus */ + cpuset_t pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ /* Page table directory, array of pointers to page tables. */ diff --git a/sys/powerpc/include/smp.h b/sys/powerpc/include/smp.h index cf95278..32fcfb4 100644 --- a/sys/powerpc/include/smp.h +++ b/sys/powerpc/include/smp.h @@ -40,9 +40,11 @@ #ifndef LOCORE +#include <sys/_cpuset.h> + void ipi_all_but_self(int ipi); void ipi_cpu(int cpu, u_int ipi); -void ipi_selected(cpumask_t cpus, int ipi); +void ipi_selected(cpuset_t cpus, int ipi); struct cpuref { uintptr_t cr_hwref; |