Skip to content

L
linux-davinci
Commit 329d4dd7 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] fix the breakage in sparc headers 

If we switch extern inline to static inline, we'd better switch the
pre-declarations we use to say that these puppies have
__attribute_const__ on them.

Otherwise we get extern declaration followed by static inline one.
Which makes gcc unhappy, and for a good reason...
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9bc39bec
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
include/asm-sparc/btfixup.h
View file @ 329d4dd7
...@@ -49,7 +49,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -49,7 +49,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
/* Put bottom 13bits into some register variable */ /* Put bottom 13bits into some register variable */
#define BTFIXUPDEF_SIMM13(__name) \ #define BTFIXUPDEF_SIMM13(__name) \
extern unsigned int ___sf_##__name(void) __attribute_const__; \ static inline unsigned int ___sf_##__name(void) __attribute_const__; \
extern unsigned ___ss_##__name[2]; \ extern unsigned ___ss_##__name[2]; \
static inline unsigned int ___sf_##__name(void) { \ static inline unsigned int ___sf_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
...@@ -57,7 +57,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -57,7 +57,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
return ret; \ return ret; \
} }
#define BTFIXUPDEF_SIMM13_INIT(__name,__val) \ #define BTFIXUPDEF_SIMM13_INIT(__name,__val) \
extern unsigned int ___sf_##__name(void) __attribute_const__; \ static inline unsigned int ___sf_##__name(void) __attribute_const__; \
extern unsigned ___ss_##__name[2]; \ extern unsigned ___ss_##__name[2]; \
static inline unsigned int ___sf_##__name(void) { \ static inline unsigned int ___sf_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
...@@ -71,7 +71,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -71,7 +71,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
*/ */
#define BTFIXUPDEF_HALF(__name) \ #define BTFIXUPDEF_HALF(__name) \
extern unsigned int ___af_##__name(void) __attribute_const__; \ static inline unsigned int ___af_##__name(void) __attribute_const__; \
extern unsigned ___as_##__name[2]; \ extern unsigned ___as_##__name[2]; \
static inline unsigned int ___af_##__name(void) { \ static inline unsigned int ___af_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
...@@ -79,7 +79,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -79,7 +79,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
return ret; \ return ret; \
} }
#define BTFIXUPDEF_HALF_INIT(__name,__val) \ #define BTFIXUPDEF_HALF_INIT(__name,__val) \
extern unsigned int ___af_##__name(void) __attribute_const__; \ static inline unsigned int ___af_##__name(void) __attribute_const__; \
extern unsigned ___as_##__name[2]; \ extern unsigned ___as_##__name[2]; \
static inline unsigned int ___af_##__name(void) { \ static inline unsigned int ___af_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
...@@ -90,7 +90,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -90,7 +90,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
/* Put upper 22 bits into some register variable */ /* Put upper 22 bits into some register variable */
#define BTFIXUPDEF_SETHI(__name) \ #define BTFIXUPDEF_SETHI(__name) \
extern unsigned int ___hf_##__name(void) __attribute_const__; \ static inline unsigned int ___hf_##__name(void) __attribute_const__; \
extern unsigned ___hs_##__name[2]; \ extern unsigned ___hs_##__name[2]; \
static inline unsigned int ___hf_##__name(void) { \ static inline unsigned int ___hf_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
...@@ -98,7 +98,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -98,7 +98,7 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
return ret; \ return ret; \
} }
#define BTFIXUPDEF_SETHI_INIT(__name,__val) \ #define BTFIXUPDEF_SETHI_INIT(__name,__val) \
extern unsigned int ___hf_##__name(void) __attribute_const__; \ static inline unsigned int ___hf_##__name(void) __attribute_const__; \
extern unsigned ___hs_##__name[2]; \ extern unsigned ___hs_##__name[2]; \
static inline unsigned int ___hf_##__name(void) { \ static inline unsigned int ___hf_##__name(void) { \
unsigned int ret; \ unsigned int ret; \
......
include/asm-sparc/pgtable.h
View file @ 329d4dd7
...@@ -194,19 +194,19 @@ BTFIXUPDEF_HALF(pte_writei) ...@@ -194,19 +194,19 @@ BTFIXUPDEF_HALF(pte_writei)
BTFIXUPDEF_HALF(pte_dirtyi) BTFIXUPDEF_HALF(pte_dirtyi)
BTFIXUPDEF_HALF(pte_youngi) BTFIXUPDEF_HALF(pte_youngi)
extern int pte_write(pte_t pte) __attribute_const__; static int pte_write(pte_t pte) __attribute_const__;
static inline int pte_write(pte_t pte) static inline int pte_write(pte_t pte)
{ {
return pte_val(pte) & BTFIXUP_HALF(pte_writei); return pte_val(pte) & BTFIXUP_HALF(pte_writei);
} }
extern int pte_dirty(pte_t pte) __attribute_const__; static int pte_dirty(pte_t pte) __attribute_const__;
static inline int pte_dirty(pte_t pte) static inline int pte_dirty(pte_t pte)
{ {
return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi); return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi);
} }
extern int pte_young(pte_t pte) __attribute_const__; static int pte_young(pte_t pte) __attribute_const__;
static inline int pte_young(pte_t pte) static inline int pte_young(pte_t pte)
{ {
return pte_val(pte) & BTFIXUP_HALF(pte_youngi); return pte_val(pte) & BTFIXUP_HALF(pte_youngi);
...@@ -217,7 +217,7 @@ static inline int pte_young(pte_t pte) ...@@ -217,7 +217,7 @@ static inline int pte_young(pte_t pte)
*/ */
BTFIXUPDEF_HALF(pte_filei) BTFIXUPDEF_HALF(pte_filei)
extern int pte_file(pte_t pte) __attribute_const__; static int pte_file(pte_t pte) __attribute_const__;
static inline int pte_file(pte_t pte) static inline int pte_file(pte_t pte)
{ {
return pte_val(pte) & BTFIXUP_HALF(pte_filei); return pte_val(pte) & BTFIXUP_HALF(pte_filei);
...@@ -229,19 +229,19 @@ BTFIXUPDEF_HALF(pte_wrprotecti) ...@@ -229,19 +229,19 @@ BTFIXUPDEF_HALF(pte_wrprotecti)
BTFIXUPDEF_HALF(pte_mkcleani) BTFIXUPDEF_HALF(pte_mkcleani)
BTFIXUPDEF_HALF(pte_mkoldi) BTFIXUPDEF_HALF(pte_mkoldi)
extern pte_t pte_wrprotect(pte_t pte) __attribute_const__; static pte_t pte_wrprotect(pte_t pte) __attribute_const__;
static inline pte_t pte_wrprotect(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte)
{ {
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_wrprotecti)); return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_wrprotecti));
} }
extern pte_t pte_mkclean(pte_t pte) __attribute_const__; static pte_t pte_mkclean(pte_t pte) __attribute_const__;
static inline pte_t pte_mkclean(pte_t pte) static inline pte_t pte_mkclean(pte_t pte)
{ {
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkcleani)); return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkcleani));
} }
extern pte_t pte_mkold(pte_t pte) __attribute_const__; static pte_t pte_mkold(pte_t pte) __attribute_const__;
static inline pte_t pte_mkold(pte_t pte) static inline pte_t pte_mkold(pte_t pte)
{ {
return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkoldi)); return __pte(pte_val(pte) & ~BTFIXUP_HALF(pte_mkoldi));
...@@ -278,7 +278,7 @@ BTFIXUPDEF_CALL_CONST(pte_t, mk_pte_io, unsigned long, pgprot_t, int) ...@@ -278,7 +278,7 @@ BTFIXUPDEF_CALL_CONST(pte_t, mk_pte_io, unsigned long, pgprot_t, int)
BTFIXUPDEF_INT(pte_modify_mask) BTFIXUPDEF_INT(pte_modify_mask)
extern pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__; static pte_t pte_modify(pte_t pte, pgprot_t newprot) __attribute_const__;
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{ {
return __pte((pte_val(pte) & BTFIXUP_INT(pte_modify_mask)) | return __pte((pte_val(pte) & BTFIXUP_INT(pte_modify_mask)) |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment