diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
| commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
| tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/mbus.h | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
| parent | fdc657c66678551c7987dc23a78ae1a26251276f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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 5f274901534..ecacdf4075d 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); } |