Re: [2.6 patch] sparc: "extern inline" -> "static inline"

[David S. Miller]

From: Adrian Bunk <[EMAIL PROTECTED]>
Date: Fri, 2 Sep 2005 22:24:44 +0200

> "extern inline" doesn't make much sense.
>
> Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

Patch does not apply to Linus's current tree, every change
in include/asm-sparc/spinlock.h was rejected.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[2.6 patch] sparc: "extern inline" -> "static inline"

[Adrian Bunk]

"extern inline" doesn't make much sense.


Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

---

 arch/sparc/kernel/time.c  |2 +-
 arch/sparc/mm/srmmu.c |2 +-
 include/asm-sparc/btfixup.h   |   12 ++--
 include/asm-sparc/cache.h |   18 +-
 include/asm-sparc/cypress.h   |8 
 include/asm-sparc/delay.h |2 +-
 include/asm-sparc/dma.h   |2 +-
 include/asm-sparc/iommu.h |4 ++--
 include/asm-sparc/kdebug.h|2 +-
 include/asm-sparc/mbus.h  |4 ++--
 include/asm-sparc/msi.h   |2 +-
 include/asm-sparc/mxcc.h  |8 
 include/asm-sparc/obio.h  |   30 +++---
 include/asm-sparc/pci.h   |6 +++---
 include/asm-sparc/pgtable.h   |   28 ++--
 include/asm-sparc/pgtsrmmu.h  |   30 +++---
 include/asm-sparc/processor.h |2 +-
 include/asm-sparc/psr.h   |6 +++---
 include/asm-sparc/sbi.h   |   10 +-
 include/asm-sparc/sbus.h  |6 +++---
 include/asm-sparc/smp.h   |   26 +-
 include/asm-sparc/smpprim.h   |8 
 include/asm-sparc/spinlock.h  |   10 +-
 include/asm-sparc/system.h|2 +-
 include/asm-sparc/traps.h |2 +-
 25 files changed, 116 insertions(+), 116 deletions(-)

--- linux-2.6.13-mm1-full/arch/sparc/kernel/time.c.old  2005-09-02 
22:13:04.0 +0200
+++ linux-2.6.13-mm1-full/arch/sparc/kernel/time.c  2005-09-02 
22:13:17.0 +0200
@@ -457,7 +457,7 @@
sbus_time_init();
 }
 
-extern __inline__ unsigned long do_gettimeoffset(void)
+static inline unsigned long do_gettimeoffset(void)
 {
return (*master_l10_counter >> 10) & 0x1f;
 }
--- linux-2.6.13-mm1-full/arch/sparc/mm/srmmu.c.old 2005-09-02 
22:13:29.0 +0200
+++ linux-2.6.13-mm1-full/arch/sparc/mm/srmmu.c 2005-09-02 22:13:47.0 
+0200
@@ -260,7 +260,7 @@
 { return __pte((pte_val(pte) & SRMMU_CHG_MASK) | pgprot_val(newprot)); }
 
 /* to find an entry in a top-level page table... */
-extern inline pgd_t *srmmu_pgd_offset(struct mm_struct * mm, unsigned long 
address)
+static inline pgd_t *srmmu_pgd_offset(struct mm_struct * mm, unsigned long 
address)
 { return mm->pgd + (address >> SRMMU_PGDIR_SHIFT); }
 
 /* Find an entry in the second-level page table.. */
--- linux-2.6.13-mm1-full/include/asm-sparc/btfixup.h.old   2005-09-02 
22:13:56.0 +0200
+++ linux-2.6.13-mm1-full/include/asm-sparc/btfixup.h   2005-09-02 
22:14:03.0 +0200
@@ -51,7 +51,7 @@
 #define BTFIXUPDEF_SIMM13(__name)  
\
extern unsigned int ___sf_##__name(void) __attribute_const__;   
\
extern unsigned ___ss_##__name[2];  
\
-   extern __inline__ unsigned int ___sf_##__name(void) {   
\
+   static inline unsigned int ___sf_##__name(void) {   
\
unsigned int ret;   
\
__asm__ ("or %%g0, ___s_" #__name ", %0" : "=r"(ret));  
\
return ret; 
\
@@ -59,7 +59,7 @@
 #define BTFIXUPDEF_SIMM13_INIT(__name,__val)   
\
extern unsigned int ___sf_##__name(void) __attribute_const__;   
\
extern unsigned ___ss_##__name[2];  
\
-   extern __inline__ unsigned int ___sf_##__name(void) {   
\
+   static inline unsigned int ___sf_##__name(void) {   
\
unsigned int ret;   
\
__asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : 
"=r"(ret));\
return ret; 
\
@@ -73,7 +73,7 @@
 #define BTFIXUPDEF_HALF(__name)
\
extern unsigned int ___af_##__name(void) __attribute_const__;   
\
extern unsigned ___as_##__name[2];  
\
-   extern __inline__ unsigned int ___af_##__name(void) {   
\
+   static inline unsigned int ___af_##__name(void) {   
\
unsigned int ret;   
\
__asm__ ("or %%g0, ___a_" #__name ", %0" : "=r"(ret));  
\
return ret; 
\
@@ -81,7 +81,7 @@
 #define BTFIXUPDEF_HALF_INIT(__name,__val) 
\
extern unsigned int ___af_##__name(void) __attribute_const__;   
\
extern un