diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2011-03-05 10:01:45 -0600 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2011-03-05 10:01:45 -0600 |
| commit | 706243ac48cf646d503a3f1ec9e6a28c916694bd (patch) | |
| tree | 5d583486a145a9646eccb9d3c4bce4dad45a2a84 /src/include/kernel/cpu.H | |
| parent | 5c20d316d21e231daee6455f0a78d5940d59cf23 (diff) | |
| download | talos-hostboot-706243ac48cf646d503a3f1ec9e6a28c916694bd.tar.gz talos-hostboot-706243ac48cf646d503a3f1ec9e6a28c916694bd.zip | |
Merge of PowerHAL project up to commit:
dd45c30bd53d8e6c123165b83842d08117558a3c
Diffstat (limited to 'src/include/kernel/cpu.H')
| -rw-r--r-- | src/include/kernel/cpu.H | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/include/kernel/cpu.H b/src/include/kernel/cpu.H index 81b43a57c..2f012700c 100644 --- a/src/include/kernel/cpu.H +++ b/src/include/kernel/cpu.H @@ -2,7 +2,8 @@ #define __KERNEL_CPU_H #include <kernel/types.h> -#include <kernel/ppcarch.H> +#include <arch/ppc.H> +#include <builtins.h> // Thread ID support only, Power7 (4 threads). #define KERNEL_MAX_SUPPORTED_CPUS 4 @@ -18,10 +19,10 @@ struct cpu_t task_t* idle_task; }; -__attribute__((always_inline)) +ALWAYS_INLINE inline uint64_t getCpuId() { - return ppc_getPIR() & (KERNEL_MAX_SUPPORTED_CPUS - 1); + return getPIR() & (KERNEL_MAX_SUPPORTED_CPUS - 1); } #endif |
