Message ID | 20210812233753.104217-4-vgupta@kernel.org |
---|---|
State | New |
Headers | show |
Series | ARC mm updates: support 3/4 levels and asm-generic/pgalloc | expand |
Heh, "Don't pollute mmu.h and cache.h with some of ARC internal bootlog/setup related functions. move them aside to setup.h" is still not there :) On Thu, Aug 12, 2021 at 04:37:37PM -0700, Vineet Gupta wrote: > Signed-off-by: Vineet Gupta <vgupta@kernel.org> > --- > arch/arc/include/asm/cache.h | 4 ---- > arch/arc/include/asm/mmu.h | 4 ---- > arch/arc/include/asm/setup.h | 12 ++++++++++-- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h > index d8ece4292388..f0f1fc5d62b6 100644 > --- a/arch/arc/include/asm/cache.h > +++ b/arch/arc/include/asm/cache.h > @@ -62,10 +62,6 @@ > #define ARCH_SLAB_MINALIGN 8 > #endif > > -extern void arc_cache_init(void); > -extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len); > -extern void read_decode_cache_bcr(void); > - > extern int ioc_enable; > extern unsigned long perip_base, perip_end; > > diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h > index 38a036508699..762cfe66e16b 100644 > --- a/arch/arc/include/asm/mmu.h > +++ b/arch/arc/include/asm/mmu.h > @@ -64,10 +64,6 @@ typedef struct { > unsigned long asid[NR_CPUS]; /* 8 bit MMU PID + Generation cycle */ > } mm_context_t; > > -void arc_mmu_init(void); > -extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len); > -void read_decode_mmu_bcr(void); > - > static inline int is_pae40_enabled(void) > { > return IS_ENABLED(CONFIG_ARC_HAS_PAE40); > diff --git a/arch/arc/include/asm/setup.h b/arch/arc/include/asm/setup.h > index 01f85478170d..028a8cf76206 100644 > --- a/arch/arc/include/asm/setup.h > +++ b/arch/arc/include/asm/setup.h > @@ -2,8 +2,8 @@ > /* > * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) > */ > -#ifndef __ASMARC_SETUP_H > -#define __ASMARC_SETUP_H > +#ifndef __ASM_ARC_SETUP_H > +#define __ASM_ARC_SETUP_H > > > #include <linux/types.h> > @@ -34,4 +34,12 @@ long __init arc_get_mem_sz(void); > #define IS_AVAIL2(v, s, cfg) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_USED_CFG(cfg)) > #define IS_AVAIL3(v, v2, s) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_DISABLED_RUN(v2)) > > +extern void arc_mmu_init(void); > +extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len); > +extern void read_decode_mmu_bcr(void); > + > +extern void arc_cache_init(void); > +extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len); > +extern void read_decode_cache_bcr(void); > + > #endif /* __ASMARC_SETUP_H */ > -- > 2.25.1 >
On 8/15/21 2:27 AM, Mike Rapoport wrote: > Heh, > > "Don't pollute mmu.h and cache.h with some of ARC internal bootlog/setup > related functions. > move them aside to setup.h" > > is still not there :) Oops my bad, indeed missed out on that one. Fixed now. Thx, -Vineet
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index d8ece4292388..f0f1fc5d62b6 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -62,10 +62,6 @@ #define ARCH_SLAB_MINALIGN 8 #endif -extern void arc_cache_init(void); -extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len); -extern void read_decode_cache_bcr(void); - extern int ioc_enable; extern unsigned long perip_base, perip_end; diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h index 38a036508699..762cfe66e16b 100644 --- a/arch/arc/include/asm/mmu.h +++ b/arch/arc/include/asm/mmu.h @@ -64,10 +64,6 @@ typedef struct { unsigned long asid[NR_CPUS]; /* 8 bit MMU PID + Generation cycle */ } mm_context_t; -void arc_mmu_init(void); -extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len); -void read_decode_mmu_bcr(void); - static inline int is_pae40_enabled(void) { return IS_ENABLED(CONFIG_ARC_HAS_PAE40); diff --git a/arch/arc/include/asm/setup.h b/arch/arc/include/asm/setup.h index 01f85478170d..028a8cf76206 100644 --- a/arch/arc/include/asm/setup.h +++ b/arch/arc/include/asm/setup.h @@ -2,8 +2,8 @@ /* * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) */ -#ifndef __ASMARC_SETUP_H -#define __ASMARC_SETUP_H +#ifndef __ASM_ARC_SETUP_H +#define __ASM_ARC_SETUP_H #include <linux/types.h> @@ -34,4 +34,12 @@ long __init arc_get_mem_sz(void); #define IS_AVAIL2(v, s, cfg) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_USED_CFG(cfg)) #define IS_AVAIL3(v, v2, s) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_DISABLED_RUN(v2)) +extern void arc_mmu_init(void); +extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len); +extern void read_decode_mmu_bcr(void); + +extern void arc_cache_init(void); +extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len); +extern void read_decode_cache_bcr(void); + #endif /* __ASMARC_SETUP_H */
Signed-off-by: Vineet Gupta <vgupta@kernel.org> --- arch/arc/include/asm/cache.h | 4 ---- arch/arc/include/asm/mmu.h | 4 ---- arch/arc/include/asm/setup.h | 12 ++++++++++-- 3 files changed, 10 insertions(+), 10 deletions(-)