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

Commit b7e4226e authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Build fix: Fix irq flags type 



Though from a hardware perspective it would be sensible to use only a
32-bit unsigned int type Linux defines interrupt flags to be stored in
an unsigned long and nothing else.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 95b866d5

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		case FPC_EIR: {	/* implementation / version register */

			unsigned int flags;

#ifdef CONFIG_MIPS_MT_SMTC

			unsigned int irqflags;

			unsigned long irqflags;

			unsigned int mtflags;

#endif /* CONFIG_MIPS_MT_SMTC */

arch/mips/kernel/smtc.c

+3 −3
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ void mipsmt_prepare_cpus(void) 
void __cpuinit smtc_boot_secondary(int cpu, struct task_struct *idle)

{

	extern u32 kernelsp[NR_CPUS];

	long flags;

	unsigned long flags;

	int mtflags;



	LOCK_MT_PRA();
@@ -753,7 +753,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action) 
{

	int tcstatus;

	struct smtc_ipi *pipi;

	long flags;

	unsigned long flags;

	int mtflags;



	if (cpu == smp_processor_id()) {
@@ -975,7 +975,7 @@ static irqreturn_t ipi_interrupt(int irq, void *dev_idm) 
	struct smtc_ipi *pipi;

	unsigned long tcstatus;

	int sent;

	long flags;

	unsigned long flags;

	unsigned int mtflags;

	unsigned int vpflags;

include/asm-mips/mipsregs.h

+3 −3
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ set_c0_##name(unsigned int set) \ 
{								\

	unsigned int res;					\

	unsigned int omt;					\

	unsigned int flags;					\

	unsigned long flags;					\

								\

	local_irq_save(flags);					\

	omt = __dmt();						\
@@ -1480,7 +1480,7 @@ clear_c0_##name(unsigned int clear) \ 
{								\

	unsigned int res;					\

	unsigned int omt;					\

	unsigned int flags;					\

	unsigned long flags;					\

								\

	local_irq_save(flags);					\

	omt = __dmt();						\
@@ -1498,7 +1498,7 @@ change_c0_##name(unsigned int change, unsigned int new) \ 
{								\

	unsigned int res;					\

	unsigned int omt;					\

	unsigned int flags;					\

	unsigned long flags;					\

								\

	local_irq_save(flags);					\

								\