Commit e5913db1 authored by Nick Child's avatar Nick Child Committed by Michael Ellerman
Browse files

powerpc/powernv: Add __init attribute to eligible functions 



Some functions defined in 'arch/powerpc/platforms/powernv' are
deserving of an `__init` macro attribute. These functions are only
called by other initialization functions and therefore should inherit
the attribute.
Also, change function declarations in header files to include `__init`.

Signed-off-by: default avatarNick Child <nick.child@ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211216220035.605465-12-nick.child@ibm.com
parent b346f571

arch/powerpc/include/asm/cpuidle.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ extern struct pnv_idle_states_t *pnv_idle_states; 
extern int nr_pnv_idle_states;



unsigned long pnv_cpu_offline(unsigned int cpu);

int validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags);

int __init validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags);

static inline void report_invalid_psscr_val(u64 psscr_val, int err)

{

	switch (err) {

arch/powerpc/include/asm/opal.h

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ extern int early_init_dt_scan_opal(unsigned long node, const char *uname, 
				   int depth, void *data);

extern int early_init_dt_scan_recoverable_ranges(unsigned long node,

				 const char *uname, int depth, void *data);

extern void opal_configure_cores(void);

void __init opal_configure_cores(void);



extern int opal_get_chars(uint32_t vtermno, char *buf, int count);

extern int opal_put_chars(uint32_t vtermno, const char *buf, int total_len);

arch/powerpc/platforms/powernv/idle.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static bool deepest_stop_found; 


static unsigned long power7_offline_type;



static int pnv_save_sprs_for_deep_states(void)

static int __init pnv_save_sprs_for_deep_states(void)

{

	int cpu;

	int rc;
@@ -1123,7 +1123,7 @@ unsigned long pnv_cpu_offline(unsigned int cpu) 
 *	stop instruction

 */



int validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags)

int __init validate_psscr_val_mask(u64 *psscr_val, u64 *psscr_mask, u32 flags)

{

	int err = 0;
@@ -1317,7 +1317,7 @@ static void __init pnv_probe_idle_states(void) 
 * which is the number of cpuidle states discovered through device-tree.

 */



static int pnv_parse_cpuidle_dt(void)

static int __init pnv_parse_cpuidle_dt(void)

{

	struct device_node *np;

	int nr_idle_states, i;

arch/powerpc/platforms/powernv/opal-core.c

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline int is_opalcore_usable(void) 
	return (oc_conf && oc_conf->opalcorebuf != NULL) ? 1 : 0;

}



static Elf64_Word *append_elf64_note(Elf64_Word *buf, char *name,

static Elf64_Word *__init append_elf64_note(Elf64_Word *buf, char *name,

				     u32 type, void *data,

				     size_t data_len)

{
@@ -108,7 +108,7 @@ static Elf64_Word *append_elf64_note(Elf64_Word *buf, char *name, 
	return buf;

}



static void fill_prstatus(struct elf_prstatus *prstatus, int pir,

static void __init fill_prstatus(struct elf_prstatus *prstatus, int pir,

			  struct pt_regs *regs)

{

	memset(prstatus, 0, sizeof(struct elf_prstatus));
@@ -134,7 +134,7 @@ static void fill_prstatus(struct elf_prstatus *prstatus, int pir, 
	}

}



static Elf64_Word *auxv_to_elf64_notes(Elf64_Word *buf,

static Elf64_Word *__init auxv_to_elf64_notes(Elf64_Word *buf,

				       u64 opal_boot_entry)

{

	Elf64_Off *bufp = (Elf64_Off *)oc_conf->auxv_buf;

arch/powerpc/platforms/powernv/opal-fadump.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void opal_fadump_update_config(struct fw_dump *fadump_conf, 
 * This function is called in the capture kernel to get configuration details

 * from metadata setup by the first kernel.

 */

static void opal_fadump_get_config(struct fw_dump *fadump_conf,

static void __init opal_fadump_get_config(struct fw_dump *fadump_conf,

				   const struct opal_fadump_mem_struct *fdm)

{

	unsigned long base, size, last_end, hole_size;