| Message ID | 20190903052407.16638-6-alastair@au1.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | powerpc: convert cache asm to C | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (c317052c95bef1f977b023158e5aa929215f443d) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Le 03/09/2019 à 07:23, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword does not value-add for function prototypes. Is it worth it ? That kind of change is nice cleanup but the drawback is to kill automatic backports of fixes. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > arch/powerpc/include/asm/cache.h | 8 ++++---- > arch/powerpc/include/asm/cacheflush.h | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h > index 91c808c6738b..54fffdf5a6ec 100644 > --- a/arch/powerpc/include/asm/cache.h > +++ b/arch/powerpc/include/asm/cache.h > @@ -102,10 +102,10 @@ static inline u32 l1_icache_bytes(void) > #define __read_mostly __attribute__((__section__(".data..read_mostly"))) > > #ifdef CONFIG_PPC_BOOK3S_32 > -extern long _get_L2CR(void); > -extern long _get_L3CR(void); > -extern void _set_L2CR(unsigned long); > -extern void _set_L3CR(unsigned long); > +long _get_L2CR(void); > +long _get_L3CR(void); > +void _set_L2CR(unsigned long val); > +void _set_L3CR(unsigned long val); > #else > #define _get_L2CR() 0L > #define _get_L3CR() 0L > diff --git a/arch/powerpc/include/asm/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h > index 4a1c9f0200e1..fa10dc19206c 100644 > --- a/arch/powerpc/include/asm/cacheflush.h > +++ b/arch/powerpc/include/asm/cacheflush.h > @@ -38,15 +38,15 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end) { } > #endif > > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > -extern void flush_dcache_page(struct page *page); > +void flush_dcache_page(struct page *page); > #define flush_dcache_mmap_lock(mapping) do { } while (0) > #define flush_dcache_mmap_unlock(mapping) do { } while (0) > > void flush_icache_range(unsigned long start, unsigned long stop); > -extern void flush_icache_user_range(struct vm_area_struct *vma, > +void flush_icache_user_range(struct vm_area_struct *vma, > struct page *page, unsigned long addr, > int len); You have to re-align the other parameters to the ( of the first line. > -extern void flush_dcache_icache_page(struct page *page); > +void flush_dcache_icache_page(struct page *page); > void __flush_dcache_icache(void *page); > > /** > Christophe
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index 91c808c6738b..54fffdf5a6ec 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -102,10 +102,10 @@ static inline u32 l1_icache_bytes(void) #define __read_mostly __attribute__((__section__(".data..read_mostly"))) #ifdef CONFIG_PPC_BOOK3S_32 -extern long _get_L2CR(void); -extern long _get_L3CR(void); -extern void _set_L2CR(unsigned long); -extern void _set_L3CR(unsigned long); +long _get_L2CR(void); +long _get_L3CR(void); +void _set_L2CR(unsigned long val); +void _set_L3CR(unsigned long val); #else #define _get_L2CR() 0L #define _get_L3CR() 0L diff --git a/arch/powerpc/include/asm/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h index 4a1c9f0200e1..fa10dc19206c 100644 --- a/arch/powerpc/include/asm/cacheflush.h +++ b/arch/powerpc/include/asm/cacheflush.h @@ -38,15 +38,15 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end) { } #endif #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 -extern void flush_dcache_page(struct page *page); +void flush_dcache_page(struct page *page); #define flush_dcache_mmap_lock(mapping) do { } while (0) #define flush_dcache_mmap_unlock(mapping) do { } while (0) void flush_icache_range(unsigned long start, unsigned long stop); -extern void flush_icache_user_range(struct vm_area_struct *vma, +void flush_icache_user_range(struct vm_area_struct *vma, struct page *page, unsigned long addr, int len); -extern void flush_dcache_icache_page(struct page *page); +void flush_dcache_icache_page(struct page *page); void __flush_dcache_icache(void *page); /**