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

Commit ff86714f authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

MIPS: Move 'gic_present' to common location. 



Move the global variable 'gic_present' to be defined in the file
'arch/mips/kernel/irq-gic.c' instead of defining it individually
for each platform making use of the GIC. Also change the type to
be an unsigned integer instead of signed.

Signed-off-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
parent 451b001b

arch/mips/include/asm/gic.h

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ struct gic_shared_intr_map { 
/* Mapped interrupt to pin X, then GIC will generate the vector (X+1). */

#define GIC_PIN_TO_VEC_OFFSET	(1)



extern int gic_present;

extern unsigned int gic_present;

extern unsigned long _gic_base;

extern unsigned int gic_irq_base;

extern unsigned int gic_irq_flags[];

arch/mips/kernel/irq-gic.c

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

#include <asm-generic/bitops/find.h>



unsigned int gic_present;

unsigned long _gic_base;

unsigned int gic_irq_base;

unsigned int gic_irq_flags[GIC_NUM_INTRS];

arch/mips/kernel/smp-mt.c

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

#include <asm/mipsmtregs.h>

#include <asm/mips_mt.h>

#include <asm/gic.h>



static void __init smvp_copy_vpe_config(void)

{
@@ -151,8 +152,6 @@ static void vsmp_send_ipi_mask(const struct cpumask *mask, unsigned int action) 
static void __cpuinit vsmp_init_secondary(void)

{

#ifdef CONFIG_IRQ_GIC

	extern int gic_present;



	/* This is Malta specific: IPI,performance and timer interrupts */

	if (gic_present)

		change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |

arch/mips/mti-malta/malta-int.c

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



int gcmp_present = -1;

int gic_present;

static unsigned long _msc01_biu_base;

static unsigned long _gcmp_base;

static unsigned int ipi_map[NR_CPUS];

arch/mips/mti-sead3/sead3-int.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define SEAD_CONFIG_BASE		0x1b100110

#define SEAD_CONFIG_SIZE		4



int gic_present;

static unsigned long sead3_config_reg;



/*