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

Commit f13cec84 authored by Adrian Bunk's avatar Adrian Bunk Committed by Kyle McMartin
Browse files

[PARISC] parisc: "extern inline" -> "static inline" 



"extern inline" will have different semantics with gcc 4.3, and "static
inline" is correct here.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 0ed54629

arch/parisc/lib/memcpy.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -139,12 +139,12 @@ DECLARE_PER_CPU(struct exception_data, exception_data); 
#define stw(_s,_t,_o,_a,_e) 	def_store_insn(stw,"r",_s,_t,_o,_a,_e)

#define stw(_s,_t,_o,_a,_e) 	def_store_insn(stw,"r",_s,_t,_o,_a,_e)





#ifdef  CONFIG_PREFETCH

#ifdef  CONFIG_PREFETCH

extern inline void prefetch_src(const void *addr)

static inline void prefetch_src(const void *addr)

{

{

	__asm__("ldw 0(" s_space ",%0), %%r0" : : "r" (addr));

	__asm__("ldw 0(" s_space ",%0), %%r0" : : "r" (addr));

}

}





extern inline void prefetch_dst(const void *addr)

static inline void prefetch_dst(const void *addr)

{

{

	__asm__("ldd 0(" d_space ",%0), %%r0" : : "r" (addr));

	__asm__("ldd 0(" d_space ",%0), %%r0" : : "r" (addr));

}

}

include/asm-parisc/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsign 
/* Most machines react poorly to I/O-space being cacheable... Instead let's

/* Most machines react poorly to I/O-space being cacheable... Instead let's

 * define ioremap() in terms of ioremap_nocache().

 * define ioremap() in terms of ioremap_nocache().

 */

 */

extern inline void __iomem * ioremap(unsigned long offset, unsigned long size)

static inline void __iomem * ioremap(unsigned long offset, unsigned long size)

{

{

	return __ioremap(offset, size, _PAGE_NO_CACHE);

	return __ioremap(offset, size, _PAGE_NO_CACHE);

}

}

include/asm-parisc/pci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ extern struct pci_bios_ops *pci_bios; 
extern void pcibios_register_hba(struct pci_hba_data *);

extern void pcibios_register_hba(struct pci_hba_data *);

extern void pcibios_set_master(struct pci_dev *);

extern void pcibios_set_master(struct pci_dev *);

#else

#else

extern inline void pcibios_register_hba(struct pci_hba_data *x)

static inline void pcibios_register_hba(struct pci_hba_data *x)

{

{

}

}

#endif

#endif

include/asm-parisc/pgtable.h

+16 −16
Original line number Original line Diff line number Diff line
@@ -325,27 +325,27 @@ static inline void pgd_clear(pgd_t *pgd) { 
 * setup: the pgd is never bad, and a pmd always exists (as it's folded

 * setup: the pgd is never bad, and a pmd always exists (as it's folded

 * into the pgd entry)

 * into the pgd entry)

 */

 */

extern inline int pgd_none(pgd_t pgd)		{ return 0; }

static inline int pgd_none(pgd_t pgd)		{ return 0; }

extern inline int pgd_bad(pgd_t pgd)		{ return 0; }

static inline int pgd_bad(pgd_t pgd)		{ return 0; }

extern inline int pgd_present(pgd_t pgd)	{ return 1; }

static inline int pgd_present(pgd_t pgd)	{ return 1; }

extern inline void pgd_clear(pgd_t * pgdp)	{ }

static inline void pgd_clear(pgd_t * pgdp)	{ }

#endif

#endif





/*

/*

 * The following only work if pte_present() is true.

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 * Undefined behaviour if not..

 */

 */

extern inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

extern inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

extern inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_WRITE; }

static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_WRITE; }

extern inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }





extern inline pte_t pte_mkclean(pte_t pte)	{ pte_val(pte) &= ~_PAGE_DIRTY; return pte; }

static inline pte_t pte_mkclean(pte_t pte)	{ pte_val(pte) &= ~_PAGE_DIRTY; return pte; }

extern inline pte_t pte_mkold(pte_t pte)	{ pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkold(pte_t pte)	{ pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }

extern inline pte_t pte_wrprotect(pte_t pte)	{ pte_val(pte) &= ~_PAGE_WRITE; return pte; }

static inline pte_t pte_wrprotect(pte_t pte)	{ pte_val(pte) &= ~_PAGE_WRITE; return pte; }

extern inline pte_t pte_mkdirty(pte_t pte)	{ pte_val(pte) |= _PAGE_DIRTY; return pte; }

static inline pte_t pte_mkdirty(pte_t pte)	{ pte_val(pte) |= _PAGE_DIRTY; return pte; }

extern inline pte_t pte_mkyoung(pte_t pte)	{ pte_val(pte) |= _PAGE_ACCESSED; return pte; }

static inline pte_t pte_mkyoung(pte_t pte)	{ pte_val(pte) |= _PAGE_ACCESSED; return pte; }

extern inline pte_t pte_mkwrite(pte_t pte)	{ pte_val(pte) |= _PAGE_WRITE; return pte; }

static inline pte_t pte_mkwrite(pte_t pte)	{ pte_val(pte) |= _PAGE_WRITE; return pte; }





/*

/*

 * Conversion functions: convert a page and protection to a page entry,

 * Conversion functions: convert a page and protection to a page entry,
@@ -369,7 +369,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) 
	return pte;

	return pte;

}

}





extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }

{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }





/* Permanent address of a page.  On parisc we don't have highmem. */

/* Permanent address of a page.  On parisc we don't have highmem. */

include/asm-parisc/prefetch.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#ifdef CONFIG_PREFETCH

#ifdef CONFIG_PREFETCH





#define ARCH_HAS_PREFETCH

#define ARCH_HAS_PREFETCH

extern inline void prefetch(const void *addr)

static inline void prefetch(const void *addr)

{

{

	__asm__("ldw 0(%0), %%r0" : : "r" (addr));

	__asm__("ldw 0(%0), %%r0" : : "r" (addr));

}

}
@@ -27,7 +27,7 @@ extern inline void prefetch(const void *addr) 
/* LDD is a PA2.0 addition. */

/* LDD is a PA2.0 addition. */

#ifdef CONFIG_PA20

#ifdef CONFIG_PA20

#define ARCH_HAS_PREFETCHW

#define ARCH_HAS_PREFETCHW

extern inline void prefetchw(const void *addr)

static inline void prefetchw(const void *addr)

{

{

	__asm__("ldd 0(%0), %%r0" : : "r" (addr));

	__asm__("ldd 0(%0), %%r0" : : "r" (addr));

}

}