[PATCH] replace extern with static in some linux code

[Flavio Cruz]

* linux/dev/include/linux/fs.h: Replace extern with static.
* linux/dev/include/linux/locks.h: Likewise.
* linux/dev/include/linux/mm.h: Likewise.
* linux/src/drivers/net/e2100.c: Likewise
* linux/src/include/asm-i386/termios.h: Likewise.
* linux/src/include/linux/interrupt.h: Likewise.
* linux/src/include/net/route.h: Likewise.
* linux/src/include/net/sock.h: Likewise.

---
diff --git a/linux/dev/include/linux/fs.h b/linux/dev/include/linux/fs.h
index a2f9383..def2bc9 100644
--- a/linux/dev/include/linux/fs.h
+++ b/linux/dev/include/linux/fs.h
@@ -650,7 +650,7 @@ mark_buffer_uptodate (struct buffer_head *bh, int on)
 void mark_buffer_uptodate(struct buffer_head * bh, int on);
 #endif
 
-extern inline void mark_buffer_clean(struct buffer_head * bh)
+static inline void mark_buffer_clean(struct buffer_head * bh)
 {
 #ifdef MACH
     clear_bit (BH_Dirty, &bh->b_state);
@@ -662,7 +662,7 @@ extern inline void mark_buffer_clean(struct buffer_head * 
bh)
 #endif
 }
 
-extern inline void mark_buffer_dirty(struct buffer_head * bh, int flag)
+static inline void mark_buffer_dirty(struct buffer_head * bh, int flag)
 {
 #ifdef MACH
     set_bit (BH_Dirty, &bh->b_state);
diff --git a/linux/dev/include/linux/locks.h b/linux/dev/include/linux/locks.h
index 72cf108..ae063fb 100644
--- a/linux/dev/include/linux/locks.h
+++ b/linux/dev/include/linux/locks.h
@@ -20,13 +20,13 @@ extern struct buffer_head *reuse_list;
  */
 extern void __wait_on_buffer(struct buffer_head *);
 
-extern inline void wait_on_buffer(struct buffer_head * bh)
+static inline void wait_on_buffer(struct buffer_head * bh)
 {
        if (test_bit(BH_Lock, &bh->b_state))
                __wait_on_buffer(bh);
 }
 
-extern inline void lock_buffer(struct buffer_head * bh)
+static inline void lock_buffer(struct buffer_head * bh)
 {
        while (set_bit(BH_Lock, &bh->b_state))
                __wait_on_buffer(bh);
@@ -42,20 +42,20 @@ void unlock_buffer(struct buffer_head *);
  */
 extern void __wait_on_super(struct super_block *);
 
-extern inline void wait_on_super(struct super_block * sb)
+static inline void wait_on_super(struct super_block * sb)
 {
        if (sb->s_lock)
                __wait_on_super(sb);
 }
 
-extern inline void lock_super(struct super_block * sb)
+static inline void lock_super(struct super_block * sb)
 {
        if (sb->s_lock)
                __wait_on_super(sb);
        sb->s_lock = 1;
 }
 
-extern inline void unlock_super(struct super_block * sb)
+static inline void unlock_super(struct super_block * sb)
 {
        sb->s_lock = 0;
        wake_up(&sb->s_wait);
diff --git a/linux/dev/include/linux/mm.h b/linux/dev/include/linux/mm.h
index cd06137..b0c3ab0 100644
--- a/linux/dev/include/linux/mm.h
+++ b/linux/dev/include/linux/mm.h
@@ -234,7 +234,7 @@ extern mem_map_t * mem_map;
 #define __get_dma_pages(priority, order) __get_free_pages((priority),(order),1)
 extern unsigned long __get_free_pages(int priority, unsigned long gfporder, 
int dma);
 
-extern inline unsigned long get_free_page(int priority)
+static inline unsigned long get_free_page(int priority)
 {
        unsigned long page;
 
diff --git a/linux/src/drivers/net/e2100.c b/linux/src/drivers/net/e2100.c
index 537295a..be4185a 100644
--- a/linux/src/drivers/net/e2100.c
+++ b/linux/src/drivers/net/e2100.c
@@ -68,7 +68,7 @@ static int e21_probe_list[] = {0x300, 0x280, 0x380, 0x220, 0};
 #define E21_SAPROM             0x10    /* Offset to station address data. */
 #define E21_IO_EXTENT   0x20
 
-extern inline void mem_on(short port, volatile char *mem_base,
+static inline void mem_on(short port, volatile char *mem_base,
                                                  unsigned char start_page )
 {
        /* This is a little weird: set the shared memory window by doing a
@@ -78,7 +78,7 @@ extern inline void mem_on(short port, volatile char *mem_base,
        outb(E21_MEM_ON, port + E21_MEM_ENABLE + E21_MEM_ON);
 }
 
-extern inline void mem_off(short port)
+static inline void mem_off(short port)
 {
        inb(port + E21_MEM_ENABLE);
        outb(0x00, port + E21_MEM_ENABLE);
diff --git a/linux/src/include/asm-i386/termios.h 
b/linux/src/include/asm-i386/termios.h
index 76551de..9f65b4d 100644
--- a/linux/src/include/asm-i386/termios.h
+++ b/linux/src/include/asm-i386/termios.h
@@ -61,7 +61,7 @@ struct termio {
 /*
  * Translate a "termio" structure into a "termios". Ugh.
  */
-extern inline void trans_from_termio(struct termio * termio,
+static inline void trans_from_termio(struct termio * termio,
        struct termios * termios)
 {
 #define SET_LOW_BITS(x,y)      (*(unsigned short *)(&x) = (y))
@@ -76,7 +76,7 @@ extern inline void trans_from_termio(struct termio * termio,
 /*
  * Translate a "termios" structure into a "termio". Ugh.
  */
-extern inline void trans_to_termio(struct termios * termios,
+static inline void trans_to_termio(struct termios * termios,
        struct termio * termio)
 {
        termio->c_iflag = termios->c_iflag;
diff --git a/linux/src/include/linux/interrupt.h 
b/linux/src/include/linux/interrupt.h
index 5765260..0224475 100644
--- a/linux/src/include/linux/interrupt.h
+++ b/linux/src/include/linux/interrupt.h
@@ -43,14 +43,14 @@ enum {
        ISICOM_BH
 };
 
-extern inline void init_bh(int nr, void (*routine)(void))
+static inline void init_bh(int nr, void (*routine)(void))
 {
        bh_base[nr] = routine;
        bh_mask_count[nr] = 0;
        bh_mask |= 1 << nr;
 }
 
-extern inline void mark_bh(int nr)
+static inline void mark_bh(int nr)
 {
        set_bit(nr, &bh_active);
 }
@@ -59,13 +59,13 @@ extern inline void mark_bh(int nr)
  * These use a mask count to correctly handle
  * nested disable/enable calls
  */
-extern inline void disable_bh(int nr)
+static inline void disable_bh(int nr)
 {
        bh_mask &= ~(1 << nr);
        bh_mask_count[nr]++;
 }
 
-extern inline void enable_bh(int nr)
+static inline void enable_bh(int nr)
 {
        if (!--bh_mask_count[nr])
                bh_mask |= 1 << nr;
@@ -75,13 +75,13 @@ extern inline void enable_bh(int nr)
  * start_bh_atomic/end_bh_atomic also nest
  * naturally by using a counter
  */
-extern inline void start_bh_atomic(void)
+static inline void start_bh_atomic(void)
 {
        intr_count++;
        barrier();
 }
 
-extern inline void end_bh_atomic(void)
+static inline void end_bh_atomic(void)
 {
        barrier();
        intr_count--;
diff --git a/linux/src/include/net/route.h b/linux/src/include/net/route.h
index 7bf32d0..2af1a41 100644
--- a/linux/src/include/net/route.h
+++ b/linux/src/include/net/route.h
@@ -105,30 +105,30 @@ extern unsigned           ip_rt_bh_mask;
 extern struct rtable   *ip_rt_hash_table[RT_HASH_DIVISOR];
 extern void            rt_free(struct rtable * rt);
 
-extern __inline__ void ip_rt_fast_lock(void)
+static __inline__ void ip_rt_fast_lock(void)
 {
        atomic_inc(&ip_rt_lock);
 }
 
-extern __inline__ void ip_rt_fast_unlock(void)
+static __inline__ void ip_rt_fast_unlock(void)
 {
        atomic_dec(&ip_rt_lock);
 }
 
-extern __inline__ void ip_rt_unlock(void)
+static __inline__ void ip_rt_unlock(void)
 {
        if (atomic_dec_and_test(&ip_rt_lock) && ip_rt_bh_mask)
                ip_rt_run_bh();
 }
 
-extern __inline__ unsigned ip_rt_hash_code(__u32 addr)
+static __inline__ unsigned ip_rt_hash_code(__u32 addr)
 {
        unsigned tmp = addr + (addr>>16);
        return (tmp + (tmp>>8)) & 0xFF;
 }
 
 
-extern __inline__ void ip_rt_put(struct rtable * rt)
+static __inline__ void ip_rt_put(struct rtable * rt)
 #ifndef MODULE
 {
        /* If this rtable entry is not in the cache, we'd better free
@@ -142,9 +142,9 @@ extern __inline__ void ip_rt_put(struct rtable * rt)
 #endif
 
 #ifdef CONFIG_KERNELD
-extern struct rtable * ip_rt_route(__u32 daddr, int local, struct device *dev);
+static struct rtable * ip_rt_route(__u32 daddr, int local, struct device *dev);
 #else
-extern __inline__ struct rtable * ip_rt_route(__u32 daddr, int local, struct 
device *dev)
+static __inline__ struct rtable * ip_rt_route(__u32 daddr, int local, struct 
device *dev)
 #ifndef MODULE
 {
        struct rtable * rth;
@@ -170,7 +170,7 @@ extern __inline__ struct rtable * ip_rt_route(__u32 daddr, 
int local, struct dev
 #endif
 #endif
 
-extern __inline__ struct rtable * ip_check_route(struct rtable ** rp, __u32 
daddr, 
+static __inline__ struct rtable * ip_check_route(struct rtable ** rp, __u32 
daddr, 
                                                 int local, struct device *dev)
 {
        struct rtable * rt = *rp;
diff --git a/linux/src/include/net/sock.h b/linux/src/include/net/sock.h
index 7a3ec03..25a9044 100644
--- a/linux/src/include/net/sock.h
+++ b/linux/src/include/net/sock.h
@@ -559,7 +559,7 @@ extern struct sk_buff               
*sock_alloc_send_skb(struct sock *skb,
  *     packet ever received.
  */
 
-extern __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
        if (sk->rmem_alloc + skb->truesize >= sk->rcvbuf)
                return -ENOMEM;
@@ -571,7 +571,7 @@ extern __inline__ int sock_queue_rcv_skb(struct sock *sk, 
struct sk_buff *skb)
        return 0;
 }
 
-extern __inline__ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff 
*skb)
+static __inline__ int __sock_queue_rcv_skb(struct sock *sk, struct sk_buff 
*skb)
 {
        if (sk->rmem_alloc + skb->truesize >= sk->rcvbuf)
                return -ENOMEM;
@@ -587,7 +587,7 @@ extern __inline__ int __sock_queue_rcv_skb(struct sock *sk, 
struct sk_buff *skb)
  *     Recover an error report and clear atomically
  */
  
-extern __inline__ int sock_error(struct sock *sk)
+static __inline__ int sock_error(struct sock *sk)
 {
        int err=xchg(&sk->err,0);
        return -err;