Skip to content

Commit

Permalink
riscv: add __init section marker to some functions
Browse files Browse the repository at this point in the history
They are not needed after booting, so mark them as __init to move them
to the __init section.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
  • Loading branch information
Jisheng Zhang authored and Palmer Dabbelt committed Apr 26, 2021
1 parent 0df68ce commit 1987501
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/riscv/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,6 @@ int is_valid_bugaddr(unsigned long pc)
#endif /* CONFIG_GENERIC_BUG */

/* stvec & scratch is already set from head.S */
void trap_init(void)
void __init trap_init(void)
{
}
6 changes: 3 additions & 3 deletions arch/riscv/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static void __init zone_sizes_init(void)
free_area_init(max_zone_pfns);
}

static void setup_zero_page(void)
static void __init setup_zero_page(void)
{
memset((void *)empty_zero_page, 0, PAGE_SIZE);
}
Expand All @@ -78,7 +78,7 @@ static inline void print_mlm(char *name, unsigned long b, unsigned long t)
(((t) - (b)) >> 20));
}

static void print_vm_layout(void)
static void __init print_vm_layout(void)
{
pr_notice("Virtual kernel memory layout:\n");
print_mlk("fixmap", (unsigned long)FIXADDR_START,
Expand Down Expand Up @@ -630,7 +630,7 @@ static inline void setup_vm_final(void)
#endif /* CONFIG_MMU */

#ifdef CONFIG_STRICT_KERNEL_RWX
void protect_kernel_text_data(void)
void __init protect_kernel_text_data(void)
{
unsigned long text_start = (unsigned long)_start;
unsigned long init_text_start = (unsigned long)__init_text_begin;
Expand Down
6 changes: 3 additions & 3 deletions arch/riscv/mm/kasan_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ asmlinkage void __init kasan_early_init(void)
local_flush_tlb_all();
}

static void kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
{
phys_addr_t phys_addr;
pte_t *ptep, *base_pte;
Expand All @@ -70,7 +70,7 @@ static void kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long en
set_pmd(pmd, pfn_pmd(PFN_DOWN(__pa(base_pte)), PAGE_TABLE));
}

static void kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long end)
static void __init kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long end)
{
phys_addr_t phys_addr;
pmd_t *pmdp, *base_pmd;
Expand Down Expand Up @@ -105,7 +105,7 @@ static void kasan_populate_pmd(pgd_t *pgd, unsigned long vaddr, unsigned long en
set_pgd(pgd, pfn_pgd(PFN_DOWN(__pa(base_pmd)), PAGE_TABLE));
}

static void kasan_populate_pgd(unsigned long vaddr, unsigned long end)
static void __init kasan_populate_pgd(unsigned long vaddr, unsigned long end)
{
phys_addr_t phys_addr;
pgd_t *pgdp = pgd_offset_k(vaddr);
Expand Down
2 changes: 1 addition & 1 deletion arch/riscv/mm/ptdump.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static int ptdump_show(struct seq_file *m, void *v)

DEFINE_SHOW_ATTRIBUTE(ptdump);

static int ptdump_init(void)
static int __init ptdump_init(void)
{
unsigned int i, j;

Expand Down

0 comments on commit 1987501

Please sign in to comment.