Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9b5444e authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] cris: "extern inline" -> "static inline" 



"extern inline" doesn't make much sense.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarMikael Starvik <starvik@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5f9c3cbc

arch/cris/arch-v10/README.mm

+3 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ The example address is 0xd004000c; in binary this is: 
Given the top-level Page Directory, the offset in that directory is calculated

using the upper 8 bits:



extern inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address)

static inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address)

{

	return mm->pgd + (address >> PGDIR_SHIFT);

}
@@ -190,14 +190,14 @@ The pgd_t from our example will therefore be the 208'th (0xd0) entry in mm->pgd. 


Since the Middle Directory does not exist, it is a unity mapping:



extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)

static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)

{

	return (pmd_t *) dir;

}



The Page Table provides the final lookup by using bits 13 to 23 as index:



extern inline pte_t * pte_offset(pmd_t * dir, unsigned long address)

static inline pte_t * pte_offset(pmd_t * dir, unsigned long address)

{

	return (pte_t *) pmd_page(*dir) + ((address >> PAGE_SHIFT) &

					   (PTRS_PER_PTE - 1));

arch/cris/arch-v10/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ give_sigsegv: 
 * OK, we're invoking a handler

 */	



extern inline void

static inline void

handle_signal(int canrestart, unsigned long sig,

	      siginfo_t *info, struct k_sigaction *ka,

              sigset_t *oldset, struct pt_regs * regs)

arch/cris/arch-v32/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ give_sigsegv: 
}



/* Invoke a singal handler to, well, handle the signal. */

extern inline void

static inline void

handle_signal(int canrestart, unsigned long sig,

	      siginfo_t *info, struct k_sigaction *ka,

              sigset_t *oldset, struct pt_regs * regs)

arch/cris/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/tlbflush.h>

#include <asm/arch/memmap.h>



extern inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,

static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,

	unsigned long phys_addr, pgprot_t prot)

{

	unsigned long end;

include/asm-cris/arch-v10/byteorder.h

+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 
 * them together into ntohl etc.

 */



extern __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)

static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));

  

	return(x);

}



extern __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)

static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)

{

	__asm__ ("swapb %0" : "=r" (x) : "0" (x));