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

Commit a7e6601f authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Move init_per_cpu() into init section 



Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent ea697648

arch/parisc/include/asm/smp.h

+1 −0
Original line number Original line Diff line number Diff line 
#ifndef __ASM_SMP_H

#ifndef __ASM_SMP_H

#define __ASM_SMP_H

#define __ASM_SMP_H





extern int init_per_cpu(int cpuid);





#if defined(CONFIG_SMP)

#if defined(CONFIG_SMP)

arch/parisc/kernel/processor.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ void __init collect_boot_cpu_data(void) 
 *

 *

 * o Enable CPU profiling hooks.

 * o Enable CPU profiling hooks.

 */

 */

int init_per_cpu(int cpunum)

int __init init_per_cpu(int cpunum)

{

{

	int ret;

	int ret;

	struct pdc_coproc_cfg coproc_cfg;

	struct pdc_coproc_cfg coproc_cfg;

arch/parisc/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/io.h>

#include <asm/io.h>

#include <asm/setup.h>

#include <asm/setup.h>

#include <asm/unwind.h>

#include <asm/unwind.h>

#include <asm/smp.h>





static char __initdata command_line[COMMAND_LINE_SIZE];

static char __initdata command_line[COMMAND_LINE_SIZE];
@@ -116,7 +117,6 @@ void __init dma_ops_init(void) 
}

}

#endif

#endif





extern int init_per_cpu(int cpuid);

extern void collect_boot_cpu_data(void);

extern void collect_boot_cpu_data(void);





void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

arch/parisc/kernel/smp.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -255,12 +255,11 @@ void arch_send_call_function_single_ipi(int cpu) 
static void __init

static void __init

smp_cpu_init(int cpunum)

smp_cpu_init(int cpunum)

{

{

	extern int init_per_cpu(int);  /* arch/parisc/kernel/processor.c */

	extern void init_IRQ(void);    /* arch/parisc/kernel/irq.c */

	extern void init_IRQ(void);    /* arch/parisc/kernel/irq.c */

	extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */

	extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */





	/* Set modes and Enable floating point coprocessor */

	/* Set modes and Enable floating point coprocessor */

	(void) init_per_cpu(cpunum);

	init_per_cpu(cpunum);





	disable_sr_hashing();

	disable_sr_hashing();