diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-05 02:11:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-05 02:11:33 -0400 |
| commit | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (patch) | |
| tree | be441bfa1e76035c00b66a3b06fea66cfd63d594 /include/asm-sparc/btfixup.h | |
| parent | 13d1ef29bc5125d7b77c5f6cdfde5ed31226005c (diff) | |
| parent | 9bc39bec87ee3e35897fe27441e979e7c208f624 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc/btfixup.h')
| -rw-r--r-- | include/asm-sparc/btfixup.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-sparc/btfixup.h b/include/asm-sparc/btfixup.h index b84c96c89581..6b29503256fd 100644 --- a/include/asm-sparc/btfixup.h +++ b/include/asm-sparc/btfixup.h | |||
| @@ -51,7 +51,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 51 | #define BTFIXUPDEF_SIMM13(__name) \ | 51 | #define BTFIXUPDEF_SIMM13(__name) \ |
| 52 | extern unsigned int ___sf_##__name(void) __attribute_const__; \ | 52 | extern unsigned int ___sf_##__name(void) __attribute_const__; \ |
| 53 | extern unsigned ___ss_##__name[2]; \ | 53 | extern unsigned ___ss_##__name[2]; \ |
| 54 | extern __inline__ unsigned int ___sf_##__name(void) { \ | 54 | static inline unsigned int ___sf_##__name(void) { \ |
| 55 | unsigned int ret; \ | 55 | unsigned int ret; \ |
| 56 | __asm__ ("or %%g0, ___s_" #__name ", %0" : "=r"(ret)); \ | 56 | __asm__ ("or %%g0, ___s_" #__name ", %0" : "=r"(ret)); \ |
| 57 | return ret; \ | 57 | return ret; \ |
| @@ -59,7 +59,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 59 | #define BTFIXUPDEF_SIMM13_INIT(__name,__val) \ | 59 | #define BTFIXUPDEF_SIMM13_INIT(__name,__val) \ |
| 60 | extern unsigned int ___sf_##__name(void) __attribute_const__; \ | 60 | extern unsigned int ___sf_##__name(void) __attribute_const__; \ |
| 61 | extern unsigned ___ss_##__name[2]; \ | 61 | extern unsigned ___ss_##__name[2]; \ |
| 62 | extern __inline__ unsigned int ___sf_##__name(void) { \ | 62 | static inline unsigned int ___sf_##__name(void) { \ |
| 63 | unsigned int ret; \ | 63 | unsigned int ret; \ |
| 64 | __asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ | 64 | __asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ |
| 65 | return ret; \ | 65 | return ret; \ |
| @@ -73,7 +73,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 73 | #define BTFIXUPDEF_HALF(__name) \ | 73 | #define BTFIXUPDEF_HALF(__name) \ |
| 74 | extern unsigned int ___af_##__name(void) __attribute_const__; \ | 74 | extern unsigned int ___af_##__name(void) __attribute_const__; \ |
| 75 | extern unsigned ___as_##__name[2]; \ | 75 | extern unsigned ___as_##__name[2]; \ |
| 76 | extern __inline__ unsigned int ___af_##__name(void) { \ | 76 | static inline unsigned int ___af_##__name(void) { \ |
| 77 | unsigned int ret; \ | 77 | unsigned int ret; \ |
| 78 | __asm__ ("or %%g0, ___a_" #__name ", %0" : "=r"(ret)); \ | 78 | __asm__ ("or %%g0, ___a_" #__name ", %0" : "=r"(ret)); \ |
| 79 | return ret; \ | 79 | return ret; \ |
| @@ -81,7 +81,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 81 | #define BTFIXUPDEF_HALF_INIT(__name,__val) \ | 81 | #define BTFIXUPDEF_HALF_INIT(__name,__val) \ |
| 82 | extern unsigned int ___af_##__name(void) __attribute_const__; \ | 82 | extern unsigned int ___af_##__name(void) __attribute_const__; \ |
| 83 | extern unsigned ___as_##__name[2]; \ | 83 | extern unsigned ___as_##__name[2]; \ |
| 84 | extern __inline__ unsigned int ___af_##__name(void) { \ | 84 | static inline unsigned int ___af_##__name(void) { \ |
| 85 | unsigned int ret; \ | 85 | unsigned int ret; \ |
| 86 | __asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ | 86 | __asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ |
| 87 | return ret; \ | 87 | return ret; \ |
| @@ -92,7 +92,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 92 | #define BTFIXUPDEF_SETHI(__name) \ | 92 | #define BTFIXUPDEF_SETHI(__name) \ |
| 93 | extern unsigned int ___hf_##__name(void) __attribute_const__; \ | 93 | extern unsigned int ___hf_##__name(void) __attribute_const__; \ |
| 94 | extern unsigned ___hs_##__name[2]; \ | 94 | extern unsigned ___hs_##__name[2]; \ |
| 95 | extern __inline__ unsigned int ___hf_##__name(void) { \ | 95 | static inline unsigned int ___hf_##__name(void) { \ |
| 96 | unsigned int ret; \ | 96 | unsigned int ret; \ |
| 97 | __asm__ ("sethi %%hi(___h_" #__name "), %0" : "=r"(ret)); \ | 97 | __asm__ ("sethi %%hi(___h_" #__name "), %0" : "=r"(ret)); \ |
| 98 | return ret; \ | 98 | return ret; \ |
| @@ -100,7 +100,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); | |||
| 100 | #define BTFIXUPDEF_SETHI_INIT(__name,__val) \ | 100 | #define BTFIXUPDEF_SETHI_INIT(__name,__val) \ |
| 101 | extern unsigned int ___hf_##__name(void) __attribute_const__; \ | 101 | extern unsigned int ___hf_##__name(void) __attribute_const__; \ |
| 102 | extern unsigned ___hs_##__name[2]; \ | 102 | extern unsigned ___hs_##__name[2]; \ |
| 103 | extern __inline__ unsigned int ___hf_##__name(void) { \ | 103 | static inline unsigned int ___hf_##__name(void) { \ |
| 104 | unsigned int ret; \ | 104 | unsigned int ret; \ |
| 105 | __asm__ ("sethi %%hi(___h_" #__name "__btset_" #__val "), %0" : \ | 105 | __asm__ ("sethi %%hi(___h_" #__name "__btset_" #__val "), %0" : \ |
| 106 | "=r"(ret)); \ | 106 | "=r"(ret)); \ |