diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/sparc/include/asm/smp_32.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/sparc/include/asm/smp_32.h')
| -rw-r--r-- | arch/sparc/include/asm/smp_32.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h index 58101dc7049..841905c1021 100644 --- a/arch/sparc/include/asm/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h | |||
| @@ -106,6 +106,15 @@ static inline int hard_smp4d_processor_id(void) | |||
| 106 | return cpuid; | 106 | return cpuid; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | extern inline int hard_smpleon_processor_id(void) | ||
| 110 | { | ||
| 111 | int cpuid; | ||
| 112 | __asm__ __volatile__("rd %%asr17,%0\n\t" | ||
| 113 | "srl %0,28,%0" : | ||
| 114 | "=&r" (cpuid) : ); | ||
| 115 | return cpuid; | ||
| 116 | } | ||
| 117 | |||
| 109 | #ifndef MODULE | 118 | #ifndef MODULE |
| 110 | static inline int hard_smp_processor_id(void) | 119 | static inline int hard_smp_processor_id(void) |
| 111 | { | 120 | { |