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

Commit 54b41b97 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/smp'

parents e60692b9 e7dc951e

arch/sh/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -706,6 +706,13 @@ config NR_CPUS 
	  This is purely to save memory - each supported CPU adds

	  approximately eight kilobytes to the kernel image.



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && HOTPLUG && EXPERIMENTAL

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.



source "kernel/Kconfig.preempt"



config GUSA

arch/sh/boards/board-urquell.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <cpu/sh7786.h>

#include <asm/heartbeat.h>

#include <asm/sizes.h>

#include <asm/smp-ops.h>



/*

 * bit  1234 5678
@@ -203,6 +204,8 @@ static void __init urquell_setup(char **cmdline_p) 
	printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");



	pm_power_off = urquell_power_off;



	register_smp_ops(&shx3_smp_ops);

}



/*

arch/sh/boards/mach-sdk7786/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/heartbeat.h>

#include <asm/sizes.h>

#include <asm/reboot.h>

#include <asm/smp-ops.h>



static struct resource heartbeat_resource = {

	.start		= 0x07fff8b0,
@@ -189,6 +190,8 @@ static void __init sdk7786_setup(char **cmdline_p) 


	machine_ops.restart = sdk7786_restart;

	pm_power_off = sdk7786_power_off;



	register_smp_ops(&shx3_smp_ops);

}



/*

arch/sh/boards/mach-x3proto/setup.c

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/usb/r8a66597.h>

#include <linux/usb/m66592.h>

#include <asm/ilsel.h>

#include <asm/smp-ops.h>



static struct resource heartbeat_resources[] = {

	[0] = {
@@ -152,7 +153,13 @@ static void __init x3proto_init_irq(void) 
	__raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);

}



static void __init x3proto_setup(char **cmdline_p)

{

	register_smp_ops(&shx3_smp_ops);

}



static struct sh_machine_vector mv_x3proto __initmv = {

	.mv_name		= "x3proto",

	.mv_setup		= x3proto_setup,

	.mv_init_irq		= x3proto_init_irq,

};

arch/sh/include/asm/irq.h

+3 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SH_IRQ_H

#define __ASM_SH_IRQ_H



#include <linux/cpumask.h>

#include <asm/machvec.h>



/*
@@ -50,6 +51,8 @@ static inline int generic_irq_demux(int irq) 
#define irq_demux(irq)		sh_mv.mv_irq_demux(irq)



void init_IRQ(void);

void migrate_irqs(void);



asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs);



#ifdef CONFIG_IRQSTACKS