diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 11:31:22 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-08 11:31:22 +0400 |
| commit | d95300758bed9e0f783f3e3b4fd037bf0a21abe0 (patch) | |
| tree | 994823b6e0b88597eded79f9eeb0f44b580c89e5 /include/asm-sparc/mbus.h | |
| parent | e12669e774be403c84baa651306d305752a35cd8 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
| download | linux-d95300758bed9e0f783f3e3b4fd037bf0a21abe0.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc/mbus.h')
| -rw-r--r-- | include/asm-sparc/mbus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/mbus.h b/include/asm-sparc/mbus.h index 5f2749015342..ecacdf4075d7 100644 --- a/include/asm-sparc/mbus.h +++ b/include/asm-sparc/mbus.h @@ -83,7 +83,7 @@ extern unsigned int hwbug_bitmask; */ #define TBR_ID_SHIFT 20 -extern __inline__ int get_cpuid(void) +static inline int get_cpuid(void) { register int retval; __asm__ __volatile__("rd %%tbr, %0\n\t" @@ -93,7 +93,7 @@ extern __inline__ int get_cpuid(void) return (retval & 3); } -extern __inline__ int get_modid(void) +static inline int get_modid(void) { return (get_cpuid() | 0x8); } |